gentoo auto-resync : 23:12:2022 - 01:58:14

183 files changed, 2582 insertions, 1604 deletions

diff --git a/Manifest b/Manifest
index 49586f82a70f..3b836f9a5ab8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29793 BLAKE2B 1ae84d2ea9b3227bdcfb064603859c601713f2a59316e6e955217ff9c5870e7514812d28b64fd10d95aac869f0511be245fe981237552d0779c128cdbeb8e622 SHA512 9f61d52b6f4dd959463ebefafa8a05e49da8c6aad73675cd2b6502ef738b1abaf0149cd9f720ae79c78dbbc7300bddc84dc2fe0d6b119a00975cb1cf1c76350e
-TIMESTAMP 2022-12-22T19:10:02Z
+MANIFEST Manifest.files.gz 29786 BLAKE2B 16e507bed9a19fc0dc0cc1b7384ba2c2fb58119e8c229a092a41750f38acda4b74d09bc74e84bc8f8bceaeb5c47ce9d9f96867923c2504cfa8e9c585378c231b SHA512 d596ca07b91e86b5bba1301633518391755a8e3d00a190184f65275c7f66c8269c0f3ebeb09b14613d2bcddc4f96f6522a3b6b45fd6dde003914b2ff373fece6
+TIMESTAMP 2022-12-23T01:10:13Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOkq4pfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOk//VfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDtahAAjEKL0QDpnW8i5MCNRUrNQ2NoBlzoyMk75qTxgKZxSHXLtzLCFd47aje9
-WIyQ8C0hABAVQ+ZswjBHpCq4xc5S+4bU9sYEDoL3rrnosr1Bz1Zx5tLaBIj8SVfJ
-eR9jFCRtJw2aNfWnFpAMFbA+EtyTJ5I416MdrdSP+xrtsA3700+isHE/+Dim1xop
-KTlRPoqJF09A30UK3Z+IyVA0/v87zkO/kY2DFiOS/8YCjQBLGxo50p2LhD/Z7m9Q
-tb3Sd5NwXeVlwQd3ezgL4ld4dNdhZCZU2yr0TxDTIf6CVvITSObMCzH7/eiOurg3
-RsDbJjJTjBgL9UFi3b2mWYenkt6KtP2/TWKjXppGxyWYmg3zXAegRudMJDrzH2+U
-6kY07CA8HUfTJZk3oAHG6c0YCX8pc+HetccDniRtFBxWKC1AUDOj5uxQrD21ITmU
-QtQa4O1bjBdAGC9N3AjuAPjrTOkhsEGE/75h+A710/7mi0AerlOqRKDXlVjABWqf
-6uex6fbPfayYACyIkFtPq4QSHcaHfke1mTo3j2ejzhWn9zECranUandgqtm2sORW
-U5jIVESMUaPaujIJB40Hdq0H4WowmJCECYEH74p6Up38u051oBWtRyyQGfbOYlzb
-cnfZxk4sjfRdwbfYNb93n2rtPEPh7Qniq6v/t4LBQ70nleIUDhY=
-=gMCj
+klDMuxAAoLL3qLJ+RSuJDvhy31qxanfy8Q89IldL5de+zjx8Eo0Vbps4ubYRPU0P
+/Wk3hCcSkkJ2I+YkE9R3v8aB7CovDk1BtorhmpWEGqn+j/RvJKE8p5I08jHS+2S4
+g+ISZ7/0irQU5/Rp6GULEdm/a3E8x7wIkm1hWuNZBKvBoVEY+FFIMoLNkn0Qogz5
+nF22HNwWJiuueTPnMbMsQEUnCMODKbotd3AkaZwZT5bg9lXunWkaMDhz+BlEvhtn
+hF/9Xtslo5bv5XqIugk0jmz5CCOjaM0NTdGtLQ7ePGkTBKqN/Q6+pB2Ce0m+Z8yR
+3AEgHf+ELlpmCzVhz8LInxetDXaWOsXSRKwRX4a/CLfZdcRS9tZkt8xN83rFoQxK
+jcbv7rvNHcIyGA+bQ9ZqvsIePRe6UxMZ8GsV9rjcG6Z5AAKNuqGCU0/doGCSIrvF
+PIk4ac2dSJeVGHcVu98X8M16w+R2u7hdwXMdeGM0wFQggMNvjsXtEhK6b4/fUsXe
+qbsf8oBWQGF1jr/hqBgMSmCRow+ywZ36sbdaV1llRLjrcwmHbsxC9sdEppfYNdgx
+qKzRJDIQyUgy6TFj2W+LasL8+1K4xYl4T4rNJVbk1P5wfTnIRYrwdOsN1OETBmUQ
+xwl4cU+mA1zFi/8LOB8mCkA4rEWtM4q+KCW9CVd7I6+UVBqQuAE=
+=+6tB
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index bbac8231694b..3bad9df5c4d9 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 09ca6169b186..c7b874444483 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index cb595bc75e82..52abfbf9f763 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,12 +1,15 @@
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
+AUX puppet.init 760 BLAKE2B 1803b602178f711cb4a0784a8e74e5bc63b66db11ce4a9855f76c1b51956eea6f2fa9d3ee898f5219ad2648e34c6d60e700f67dcfcaef85f586f3f6d5a44b8fd SHA512 f70660aad14fd9690f83a2689fa46370fdda0f04601146956d9436d1363a9a12739f0d1c0d4540c239c8cffe29149e2464787a5bbadda80453128a2a843d84bb
 AUX puppet.init-4.x 764 BLAKE2B 997fef3e95718f3e0f46fa2ab5994ac994a585bcfe728a9dcdfb3ccd5b76e6fd879a4160dce1402803713344fc2082b43e3116b468e9b49fd1b17a043040f860 SHA512 170100981c7e24284a12a208cede1a73afbaeab73315fd15a7337d416825c6d26a29ee272244d39764ad4086bc6a6f99cdc56ed6a600282d6ff9ed74794bfaf8
 AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76655a4897fdf128fb38950ff8e62abfa806785906fdae648c544310b75f9a33694ce1fbc0c31fe4f04a8 SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
+AUX tmpfiles.d-2 35 BLAKE2B 333994788552e5c52273752f4e3c2947666737d03f9d340e16ada790607efe77da1ba9bb4852bc8274174fbb96ce0c7ae81062f7197e63ea4701e539b2650b3b SHA512 fdf00147c497bd822a14f0e42bad825a43ce0977ec6c0265d267dedeef56295e3ce319f7972d0ec2ab9f04f2407856947f4261d6e62054a36c6e1672b45f86f0
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
 DIST puppet-7.20.0.tar.gz 2817232 BLAKE2B 479c4e162230371bd69509844fcd97d0d3392eb2e66578b38e6dc120dd3dd15804d73f70c1b29f1f3d9e57af539f82e605a86c9afff15e78ff48ddf482432c4d SHA512 6774bf03ad0ee80c0fd2cd8ebad60da56df7ed9818a526084fc2cf1ba2fecc81555fff200f5feef2b5d7a2275d90f44b24160de7221d682de470b511a7051f7f
 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
 MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1
diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
new file mode 100644
index 000000000000..ad7a638bebb8
--- /dev/null
+++ b/app-admin/puppet/files/puppet.init
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/run/puppet}"
+
+pidfile="${PUPPET_PID_DIR}/puppet.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
+
+depend() {
+	need localmount
+	use dns logger puppetmaster netmount nfsmount
+}
+
+start_pre() {
+	checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
+	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+}
+
+reload() {
+    ebegin "Reloading $RC_SVCNAME"
+    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+    eend $?
+}
diff --git a/app-admin/puppet/files/tmpfiles.d-2 b/app-admin/puppet/files/tmpfiles.d-2
new file mode 100644
index 000000000000..b36eec4dbdfc
--- /dev/null
+++ b/app-admin/puppet/files/tmpfiles.d-2
@@ -0,0 +1 @@
+D /run/puppet 0755 puppet puppet -
diff --git a/app-admin/puppet/puppet-7.21.0-r1.ebuild b/app-admin/puppet/puppet-7.21.0-r1.ebuild
new file mode 100644
index 000000000000..42b2ff4970b6
--- /dev/null
+++ b/app-admin/puppet/puppet-7.21.0-r1.ebuild
@@ -0,0 +1,127 @@
+# 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-2" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init 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-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 774f15d2249e..eceb9d38d6d1 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 3da27e2c9fab..356e890489b4 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -4,7 +4,7 @@ DIST certbot-2.0.0.tar.gz 1326589 BLAKE2B d1dc7e2c2a807f767d5dd4209b0fe079e18a88
 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 1142 BLAKE2B af61465467a32e5a587c4cd49f6a489f02a520fb59a07e432d10ea2df5ab8b4ed44e3bf6b0b84ec83b1441c72753ba48c0e9c7916d39086edabe9577ca05d095 SHA512 96e9dafeea8b14bfc15cb66efd9f4e76c1ecefc704d3e7997c9bc07b8c10956b53842c226195d15a867b80875a4a6278800494a9514d89dcadfb4f75062546c3
+EBUILD acme-2.0.0.ebuild 1140 BLAKE2B 58612987f7c89e8c00c7c5310afc2bd29824ff4fa24860cf4daf3ccce84b4c745dcfa6fb95cf5eaa76dbc229b918a48ac7d61a2106017b32b41336ee31f7914f SHA512 1b82f48a978ecb5a1d8ee6b339ea14e96ae8c61bb0cc541a4ca5e3165c2bee9ee1fd633700f6f0897ae8a8baf23f998455ae5ec84f9c305ac80a5034ea87c1cc
 EBUILD acme-2.1.0.ebuild 1142 BLAKE2B af61465467a32e5a587c4cd49f6a489f02a520fb59a07e432d10ea2df5ab8b4ed44e3bf6b0b84ec83b1441c72753ba48c0e9c7916d39086edabe9577ca05d095 SHA512 96e9dafeea8b14bfc15cb66efd9f4e76c1ecefc704d3e7997c9bc07b8c10956b53842c226195d15a867b80875a4a6278800494a9514d89dcadfb4f75062546c3
 EBUILD acme-9999.ebuild 1142 BLAKE2B af61465467a32e5a587c4cd49f6a489f02a520fb59a07e432d10ea2df5ab8b4ed44e3bf6b0b84ec83b1441c72753ba48c0e9c7916d39086edabe9577ca05d095 SHA512 96e9dafeea8b14bfc15cb66efd9f4e76c1ecefc704d3e7997c9bc07b8c10956b53842c226195d15a867b80875a4a6278800494a9514d89dcadfb4f75062546c3
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-2.0.0.ebuild b/app-crypt/acme/acme-2.0.0.ebuild
index 8105093d2780..07f2c8f48ea5 100644
--- a/app-crypt/acme/acme-2.0.0.ebuild
+++ b/app-crypt/acme/acme-2.0.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 729579279c86..3beedd29d468 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -4,7 +4,7 @@ DIST certbot-2.0.0.tar.gz 1326589 BLAKE2B d1dc7e2c2a807f767d5dd4209b0fe079e18a88
 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 947 BLAKE2B 158a5fe2dafaf8aec9cb10f9c376536e7e303f059344564d5d018175af5f19580f6adc34c153183b52c4f28b7c2ba0879ce7eebb5ae47376789d0aa51c824939 SHA512 6853f06d052b6f3a1a0510de393a8bf99e81475cf4e570d8ce2a5caeded82a1103ce919945f5540d80a41b822e6799a903073531440260a1d396af68840835ed
+EBUILD certbot-apache-2.0.0.ebuild 945 BLAKE2B b7486d3ca9bcdc7d42a52f1fc7d6a2587f3b1904d12ef829c89aa0d0f9f6b93f808bd8a08b72d7aa20ed026b4cf0913f1edfba84d9b84ef6fca57a03b8f43f62 SHA512 a6eccbbdb305014d161e646784dc8af6efd7ded410f25d449193c3eaf79180654a1d069dbd12a5987bd88641a4740e87f34c61014c758077c394930044d25eb7
 EBUILD certbot-apache-2.1.0.ebuild 947 BLAKE2B 158a5fe2dafaf8aec9cb10f9c376536e7e303f059344564d5d018175af5f19580f6adc34c153183b52c4f28b7c2ba0879ce7eebb5ae47376789d0aa51c824939 SHA512 6853f06d052b6f3a1a0510de393a8bf99e81475cf4e570d8ce2a5caeded82a1103ce919945f5540d80a41b822e6799a903073531440260a1d396af68840835ed
 EBUILD certbot-apache-9999.ebuild 947 BLAKE2B 158a5fe2dafaf8aec9cb10f9c376536e7e303f059344564d5d018175af5f19580f6adc34c153183b52c4f28b7c2ba0879ce7eebb5ae47376789d0aa51c824939 SHA512 6853f06d052b6f3a1a0510de393a8bf99e81475cf4e570d8ce2a5caeded82a1103ce919945f5540d80a41b822e6799a903073531440260a1d396af68840835ed
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot-apache/certbot-apache-2.0.0.ebuild b/app-crypt/certbot-apache/certbot-apache-2.0.0.ebuild
index f8549e7c0712..9c216af8fefe 100644
--- a/app-crypt/certbot-apache/certbot-apache-2.0.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-2.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index e59db572c801..1250c99bb9e4 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -4,7 +4,7 @@ DIST certbot-2.0.0.tar.gz 1326589 BLAKE2B d1dc7e2c2a807f767d5dd4209b0fe079e18a88
 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 965 BLAKE2B e3e3b606150eed6b54ac0bf8a34f5411562cff0037cac421b08834c23a2b3165c8bdae7ecc132979dad5aa9d2e51d3800a5ab47c3fcc669e3b1a4507e41af05c SHA512 04390d9abeadf60ac52ffbcb79bfba039a62f4fbe60714bcf1b18099dfe914546d066871682a090b69d778a5539b29788ebccbd8d9d5c05555a2dbbbb9c782a8
+EBUILD certbot-nginx-2.0.0.ebuild 963 BLAKE2B 18ef43b8278c51862184208303b881650a15603307554fbb89fa63aedc79ab9e1e416fedbfd9a1830f9ab1dd4ef9aa24fde5c57b7a8c9626d0f698218b4a81a6 SHA512 edf658cafb50a42072a0aa62fd289531e1a51fd3ef7aee3c92803921a78f36b509a7cc12ba58c8e5f554025410842e1a3e3d1a0e3033dd6b147e07532270d0e6
 EBUILD certbot-nginx-2.1.0.ebuild 965 BLAKE2B e3e3b606150eed6b54ac0bf8a34f5411562cff0037cac421b08834c23a2b3165c8bdae7ecc132979dad5aa9d2e51d3800a5ab47c3fcc669e3b1a4507e41af05c SHA512 04390d9abeadf60ac52ffbcb79bfba039a62f4fbe60714bcf1b18099dfe914546d066871682a090b69d778a5539b29788ebccbd8d9d5c05555a2dbbbb9c782a8
 EBUILD certbot-nginx-9999.ebuild 965 BLAKE2B e3e3b606150eed6b54ac0bf8a34f5411562cff0037cac421b08834c23a2b3165c8bdae7ecc132979dad5aa9d2e51d3800a5ab47c3fcc669e3b1a4507e41af05c SHA512 04390d9abeadf60ac52ffbcb79bfba039a62f4fbe60714bcf1b18099dfe914546d066871682a090b69d778a5539b29788ebccbd8d9d5c05555a2dbbbb9c782a8
 MISC metadata.xml 335 BLAKE2B 048854ec6bc919f9bf9b0bc74e7c291841cbfea0e571f43437937c5dd78cc65f9df53463adcf313441e01323491709b462bd9bc364876eb1508a83b3426b6b78 SHA512 25ac45574a568e362c419dfbeade4a977afa2885e7b32fb4c3d4c765450b09aa98cf419df1a39ab194518ad6f2b582e162d4dd4eec14f278635d63bf66352523
diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.0.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.0.0.ebuild
index b1aa9acb7e1a..d0adb3551929 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-2.0.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-2.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 3d632b09412f..3913f1382c06 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -4,7 +4,7 @@ DIST certbot-2.0.0.tar.gz 1326589 BLAKE2B d1dc7e2c2a807f767d5dd4209b0fe079e18a88
 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 1258 BLAKE2B 8e297849572a6c78e169b56d3560b2e67669827cffd5e2b850634d37a713a77b3d000b322d3325719ed8dcb28013a5105d46919ee1ff5a861feefcf7daab2161 SHA512 59169cf0f87dbb644f05d34cdc96ecd050be0492693345fa10c32c545ebe5fcad8fe208289593232021055133ebdfface4558568d054914c585909d25a03fac4
+EBUILD certbot-2.0.0.ebuild 1256 BLAKE2B 1e3714e2aece33cf51a646b27a2bed851673b170f50185efc52aa8105ac217c3a4f74b9c4f8eea0390a9ebd350428572a48301051df568be48d2c4b54e1c85f4 SHA512 2167665cb9046180b0e9ef7b21a944718d3836a8056cc4029b8c62de29827608bc66a6f1a623ca2e305d54a6293eeacbaecba5942506059087ee593d7db76f6c
 EBUILD certbot-2.1.0.ebuild 1258 BLAKE2B 8e297849572a6c78e169b56d3560b2e67669827cffd5e2b850634d37a713a77b3d000b322d3325719ed8dcb28013a5105d46919ee1ff5a861feefcf7daab2161 SHA512 59169cf0f87dbb644f05d34cdc96ecd050be0492693345fa10c32c545ebe5fcad8fe208289593232021055133ebdfface4558568d054914c585909d25a03fac4
 EBUILD certbot-9999.ebuild 1258 BLAKE2B 8e297849572a6c78e169b56d3560b2e67669827cffd5e2b850634d37a713a77b3d000b322d3325719ed8dcb28013a5105d46919ee1ff5a861feefcf7daab2161 SHA512 59169cf0f87dbb644f05d34cdc96ecd050be0492693345fa10c32c545ebe5fcad8fe208289593232021055133ebdfface4558568d054914c585909d25a03fac4
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot/certbot-2.0.0.ebuild b/app-crypt/certbot/certbot-2.0.0.ebuild
index 91bad26d75d6..5dda54b27949 100644
--- a/app-crypt/certbot/certbot-2.0.0.ebuild
+++ b/app-crypt/certbot/certbot-2.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index cfd413dc3887..48de97b12d3c 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/emacs-ansilove/Manifest b/app-emacs/emacs-ansilove/Manifest
new file mode 100644
index 000000000000..b9f596c2442d
--- /dev/null
+++ b/app-emacs/emacs-ansilove/Manifest
@@ -0,0 +1,4 @@
+DIST emacs-ansilove-1.0.1.tar.bz2 17727 BLAKE2B 708497e4163bad664a7208ce027ea9222a75b8ddecbed5f4d24619efe5c0f65d6f40c6ca592bbc7676207b9d5f6fa83883154b0624b8919d42458d09b595c58f SHA512 a1f472f3b2ea5bb3c6221afd0d84c18f174d24992865fe689166ae6d8c6099bdbbfa38bee639d0a22c16cded8047ae808143e855a9624943eb59a3f35676a9a9
+EBUILD emacs-ansilove-1.0.1.ebuild 831 BLAKE2B 9fc84b121b5f93730985ec424a801f4bc0c62fd65685b73a72e9a54e29c57984562d8cee0278446082f235cab2d9754fce57b83e7fd566ca09058ac9e25795a1 SHA512 c6b81490b75c4cd12dde9a51365620b2fa52e85d81b1a9bd5a22baaf8280f11ddfe22f6194590a747d178bdafad69bceb76afe62e4d2dab4d5ba4be778a9f46e
+EBUILD emacs-ansilove-9999.ebuild 831 BLAKE2B 9fc84b121b5f93730985ec424a801f4bc0c62fd65685b73a72e9a54e29c57984562d8cee0278446082f235cab2d9754fce57b83e7fd566ca09058ac9e25795a1 SHA512 c6b81490b75c4cd12dde9a51365620b2fa52e85d81b1a9bd5a22baaf8280f11ddfe22f6194590a747d178bdafad69bceb76afe62e4d2dab4d5ba4be778a9f46e
+MISC metadata.xml 709 BLAKE2B 4388f2955b320a7200bae721d130dff43a71bb211eb7caa29166211b319c2445ce0b8c48cb70f4e6e00195c3e67815833cf132453849b2579257a22ab212a49e SHA512 aff59d88685ec26fadf27b908c7035f7f8ebb79dcbcefd078923eebec699073864928f03594868277bb0d43afcdb585cf9109e5abc1b06255575b7301862186f
diff --git a/app-emacs/emacs-ansilove/emacs-ansilove-1.0.1.ebuild b/app-emacs/emacs-ansilove/emacs-ansilove-1.0.1.ebuild
new file mode 100644
index 000000000000..290a0c7ba03f
--- /dev/null
+++ b/app-emacs/emacs-ansilove/emacs-ansilove-1.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Display buffers as PNG images using ansilove in GNU Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-ansilove/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-editors/emacs-${NEED_EMACS}[imagemagick]
+	media-gfx/ansilove
+	media-gfx/imagemagick[png]
+"
+
+src_compile() {
+	emake EMACS="${EMACS}" compile
+}
+
+src_install() {
+	dodoc "${S}"/extras/ansi/logo.ans README.md logo.png
+	elisp-install ${PN} src/*.el{,c}
+	elisp-site-file-install "${S}"/extras/gentoo/50ansilove-gentoo.el
+}
diff --git a/app-emacs/emacs-ansilove/emacs-ansilove-9999.ebuild b/app-emacs/emacs-ansilove/emacs-ansilove-9999.ebuild
new file mode 100644
index 000000000000..290a0c7ba03f
--- /dev/null
+++ b/app-emacs/emacs-ansilove/emacs-ansilove-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Display buffers as PNG images using ansilove in GNU Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-ansilove/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-editors/emacs-${NEED_EMACS}[imagemagick]
+	media-gfx/ansilove
+	media-gfx/imagemagick[png]
+"
+
+src_compile() {
+	emake EMACS="${EMACS}" compile
+}
+
+src_install() {
+	dodoc "${S}"/extras/ansi/logo.ans README.md logo.png
+	elisp-install ${PN} src/*.el{,c}
+	elisp-site-file-install "${S}"/extras/gentoo/50ansilove-gentoo.el
+}
diff --git a/app-emacs/emacs-ansilove/metadata.xml b/app-emacs/emacs-ansilove/metadata.xml
new file mode 100644
index 000000000000..c0785c1f9d2e
--- /dev/null
+++ b/app-emacs/emacs-ansilove/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    This package provides some integration with the ansilove tool, which is a
+    ANSI and ASCII art to PNG converter.
+  </longdescription>
+  <upstream>
+    <maintainer status="active">
+      <email>xgqt@riseup.net</email>
+      <name>Maciej Barć</name>
+    </maintainer>
+    <bugs-to>https://gitlab.com/xgqt/emacs-ansilove/-/issues/</bugs-to>
+    <remote-id type="gitlab">xgqt/emacs-ansilove</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/emacs-el-fetch/Manifest b/app-emacs/emacs-el-fetch/Manifest
new file mode 100644
index 000000000000..1d38ad1b2a52
--- /dev/null
+++ b/app-emacs/emacs-el-fetch/Manifest
@@ -0,0 +1,4 @@
+DIST emacs-el-fetch-3.2.1.tar.bz2 18093 BLAKE2B b09d9bb77834f77597e92115f5055b0f17fa466ec695b5e8855cbc445ae2fda00f9a951a8b45b43e12eaf0846b7e2e3533091e9b2a879b2220edaeb40050029d SHA512 c46713d1d51c55715d7ffc165d89b5ae56a7f93aea894111da24547d02ed0c8cf3bc9c2deaa5a9a762ac5d699a6558b6215c55c207413d25bbfe52624ba86148
+EBUILD emacs-el-fetch-3.2.1.ebuild 763 BLAKE2B 95dcc54ea71dd112b45ebd7b156ab2f00cbdb4185d85e1a25aa51c2c67fbbd67919551243b2bf85ca9b62fe2fd9a5b96c290cbbf80b74f0c82ab2054084501f3 SHA512 46d6c970d1bab1313249e569c2861dfddc3390aaf24fc890f24bebc7f33476191335e367029b7239ce2e21748c9b9c0dda7e0d4320f4247361ae10daefaee9d7
+EBUILD emacs-el-fetch-9999.ebuild 763 BLAKE2B 95dcc54ea71dd112b45ebd7b156ab2f00cbdb4185d85e1a25aa51c2c67fbbd67919551243b2bf85ca9b62fe2fd9a5b96c290cbbf80b74f0c82ab2054084501f3 SHA512 46d6c970d1bab1313249e569c2861dfddc3390aaf24fc890f24bebc7f33476191335e367029b7239ce2e21748c9b9c0dda7e0d4320f4247361ae10daefaee9d7
+MISC metadata.xml 575 BLAKE2B 101713b2da08b2cee85fc0071f4b29ef4cc2af73bb858c28b01da3c256b32e410994972818fcdb80e886d0e2982900829b3bc96ec38a5c904faa26c248b57eca SHA512 3e09cee66a38365b9e65ef02dc6452badbcafaacd4f8ff1c68e76efb17072eb170367da17b59dcb7da7c864457e5259d8da96cee43d614d7d03c3c4888226dd8
diff --git a/app-emacs/emacs-el-fetch/emacs-el-fetch-3.2.1.ebuild b/app-emacs/emacs-el-fetch/emacs-el-fetch-3.2.1.ebuild
new file mode 100644
index 000000000000..cbe834002bf1
--- /dev/null
+++ b/app-emacs/emacs-el-fetch/emacs-el-fetch-3.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Show system information in Neofetch-like style inside Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-el-fetch/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/buttercup )"
+
+src_compile() {
+	emake compile
+}
+
+src_install() {
+	einstalldocs
+	elisp-install ${PN} "${S}"/src/el-fetch/*.el{,c}
+	elisp-site-file-install "${S}"/extras/gentoo/50el-fetch-gentoo.el
+}
diff --git a/app-emacs/emacs-el-fetch/emacs-el-fetch-9999.ebuild b/app-emacs/emacs-el-fetch/emacs-el-fetch-9999.ebuild
new file mode 100644
index 000000000000..cbe834002bf1
--- /dev/null
+++ b/app-emacs/emacs-el-fetch/emacs-el-fetch-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Show system information in Neofetch-like style inside Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-el-fetch/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/buttercup )"
+
+src_compile() {
+	emake compile
+}
+
+src_install() {
+	einstalldocs
+	elisp-install ${PN} "${S}"/src/el-fetch/*.el{,c}
+	elisp-site-file-install "${S}"/extras/gentoo/50el-fetch-gentoo.el
+}
diff --git a/app-emacs/emacs-el-fetch/metadata.xml b/app-emacs/emacs-el-fetch/metadata.xml
new file mode 100644
index 000000000000..6bdc4f73ca31
--- /dev/null
+++ b/app-emacs/emacs-el-fetch/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches />
+  <upstream>
+    <maintainer status="active">
+      <email>xgqt@riseup.net</email>
+      <name>Maciej Barć</name>
+    </maintainer>
+    <bugs-to>https://gitlab.com/xgqt/emacs-el-fetch/-/issues/</bugs-to>
+    <remote-id type="gitlab">xgqt/emacs-el-fetch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/emacs-websearch/Manifest b/app-emacs/emacs-websearch/Manifest
new file mode 100644
index 000000000000..3aec77d44dbe
--- /dev/null
+++ b/app-emacs/emacs-websearch/Manifest
@@ -0,0 +1,4 @@
+DIST emacs-websearch-2.0.1.tar.bz2 93918 BLAKE2B ec7a1c03b8b04d6fd48f56a774e69d962536fb7add843533b554099349638e4223ceb2cf37f89d68589292efe6388b4bce9b31b9100b73ced0dbc540cf8fcc21 SHA512 c6815be855b887943315f96e880a566b38c91da3c88b6077c3845d96aa35c0ea33af32ae9224f9efeb8d8b49c0cbb5bc08dfaade1659d1fc85ed44aecaa371ff
+EBUILD emacs-websearch-2.0.1.ebuild 607 BLAKE2B e35a4536b6ad5bbc8beaa4f726ec50459fe543c6890918ad44566fee71997c846d3ba2d79dfa2bfb833d0e91a3ca7539e1b71981035800a9050cd590f2f86d6e SHA512 4df18413ce2b5f399602e726f754344e91c960508842be3f72872a7b281434440d72d11b2554ba6d5af2c0587bb0d9becb281615c8ef4aa2646045c40d45b667
+EBUILD emacs-websearch-9999.ebuild 607 BLAKE2B e35a4536b6ad5bbc8beaa4f726ec50459fe543c6890918ad44566fee71997c846d3ba2d79dfa2bfb833d0e91a3ca7539e1b71981035800a9050cd590f2f86d6e SHA512 4df18413ce2b5f399602e726f754344e91c960508842be3f72872a7b281434440d72d11b2554ba6d5af2c0587bb0d9becb281615c8ef4aa2646045c40d45b667
+MISC metadata.xml 839 BLAKE2B 3a78bb74b34993137c9c531a46598f46a57acaaf56dc0b50aab376bda93f057883f0b5effdeb7cec07cfe65ab7218de53bc363c667d67f9a4d4aaa1e14e05199 SHA512 26f12be83eb2c498f14671e84d2c3ad25c27b71ed0726ac0295d8ed2e8d3f3425b2bb67973b14c7feaa24b022ef93880d161b7668abffecfea7b157b18509c77
diff --git a/app-emacs/emacs-websearch/emacs-websearch-2.0.1.ebuild b/app-emacs/emacs-websearch/emacs-websearch-2.0.1.ebuild
new file mode 100644
index 000000000000..8a88f1199ed5
--- /dev/null
+++ b/app-emacs/emacs-websearch/emacs-websearch-2.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Query search engines from Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-websearch/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DOCS=( README.md logo.png )
+
+src_install() {
+	elisp_src_install
+	elisp-site-file-install "${S}"/extras/gentoo/50websearch-gentoo.el
+}
diff --git a/app-emacs/emacs-websearch/emacs-websearch-9999.ebuild b/app-emacs/emacs-websearch/emacs-websearch-9999.ebuild
new file mode 100644
index 000000000000..8a88f1199ed5
--- /dev/null
+++ b/app-emacs/emacs-websearch/emacs-websearch-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Query search engines from Emacs"
+HOMEPAGE="https://gitlab.com/xgqt/emacs-websearch/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/xgqt/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DOCS=( README.md logo.png )
+
+src_install() {
+	elisp_src_install
+	elisp-site-file-install "${S}"/extras/gentoo/50websearch-gentoo.el
+}
diff --git a/app-emacs/emacs-websearch/metadata.xml b/app-emacs/emacs-websearch/metadata.xml
new file mode 100644
index 000000000000..3dc420dbd6ef
--- /dev/null
+++ b/app-emacs/emacs-websearch/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    The websearch package allows You to query predefined search engines
+    (websearch-custom-engines) with interactive selection. The query terms can
+    either be extracted form selection, kill-ring or typed on demand.
+  </longdescription>
+  <stabilize-allarches />
+  <upstream>
+    <maintainer status="active">
+      <email>xgqt@riseup.net</email>
+      <name>Maciej Barć</name>
+    </maintainer>
+    <bugs-to>https://gitlab.com/xgqt/emacs-websearch/-/issues/</bugs-to>
+    <remote-id type="gitlab">xgqt/emacs-websearch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/marginalia/Manifest b/app-emacs/marginalia/Manifest
index 56a542e4e4f6..db0fccae10e6 100644
--- a/app-emacs/marginalia/Manifest
+++ b/app-emacs/marginalia/Manifest
@@ -1,8 +1,8 @@
 AUX 50marginalia-gentoo.el 133 BLAKE2B 9924046f0683974aba9bf9bd0939058eab78abc131b0eebd5d2aac17c0653e0a578c062fba7a363797e6455b8bc85149e79778f8abd4185eec68dd61206b8216 SHA512 e5cd461343454dfc9de75f15e5c35337780ecbc96d844a160c3f9cfcfd5382232b4359191b382741839700224493adc6f4d3218c050c3214b49af0dc85feb135
-DIST marginalia-0.13.tar.gz 28803 BLAKE2B 396656d93ee85d0b4ad216c2b27de5f2415ae0b54198eacf327eb035f4753a74389734353dd19913f6778d4cf9bfd82b1ee359105d7527d95fe9675afa368655 SHA512 08c6fd3ff744c3112e76a44786d5422b04d0fdf3e08342b1903578b80922df28b2fadd8f0af612f32dfd9c607786c12b6508b6996acbc671ba4d542c9a67d52b
 DIST marginalia-0.14.tar.gz 28890 BLAKE2B 801f9c6a83f564f74a03466b1de0a9d7403d7c0d3fcbb597a3f6f824f3156f44d4267623bc21ab7c2e8f6ef6363add730c8dfe5dbbe5b050240a32ae8f14753c SHA512 efc98387572df01b9a45133587023ce33654a4f8c87d33ccd55ad42a26c6bb2418d388995167b2bdb3276c6f961100f12774743670933467dfdc8060beeeafe8
 DIST marginalia-0.15.tar.gz 28952 BLAKE2B 80d89d0dad5d3c4494dfbe888763f3e1712ae575ee5e5d392ca4b0691ea3fcfa8b1da9ada6afe75f7e936e1d9d46b32e13b541ac7521fbd009f5ef5322e9b3cc SHA512 bdd06de527a3d5849c776a55c704a8c41c086a5bc4d69f980194484f6f7aa3202b0dec8ffccaa0de5e7c54d1d93476d6d5fdb66c62a507cbe368696e4a0ee84c
-EBUILD marginalia-0.13.ebuild 399 BLAKE2B 6b87ae5eddfc9d7e305e5244b279d152718f85dfa210ed451cf1782713b1ecfe2aea8b8e43fa9304f8a4cd7230ff66cffa2bee0e884e3f72d65488107aa8a1e8 SHA512 5659efc316b5a4bdb537b2b05459850e27e006a96612b1ad00a7ccc6f5b4196217bfc0f79c4dacb38029ea7cb91c4a68463d06107cfe233183e79660c69493bd
+DIST marginalia-1.0.tar.gz 29142 BLAKE2B 99048ebca2156981aa77eb10bbd914648932bfc328f41abdda8196361542e7550895f5263b04a239fca3ef79a2cc87ff7e9a9d315ab46ef6d87846117a325cd5 SHA512 82b7220bce1d8804be9a4783518f4492d66e039a50c0fb064bbfe18acf119600a9f3c9cc2dede038b390c4522c1163ea1982e9f3f8a3f170c0f4f86ef1ec87d5
 EBUILD marginalia-0.14.ebuild 399 BLAKE2B 6b87ae5eddfc9d7e305e5244b279d152718f85dfa210ed451cf1782713b1ecfe2aea8b8e43fa9304f8a4cd7230ff66cffa2bee0e884e3f72d65488107aa8a1e8 SHA512 5659efc316b5a4bdb537b2b05459850e27e006a96612b1ad00a7ccc6f5b4196217bfc0f79c4dacb38029ea7cb91c4a68463d06107cfe233183e79660c69493bd
 EBUILD marginalia-0.15.ebuild 399 BLAKE2B 6b87ae5eddfc9d7e305e5244b279d152718f85dfa210ed451cf1782713b1ecfe2aea8b8e43fa9304f8a4cd7230ff66cffa2bee0e884e3f72d65488107aa8a1e8 SHA512 5659efc316b5a4bdb537b2b05459850e27e006a96612b1ad00a7ccc6f5b4196217bfc0f79c4dacb38029ea7cb91c4a68463d06107cfe233183e79660c69493bd
+EBUILD marginalia-1.0.ebuild 399 BLAKE2B 6b87ae5eddfc9d7e305e5244b279d152718f85dfa210ed451cf1782713b1ecfe2aea8b8e43fa9304f8a4cd7230ff66cffa2bee0e884e3f72d65488107aa8a1e8 SHA512 5659efc316b5a4bdb537b2b05459850e27e006a96612b1ad00a7ccc6f5b4196217bfc0f79c4dacb38029ea7cb91c4a68463d06107cfe233183e79660c69493bd
 MISC metadata.xml 362 BLAKE2B 170d321c62f5b92b3fda03c4c6a1dc8438023211ae2f9261c997ce1300e4d24fde6588ed57ee766b2637e31c186e11aefdae58b083fd19ec15cbfe2846475bf6 SHA512 99a6cc13efa79095c0fe1bbcd2661fcd56bce0b3cfc9da0af6f90248b8e1ff27e78e0984677df5aba4c383530cc8446c5748296b35e07d6d2d81bda26b5433b4
diff --git a/app-emacs/marginalia/marginalia-0.13.ebuild b/app-emacs/marginalia/marginalia-1.0.ebuild
index 87470ff0f45d..87470ff0f45d 100644
--- a/app-emacs/marginalia/marginalia-0.13.ebuild
+++ b/app-emacs/marginalia/marginalia-1.0.ebuild
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 189995c8f490..e23672106082 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index 652ca3fe3977..20400e199cbe 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,3 +1,5 @@
 DIST colordiff-1.0.19.tar.gz 21329 BLAKE2B 3137159aa9bb83d0813c18ef62936cdd7cfaaf9655b077fc7efd0c70b7f88157720f71166d9449dc9840762f09267c9baa81065a3bd7df15d322cba61c48a585 SHA512 2845c4b8229df317984ea93aa9d2e08b3bb39ba67b870a14f09dc19fa1e94b4fc8e4da9a7554d53934591766b3aa1696fdc62765ce95e55f50da219e44dae523
+DIST colordiff-1.0.21.tar.gz 25677 BLAKE2B 4da02bc3642e2133e5f730703928b0b77dce70125d5dc87c0a3dcbccd37294f4a3e2680e3f5515f8c6bd10fd885f94c087ad504f4c0421cb856f0af5bc34db84 SHA512 e814e38db0db6e0ba420c64bc53815c1c9e74457390bbe45f31eb9539c068efc9354c11dbf1259b1a64bd3cd5b2cc452441f822e030af80d18fe5b5c5f627c9d
 EBUILD colordiff-1.0.19.ebuild 924 BLAKE2B 10cbd7d823f7bff47e499f954af8bd068696d0fb7f3d0c5203c10b4686f21054cd970e45844cd692e5d5c8a67d671976871e44f241a54f8eb12f0edd953cb6d1 SHA512 1d458d91463cf97690d0f1788e54a83695acb50ed67c88a8a68c081a1898921e51f641cd208adfa637750d1c7fb75052cdacf9cbf8ca6c03b3b286e715cd6588
-MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
+EBUILD colordiff-1.0.21.ebuild 931 BLAKE2B 91144be49b5d299ba12f194429fa7cd0d6957a350033719f380f88bc469726ecd66cbaca0fa88ceb43dd9b6624e08c734177445e358928d2779b3ee2f0218c9d SHA512 9c882dcab0e6b20f05a762011096f91507095e487f132d519626f1cfbf4f901ed6f296db1ad3201b7306373644c66a85d96603a774c14a95aa69bd24ce70eb4a
+MISC metadata.xml 350 BLAKE2B bebc16c41e666f056631f6533b4e012773b9b8902603fb5d889def4602a8838e34103894b5443f23b04b8d736f2db71dd0533dd8c7658c2273b656683df1a438 SHA512 b1c0305ceade7d04419b175b0155a5b9cf87f5ba28e58be249158159ab2f832da7e1dc3f86c88ea5f774d95d06edc19e2272e9cca9d96c4a94455c8744a21a0b
diff --git a/app-misc/colordiff/colordiff-1.0.21.ebuild b/app-misc/colordiff/colordiff-1.0.21.ebuild
new file mode 100644
index 000000000000..08a993f9254d
--- /dev/null
+++ b/app-misc/colordiff/colordiff-1.0.21.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit prefix
+
+DESCRIPTION="Colorizes output of diff"
+HOMEPAGE="https://www.colordiff.org/"
+SRC_URI="https://www.colordiff.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-lang/perl
+	sys-apps/diffutils
+"
+
+src_prepare() {
+	default
+
+	# set proper etcdir for Gentoo Prefix
+	sed \
+		-e "s:'/etc:'@GENTOO_PORTAGE_EPREFIX@/etc:" \
+		-i "${S}/colordiff.pl" || die "sed etcdir failed"
+	eprefixify "${S}"/colordiff.pl
+}
+
+# This package has a makefile, but we don't want to run it
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}{.pl,}
+	dobin cdiff.sh
+	insinto /etc
+	doins colordiffrc{,-lightbg,-gitdiff}
+	dodoc BUGS CHANGES README
+	doman {cdiff,colordiff}.1
+}
diff --git a/app-misc/colordiff/metadata.xml b/app-misc/colordiff/metadata.xml
index df1ea8d84522..5cef77f61b09 100644
--- a/app-misc/colordiff/metadata.xml
+++ b/app-misc/colordiff/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>shell-tools@gentoo.org</email>
-    <name>Gentoo Shell Tools Project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">daveewart/colordiff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 6d0118fbb53c..211ab528eeda 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/scrcpy/Manifest b/app-mobilephone/scrcpy/Manifest
index 53740cf587e6..0e68028c2d3a 100644
--- a/app-mobilephone/scrcpy/Manifest
+++ b/app-mobilephone/scrcpy/Manifest
@@ -1,5 +1,8 @@
 DIST scrcpy-1.24.tar.gz 424970 BLAKE2B 33a0249ee9e9579b3bf8e0a4f94427b0c44b2a3aaf953c527a072d4f69ab89a680107b234803415741ba003ea6a8a207d33ce0d40341560fd6d85cda3807f7a6 SHA512 0eda7d6b0fb7339e1e32114d861194fd6bfce5ddb15d8d241f94278cb5800c2dd6c3bd69ea0b09b2bd5137757e85d679b2c789218e6933d83df4bc07dac09b2e
+DIST scrcpy-1.25.tar.gz 345594 BLAKE2B 9be58de258d2e048fc87ef642ba668ad7427faea51d6bd06d48d1ca61a5c55bbce2b758b445d21ea3052ac63809769043e57a28502c53fae98079056029ded1f SHA512 7f28adb69becdc247156d664744ef382cc9ac5e746d2be9c833a53309386c22eb90893b499aee80404cb9903ea40ce5f389b41f2201bf85801e1b8ab920b4eb0
 DIST scrcpy-server-v1.24 41159 BLAKE2B 332f05198bd64392ed870add260249d7e549ceb963e707ee6a249c08197c2c6a52bc427be0dfa99a479d61926d1ccea1471f5a448816b4b157c933d7a17cd75f SHA512 1bbc921e954c722307ef4fb2e1478954f6bf14544da362a9edeefd0f90def435bee409130d2ef2fddee98ec6255e12e9bda595507fec479f3feae0a57fb78236
+DIST scrcpy-server-v1.25 42151 BLAKE2B 90789c8b259f9a63820652f8884b51abe1040201f37788542796fbff6445bc13259e2aaf635c99c6ccdb515d8fd4b0b3bcd54d8972d134086f05d149a5073d41 SHA512 2861f423b6c982354c5959570708b51832e18b9d376397f98a78c8d6137af22bb3f19cbce501d7f413276362e9ac9e0358b8984566ff04102a3720074ff1fea1
 EBUILD scrcpy-1.24-r1.ebuild 868 BLAKE2B 62269b6e351772639366f7254583a6c84a7362d7b3f68dc6eec929fd2041de97ba57ba75003aaa71d736e07788920d7bad372aab0315355d5fbf6c7c87d96e53 SHA512 43c83f799e73b5bfcec7f60cad1d5c60c36d8028f71330d217eb96a3953ad504b7e8264df073d9e75d9f5e50232fc87aa7bd93bc0e85b9266f61701bc89364ad
 EBUILD scrcpy-1.24-r2.ebuild 889 BLAKE2B 690408122b728cb507fff76599647a3a5747ac881ff224cef13f06f66bf1ac75b997824b406856ea7f4db75cc8e8449f2e550bf9d5e5c79c043e329d80db2615 SHA512 83c4e242982ccca4bfc69deccb9501c356a29f55dbdaae0c271f31b8b7564fb493866bc44019798b96826530ac9e77b3096c22a8b4c2b0dae99c39ee84a45b25
+EBUILD scrcpy-1.25.ebuild 889 BLAKE2B 690408122b728cb507fff76599647a3a5747ac881ff224cef13f06f66bf1ac75b997824b406856ea7f4db75cc8e8449f2e550bf9d5e5c79c043e329d80db2615 SHA512 83c4e242982ccca4bfc69deccb9501c356a29f55dbdaae0c271f31b8b7564fb493866bc44019798b96826530ac9e77b3096c22a8b4c2b0dae99c39ee84a45b25
 MISC metadata.xml 416 BLAKE2B a0f726ba54b43d068ed72c75576a9d397a0f358f98b97ac2db8eaf3fe2e6df4943e9e9b9e3a6ccdbdd3de2827b27178033228e43e3a1d6e93ef3db6ac5d2245e SHA512 d9765dc3395923a1f6b630c82ea5a1d08caa8a762b4bb58d5f271e36c6f78a363cb294e80bf32d04015eb1a0360b1f179a20bffc05c50b91b1be5ea34bbeda02
diff --git a/app-mobilephone/scrcpy/scrcpy-1.25.ebuild b/app-mobilephone/scrcpy/scrcpy-1.25.ebuild
new file mode 100644
index 000000000000..a244fae445e4
--- /dev/null
+++ b/app-mobilephone/scrcpy/scrcpy-1.25.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Display and control your Android device"
+HOMEPAGE="https://github.com/Genymobile/scrcpy"
+# Source code and server part on Android device
+SRC_URI="https://github.com/Genymobile/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/Genymobile/${PN}/releases/download/v${PV}/${PN}-server-v${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="lto"
+
+DEPEND="media-libs/libsdl2[X]
+	media-video/ffmpeg
+	virtual/libusb:1"
+# Manual install for ppc64 until bug #723528 is fixed
+RDEPEND="${DEPEND}
+	!ppc64? ( dev-util/android-tools )"
+BDEPEND=""
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use lto b_lto)
+		-Dprebuilt_server="${DISTDIR}/${PN}-server-v${PV}"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 154b0bf6e6f1..d22bdb8357ab 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 86e3208dd493..10a08d1ab249 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -7,5 +7,5 @@ DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c7
 DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6
 EBUILD glib-2.74.1-r1.ebuild 10172 BLAKE2B 0920ab3c5ac1187ac6c31c6b9531fe7f5f0b4027a9f084f8620d4a0579b07baa10cf9f93fcc16bea2362bd7b43a25e67e77225702d1e2a35dc47b63e2bbe5b17 SHA512 1644fdff2f7031251b0f5b9e9d71f4ef522660fefcf9c963be73f911b9a283c7448657fc68f5dc679658861cb33c63ba5c0bd4785ecedee1429220e415e5fdb6
 EBUILD glib-2.74.3-r3.ebuild 10421 BLAKE2B eb8f55fb189bbd9cbd593f80042d78f5c9f158457105754805514adb91ed05d2db5e83aaf8e81558ba5f94028892aebe75f32cc8875fbc5d736fc66d1198b885 SHA512 ad7247cb30611ef5e88f96dc9ade10c0e0b92169f153eca520e68f1c299c449d8467830a135cfb418b33a2a3a6d7187b0b7a470cd0a97a9440e28494e6f2dc94
-EBUILD glib-2.74.4.ebuild 10260 BLAKE2B a091225798e35a6e142054a81c4112d45e8f728f7b16f3c6143c3641a03a5442acd57c5e15560105e8424c0a9f5bc29e98c5038ebdf0012d3d93020f34b6c855 SHA512 6a06c0c8f85762c0062c1302c89460c11350eb1218b2ee331cee3c6ba972d06a77e95b6c8b536152e058647e88025720e036e75b87972b2f92c6d98f7cb2f72e
+EBUILD glib-2.74.4.ebuild 10259 BLAKE2B 05804de7f1c37678353528f048a35ac4df5fcdace3f9db95c74a33a1459418856b614d7b1d2e4d760d6e6b25962c64e270e1d9e7824c5a8bce64dc5783e169db SHA512 6e090262c72e4035ba4e0ab7cc355fc9bff3b441250c747fbcd39e6af814a5610cbd8fea9a27dcc7620ecb79c105a27ca4fbe0760ee1eba3b1d17a8d9c76b840
 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b
diff --git a/dev-libs/glib/glib-2.74.4.ebuild b/dev-libs/glib/glib-2.74.4.ebuild
index 4da035ddf9e3..fe958b99def8 100644
--- a/dev-libs/glib/glib-2.74.4.ebuild
+++ b/dev-libs/glib/glib-2.74.4.ebuild
@@ -16,7 +16,7 @@ IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test u
 RESTRICT="!test? ( test )"
 #REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/gost-engine/Manifest b/dev-libs/gost-engine/Manifest
index b5c7e2df1292..bd11f491af22 100644
--- a/dev-libs/gost-engine/Manifest
+++ b/dev-libs/gost-engine/Manifest
@@ -1,6 +1,4 @@
-DIST gost-engine-1.1.0.3_p20181031.tar.gz 473151 BLAKE2B fb8dc737c3bda181de168d918744d6e036886753e70cfcd0516499dd5d9a1ba3af0d44d26fc50570318375a142adfec532327dc57fac5996266b12551631b5fd SHA512 9f0df3c48191aea75d3fee5b5886ba32451889bdbb97c5e540f14a57d8d41606d858769a70b51c0c2c958565b347c5a613004e7c3f81658281d6a3eecd030707
 DIST gost-engine-3.0.1.tar.gz 1645245 BLAKE2B 713a7343f9c11feec361dd2828b00dd7d47518f5a1b047a6e11f8d8eea206ce9058ace1bd70e12b4cb2200789eb8209de671cb5e2692e95391b4e7a82d0badc2 SHA512 eb9fb126393cfe23bcef0f45c05b38d39aadd8909419ebcf6dab4800bd7372b63891e9061f8e70686f8ba5cd58669681895b36320ed6a8cc0ca1ff037aa73b85
-EBUILD gost-engine-1.1.0.3_p20181031-r3.ebuild 962 BLAKE2B da0234d5c900963999b8cbf2106b0df7f633a61f0f29c19720cbd6363a19ff267e6bf624dda2458af4e69c416efbaceee3aa2087c98607b35a47d262c6a5cefd SHA512 f5ca11e08c6a1324fe4b9b9c9dd45e5e809cc8450bc8a255f90d579a483b8da5adbea04f021200c28fc84a731ccfa79d5e16a3910ba6a0ff35edf1a5fca871e8
 EBUILD gost-engine-3.0.1.ebuild 895 BLAKE2B 2561f3d5e5ec58012f83e15a3157a616b994a7ea0449fbd9bc9c285a6a33d160aefdf0712895065575e6a87879ef30dcd0e090fb62e3623ac615bddec7a56f68 SHA512 fc9773a01c3d40e9ae796869906e6acfe09839e3636ec5815c72d04e23c0dcab55ea1d6a77c36b474d7cac3e0da6e3ce8964b13518c48d2f3c3df1ad830fbebc
 EBUILD gost-engine-9999.ebuild 895 BLAKE2B 2561f3d5e5ec58012f83e15a3157a616b994a7ea0449fbd9bc9c285a6a33d160aefdf0712895065575e6a87879ef30dcd0e090fb62e3623ac615bddec7a56f68 SHA512 fc9773a01c3d40e9ae796869906e6acfe09839e3636ec5815c72d04e23c0dcab55ea1d6a77c36b474d7cac3e0da6e3ce8964b13518c48d2f3c3df1ad830fbebc
 MISC metadata.xml 342 BLAKE2B 3f19b05411fb2960f8218ebcce89e66eba7baabeac9a4a78ab2b7bea1657a082387ccd6fc50dd4a25f5d21d54be6e0c1cfe51cc9eff91cf426660be1041ef0a4 SHA512 4a73c89be75bf257bada6ff299eb6cb48b53b2b92dc9b9647d7345b699118ad4a2e5cfcbe61fc74dc624f6ab019bb21bffc5e1fa0005f761b6435b2badfcf4c4
diff --git a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r3.ebuild b/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r3.ebuild
deleted file mode 100644
index d6f82551ac1c..000000000000
--- a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL"
-HOMEPAGE="https://github.com/gost-engine/engine"
-IUSE="test"
-RESTRICT="!test? ( test )"
-SLOT="0/${PV}"
-
-COMMON_DEPEND="=dev-libs/openssl-1.1*:0="
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	test? (
-		dev-lang/perl
-	)"
-RDEPEND="${COMMON_DEPEND}"
-
-LICENSE="openssl"
-
-DOCS=( INSTALL.md README.gost README.md )
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/gost-engine/engine.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa"
-	SRC_URI="https://github.com/gost-engine/engine/archive/e5cc3684f3b3ad40e186e23b00b253d234df92ab.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/engine-e5cc3684f3b3ad40e186e23b00b253d234df92ab"
-fi
-
-src_prepare() {
-	cmake_src_prepare
-	sed 's:Werror:Wno-error:g' -i "${S}/CMakeLists.txt" || die
-}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 3819763c1cb4..d29dde13b62e 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 50ae9c61b90e..2a51639d33d2 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -2,5 +2,5 @@ AUX ocamlnet-4.1.9-unboundLexer.patch 284 BLAKE2B 8d934f1aa24d19f3065dd4501c6656
 DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815
 DIST ocamlnet-4.1.9.tar.gz 4628747 BLAKE2B 40e41edee79ba5957d297506cdf1b907adc8d44a33f25f25b8b1a18487f5ec379fb328c86d6283f7da7cedd8d35b80809e1cd5224522d51afa3e5f2402ac8663 SHA512 a251724deb35e756c81d2d3ac836d413b659acdce6c0acf479a4fca48934ab62ad399a884197d00dbb7e7558132a56be1c8efd553c0a644d329418272f809a46
 EBUILD ocamlnet-4.1.8-r1.ebuild 1636 BLAKE2B 96ff9aeb5b1012aa0544a36ac7c3cccb24cf23e79911118b2fe0d7cabd3fd6ad435503ffe43e05e1d1ecedb8821649b2720b2040c9b074fd6ac8017c3167336e SHA512 ff2b81572d3dd298af654bd9bc43d55c951b0f8f6a417521b1cec8d489cbd6d0b1f407194d93b2d8176b08fdc374051557bc47c1df6e4d2040be3e7a633373e6
-EBUILD ocamlnet-4.1.9.ebuild 1687 BLAKE2B a87dcb28e0f187453b64123bb6d78387ef71ec62b2ec86a64d0c441547f61a66501b7ab273f4c8556701e2c454c171fee9d53dbda51aec7eae79656a09ef3b95 SHA512 00de463887e00349b3b26e1abc794509707c058ad459cc40bb48b0cf70b9207dde03a19635e9a8fc12e49883749aa95da5de4e1dcc284f94d643aab9ee21614e
+EBUILD ocamlnet-4.1.9-r1.ebuild 1786 BLAKE2B 0fb0d5f2fced29d5ba11191fd17154dd6de0b3562ffb163e0104b91e281fa46f2d9022f9d2fad42e5a65a375b1fa6be9998d0b6dab9bdb076cd016b6fed13670 SHA512 639930978abfe4b981013fc14d3762dded345208c3c02bed5ee16ceaef5f5052822918f83ad158d6b81567f98cb496d87ba22ca71151f7f6093769382ef9adab
 MISC metadata.xml 406 BLAKE2B 765eb184895dcb4d3769fc590facc0435ca84a33a1954b8c33b2f1f40f775fd165aa7e1d86b3f874a8c83c8020c094f73d3174d46d94c1c455d54069ff431414 SHA512 911bd8206d13c92e78ceb3ea00c71ddebc1ab83459bd2d209f2209b81e7952b69ee6ee53003806c8c674dd083c300cd0b243ccfc7449c2a8678a3d459c434879
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
index 6bd4d2437240..0029b1219894 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
@@ -53,6 +53,14 @@ ocamlnet_use_enable() {
 	fi
 }
 
+src_prepare() {
+	sed -i \
+		-e "s:^version.*$:version=${PV}:" \
+		configure \
+		|| die
+	default
+}
+
 src_configure() {
 	./configure \
 		-bindir /usr/bin \
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 0c2f7e4b0cb4..abbb4a1146bd 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 62c7bbefc865..129b55001be4 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,8 +1,10 @@
 DIST qtwayland-5.15.7-gentoo-kde-1.tar.xz 42912 BLAKE2B e616cdb5aef13b6350658de2d6922109b7d827536afce98d67f7b1936c91de7521a6b4f8997926334cb77e1009fd4e27e4e0aef5c78cf9ba5a6c964797d2b1e1 SHA512 23be3f4e1612a557f1eb0c17cb158897b48910e336765b6c2e06ed892b67f368dfd4ba916373bbed9d3650a1e1f39b3768db39632b4763ad103515b32a86c0c2
 DIST qtwayland-5.15.7-gentoo-kde-2.tar.xz 43720 BLAKE2B b80db3b4113ea2b80709595a7762d185576f9017e6dc089c99613cb03aad569e53bee3ca083b9ec9866c6835aee5f35cf3240cd3a681a1e038ae0fa18f62bd03 SHA512 947e2862524f83ca7f4ca6e5eee16162642cf510929ef9dad642408fe023d9b27fe88ee21cf1bd498c318ae39a278d02ae85c8aae0a552f30823a9a244250dc4
+DIST qtwayland-5.15.7-gentoo-kde-3.tar.xz 44552 BLAKE2B bbe009f17546d975a128e68a604da853d74ce840ead2952ee465a7b4a43f8e2c6392079e73da14b184119e0f47f10293628a6fcf4115b4b19879cce592c01a1f SHA512 ed49d4cf724afd9819ffcda9a0c25aba96f422d72d3e172b882683cf650a01966a032ae1241e3bc7258717515ddc6f9b240003ec8886d5a01b2cf4f1d0c856b6
 DIST qtwayland-everywhere-opensource-src-5.15.7.tar.xz 568024 BLAKE2B ed2031ea40c5618c2390865807ef33eae42a3231098f1959f0a7e9e3b8e8d70f4461647aaa11afeade0528aa4d14049b03cc566552a13dd4d1b5773ec3d16061 SHA512 a004a82ec2b4f132d597ae3c82b4079671ecdfeed09c455073e552197da2b9f921c85bef2b40be76e87e61d5ec1e7ab39ed232be26b27d9aed6e938c659965a3
 DIST qtwayland-everywhere-src-6.4.0.tar.xz 836088 BLAKE2B 3efc506e1a0bc63182397d483bf352e21d39c75a7360ee3fe839527451950875748aea5cf62207ffef38b845a12c2bbbefde918d14333d1b194a4ea39b82670f SHA512 745fcc84c936c3f2fa7382291b5013679f9e57d6c680f1d352b0a132ba7cbaaea1495211f8fc4f1af85a81c711794987e4e05284d3ac06c94e92e9b601dae924
 EBUILD qtwayland-5.15.7-r1.ebuild 1008 BLAKE2B 6c530af0c321eec7d3ebabc7304bb5803b97983d0bd6b7ec032f09b91ad2456bd7300e505c931870e0b3449ed4c5afa0bf8eb0ea45ad2cd3529265dc1d722488 SHA512 a4f711eb5c1cc2c39182826abecffb3d279b61ff82eb92c2d5c9f10c5c28efad05688a0a9b771d48e147801082cfe67dbe5522cb7b5b2bf28caedbcfbce01e52
+EBUILD qtwayland-5.15.7-r2.ebuild 1008 BLAKE2B 9ca1e394a5b76939dc6d2e4d3d0e56b6f64e7ee126dc7af909bfb36b22b26b361f1d812a9e577af17588cb90b17c8e7ae2bb5a5f716b09a6a69df5da1f54befe SHA512 6247eeab4684891212098d51b84a8ef1df693070daa6b2c53679cbccc6bed2895dbd64b90d84f82ee7c6350a6e6e214b99b1d9293599b2e85d75fb0760369628
 EBUILD qtwayland-5.15.7.ebuild 1002 BLAKE2B 7a4945b847da1f25bcb4f6c1deced1caced106e08ef96a26e54601448a839b4e14dac349cc6594b977bc5673520a5578cbb108e962a737f7d72eb15eaf19f08c SHA512 cb5bc1170be1a8e27b61805155749e627bd93f09402b23400622c8f43ee8fd3b5007e9bf5fb93682809ee049f93f8714dd2c27e0c05921c35cb7a26a5f0785de
 EBUILD qtwayland-6.4.0.ebuild 438 BLAKE2B ecb43b4035f97bde672b22faf6a1aa7a5fd0860db6bf871b4055c97b1c199840e2ba84b6720a69a3a2ff5bc8222abaead3a6ba53c282e83b1c3c114cd075115a SHA512 c9512430e1085f3e60a4fcab21036ac8aa393eb442ec2ebcc7f4161958316a9131bddbdb422fb2018f190ec99d5d51d2ba02a28503c220cc5e2c16e904445190
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.7-r2.ebuild b/dev-qt/qtwayland/qtwayland-5.15.7-r2.ebuild
new file mode 100644
index 000000000000..54a7ae528c62
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.15.7-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=3
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+SLOT=5/${QT5_PV} # bug 815646
+IUSE="vulkan X"
+
+DEPEND="
+	dev-libs/wayland
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtdeclarative-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
+	media-libs/libglvnd
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-util/wayland-scanner"
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
+		$(qt_use X feature-xcomposite-egl)
+		$(qt_use X feature-xcomposite-glx)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+	rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 38282980d3fb..fa52a060a5f9 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 5483454b7724..dd4d59fefe40 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -5,5 +5,5 @@ DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c7
 DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6
 EBUILD gdbus-codegen-2.74.1.ebuild 2197 BLAKE2B 5feb327a7db8b4d345f3b1383be73dcbbf6da3d86815c8c7994bbe405b43cc92ca855ae9277ff688eca859aadcc7271bed531e1fc3ffcc329ae7caf37a976648 SHA512 8842a8eab75118b9ac6ed0843568f1e352ce31d06dd77d87512d4da2cfa08d31658bf29a6c0705cea1062f13633739880e07091f2ca5147dda97c7625f2bc433
 EBUILD gdbus-codegen-2.74.3.ebuild 2197 BLAKE2B 5feb327a7db8b4d345f3b1383be73dcbbf6da3d86815c8c7994bbe405b43cc92ca855ae9277ff688eca859aadcc7271bed531e1fc3ffcc329ae7caf37a976648 SHA512 8842a8eab75118b9ac6ed0843568f1e352ce31d06dd77d87512d4da2cfa08d31658bf29a6c0705cea1062f13633739880e07091f2ca5147dda97c7625f2bc433
-EBUILD gdbus-codegen-2.74.4.ebuild 2205 BLAKE2B bfafd9b08250c6a2ecdcf43150ce1e73a5830dd5b3b25d8095e60cdf2396d871698f23525a7aa9395669191a5a507c9f8cd53d2215e9b83e6d907eef2315c963 SHA512 2d7fdca3ea1983f1fde3b6b1759c68faa515995030586cb62dc4e836d7b62da0ae03686c5316fe4b8ec66e320d7cc7cd58c159b9a8009c665be51600e0134da7
+EBUILD gdbus-codegen-2.74.4.ebuild 2204 BLAKE2B 62f36309919b5ae031e632b5b631f5c8da759b5a1aefc0d7798530242027367f961810e578eb8412422bbfb2b7c0b894d8168040344b6d7e3b4bb2eebc08180f SHA512 847d674e75c9fdb40500802dda1e0f0c7d8b8c698713bf94f0bd91b2e0b69e102e186770a411d4e08c2e28cd36973354292e630905a01e0dc1ec18f6dde70b0a
 MISC metadata.xml 345 BLAKE2B 91a0526be5ce32d4aa4ea0827c78b2d2d45beae9a8d467916448a0a6b5459fd457e44ac900182654826328b34d37999bedb3ade42e80db92312e50f34d940014 SHA512 b11e427345fab56c77cb1f4f96473645b69054012e86840e2ca7dab221cf55041a1add1dfabce155274acf18488ac79de8149d405213daf39b807f679d4ac752
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild
index 6964fb9fd48a..967f48c39206 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 4e6434df55e2..b003fa28d41c 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -3,5 +3,5 @@ DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c7
 DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6
 EBUILD glib-utils-2.74.1.ebuild 2332 BLAKE2B eae0be3ecd001de535ff7db1483b93bdcc5405ed13935073cec2c4c92755bbe6628f86c9477396b54280384f16487af9b842dd92b7214e8e127e7affbfd68520 SHA512 2095a7aa280bbff2ce40745fc1e349fcc8fd890634b4303ff1b65b7410d0f8f30e6ff05f7f580650b48dbdc2c682a82475d0cf1c6e791da6c20eea2a259f9ea1
 EBUILD glib-utils-2.74.3.ebuild 2332 BLAKE2B eae0be3ecd001de535ff7db1483b93bdcc5405ed13935073cec2c4c92755bbe6628f86c9477396b54280384f16487af9b842dd92b7214e8e127e7affbfd68520 SHA512 2095a7aa280bbff2ce40745fc1e349fcc8fd890634b4303ff1b65b7410d0f8f30e6ff05f7f580650b48dbdc2c682a82475d0cf1c6e791da6c20eea2a259f9ea1
-EBUILD glib-utils-2.74.4.ebuild 2340 BLAKE2B 76f931baf38bb3e77988477867d576576aef408a629a10b20e5ae6a7fae2b4c8ff8f108d7f4cd23efc1a17c4f8809c537190394fc7cbfb3c3a777d7b9df18fcb SHA512 ad137f2ee9ea091e5ddb4d2ba7455cba82b003d748ffa0ae56cf53e6e443b029f0558b9b7632c4d50ae36a55904dff54cec99bc2d49ee609054fadac9c79f144
+EBUILD glib-utils-2.74.4.ebuild 2339 BLAKE2B 788c1326f5697aa7d2293c1dea582bc97ef3ea21ea5a5ed471effbb970718cb34f58121215243fc92dbc7c0d11be48f8390e0029026ade7003586b676e87ba50 SHA512 3e242e63948c7363ad40bb6007342d365a1e3a89f199c6dd9e8ddf03e4866fcb3c9d58fe9d7a443eee293fd405dc04a66c10ebe1125b05501647f3ba058d4bf9
 MISC metadata.xml 401 BLAKE2B bdf1884a4dcf8ab8362a86ed6559bb887c026bc315bd8cbfca0b5d8def8102636965da5af0f1871096704309a4a0919028d02f168a91830aa4ed911c6583d103 SHA512 2eaaccd9c6bd6e059b3acf34c964857a9e541f2eedd191c0fa35eca3499242349184ab01becca40791ac1dcdf02ba4a75369ea9c69fa5c21f15d878b1c28c453
diff --git a/dev-util/glib-utils/glib-utils-2.74.4.ebuild b/dev-util/glib-utils/glib-utils-2.74.4.ebuild
index c715c1e6fd52..1748a0122d99 100644
--- a/dev-util/glib-utils/glib-utils-2.74.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.74.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 9017b91f2b53..c6cf61c7e75d 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index 4a7bd50d865c..eb1c3e52a53d 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,8 +1,5 @@
-AUX dosbox-staging-0.78.1-musl.patch 529 BLAKE2B fd0ce9ea24e8d921dcff9a77d6f01b54054868206c0abd2a96a4a89f4137969ff7c83ecd1e191b25fa7f1c1bf3f4232821e1405a84578c9a37323dbdebf6bad5 SHA512 ab7a5ee73872f654cf20e4736d9201af33bab170a717de6f6e0019a4383defd15448f8923057bc9dab236e577e7a0833aa5f198d8ffd21d30dab05fbe8afcd82
-DIST dosbox-staging-0.78.1.tar.gz 2968448 BLAKE2B 7b48763d10338d36e61696331358f7572a528c10d48e473dfaba6a8c96dd5d3ca2b9e1f5c595d653fbbe64f2b5f1d9f1ff8279dfab8f2cb49ac6faba697e97ca SHA512 3179e8eac00e22e35b36623c11688b8c60408bf487a56683269ff065988fbdf4319c16097232cc191695cf2e10c05f4c4eee15e92d9887ebf03a23f808d5db7c
-DIST dosbox-staging-0.79.0.tar.gz 3114176 BLAKE2B 1206aed3d87ead0315a1e7e4ff814c4a787026521653b68532cb231590417c9124511ad8f39132d8d595b227675cfafdec4236a6f8dece43c139a401b7e9d11a SHA512 573365258d2fdc82ad8a803ce8f2b7f47b7219eeba9bc3253447ad48b9df793bc459947dbaa7a484bcce7e23ed3d0385438335dcdd2790c7eba6723960dfc890
 DIST dosbox-staging-0.79.1.tar.gz 3280884 BLAKE2B 48fd371df026392d59db2c9874f81b772b6595e2471a7ad1200e27e94fc87892f8e1c51288c1b0a430d8c3260535e35a00025047248551569f402b32a1ca3cf8 SHA512 6d7212229b58936cd1c4382f5e5cad45066e92f6a5b3bb2e97177ff7122dd527496a16dcefbfa84c3ad031d805c804c7872ec6eeaef9d695b0b8c4309f58acc7
-EBUILD dosbox-staging-0.78.1.ebuild 1837 BLAKE2B 348e7961693ef926388a3a71911d334ccbfb5d416314ed7767fb1176260cf20e9d9bb8832536f3dfb1274ac17d88c1ca308d8da45fcb3c105aedb5775933b02b SHA512 3ba80b137691ea234b7bfbd2d3b10cc4fe829ad88395a02b94f40d88113e1ce9952f6d428783c9424198c759bc004a9a3d4d27a4e384501e9000ac67c91986d2
-EBUILD dosbox-staging-0.79.0.ebuild 1812 BLAKE2B e861fd380c7a7f5c51a1a345f24e7503681e62a1a7975a7a7680bb69cc34bd6e8b7f2b2961ccece86e1ffb78e375449c58d02a03ecbd5d2d15db59c3ed78af7e SHA512 9b728673c121d11ebfe3ddaabdc82affabb02694341b97563ec433570ec0671bd9e89cdbdeb6f3f0c5f1b02ed3e7f5916c8cdd2702b7875462986ccefd4f4650
+DIST dosbox-staging-0.80.0.tar.gz 3871598 BLAKE2B 59cb6515f17b9a661f5e9d7787b01ecef4fe047dfd0ca4573cc12c73af1f9fe433f4c20a1c42e1fcd259c31af3922738c057aa64fc777a513a7881a86436a1fa SHA512 aed548df29d5d4aa6593f0b589d7548caaf02be31668dc2c6bcbb0eb324a73d9344ce471a8449e90706b379ed6794e6584e5ebc6b3628274f5ec6667c14a3d8a
 EBUILD dosbox-staging-0.79.1.ebuild 1666 BLAKE2B 3e618bf06a4f87ffb61131faab759f9580d4d0dec873d5b4086ddee9c593ed90d1b5a192808b52a7c10c77174a85d39053d7e3f709bf673542b28d5ead2ebced SHA512 e4c11f68c8ba5e7282379c2d006df89ef5f8ef65986a703e306eb9aaabcdbd4f69dcb2596aa445b2585806ce40b088280c26be694cf4d8525cdc03f61bd1954e
-MISC metadata.xml 797 BLAKE2B c7d440ebd04ed5cedb3c97e95295e5120223e61920baea68c13857395ad4c117e577a597cc6eb46bdc637b6ecc8642348fb27ac7ff449650bf3eb68a038fc6bf SHA512 aa32bedd4eadb03665259ded49733267573a9dee6d2135d881c657e21183fcbd8d4a8983ede0c0931655434ac302fa0633368bb3ab839928e0a5a8d13a435870
+EBUILD dosbox-staging-0.80.0.ebuild 1757 BLAKE2B d070b30d916d3d15c0db8332f97cac661a8658347079215dc3d974c3b08fa429f25b18edcb641fdeacc2197c4b9f0482361437b2a6c1bd7e776bf65e50f4ebd0 SHA512 e7fb45abe3d1accf8a806aad68af29a4ef644e093495155099730b137e669abefe099dfb7d4beaefdae87be6ee88d763cf0584a9de369b5394a96d6ccec214ef
+MISC metadata.xml 907 BLAKE2B d4d1f88337a4cb5154de5bc532b82b0853d76629819dc29f43899e6c498108f5deb46ba9acbfbd0fd290790dd8bdbef2f0aae7079f5c3876004bde6f1d2f14eb SHA512 eb52e2b50ebb74b40cdd28af4ba8d3026ddcceba910729a275a92c5951ced7130b728e39338f22721b5873883e455283ee7747d3f0dcd49608e43931467c3528
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
deleted file mode 100644
index a882bcb7b4a8..000000000000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/"
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	debug? ( sys-libs/ncurses:0= )
-	fluidsynth? (
-		media-sound/fluid-soundfont
-		media-sound/fluidsynth
-	)
-	mt-32? ( media-libs/munt-mt32emu )
-	network? ( media-libs/sdl2-net )
-	opengl? ( virtual/opengl )
-	slirp? ( net-libs/libslirp )
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,opengl?,video,X]
-	media-libs/opusfile
-	sys-libs/zlib
-	!games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-DOCS=( AUTHORS README THANKS )
-
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
-
-src_prepare() {
-	default
-
-	# We do not have default.sf2, use actual name from fluid-soundfont
-	sed -e "s/default.sf2/FluidR3_GM.sf2/" \
-		-i src/midi/midi_fluidsynth.cpp || die
-
-	# Disable license and docs install (handled by ebuild)
-	sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
-
-	# Test failing on some platforms, bug #817908
-	# https://github.com/dosbox-staging/dosbox-staging/issues/1230
-	sed -i 's/.*soft_limit.*//' tests/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use alsa use_alsa)
-		$(meson_use debug)
-		-Ddynamic_core=$(usex dynrec dynrec dyn-x86)
-		$(meson_use fluidsynth use_fluidsynth)
-		$(meson_use mt-32 use_mt32emu)
-		$(meson_use network use_sdl2_net)
-		$(meson_use opengl use_opengl)
-		$(meson_use slirp use_slirp)
-		$(meson_feature test unit_tests)
-	)
-	meson_src_configure
-}
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.79.0.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild
index a22e5df9f7cb..0b11b68c3d99 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.79.0.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl screenshot slirp test"
 
 RESTRICT="!test? ( test )"
 
@@ -24,6 +24,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	mt-32? ( media-libs/munt-mt32emu )
 	network? ( media-libs/sdl2-net )
 	opengl? ( virtual/opengl )
+	screenshot? ( media-libs/sdl2-image )
 	slirp? ( net-libs/libslirp )
 	media-libs/iir1
 	media-libs/libpng:0=
@@ -49,11 +50,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# Do not look for static libraries
-	# speexdsp system flag needs to be manually enabled
 	local emesonargs=(
-		-Ddefault_library=shared
-		-Dsystem_libraries=speexdsp
 		$(meson_use alsa use_alsa)
 		$(meson_use debug)
 		-Ddynamic_core=$(usex dynrec dynrec dyn-x86)
@@ -61,6 +58,7 @@ src_configure() {
 		$(meson_use mt-32 use_mt32emu)
 		$(meson_use network use_sdl2_net)
 		$(meson_use opengl use_opengl)
+		$(meson_use screenshot use_sdl2_image)
 		$(meson_use slirp use_slirp)
 		$(meson_feature test unit_tests)
 	)
diff --git a/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch
deleted file mode 100644
index a1f4fe3ca654..000000000000
--- a/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/libs/loguru/loguru.cpp b/src/libs/loguru/loguru.cpp
-index 9675cc1d..c4b5c0e3 100644
---- a/src/libs/loguru/loguru.cpp
-+++ b/src/libs/loguru/loguru.cpp
-@@ -83,7 +83,7 @@
- 	#ifndef LOGURU_STACKTRACES
- 		#define LOGURU_STACKTRACES 0
- 	#endif
--#elif defined(__rtems__) || defined(__ANDROID__) || defined(__FreeBSD__)
-+#elif defined(__rtems__) || defined(__ANDROID__) || defined(__FreeBSD__) || !defined(__GLIBC__)
- 	#define LOGURU_PTHREADS    1
- 	#define LOGURU_WINTHREADS  0
- 	#ifndef LOGURU_STACKTRACES
--- 
-2.34.1
-
diff --git a/games-emulation/dosbox-staging/metadata.xml b/games-emulation/dosbox-staging/metadata.xml
index bcf5208f4d03..5f790a376160 100644
--- a/games-emulation/dosbox-staging/metadata.xml
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="fluidsynth">use <pkg>media-sound/fluidsynth</pkg> for MIDI emulation</flag>
 		<flag name="mt-32">use <pkg>media-libs/munt-mt32emu</pkg> for MT-32 emulation</flag>
 		<flag name="network">Enable networking features (modem, ipx)</flag>
+		<flag name="screenshot">Enable screenshots of rendered output using <pkg>media-libs/sdl2-image</pkg></flag>
 		<flag name="slirp">Enable Ethernet emulation using <pkg>net-libs/libslirp</pkg></flag>
 	</use>
 	<upstream>
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 2a0d001c9072..ecd8ff4a743b 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 60d407cc9686..45a5c77bfb92 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -5,5 +5,5 @@ AUX 43.0-optional-gstreamer.patch 1269 BLAKE2B 2a4599771977e44f9e1b25d2334f838a2
 DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
 DIST nautilus-43.1.tar.xz 3162772 BLAKE2B 5150f1453328d3861b343bdd7070ee5eaea95a96b5b52db928eeb16e0aefad05cc0281295cb26c28cf3808e6ea3d76a2efff0fd9fc670b173ef3d3ad8c9ed9f3 SHA512 f09362584f2d4a04870c7e6b64ec3d23c90f20c8d37aa7103277985f182db49f3306f6e130966c6cfc97463fd5322f454564f713e70b839fea177545214dced2
 EBUILD nautilus-42.2.ebuild 3340 BLAKE2B f2968baf0c7af84edc0d048a40e4edf84d83338d35d57a146bc6ad8dc10867ca3403c7248d0b1b8b530d451cae7299f35a201dca2b100115073acd79e208931d SHA512 465f03fa321f14ef1b8cef926e2c34b4eaa1f648a13f96e273521f193eca174b8b94539701e377f8de9119a1fa2fbbae8cf733511955db6d674007474872b5be
-EBUILD nautilus-43.1.ebuild 3300 BLAKE2B 71b61a75ffae185c5639ea563e265a344422ae97a852f3aa9a911a19c17e6481c25805485cb3b8a7ad4856dfcdddcf4d73a8d326b828ee0b7651aca3fe650a4f SHA512 1d7ab1c23f38989c25fa73bacf7d5fee3957689ac6343d37d548a4e2da214db1275fcb964ae5323cee4ac6ea5da793f85de0c5f474c6dee39e4e3791476f63e6
+EBUILD nautilus-43.1.ebuild 3306 BLAKE2B e904e5f8113825c98a02284c3e6867c3ac2172261e5f29d4564d4afd6e03cb883572328a559861675794812b6a189541a985ae5499c167b7db0388f6cc0adf04 SHA512 5e7a98b9217d5529f345c349b4cd76da9169846084a1c5f64c8e1e8fc90969a44f3c6b2daa6c9e281c17586bbfab5093dbc90cfd6a8dcff12b849b219dae3f12
 MISC metadata.xml 662 BLAKE2B 0d7e1a575749fe5e00899852e51bc0eb184f7b2a55f2fe0eaade6ca087961ceb673d7523b9c6b71d4ac266b8488ad599de1651fb7e6fb0b2c7c160384dc059f5 SHA512 696cc099a35c07475920b8ee5785820ab6f0505bf3a14fc67f6372d8762012f5d21e3c4fa573fee1d7e6cff4e7233dacfb9c78c5f7f025a03f50e6374f3ebb67
diff --git a/gnome-base/nautilus/nautilus-43.1.ebuild b/gnome-base/nautilus/nautilus-43.1.ebuild
index 9a34fbd03c43..fd28edbbb81d 100644
--- a/gnome-base/nautilus/nautilus-43.1.ebuild
+++ b/gnome-base/nautilus/nautilus-43.1.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
 REQUIRED_USE="gtk-doc? ( introspection )"
 
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.72.0:2
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 005132d3b16c..b22b0c93d161 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index d9e1af979030..d98e04d13d7c 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-boxes-42.3.tar.xz 1235916 BLAKE2B 69a52117b0ef459b4f6c11287f3961283c0493522875958ae65cf1838d9359b60e1c376bf86c1bc1899e69b6b9aed72a32aa39c7e687afef6a23de50d599b8e8 SHA512 2c455830b76cffc647838b797dc7667d9dec0be45658972075b203553bd73bb54dd6b9b22891da9eb12bea7f157b26980a172685a10e1d252f32014f38eb8805
 DIST gnome-boxes-43.1.tar.xz 1231472 BLAKE2B 1c7bd9094e7ddd8f5062ccd4660f72f2b3069cf3d66f45b8713e0880f5e5d8976eb4c1c8d4dfe8418a7a51e9b1ae0b9b5c85996e179a932c43748b308819d2d0 SHA512 25865c4bb1dfd47552001eda18ba901f9501a22978ef382bd7edcb31493cc284794506f5e2ba4f28d72e6ddb35e5c6e9b5646ccc4d2e87bf41e8620c102d335e
+DIST gnome-boxes-43.2.tar.xz 1235424 BLAKE2B f99106ee7a8744a92a6f749230802a882a96489a2b2047b70ec07263b2f03ee0fcd910c907e2307a09c78f85784849bf87c20e901894e7c9692dfa77a0182a18 SHA512 edddf5980adf6bce516a4fd35be14e7b261c6cf886f1f1e7fc9cd79089b8320e781c98f2a040babc1661af6ae1f331dec3a2ecd728bcdb26d9a9031175c8e1be
 EBUILD gnome-boxes-42.3.ebuild 3852 BLAKE2B f077a6d89ead04038dce83f85f0c7ee1d363fc26a0a2e07db5748d65f140cde0d55d2f89e57bd566dbdaefbac9e9dda8fba3173dbd918444d9d05c30b3db01d8 SHA512 6f1ebb0dd036865f817d0c3651b4d6739967814778aecfa7039a1f7e5eb04c9258f030d94924ec2ebb56ad14c42c774b29ea17396fed4d7d68cb3262fec0364c
 EBUILD gnome-boxes-43.1.ebuild 3515 BLAKE2B ee91cdf2ac293437bfffddf9b2d6d7acff87a496956e6937996400c45961f8d653a88fdab9fd05267f52e13a8897b791caa51e543ced4010463ada5ed919c8d2 SHA512 7460ddcffb342e0770d5f314f494455c16be30b823e163830ecd8949dfd9f45e00ca4ad11ac098cde7606806e18973b4d5fe8aabdc2a4204480a3d39cd60e03d
+EBUILD gnome-boxes-43.2.ebuild 3516 BLAKE2B 773eef692e358381f03cbb8d3524b44354b0065bf4293566074ffa5e21ea352c2af0680d18ec72b55aadf5b87a7b8603b7dd25dd4dab3fd722401a81f29ddc4c SHA512 fc8787fb0a6fc9b3681f3a245db9cd50522a91e2590f7a8023c7df550a75b5490a40810bc838784c2e605966bc8d311d006e66415073cc77c2813c1347d93818
 MISC metadata.xml 352 BLAKE2B 285b6e588965df3d070f92552b36941c6346a9fde3dce831baa82d42c8ca23f62cc027e5984a27fc87bffca8181c2d13a52b064729349daef0aa815a566a885e SHA512 09baca6576a90ca57b6e0935879f1630550efc9d591b425d6944b28b1184612b34fcdbae6d835d98812c89ec7a47415af9a01678be16f35a52933bb7c374131f
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-43.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-43.2.ebuild
new file mode 100644
index 000000000000..7af9bb261f0c
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-43.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Simple GNOME application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2+ CC-BY-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
+# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
+# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
+DEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.24.1:3
+	>=gui-libs/libhandy-1.5.0:1
+	>=sys-libs/libosinfo-1.10.0-r1
+	app-crypt/libsecret
+	net-libs/libsoup:3.0
+	virtual/libusb:1
+	>=app-emulation/libvirt-glib-4.0.0
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
+	app-misc/tracker:3
+	>=net-libs/webkit-gtk-2.38.0:4.1
+
+	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/libgudev-165:=
+" # gobject-introspection needed for libovf subproject
+# These are called via exec():
+# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
+# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
+# sys-apps/policycoreutils restorecon is used for checking selinux context
+# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
+# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
+# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
+RDEPEND="${DEPEND}
+	app-cdr/cdrtools
+	app-misc/tracker-miners:3[iso]
+	app-emulation/spice[smartcard]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	sys-fs/mtools
+	sys-auth/polkit
+"
+# This is only needed for creating the .vapi file, but gnome-boxes needs it
+BDEPEND="
+	$(vala_depend)
+	sys-libs/libosinfo[vala]
+	app-crypt/libsecret[vala]
+	net-libs/libsoup:3.0[vala]
+	app-emulation/libvirt-glib[vala]
+	net-misc/spice-gtk[vala]
+	x11-libs/vte:2.91[vala]
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddistributor_name=Gentoo
+		-Ddistributor_version=${PVR}
+		-Dinstalled_tests=false
+		-Dflatpak=false
+		-Dprofile=default
+		-Duefi=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 627f40c2bfb6..3f30ab1663a2 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 46741d0ca1ca..2221a46e90cb 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,3 +1,5 @@
 DIST gtk-4.8.2.tar.xz 20210736 BLAKE2B 0595ee5b497cdf1b0fff3bc468a7e79d9665f5552213b3bd794f9df6354e280f3d4747820bf3cd83ee903b8709e2902f70f6c3721322573b204447017a9c0ebf SHA512 400cdde53a4b76a912f52b1300286b2198d47195902ccfc034fbc518be7bc4c5817fe6df6386d764c95686083eede2e4582cc555fb38b0bce455942ea6c5fcb5
+DIST gtk-4.8.3.tar.xz 20297060 BLAKE2B ad0f9e2998f3748afe4a03317e6d0438bfd9eaf804f202e96724541cce20597b7b6e69d5c50ce319450feed4f4a5653c0d99b949b23ce3a40c46a12da7e2d85f SHA512 56be0f5ce85a9cbbda4a5de53baeeb6b8cc527a5d34723ae5548759ec7c28f03d204b6b6758dffed02a9e226f3bfcd1f15971105c2f2f7be7cef22538be27754
 EBUILD gtk-4.8.2-r1.ebuild 5750 BLAKE2B af5106d863fad1868c47125d7c86f28c2855b4ffefbae2efdc9242046e11d2bc288a8ffa04eca63a079f8c72cd9498d1d43334e2792fca4b152519557b58d2c0 SHA512 f21d952abf1dec1152741df502eed4863c645fc083a12b5311d73e5afd9926d1080afc9323a3b95ae379649598b04a11f62bcf3faf254f6dfc9edf2207846ade
+EBUILD gtk-4.8.3.ebuild 5703 BLAKE2B ebb9f5bd3e434fe092e7eca7d013870526d4f1f24b3baad5a6b7c376cf453f2363bab77e4778fa6ce618cb8424fdfeca65b025d4f713e94dce60e885cd219e8b SHA512 4a57dc62d187fecb6086026c4842ff2c08c517ab9bd14147ac1ddca4455efa585f2f00ffa26b8b9b2e317aa5517e755c7856a969e0c22897e2089e32fd6b9fbc
 MISC metadata.xml 761 BLAKE2B 9bfb7757b82761ef2285e2d912376112958df4400ed93bdfc4a3f195cada9caf927cbced29820f6db049b8e5b7f2246d9264290ade62ba3bde8975491fd6331b SHA512 6ba84b2e3eeafceb179339561ac5e9fbd94dc34b71da768d9ca909818cf0c9ec5fe04906ed33aa58bc56929323bc41272223faee908052861fd1c6f8bbad95a5
diff --git a/gui-libs/gtk/gtk-4.8.3.ebuild b/gui-libs/gtk/gtk-4.8.3.ebuild
new file mode 100644
index 000000000000..089c19af93ad
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.8.3.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
+
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
+
+LICENSE="LGPL-2+"
+SLOT="4"
+IUSE="aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	test? ( introspection )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/fribidi-0.19.7
+	>=dev-libs/glib-2.66.0:2
+	>=media-libs/graphene-1.9.1[introspection?]
+	>=media-libs/libepoxy-1.4[egl,X(+)?]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+	>=x11-libs/pango-1.50.0[introspection?]
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/harfbuzz-2.6.0:=
+	app-text/iso-codes
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9:0= )
+	cups? ( >=net-print/cups-2.0 )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? (
+		>=media-libs/gst-plugins-bad-1.12.3:1.0
+		>=media-libs/gst-plugins-base-1.12.3:1.0[opengl]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	vulkan? ( media-libs/vulkan-loader:= )
+	wayland? (
+		>=dev-libs/wayland-1.21.0
+		>=dev-libs/wayland-protocols-1.25
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
+		>=app-accessibility/at-spi2-core-2.46.0
+		media-libs/fontconfig
+		media-libs/mesa[X(+)]
+		x11-libs/libX11
+		>=x11-libs/libXi-1.8
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.5
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg
+	>=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+	dev-libs/gobject-introspection-common
+	introspection? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+	dev-python/docutils
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	test? (
+		dev-libs/glib:2
+		media-fonts/cantarell
+		wayland? ( dev-libs/weston[headless] )
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+}
+
+pkg_setup() {
+	use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
+	sed -i -e '/gtk4-update-icon-cache/d' tools/meson.build || die
+	# Workaround RWX ELF sections, https://gitlab.gnome.org/GNOME/gtk/-/issues/4598
+	sed -i -e 's/^ld =.*/ld = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
+	sed -i -e 's/^objcopy =.*/objcopy = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		# GDK backends
+		$(meson_use X x11-backend)
+		$(meson_use wayland wayland-backend)
+		$(meson_use broadway broadway-backend)
+		-Dwin32-backend=false
+		$(meson_use aqua macos-backend)
+
+		# Media backends
+		$(meson_feature ffmpeg media-ffmpeg)
+		$(meson_feature gstreamer media-gstreamer)
+
+		# Print backends
+		$(meson_feature cups print-cups)
+
+		# Optional dependencies
+		$(meson_feature vulkan)
+		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
+		$(meson_feature sysprof)
+		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
+		$(meson_feature colord)
+		# Expected to fail with GCC < 11
+		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
+		$(meson_feature cpu_flags_x86_f16c f16c)
+
+		# Documentation and introspection
+		-Dgtk_doc=false # we ship pregenerated API docs from tarball
+		-Dupdate_screenshots=false
+		-Dman-pages=true
+		$(meson_feature introspection)
+
+		# Demos and binaries
+		$(meson_use examples build-examples)
+		$(meson_use examples demos)
+		$(meson_use test build-tests)
+		-Dinstall-tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	if use X; then
+		einfo "Running tests under X"
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
+	fi
+
+	if use wayland; then
+		einfo "Running tests under Weston"
+
+		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+		compositor=$!
+		export WAYLAND_DISPLAY=wayland-5
+
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
+
+		exit_code=$?
+		kill ${compositor}
+	fi
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
+	doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+
+	if use examples ; then
+		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4d2174e04490..faac3b089d43 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 2996c172640e..9bfdeaca108a 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,6 +1,4 @@
 AUX lensfun-0.3.2-warnings.patch 1813 BLAKE2B d0ee40324b584eddbee19442f1c221b25043d06b90357feee37b93e9c77dc9475bb45bb23fcd884d90cea031f6b6b46fc9c50e6f22d5bb816d9e289bac8a1e3a SHA512 517d613ba3916dd031eb026748465ec71f2cdc4658b0ce3dede827386f9805916f9bb1c4adc9af350b61b7e68bba1ceee02f89989ff91e52ffcb1ee442599527
-DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
 DIST lensfun-0.3.3.tar.gz 992432 BLAKE2B 174f9a34195ca8d7f09de43a2f0d1015bc766579607c44541f631142386a3b5c27c823f9f54f08d462946a0809610b6a87e61cd093b69339fa7d57d28cc833ae SHA512 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf
-EBUILD lensfun-0.3.2-r1.ebuild 1480 BLAKE2B efb609dca27ad95b193f5b4e2d1e5bd8dde7740be3878d9fb48dae651bde567881cfe5747cf0f2664db4d0999b022d5b8fd23ff5d5c81e0a85b26f84c92d349a SHA512 87f7f9732e2befc6c53e15664125345c88fc24710d31c311cad49754b8f5ea99613432d791737c51906177202078be7a5d9fdfc4e98b73637565cf53d0135bb9
 EBUILD lensfun-0.3.3.ebuild 1487 BLAKE2B 717d61ec553358c6b134fa4944f2b7a279b86ae24382a6541178e2365a3fdcb2abb30c85cea25afba4730e134d10a72ce764067c5ba831c42de0d764f849b9e1 SHA512 f53e645d78d107a0d19a3212cb899ace3752c723a33e997b5d8425a8c8f0da1b3717f42e851d5639cd95b0fb534a34a7fd56ade958c6811e5ec899fd9151ef44
 MISC metadata.xml 716 BLAKE2B 866b92afec30235731857799268948cf0d63be654432c72bf6a93084d2e344d486d0156571e08accfce4c9323aee6e7f155620d2e7a72ebfe69ef27b39bb13cb SHA512 fa3c54e5ea453bcefb5e9b9c76c3a45fa74280ba52b713ac93aa5a95341dc0f9111130b1952bc0a4b3b7898d5d0bde46234e1b42453757ead0c42c002141e6c4
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
deleted file mode 100644
index 0cf6eb2b6e13..000000000000
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-single-r1 cmake
-
-DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
-HOMEPAGE="https://lensfun.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-python/docutils
-	)
-"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.40
-	media-libs/libpng:0=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md docs/mounts.txt ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}/${P}-warnings.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-		-DSETUP_PY_INSTALL_PREFIX="${ED}"/usr
-		-DBUILD_LENSTOOL=ON
-		-DBUILD_STATIC=OFF
-		-DBUILD_DOC=$(usex doc)
-		-DBUILD_FOR_SSE=$(usex cpu_flags_x86_sse)
-		-DBUILD_FOR_SSE2=$(usex cpu_flags_x86_sse2)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	mkdir -p "${T}/db/lensfun" || die
-	cp data/db/* "${T}/db/lensfun/" || die
-
-	XDG_DATA_HOME="${T}/db" cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-}
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 6e2c22fcef8e..4f81b0c02edd 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -1,9 +1,4 @@
 AUX libharu-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch 8278 BLAKE2B fe7ededc5a3d82abf89c6e4923f7c4e7d2020753098921710822f315436dc17577c0a530de9d06587f69cfa7a832fa5e6b43cec0e57f9c0c3f0ca676030fb773 SHA512 8a739951cba5264b11f575fa3e366d0968a6c6f412d0f467be914a5c666f16e6f60f9535a06c96ce50c11f8c99979e19c09d0b2522b1aef1a54be109b7a8f61a
-AUX libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch 2867 BLAKE2B aa68693458cf1f8c6677a7014e66feba95145f41099d555d07b05d914a117d8fce9dfc9a07ae0418bfe68f4ec4b6e66f3286009ec33dc80aea8866d9d175a7cd SHA512 05e7abd46ab817edd68fd1f5baac6a95155c1410651e92aea1067b8d80fc1e3cfa1c142527ab5bc578b4703361a992d6c5865beede5297f95260c59215e3d900
-AUX libharu-2.3.0-3-cmake-fixes.patch 6376 BLAKE2B ec14be6aeda6e0e43a40bc2f1d41fcec4b601161cdcf1bdeff3e585bd78d6924aae322ffa5fe48f4fe221b1750b672ec7a80ba0a985368da4e5b00122b7d6617 SHA512 186d36b0b943c811e9fc34d448f58177914d2146a3df5cf8b12fe8c9fe7525046a7e53361052d308164cb99d4ec9a28341e4fe3b6cc69d6cb2c0ea03a49b0355
-AUX libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch 15988 BLAKE2B 6cbd9826317e6d1de126dfdcdd3508bfb6351c34cd58fda8f09fe44efead890d78c67f33750223cb2291312b2299ecf16f7b91e4e20a3024bb6007da96753f86 SHA512 94d1377e529d1d96941a90ac82276748f5bf7f0e248a6770d938394151e453aaa082c0d256c0de28f737e7e995bc0ee60a4eb5562aa450af1dfcc1733b403466
-DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c SHA512 ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
 DIST libharu-2.4.2.tar.gz 1411029 BLAKE2B 8618803022cc2c745d2517f71cf9da49eeefe16b05c486a5ecaa6ec09f6fb7e0dbe3af6d12018bf1c81d3a06c3be1446617e634ab21ea25a68ee9f9d645b65cb SHA512 faa5c0390f22ae8bbe3dbc2b49e49b475257a70c5772e456cc34df3f98b26e39b65b17b0f982dd844b9774a4217a621337a1a8a810d7be09569a7bffe4ea1f15
-EBUILD libharu-2.3.0-r3.ebuild 915 BLAKE2B 3ecaecabfb3c495255b3fc79855585cf019650029ea5fd359131836725fba6f8865e99236fb1928d504c854d940d2fec7a5aa6dbbf5dbc09e0ff5a6ad609558e SHA512 934f768be1795013ce7b8b6fe24cbafe0fcebfccd531ab785b0440f4101de07ce2bb61529758f4c5445f2c8cd6e0c0b556053c8ad6567733393a863839088ae9
 EBUILD libharu-2.4.2-r1.ebuild 680 BLAKE2B 16d596c0b72062be438a556b849b0cdfaab102b9b6763ebabd77cd94d3f75cf4dfe3f524b31f2ddc17cbd9bdb23f3ec8ac45560f2bd10e78ce70fb5feca5bc4c SHA512 02abbbfd38130682f390a43f2278935fcfe176f1f320bd849d3e66eaf4400b486ae2409194cc3430dfa92678e2f8f5d3e1960175a01a7bd7996cb1d43ee1ffcc
 MISC metadata.xml 878 BLAKE2B 3a663b2bf854d6981de546932e6073c7b314e4f7a2688660a227092d3fa465c009ec473bd0452b0902563d862acd1184dd3c5df93d1de1d3248f08ebabc7708f SHA512 9decbd81a34c575c28c241103c16f03d865ed4b5000874181c29c224bf1395521d1640a89fe74cdb41c4920c50fe05e3d106ffdc283a4003b4f539681851253a
diff --git a/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch b/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
deleted file mode 100644
index 78a56f6eb33c..000000000000
--- a/media-libs/libharu/files/libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From c1ecbf1bd286e26572fc0fd7a49d06774d6436f7 Mon Sep 17 00:00:00 2001
-From: Bruno Virlet <bruno.virlet@gmail.com>
-Date: Thu, 30 Nov 2017 12:19:37 +0100
-Subject: [PATCH 2/4] Avoid issue with libtiff duplicate symbols
-
-To achieve this, I move the G3CODES #define to pdf_conf.h so that anyone
-who builds the project has more control.
----
- include/hpdf_conf.h    | 3 ++-
- src/hpdf_image_ccitt.c | 9 ++++-----
- src/t4.h               | 6 ++++--
- 3 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/include/hpdf_conf.h b/include/hpdf_conf.h
-index d25b464..27d1dff 100644
---- a/include/hpdf_conf.h
-+++ b/include/hpdf_conf.h
-@@ -78,8 +78,9 @@
- 
- /* alignment size of memory-pool-object
-  */
--#define HPDF_ALIGN_SIZ              sizeof int;
-+#define HPDF_ALINMENT_SIZ              sizeof(int)
- 
-+#define G3CODES
- 
- #endif /* _HPDF_CONF_H */
- 
-diff --git a/src/hpdf_image_ccitt.c b/src/hpdf_image_ccitt.c
-index 8672763..939b0b5 100644
---- a/src/hpdf_image_ccitt.c
-+++ b/src/hpdf_image_ccitt.c
-@@ -21,7 +21,6 @@
- #include <memory.h>
- #include <assert.h>
- 
--#define	G3CODES
- #include "t4.h"
- 
- typedef unsigned int uint32;
-@@ -578,11 +577,11 @@ HPDF_Fax3Encode2DRow(struct _HPDF_CCITT_Data *pData, unsigned char* bp, unsigned
- 				a2 = finddiff2(bp, a1, bits, PIXEL(bp,a1));
- 				putcode(pData, &horizcode);
- 				if (a0+a1 == 0 || PIXEL(bp, a0) == 0) {
--					putspan(pData, a1-a0, TIFFFaxWhiteCodes);
--					putspan(pData, a2-a1, TIFFFaxBlackCodes);
-+					putspan(pData, a1-a0, HPDF_TIFFFaxWhiteCodes);
-+					putspan(pData, a2-a1, HPDF_TIFFFaxBlackCodes);
- 				} else {
--					putspan(pData, a1-a0, TIFFFaxBlackCodes);
--					putspan(pData, a2-a1, TIFFFaxWhiteCodes);
-+					putspan(pData, a1-a0, HPDF_TIFFFaxBlackCodes);
-+					putspan(pData, a2-a1, HPDF_TIFFFaxWhiteCodes);
- 				}
- 				a0 = a2;
- 			} else {			/* vertical mode */
-diff --git a/src/t4.h b/src/t4.h
-index f306e15..c4c8c0d 100644
---- a/src/t4.h
-+++ b/src/t4.h
-@@ -55,7 +55,7 @@ typedef struct tableentry {
-  *     during state generation (see mkg3states.c).
-  */
- #ifdef G3CODES
--const tableentry TIFFFaxWhiteCodes[] = {
-+const tableentry HPDF_TIFFFaxWhiteCodes[] = {
-     { 8, 0x35, 0 },	/* 0011 0101 */
-     { 6, 0x7, 1 },	/* 0001 11 */
-     { 4, 0x7, 2 },	/* 0111 */
-@@ -167,7 +167,7 @@ const tableentry TIFFFaxWhiteCodes[] = {
-     { 12, 0x0, G3CODE_INVALID },	/* 0000 0000 0000 */
- };
- 
--const tableentry TIFFFaxBlackCodes[] = {
-+const tableentry HPDF_TIFFFaxBlackCodes[] = {
-     { 10, 0x37, 0 },	/* 0000 1101 11 */
-     { 3, 0x2, 1 },	/* 010 */
-     { 2, 0x3, 2 },	/* 11 */
-@@ -281,5 +281,7 @@ const tableentry TIFFFaxBlackCodes[] = {
- #else
- extern	const tableentry TIFFFaxWhiteCodes[];
- extern	const tableentry TIFFFaxBlackCodes[];
-+const tableentry *HPDF_TIFFFaxWhiteCodes = TIFFFaxWhiteCodes;
-+const tableentry *HPDF_TIFFFaxBlackCodes = TIFFFaxBlackCodes;
- #endif
- #endif /* _T4_ */
--- 
-2.16.0
-
diff --git a/media-libs/libharu/files/libharu-2.3.0-3-cmake-fixes.patch b/media-libs/libharu/files/libharu-2.3.0-3-cmake-fixes.patch
deleted file mode 100644
index 385dfc228257..000000000000
--- a/media-libs/libharu/files/libharu-2.3.0-3-cmake-fixes.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 751d8a334d0f3fbce9c74352004e9d3899ec8b38 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Wed, 24 Jan 2018 11:08:16 +0000
-Subject: [PATCH 3/4] cmake fixes
-
----
- CMakeLists.txt           | 31 +++++++++++++++++--------------
- cmake/modules/haru.cmake |  2 +-
- src/CMakeLists.txt       | 19 ++++++++++++-------
- src/hpdf_image_png.c     |  2 +-
- 4 files changed, 31 insertions(+), 23 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 354ca75..4227f03 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,7 +25,7 @@ endif(MSVC)
- 
- # information about libharu
- set(LIBHPDF_MAJOR 2)
--set(LIBHPDF_MINOR 2)
-+set(LIBHPDF_MINOR 3)
- set(LIBHPDF_PATCH 0)
- set(LIBHPDF_VERSION ${LIBHPDF_MAJOR}.${LIBHPDF_MINOR}.${LIBHPDF_PATCH})
- set(LIBHPDF_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.")
-@@ -53,12 +53,17 @@ option(LIBHPDF_STATIC "Build static lib" YES)
- option(LIBHPDF_EXAMPLES "Build libharu examples" NO)
- option(DEVPAK "Create DevPackage" NO)
- 
-+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-+  set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -undefined dynamic_lookup")
-+endif()
-+
- # Enable exceptions on linux if required
- # (eg if you are using libharu in a C++ environment,
- # and you want your error-callback to throw an exception,
- # you will need to enable this for the exception to be
- # able to throw through the libharu callstack).
- if (CMAKE_COMPILER_IS_GNUCC OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
-+   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
-    option (LIBHPDF_ENABLE_EXCEPTIONS "Enable exceptions" NO)
-    if (LIBHPDF_ENABLE_EXCEPTIONS)
-       set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
-@@ -81,6 +86,7 @@ endif(BUILD_SHARED_LIBS)
- # =======================================================================
- # look for headers and libraries
- # =======================================================================
-+include(GNUInstallDirs)
- include(haru)
- include(summary)
- 
-@@ -110,7 +116,7 @@ endif(PNG_FOUND)
- if(MSVC_VERSION GREATER 1399)
-   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE)
- endif(MSVC_VERSION GREATER 1399)
--include_directories(${CMAKE_SOURCE_DIR}/include)
-+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
- 
- 
- # these are options
-@@ -149,16 +155,16 @@ endif (NOT ZLIB_FOUND)
- 
- # create hpdf_config.h
- configure_file(
--  ${CMAKE_SOURCE_DIR}/include/hpdf_config.h.cmake
--  ${CMAKE_BINARY_DIR}/include/hpdf_config.h
-+  ${CMAKE_CURRENT_SOURCE_DIR}/include/hpdf_config.h.cmake
-+  ${CMAKE_CURRENT_BINARY_DIR}/include/hpdf_config.h
- )
--include_directories(${CMAKE_BINARY_DIR}/include)
-+include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
- 
- # create DevPackage file
- if(DEVPAK)
-   configure_file(
--    ${CMAKE_SOURCE_DIR}/libharu.DevPackage.cmake
--    ${CMAKE_BINARY_DIR}/libharu.DevPackage
-+    ${CMAKE_CURRENT_SOURCE_DIR}/libharu.DevPackage.cmake
-+    ${CMAKE_CURRENT_BINARY_DIR}/libharu.DevPackage
-   )
- endif(DEVPAK)
- # =======================================================================
-@@ -203,19 +209,16 @@ set(
-     include/hpdf_pdfa.h
-     include/hpdf_3dmeasure.h
-     include/hpdf_exdata.h
--    ${CMAKE_BINARY_DIR}/include/hpdf_config.h
-+    ${CMAKE_CURRENT_BINARY_DIR}/include/hpdf_config.h
- )
- 
- # install header files
--install(FILES ${haru_HDRS} DESTINATION include)
-+install(FILES ${haru_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- # install various files
--install(FILES README CHANGES INSTALL DESTINATION .)
--if(NOT DEVPAK)
--  install(DIRECTORY if DESTINATION .)
--endif(NOT DEVPAK)
-+install(FILES README CHANGES INSTALL DESTINATION ${CMAKE_INSTALL_DOCDIR})
- if(DEVPAK)
--  install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .)
-+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libharu.DevPackage DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif(DEVPAK)
- 
- # =======================================================================
-diff --git a/cmake/modules/haru.cmake b/cmake/modules/haru.cmake
-index 95647b9..f0b08b5 100644
---- a/cmake/modules/haru.cmake
-+++ b/cmake/modules/haru.cmake
-@@ -28,7 +28,7 @@ check_include_files(unistd.h LIBHPDF_HAVE_UNISTD_H)
- # On windows systems the math library is not separated so do not specify
- # it unless you are on a non-windows system.
- if(NOT WIN32)
--  find_library(MATH_LIB NAMES m PATHS /usr/local/lib /usr/lib)
-+  find_library(MATH_LIB NAMES m PATHS ${CMAKE_INSTALL_FULL_LIBDIR})
-   if(NOT MATH_LIB)
-     message(FATAL_ERROR "Cannot find required math library")
-   endif(NOT MATH_LIB)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9d2a604..6f93d18 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -72,16 +72,21 @@ set(
- # =======================================================================
- if(LIBHPDF_STATIC)
-   add_library(${LIBHPDF_NAME_STATIC} STATIC ${LIBHPDF_SRCS})
-+
-+  if( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
-+      set_target_properties(${LIBHPDF_NAME_STATIC} PROPERTIES COMPILE_FLAGS "-fPIC")
-+  endif( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
-+
-   target_link_libraries(${LIBHPDF_NAME_STATIC} ${ADDITIONAL_LIBRARIES})
-   install(
-     TARGETS ${LIBHPDF_NAME_STATIC}
--    ARCHIVE DESTINATION lib
--    LIBRARY DESTINATION lib
--    RUNTIME DESTINATION bin
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-   )
-   if(WIN32 AND NOT CYGWIN)
- 		foreach(addlib ${ADDITIONAL_LIBRARIES})
--			install(FILES ${addlib} DESTINATION lib)
-+			install(FILES ${addlib} DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 		endforeach(addlib)
-   endif(WIN32 AND NOT CYGWIN)
- endif(LIBHPDF_STATIC)
-@@ -93,8 +98,8 @@ if(LIBHPDF_SHARED)
-   endif(WIN32 AND NOT CYGWIN)
-   install(
-     TARGETS ${LIBHPDF_NAME}
--    ARCHIVE DESTINATION lib
--    LIBRARY DESTINATION lib
--    RUNTIME DESTINATION bin
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-   )
- endif(LIBHPDF_SHARED)
-diff --git a/src/hpdf_image_png.c b/src/hpdf_image_png.c
-index 3a35f5c..4304ced 100644
---- a/src/hpdf_image_png.c
-+++ b/src/hpdf_image_png.c
-@@ -20,7 +20,7 @@
- #include "hpdf_image.h"
- 
- #ifndef LIBHPDF_HAVE_NOPNGLIB
--#include <png.h>
-+#include "png.h"
- #include <string.h>
- 
- static void
--- 
-2.16.0
-
diff --git a/media-libs/libharu/files/libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch b/media-libs/libharu/files/libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch
deleted file mode 100644
index 5248c4fcac16..000000000000
--- a/media-libs/libharu/files/libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch
+++ /dev/null
@@ -1,530 +0,0 @@
-From 54c145867ad04c20cc71878fab662f6eb720621e Mon Sep 17 00:00:00 2001
-From: "David C. Lonie" <david.lonie@kitware.com>
-Date: Wed, 10 May 2017 11:07:28 -0400
-Subject: [PATCH 4/4] Add support for free-form triangle Shading objects.
-
----
- include/hpdf.h           |  24 ++++-
- include/hpdf_error.h     |   3 +
- include/hpdf_objects.h   |   2 +
- include/hpdf_pages.h     |   5 +
- include/hpdf_types.h     |  14 +++
- src/CMakeLists.txt       |   1 +
- src/hpdf_page_operator.c |  31 +++++++
- src/hpdf_pages.c         |  55 ++++++++++-
- src/hpdf_shading.c       | 231 +++++++++++++++++++++++++++++++++++++++++++++++
- 9 files changed, 362 insertions(+), 4 deletions(-)
- create mode 100644 src/hpdf_shading.c
-
-diff --git a/include/hpdf.h b/include/hpdf.h
-index e369f67..40e3c41 100644
---- a/include/hpdf.h
-+++ b/include/hpdf.h
-@@ -77,6 +77,7 @@ typedef HPDF_HANDLE   HPDF_Dict;
- typedef HPDF_HANDLE   HPDF_EmbeddedFile;
- typedef HPDF_HANDLE   HPDF_OutputIntent;
- typedef HPDF_HANDLE   HPDF_Xref;
-+typedef HPDF_HANDLE   HPDF_Shading;
- 
- #else
- 
-@@ -1171,6 +1172,11 @@ HPDF_EXPORT(HPDF_STATUS)
- HPDF_Page_SetExtGState  (HPDF_Page        page,
-                          HPDF_ExtGState   ext_gstate);
- 
-+/* sh */
-+HPDF_EXPORT(HPDF_STATUS)
-+HPDF_Page_SetShading  (HPDF_Page    page,
-+                       HPDF_Shading shading);
-+
- 
- /*--- Special graphic state operator --------------------------------------*/
- 
-@@ -1450,7 +1456,23 @@ HPDF_Page_SetCMYKStroke  (HPDF_Page  page,
- 
- /*--- Shading patterns ---------------------------------------------------*/
- 
--/* sh --not implemented yet */
-+/* Notes for docs:
-+ * - ShadingType must be HPDF_SHADING_FREE_FORM_TRIANGLE_MESH (the only
-+ *   defined option...)
-+ * - colorSpace must be HPDF_CS_DEVICE_RGB for now.
-+ */
-+HPDF_EXPORT(HPDF_Shading)
-+HPDF_Shading_New  (HPDF_Doc         pdf,
-+                   HPDF_ShadingType type,
-+                   HPDF_ColorSpace  colorSpace,
-+                   HPDF_REAL xMin, HPDF_REAL xMax,
-+                   HPDF_REAL yMin, HPDF_REAL yMax);
-+
-+HPDF_EXPORT(HPDF_STATUS)
-+HPDF_Shading_AddVertexRGB(HPDF_Shading shading,
-+                          HPDF_Shading_FreeFormTriangleMeshEdgeFlag edgeFlag,
-+                          HPDF_REAL x, HPDF_REAL y,
-+                          HPDF_UINT8 r, HPDF_UINT8 g, HPDF_UINT8 b);
- 
- /*--- In-line images -----------------------------------------------------*/
- 
-diff --git a/include/hpdf_error.h b/include/hpdf_error.h
-index b04e2cd..ef4fa61 100644
---- a/include/hpdf_error.h
-+++ b/include/hpdf_error.h
-@@ -145,6 +145,9 @@ extern "C" {
- #define HPDF_INVALID_U3D_DATA                     0x1083
- #define HPDF_NAME_CANNOT_GET_NAMES                0x1084
- #define HPDF_INVALID_ICC_COMPONENT_NUM            0x1085
-+/*                                                0x1086 */
-+/*                                                0x1087 */
-+#define HPDF_INVALID_SHADING_TYPE                 0x1088
- 
- /*---------------------------------------------------------------------------*/
- 
-diff --git a/include/hpdf_objects.h b/include/hpdf_objects.h
-index 525adda..b16de02 100644
---- a/include/hpdf_objects.h
-+++ b/include/hpdf_objects.h
-@@ -61,6 +61,7 @@ extern "C" {
- #define  HPDF_OSUBCLASS_EXT_GSTATE_R  0x0B00  /* read only object */
- #define  HPDF_OSUBCLASS_NAMEDICT      0x0C00
- #define  HPDF_OSUBCLASS_NAMETREE      0x0D00
-+#define  HPDF_OSUBCLASS_SHADING       0x0E00
- 
- 
- 
-@@ -595,6 +596,7 @@ typedef HPDF_Array HPDF_Destination;
- typedef HPDF_Dict  HPDF_U3D;
- typedef HPDF_Dict  HPDF_OutputIntent;
- typedef HPDF_Dict  HPDF_JavaScript;
-+typedef HPDF_Dict  HPDF_Shading;
- 
- #ifdef __cplusplus
- }
-diff --git a/include/hpdf_pages.h b/include/hpdf_pages.h
-index 44b816c..60b1d84 100644
---- a/include/hpdf_pages.h
-+++ b/include/hpdf_pages.h
-@@ -55,6 +55,7 @@ typedef struct _HPDF_PageAttr_Rec {
-     HPDF_Dict          fonts;
-     HPDF_Dict          xobjects;
-     HPDF_Dict          ext_gstates;
-+    HPDF_Dict          shadings;
-     HPDF_GState        gstate;
-     HPDF_Point         str_pos;
-     HPDF_Point         cur_pos;
-@@ -101,6 +102,10 @@ const char*
- HPDF_Page_GetExtGStateName  (HPDF_Page       page,
-                              HPDF_ExtGState  gstate);
- 
-+const char*
-+HPDF_Page_GetShadingName  (HPDF_Page    page,
-+                           HPDF_Shading shading);
-+
- 
- HPDF_Box
- HPDF_Page_GetMediaBox  (HPDF_Page    page);
-diff --git a/include/hpdf_types.h b/include/hpdf_types.h
-index 8b3e0a8..a2e2157 100644
---- a/include/hpdf_types.h
-+++ b/include/hpdf_types.h
-@@ -557,6 +557,20 @@ typedef enum _HPDF_NameDictKey {
-     HPDF_NAME_EOF
- } HPDF_NameDictKey;
- 
-+/*----------------------------------------------------------------------------*/
-+
-+typedef enum _HPDF_ShadingType {
-+  HPDF_SHADING_FREE_FORM_TRIANGLE_MESH = 4 /* TODO the rest */
-+} HPDF_ShadingType;
-+
-+typedef enum _HPDF_Shading_FreeFormTriangleMeshEdgeFlag {
-+  HPDF_FREE_FORM_TRI_MESH_EDGEFLAG_NO_CONNECTION = 0,
-+  HPDF_FREE_FORM_TRI_MESH_EDGEFLAG_BC,
-+  HPDF_FREE_FORM_TRI_MESH_EDGEFLAG_AC
-+} HPDF_Shading_FreeFormTriangleMeshEdgeFlag;
-+
-+/*----------------------------------------------------------------------------*/
-+
- #ifdef __cplusplus
- }
- #endif /* __cplusplus */
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f93d18..d428b78 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -56,6 +56,7 @@ set(
-   	hpdf_page_operator.c
-   	hpdf_pages.c
-   	hpdf_real.c
-+  	hpdf_shading.c
-   	hpdf_streams.c
-   	hpdf_string.c
-   	hpdf_u3d.c
-diff --git a/src/hpdf_page_operator.c b/src/hpdf_page_operator.c
-index 23f5920..dda1078 100644
---- a/src/hpdf_page_operator.c
-+++ b/src/hpdf_page_operator.c
-@@ -312,6 +312,37 @@ HPDF_Page_SetExtGState  (HPDF_Page        page,
-     return ret;
- }
- 
-+/* sh */
-+HPDF_EXPORT(HPDF_STATUS)
-+HPDF_Page_SetShading  (HPDF_Page    page,
-+                       HPDF_Shading shading)
-+{
-+    HPDF_STATUS ret = HPDF_Page_CheckState (page, HPDF_GMODE_PAGE_DESCRIPTION);
-+    HPDF_PageAttr attr;
-+    const char *local_name;
-+
-+    HPDF_PTRACE ((" HPDF_Page_SetShading\n"));
-+
-+    if (ret != HPDF_OK)
-+        return ret;
-+
-+    if (page->mmgr != shading->mmgr)
-+        return HPDF_RaiseError (page->error, HPDF_INVALID_OBJECT, 0);
-+
-+    attr = (HPDF_PageAttr)page->attr;
-+    local_name = HPDF_Page_GetShadingName (page, shading);
-+
-+    if (!local_name)
-+        return HPDF_CheckError (page->error);
-+
-+    if (HPDF_Stream_WriteEscapeName (attr->stream, local_name) != HPDF_OK)
-+        return HPDF_CheckError (page->error);
-+
-+    if (HPDF_Stream_WriteStr (attr->stream, " sh\012") != HPDF_OK)
-+        return HPDF_CheckError (page->error);
-+
-+    return ret;
-+}
- 
- /*--- Special graphic state operator --------------------------------------*/
- 
-diff --git a/src/hpdf_pages.c b/src/hpdf_pages.c
-index fcc9b5c..c0a7c4f 100644
---- a/src/hpdf_pages.c
-+++ b/src/hpdf_pages.c
-@@ -514,7 +514,7 @@ HPDF_Page_GetLocalFontName  (HPDF_Page  page,
-     /* search font-object from font-resource */
-     key = HPDF_Dict_GetKeyByObj (attr->fonts, font);
-     if (!key) {
--        /* if the font is not resisterd in font-resource, register font to
-+        /* if the font is not registered in font-resource, register font to
-          * font-resource.
-          */
-         char fontName[HPDF_LIMIT_MAX_NAME_LEN + 1];
-@@ -603,7 +603,7 @@ HPDF_Page_GetXObjectName  (HPDF_Page     page,
-     /* search xobject-object from xobject-resource */
-     key = HPDF_Dict_GetKeyByObj (attr->xobjects, xobj);
-     if (!key) {
--        /* if the xobject is not resisterd in xobject-resource, register
-+        /* if the xobject is not registered in xobject-resource, register
-          * xobject to xobject-resource.
-          */
-         char xobj_name[HPDF_LIMIT_MAX_NAME_LEN + 1];
-@@ -654,7 +654,7 @@ HPDF_Page_GetExtGStateName  (HPDF_Page       page,
-     /* search ext_gstate-object from ext_gstate-resource */
-     key = HPDF_Dict_GetKeyByObj (attr->ext_gstates, state);
-     if (!key) {
--        /* if the ext-gstate is not resisterd in ext-gstate resource, register
-+        /* if the ext-gstate is not registered in ext-gstate resource, register
-          *  to ext-gstate resource.
-          */
-         char ext_gstate_name[HPDF_LIMIT_MAX_NAME_LEN + 1];
-@@ -673,6 +673,55 @@ HPDF_Page_GetExtGStateName  (HPDF_Page       page,
-     return key;
- }
- 
-+const char*
-+HPDF_Page_GetShadingName  (HPDF_Page    page,
-+                           HPDF_Shading shading)
-+{
-+    HPDF_PageAttr attr = (HPDF_PageAttr )page->attr;
-+    const char *key;
-+
-+    HPDF_PTRACE((" HPDF_Page_GetShadingName\n"));
-+
-+    if (!attr->shadings) {
-+        HPDF_Dict resources;
-+        HPDF_Dict shadings;
-+
-+        resources = HPDF_Page_GetInheritableItem (page, "Resources",
-+                                                  HPDF_OCLASS_DICT);
-+        if (!resources)
-+            return NULL;
-+
-+        shadings = HPDF_Dict_New (page->mmgr);
-+        if (!shadings)
-+            return NULL;
-+
-+        if (HPDF_Dict_Add (resources, "Shading", shadings) != HPDF_OK)
-+            return NULL;
-+
-+        attr->shadings = shadings;
-+    }
-+
-+    /* search shading-object from shading-resource */
-+    key = HPDF_Dict_GetKeyByObj (attr->shadings, shading);
-+    if (!key) {
-+        /* if the shading is not registered in shadings resource, register
-+         *  to shadings resource.
-+         */
-+        char shading_str[HPDF_LIMIT_MAX_NAME_LEN + 1];
-+        char *ptr;
-+        char *end_ptr = shading_str + HPDF_LIMIT_MAX_NAME_LEN;
-+
-+        ptr = (char *)HPDF_StrCpy (shading_str, "Sh", end_ptr);
-+        HPDF_IToA (ptr, attr->shadings->list->count, end_ptr);
-+
-+        if (HPDF_Dict_Add (attr->shadings, shading_str, shading) != HPDF_OK)
-+            return NULL;
-+
-+        key = HPDF_Dict_GetKeyByObj (attr->shadings, shading);
-+    }
-+
-+    return key;
-+}
- 
- static HPDF_STATUS
- AddAnnotation  (HPDF_Page        page,
-diff --git a/src/hpdf_shading.c b/src/hpdf_shading.c
-new file mode 100644
-index 0000000..53204c0
---- /dev/null
-+++ b/src/hpdf_shading.c
-@@ -0,0 +1,231 @@
-+/*
-+ * << Haru Free PDF Library >> -- hpdf_shading.c
-+ *
-+ * URL: http://libharu.org
-+ *
-+ * Copyright (c) 1999-2006 Takeshi Kanno <takeshi_kanno@est.hi-ho.ne.jp>
-+ * Copyright (c) 2007-2009 Antony Dovgal <tony@daylessday.org>
-+ * Copyright (c) 2017 Kitware <kitware@kitware.com>
-+ *
-+ * Permission to use, copy, modify, distribute and sell this software
-+ * and its documentation for any purpose is hereby granted without fee,
-+ * provided that the above copyright notice appear in all copies and
-+ * that both that copyright notice and this permission notice appear
-+ * in supporting documentation.
-+ * It is provided "as is" without express or implied warranty.
-+ *
-+ */
-+
-+#include "hpdf.h"
-+#include "hpdf_utils.h"
-+
-+#include "assert.h"
-+
-+typedef struct _RGBVertex
-+{
-+  HPDF_UINT8 EdgeFlag;
-+  HPDF_UINT32 X;
-+  HPDF_UINT32 Y;
-+  HPDF_UINT8 RGB[3];
-+} RGBVertex;
-+
-+static const char *COL_CMYK = "DeviceCMYK";
-+static const char *COL_RGB = "DeviceRGB";
-+static const char *COL_GRAY = "DeviceGray";
-+
-+/* bbox is filled with xMin, xMax, yMin, yMax */
-+static HPDF_BOOL _GetDecodeArrayVertexValues(HPDF_Shading shading,
-+                                             HPDF_REAL *bbox)
-+{
-+  HPDF_Array decodeArray;
-+  HPDF_Real r;
-+  int i;
-+
-+  if (!shading) {
-+    return HPDF_FALSE;
-+  }
-+
-+  decodeArray = (HPDF_Array)(HPDF_Dict_GetItem(shading, "Decode",
-+                                               HPDF_OCLASS_ARRAY));
-+  if (!decodeArray) {
-+    return HPDF_FALSE;
-+  }
-+
-+  for (i = 0; i < 4; ++i)
-+  {
-+    r = HPDF_Array_GetItem(decodeArray, i, HPDF_OCLASS_REAL);
-+    if (!r) {
-+      return HPDF_FALSE;
-+    }
-+
-+    bbox[i] = r->value;
-+  }
-+
-+  return HPDF_TRUE;
-+}
-+
-+static void UINT32Swap (HPDF_UINT32  *value)
-+{
-+  HPDF_BYTE b[4];
-+
-+  HPDF_MemCpy (b, (HPDF_BYTE *)value, 4);
-+  *value = (HPDF_UINT32)((HPDF_UINT32)b[0] << 24 |
-+           (HPDF_UINT32)b[1] << 16 |
-+           (HPDF_UINT32)b[2] << 8 |
-+           (HPDF_UINT32)b[3]);
-+}
-+
-+/* Encode a position coordinate for writing */
-+static HPDF_UINT32 _EncodeValue(HPDF_REAL x, HPDF_REAL xMin, HPDF_REAL xMax)
-+{
-+  HPDF_DOUBLE norm = (x - xMin) / (xMax - xMin);
-+  HPDF_DOUBLE max = (HPDF_DOUBLE)(0xFFFFFFFF);
-+  HPDF_UINT32 enc = (HPDF_UINT32)(norm * max);
-+  UINT32Swap(&enc);
-+  return enc;
-+}
-+
-+HPDF_EXPORT(HPDF_Shading)
-+HPDF_Shading_New  (HPDF_Doc         pdf,
-+                   HPDF_ShadingType type,
-+                   HPDF_ColorSpace  colorSpace,
-+                   HPDF_REAL xMin, HPDF_REAL xMax,
-+                   HPDF_REAL yMin, HPDF_REAL yMax)
-+{
-+  HPDF_Shading shading;
-+  HPDF_Array decodeArray;
-+  HPDF_STATUS ret = HPDF_OK;
-+  int i;
-+
-+  HPDF_PTRACE((" HPDF_Shading_New\n"));
-+
-+  if (!HPDF_HasDoc(pdf)) {
-+    return NULL;
-+  }
-+
-+  /* Validate shading type: */
-+  switch (type)
-+  {
-+    case HPDF_SHADING_FREE_FORM_TRIANGLE_MESH:
-+      break;
-+
-+    default:
-+      HPDF_SetError (pdf->mmgr->error, HPDF_INVALID_SHADING_TYPE, 0);
-+      return NULL;
-+  }
-+
-+  decodeArray = HPDF_Array_New(pdf->mmgr);
-+  if (!decodeArray) {
-+    return NULL;
-+  }
-+
-+  /* X-range */
-+  ret += HPDF_Array_AddReal(decodeArray, xMin);
-+  ret += HPDF_Array_AddReal(decodeArray, xMax);
-+
-+  /* Y-range */
-+  ret += HPDF_Array_AddReal(decodeArray, yMin);
-+  ret += HPDF_Array_AddReal(decodeArray, yMax);
-+
-+  const char *colName = NULL;
-+  switch (colorSpace) {
-+    case HPDF_CS_DEVICE_RGB:
-+      colName = COL_RGB;
-+      for (i = 0; i < 3; ++i) {
-+        ret += HPDF_Array_AddReal(decodeArray, 0.0);
-+        ret += HPDF_Array_AddReal(decodeArray, 1.0);
-+      }
-+      break;
-+
-+    default:
-+      HPDF_SetError(pdf->mmgr->error, HPDF_INVALID_COLOR_SPACE, 0);
-+      return NULL;
-+  }
-+
-+  if (ret != HPDF_OK) {
-+    return NULL;
-+  }
-+
-+  shading = HPDF_DictStream_New(pdf->mmgr, pdf->xref);
-+  if (!shading) {
-+    return NULL;
-+  }
-+
-+  shading->header.obj_class |= HPDF_OSUBCLASS_SHADING;
-+  ret += HPDF_Dict_AddNumber(shading, "ShadingType", type);
-+  ret += HPDF_Dict_AddName(shading, "ColorSpace", colName);
-+
-+  switch (type)
-+  {
-+    case HPDF_SHADING_FREE_FORM_TRIANGLE_MESH:
-+      ret += HPDF_Dict_AddNumber(shading, "BitsPerCoordinate", 32);
-+      ret += HPDF_Dict_AddNumber(shading, "BitsPerComponent", 8);
-+      ret += HPDF_Dict_AddNumber(shading, "BitsPerFlag", 8);
-+      ret += HPDF_Dict_Add(shading, "Decode", decodeArray);
-+      break;
-+
-+    default:
-+      HPDF_SetError (pdf->mmgr->error, HPDF_INVALID_SHADING_TYPE, 0);
-+      return NULL;
-+  }
-+
-+  if (ret != HPDF_OK) {
-+    return NULL;
-+  }
-+
-+  return shading;
-+}
-+
-+HPDF_EXPORT(HPDF_STATUS)
-+HPDF_Shading_AddVertexRGB(HPDF_Shading shading,
-+                          HPDF_Shading_FreeFormTriangleMeshEdgeFlag edgeFlag,
-+                          HPDF_REAL x, HPDF_REAL y,
-+                          HPDF_UINT8 r, HPDF_UINT8 g, HPDF_UINT8 b)
-+{
-+  HPDF_STATUS ret = HPDF_OK;
-+  RGBVertex vert;
-+  float bbox[4];
-+
-+  HPDF_PTRACE((" HPDF_Shading_AddVertexRGB\n"));
-+
-+  if (!shading) {
-+    return HPDF_INVALID_OBJECT;
-+  }
-+
-+  if (_GetDecodeArrayVertexValues(shading, bbox) != HPDF_TRUE) {
-+    return HPDF_SetError(shading->error, HPDF_INVALID_OBJECT, 0);
-+  }
-+
-+  vert.EdgeFlag = (HPDF_UINT8)edgeFlag;
-+  vert.X = _EncodeValue(x, bbox[0], bbox[1]);
-+  vert.Y = _EncodeValue(y, bbox[2], bbox[3]);
-+  vert.RGB[0] = r;
-+  vert.RGB[1] = g;
-+  vert.RGB[2] = b;
-+
-+  ret = HPDF_Stream_Write(shading->stream,
-+                          (HPDF_BYTE*)(&vert.EdgeFlag), sizeof(vert.EdgeFlag));
-+  if (ret != HPDF_OK)
-+  {
-+    return ret;
-+  }
-+
-+  ret = HPDF_Stream_Write(shading->stream,
-+                          (HPDF_BYTE*)(&vert.X), sizeof(vert.X));
-+  if (ret != HPDF_OK)
-+  {
-+    return ret;
-+  }
-+
-+  ret = HPDF_Stream_Write(shading->stream,
-+                          (HPDF_BYTE*)(&vert.Y), sizeof(vert.Y));
-+  if (ret != HPDF_OK)
-+  {
-+    return ret;
-+  }
-+
-+  ret = HPDF_Stream_Write(shading->stream,
-+                          (HPDF_BYTE*)(&vert.RGB), sizeof(vert.RGB));
-+
-+  return ret;
-+}
--- 
-2.16.0
-
diff --git a/media-libs/libharu/libharu-2.3.0-r3.ebuild b/media-libs/libharu/libharu-2.3.0-r3.ebuild
deleted file mode 100644
index 60153140f9a5..000000000000
--- a/media-libs/libharu/libharu-2.3.0-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MYP=RELEASE_${PV//./_}
-inherit cmake
-
-DESCRIPTION="C/C++ library for PDF generation"
-HOMEPAGE="http://www.libharu.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/libpng:=
-	sys-libs/zlib:=
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MYP}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-1-Included-necessary-char-widths-in-generated-PDF.patch
-	"${FILESDIR}"/${P}-2-Avoid-issue-with-libtiff-duplicate-symbols.patch
-	"${FILESDIR}"/${P}-3-cmake-fixes.patch
-	"${FILESDIR}"/${P}-4-Add-support-for-free-form-triangle-Shading-objects.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBHPDF_EXAMPLES=NO # Doesn't work
-		-DLIBHPDF_STATIC=NO
-	)
-	cmake_src_configure
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 01dac1629227..58dbdb8baf61 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index dc7852587ce4..8b1a0f6f9479 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,5 +1,6 @@
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-avoid-conveying-positional-parameters-to-source-builtin.patch 1831 BLAKE2B f46889a5140423f29095e79a0a5778dd1b21d812570c8c5e444473266527ee3808a07d578b8aff4ce91d6ca665c230d66bcbf810851fa31a95e625c32e8c0fc6 SHA512 97623b47828b0db7dfcde2f8d9f00d835cb98dd8be2d9b727f1d4a3b73b13b5e3bc0c3f40ae41d6b21fadaab14b019a788a2b55a84fb365ad23bb75e76387df8
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-ffmpegsource-2.40-compat2.patch 3842 BLAKE2B 8e03d10f2cc1231ee6c89a81b3eec93a5b4c9bd2100aae0fe2eeb903bef08d9f6704010085e6f7a666ed9269130ecf01345cd109cf4d2796de2b1b65dc8813dc SHA512 35d8f0d2f7bf1bcd6602be9e53914e430ed64e779233245e8d0d8ea4ea8ebdccee23a405f92956e641052f6243027cf34d1ffa7ae47f3d15ed35d625be5fe2cd
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost-181-build.patch 2243 BLAKE2B 5b6874ebb89f6ed3ab7929796bd1f59e1748c418ae5397df265fe3007d9f971eec7388f5f6a2dcac020d71c9cffece931a1ae5eb78f8ff4ab61fdc4c5e65328a SHA512 b9bfb48172f35c0b08ee5bae6ecef3c73a6210321d74c2510da4258901ec9eac523a30c10de4e8d025352961a98956478606dadb662a40ddbf70413bf77dedab
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch 1490 BLAKE2B 6b3fb8f98348585dc15fd92e992b231fb83f94dffd3ed97cf0d41323e28bd6c48a77e6e7eecd9e79a1f85ab933eee93f31feebf08ed2d18488d519dbe47b57a3 SHA512 59ec5d28424f9b2ab1d63b00c2e237263f6816d42baef977ab9494fa696aace7d3b7e949c672aa77c799dbb255c69fcd3acdc289413dd5b3f8569e28ba528cef
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch 496 BLAKE2B 33e646f71ced61c5411ddc871ff42fb61d5e89d068441e72c33a99927a27cad206068eab70563db94d21f4aa9516e69da8c34d0e78c46f15b1561b2170d8d5ff SHA512 58c8acc766751b6f9122821b5958ef3756c4802e91ed7ed8915c54eb7c8c960c46734a8d76cc200c064e0dab5a1f0008f99a5dd4a1c51ecda7983bb84ef6d645
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch 2369 BLAKE2B edbada9d9bb3fbd4ffcd3f8f6aa640132163e0127baada7d40eb39312479602cf57b80e9314b8d3a92aff74764a9ed8336b055cf9c2d387c27595553f1f01185 SHA512 7963b76652126e1aa574e89f56c09e6008afd745c9198a2b081ed65c8697a15cbd7e611d6aeae0e2513b0eb79409665fd78885ef3599ff6f0d074b42bb461a8a
@@ -12,5 +13,6 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch 505
 AUX aegisub-9999-git.patch 1602 BLAKE2B ae40661da657c303eaaefc8b2d850e810ca506b60eb023bb34b6fe9839205dec15c7f781ab0e886f52e3c1d721338bf9bd9ec29814c65f236c8d5b99156a8a45 SHA512 7e4c1be034543b887b9ee6b84e686c2f1c26e6138a9aee997a0eab2dd5256a918c4ccfda41b0cc71a88fc0856f1726cee413e16fa4aef260faacb0803e01732d
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
 EBUILD aegisub-3.2.2_p20160518-r104.ebuild 4225 BLAKE2B 2cda2b96b73e67fdb2891e198720bb21fa8968f0be833731033778360d120311eeb17d42c4df7967e547a99a598c3b7c1f65fe35530005c8a2584eff676f453d SHA512 2109821673748c026bf3316718c10e866ea77f0d27ff392d02d38e0ed64cc2cafecc841b57f659512232d66bab136f47e815edd56bc6d969b99fa535e63c7fac
+EBUILD aegisub-3.2.2_p20160518-r105.ebuild 4279 BLAKE2B 96d9d274ae7914276e2a4d5c0bd08a22573b492dfe29dbe3a050d83646fc3ebc1e1a85506ed94359d3c16dfd701ab32db9964af6d6b0fed4eff1b0bf2bfdaa28 SHA512 e21264ab48cc71a1e67195a63c6b8279d84f5fe332402798da5218573103fd9d937b61cbf641a887ebd50e892ce82b4b4e178a2865d4cf7f8d26a8da8e84b7a8
 EBUILD aegisub-9999.ebuild 2861 BLAKE2B d9f0a07dc04e1b220e3346ad27480ce9c2854ddcc25a73c30e9eba8bc4a6507ef7e37bea5db70defbab336a6ffaa634f2bb0a82338eada2af5263ca7898caf7b SHA512 c2031bcd77f9980f7eade7548cc2821220fe4a42f91b5b0ddc76e67c2e6b77db794a8068372e6dee92458fbd4b2bda79940c45ca72ec7d3558c72f1bfa4de9ad
 MISC metadata.xml 490 BLAKE2B 1f9546d336e50825e1490d8f0b54a21c076ec000427f0c319781e702ec0a58966bd4193e26c0c7cc4e677bea67a865a9a2f040fd4f58356d8e5539c5c7592665 SHA512 7717dcf3bbe125775a8a93682cde4477294649cbd6d01dcccc132b51880d7a58a61314134cb83f7ffd43e104f4818d9d27c1b90685f988ebe78ecdd9156db9eb
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r105.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r105.ebuild
new file mode 100644
index 000000000000..f9b435cd6a74
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r105.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+LUA_REQ_USE="lua52compat"
+
+WX_GTK_VER=3.0
+PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW"
+COMMIT_ID="b118fe7e7a5c37540e2f0aa75af105e272bad234"
+
+inherit autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot
+
+DESCRIPTION="Advanced subtitle editor"
+HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
+SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+RESTRICT="test"
+
+# aegisub bundles luabins (https://github.com/agladysh/luabins).
+# Unfortunately, luabins upstream is practically dead since 2010.
+# Thus unbundling luabins isn't worth the effort.
+RDEPEND="${LUA_DEPS}
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	media-libs/ffmpegsource:=
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libass:=[fontconfig]
+	sys-libs/zlib
+	virtual/libiconv
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( >=sci-libs/fftw-3.3:= )
+	openal? ( media-libs/openal )
+	portaudio? ( =media-libs/portaudio-19* )
+	pulseaudio? ( media-sound/pulseaudio )
+	spell? ( app-text/hunspell:= )
+	uchardet? ( app-i18n/uchardet )
+"
+DEPEND="${RDEPEND}"
+# luarocks is only used as a command-line tool so there is no need to enforce
+# LUA_SINGLE_USEDEP on it. On the other hand, this means we must use version
+# bounds in order to make sure we use a version migrated to Lua eclasses.
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		>=dev-cpp/gtest-1.8.1
+		>=dev-lua/luarocks-3.4.0-r100
+		$(lua_gen_cond_dep '
+			dev-lua/busted[${LUA_USEDEP}]
+		')
+	)
+"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	|| ( alsa openal oss portaudio pulseaudio )"
+
+PATCHES=(
+	"${FILESDIR}/${PV}/${P}-fix-system-luajit-build.patch"
+	"${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch"
+	"${FILESDIR}/${PV}/${P}-support-system-gtest.patch"
+	"${FILESDIR}/${PV}/${P}-fix-icu59-build.patch"
+	"${FILESDIR}/${PV}/${P}-fix-icu62-build.patch"
+	"${FILESDIR}/${PV}/${P}-fix-boost170-build.patch"
+	"${FILESDIR}/${PV}/${P}-fix-makefile-for-make4.3.patch"
+	"${FILESDIR}/${PV}/${P}-tests_luarocks_lua_version.patch"
+	"${FILESDIR}/${PV}/${P}-avoid-conveying-positional-parameters-to-source-builtin.patch"
+	"${FILESDIR}/${PV}/${P}-luaL_Reg-not-luaL_reg.patch"
+	"${FILESDIR}/${PV}/${P}-ffmpegsource-2.40-compat2.patch"
+	"${FILESDIR}/${PV}/${P}-fix-boost-181-build.patch"
+)
+
+aegisub_check_compiler() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
+	fi
+}
+
+pkg_pretend() {
+	aegisub_check_compiler
+}
+
+pkg_setup() {
+	aegisub_check_compiler
+	lua-single_pkg_setup
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Remove tests that require unavailable uuid Lua module.
+	rm automation/tests/modules/lfs.moon || die
+
+	remove_locale() {
+		rm "po/${1}.po" || die
+	}
+
+	plocale_find_changes 'po' '' '.po'
+	plocale_for_each_disabled_locale remove_locale
+
+	# See http://devel.aegisub.org/ticket/1914
+	config_rpath_update "${S}"/config.rpath
+
+	eautoreconf
+
+	cat <<- EOF > build/git_version.h || die
+		#define BUILD_GIT_VERSION_NUMBER 8897
+		#define BUILD_GIT_VERSION_STRING "${PV}"
+		#define TAGGED_RELEASE 0
+	EOF
+}
+
+src_configure() {
+	# Prevent access violations from OpenAL detection. See Gentoo bug 508184.
+	use openal && export agi_cv_with_openal="yes"
+
+	setup-wxwidgets
+	local myeconfargs=(
+		--disable-update-checker
+		--with-ffms2
+		--with-system-luajit
+		$(use_enable debug)
+		$(use_with alsa)
+		$(use_with fftw fftw3)
+		$(use_with openal)
+		$(use_with oss)
+		$(use_with portaudio)
+		$(use_with pulseaudio libpulse)
+		$(use_with spell hunspell)
+		$(use_with uchardet)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake WITH_SYSTEM_GTEST=$(usex test)
+}
+
+src_test() {
+	emake test-automation
+	emake test-libaegisub
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost-181-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost-181-build.patch
new file mode 100644
index 000000000000..ac264bc70676
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost-181-build.patch
@@ -0,0 +1,56 @@
+diff --git a/libaegisub/include/libaegisub/lua/utils.h b/libaegisub/include/libaegisub/lua/utils.h
+index c5a65d6e4..f4921d582 100644
+--- a/libaegisub/include/libaegisub/lua/utils.h
++++ b/libaegisub/include/libaegisub/lua/utils.h
+@@ -87,7 +87,10 @@ int exception_wrapper(lua_State *L) {
+ 
+ template<typename T>
+ void set_field(lua_State *L, const char *name, T value) {
+-	push_value(L, value);
++	if constexpr(std::is_convertible<T, std::string>::value)
++            push_value(L, static_cast<std::string>(value));
++	else
++            push_value(L, value);
+ 	lua_setfield(L, -2, name);
+ }
+ 
+diff --git a/src/auto4_lua.cpp b/src/auto4_lua.cpp
+index 245689679..6d479b2c3 100644
+--- a/src/auto4_lua.cpp
++++ b/src/auto4_lua.cpp
+@@ -115,7 +115,8 @@ namespace {
+ 	int get_translation(lua_State *L)
+ 	{
+ 		wxString str(check_wxstring(L, 1));
+-		push_value(L, _(str).utf8_str());
++		const char* val = static_cast<const char*>( _(str).utf8_str());
++		push_value(L, val);
+ 		return 1;
+ 	}
+ 
+diff --git a/src/command/video.cpp b/src/command/video.cpp
+index fb2bcb0ba..77e3e9ca7 100644
+--- a/src/command/video.cpp
++++ b/src/command/video.cpp
+@@ -475,7 +475,7 @@ static void save_snapshot(agi::Context *c, bool raw) {
+ 		// If where ever that is isn't defined, we can't save there
+ 		if ((basepath == "\\") || (basepath == "/")) {
+ 			// So save to the current user's home dir instead
+-			basepath = wxGetHomeDir().c_str();
++			basepath = static_cast<const char*>(wxGetHomeDir().c_str());
+ 		}
+ 	}
+ 	// Actual fixed (possibly relative) path, decode it
+diff --git a/src/dialog_attachments.cpp b/src/dialog_attachments.cpp
+index 38ff53027..e30339f81 100644
+--- a/src/dialog_attachments.cpp
++++ b/src/dialog_attachments.cpp
+@@ -161,7 +161,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &) {
+ 
+ 	// Multiple or single?
+ 	if (listView->GetNextSelected(i) != -1)
+-		path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str();
++		path = static_cast<const char*>(wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str());
+ 	else {
+ 		path = SaveFileSelector(
+ 			_("Select the path to save the file to:"),
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 78d89c217218..17e619b980ae 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f5e1feedd1cf..fef88fc3698c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 22 Dec 2022 19:09:58 +0000
+Fri, 23 Dec 2022 01:10:10 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fe5dc37930e6..fb42104184cc 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538471 BLAKE2B b7385901234c82cabfe7b6fe500f9a2de535ba832c5fe98f7b1adcf90342ab9ac009a4eefb2c71141609f93233148e5db41c6f760cbea8413d0a285b67c25f90 SHA512 8b561e583b67bc367b59eefc1d958442632b1001434a1d0874a9ae00334c80cc4a27278dac1813b0d7b255f214d060c5e60573b828bb87fc8e319dc9233f12aa
-TIMESTAMP 2022-12-22T19:10:02Z
+TIMESTAMP 2022-12-23T01:10:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOkq4pfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOk//RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDgVw//UaFgCMRh+YJJ1M7b/C2y3khtrRDqUkrzKAT88BqTfdzzVSm2XLskyIbf
-QP26yDnc3X4Gl4C3WVH/RD8VpMOSxjn88Jum0fLGSMTj6e/xVXRDn14moGYSFKrx
-YK3Dweag00BU/huTkLfhhZpldTRuzAXU+ZgDeAKKJkivrhZMIg1XLMYpzBWMiyzQ
-GXVempqwfyg7ND+Z7jcsoO1AHPYBAqJp/R/RBoPwyc7OGnRQv33e7a5bHStNnTyy
-Iz16atWD6CTSRAXzM2/HGYvjbpVUNDFqDjUlY0KN1Kvoqh8nyF7IpbypeZHJ3mQa
-gg+mMM4g5cPKSlo+H1zuVrrBjQEv0N9VZAvJhuys7iwwigZjA3mbluqEIxsEx9NK
-ykgMfAtp3sVvTXRwilYUuT2aojPXAXhi56fiehPa0d4WfFDQI2/BATfdrilFYXe9
-WjXT3JsabwRlapJK/E0j7uMQySKXfBdJtkOdGYhs4KMDX7tltW+vOFL9EhZVGgzx
-6USSw1+/+9soEPFBz8O2RcdUbpBXZBp7oBtCjv0pX7XH9H1VjZ8ydZUu5rHxEUQD
-PvoIyLuhnL5jfdFwI5uwDOTMKA4Cxjc7XoBuQexmz+80qdsHT+HsGM0Umz6rMNUJ
-p0Epl0y8T08rXxtth7beSy0xYaKMaeBY+uz4JwAoaz0xdZV/lxI=
-=OEej
+klAqGg/+IZav0KnzTmG8iW3NBTZ/iB8CrVBqn9lYuyBgAWF3GVb3jlRPqv+HfdBS
+alEHy9Yb5cfTAcf3QXpUc3iEMp5zAXxaHQxQtt8GBcRb7hGH5u76WnYdrBZr1nnn
+abeF6ElsXC/Sz5JrkQfWaX3NiSqgTHzFwwZ19OD06ziCJFpkWsHQK3iHbsnWlloU
+acwkoDNh6AIf9GFpp3vPUlfVME9gW2pcTBRQAUopcJu8X47BiU9/QFKaMZ+L3y/N
+uja6vMNwNrnAnjzxaXKJcgVuDinQqG0ykDnG1Gp4KIsl04MIFGBpF8d8hg0AeT9N
+OiBMrdaxrhC5mw32Epr4gnPRCB4UdsH0dHJkaTtXCx9qRaFXXtsP+6L/USChj4Fy
+e40/S0/pYzDny7fGj4UKIS0qn+ytCsVpwUm6ZhLykJ45dv+l/I8SQwyKlAIt00J9
+gKARtdM5zu3TlW57DbjJxADHhV1+TOQq5/xAGTwV1P43nrEZfpuAQy2gZ5gtmaaI
+mh4suBqL8mNSu6mqY1XFVflFg1NP1SqO7h/0ApPKrl4uGac1JkFefG1r6jsWXLWA
+6OF9oY1/h1BFIDhE0tp3TAAZcrC2s3lOOWwqADK94aEJC6Qj8uzHT9sgcxdycFTT
+gWHwysNCHO0wBHIKhL/fD/VA3F5FVp6dD30OfqfaglOO2L6Twak=
+=s/m6
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f5e1feedd1cf..fef88fc3698c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 22 Dec 2022 19:09:58 +0000
+Fri, 23 Dec 2022 01:10:10 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1c0dc4934d4a..ab0a03969450 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 9a8d32237281..b1c291ba38dc 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-r1 b/metadata/md5-cache/app-admin/puppet-7.21.0-r1
new file mode 100644
index 000000000000..145cdf38a01f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-7.21.0-r1
@@ -0,0 +1,18 @@
+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	37a4612ce5522df5a100359a8dbc8491
+_md5_=0b93771536303d885e452461d588b4da
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index cbf7f3450efb..f072f5d9a81e 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-2.0.0 b/metadata/md5-cache/app-crypt/acme-2.0.0
index 1e1956db5e4a..f44b3ad32bd0 100644
--- a/metadata/md5-cache/app-crypt/acme-2.0.0
+++ b/metadata/md5-cache/app-crypt/acme-2.0.0
@@ -5,7 +5,7 @@ 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 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+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(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v2.0.0.tar.gz -> certbot-2.0.0.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=647fe9241ff5d6bf7e19bd4c66056d10
+_md5_=9b24e69f4470b5aeedf5ba4c2b4bd268
diff --git a/metadata/md5-cache/app-crypt/certbot-2.0.0 b/metadata/md5-cache/app-crypt/certbot-2.0.0
index 5833b5c86977..dfcf912acf1d 100644
--- a/metadata/md5-cache/app-crypt/certbot-2.0.0
+++ b/metadata/md5-cache/app-crypt/certbot-2.0.0
@@ -5,7 +5,7 @@ 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 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v2.0.0.tar.gz -> certbot-2.0.0.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7f431269b0c85e02f6811dd53d0f697e
+_md5_=6ed1aff52a9e2ddb3aaf64ab0cb7c5bc
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-2.0.0 b/metadata/md5-cache/app-crypt/certbot-apache-2.0.0
index 2f23384083d3..108019aa9ffa 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-2.0.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-2.0.0
@@ -5,7 +5,7 @@ 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 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v2.0.0.tar.gz -> certbot-2.0.0.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3d6ca2212bd6f792d9f4bb757445a965
+_md5_=5259eb2216a79b7b0456fe5ae49f6454
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-2.0.0 b/metadata/md5-cache/app-crypt/certbot-nginx-2.0.0
index a268a5fb42f9..7a8edc843722 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-2.0.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-2.0.0
@@ -5,7 +5,7 @@ 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 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v2.0.0.tar.gz -> certbot-2.0.0.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=46e6a88d34e8904e6164cbe3bc5f6f09
+_md5_=2567c770f49abcc99bd1f4efcec0a4f6
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 090dff1f344c..ec680b1d04bf 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/emacs-ansilove-1.0.1 b/metadata/md5-cache/app-emacs/emacs-ansilove-1.0.1
new file mode 100644
index 000000000000..ac051fe1ee88
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-ansilove-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-26.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Display buffers as PNG images using ansilove in GNU Emacs
+EAPI=8
+HOMEPAGE=https://gitlab.com/xgqt/emacs-ansilove/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-26.1[imagemagick] media-gfx/ansilove media-gfx/imagemagick[png] >=app-editors/emacs-26.1:*
+SLOT=0
+SRC_URI=https://gitlab.com/xgqt/emacs-ansilove/-/archive/1.0.1/emacs-ansilove-1.0.1.tar.bz2
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=8fcf5c98601152fd6d2f7747ad78efc8
diff --git a/metadata/md5-cache/app-emacs/emacs-ansilove-9999 b/metadata/md5-cache/app-emacs/emacs-ansilove-9999
new file mode 100644
index 000000000000..a0e6a654d4a2
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-ansilove-9999
@@ -0,0 +1,12 @@
+BDEPEND=>=app-editors/emacs-26.1:* >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Display buffers as PNG images using ansilove in GNU Emacs
+EAPI=8
+HOMEPAGE=https://gitlab.com/xgqt/emacs-ansilove/
+INHERIT=elisp git-r3
+LICENSE=GPL-3+
+PROPERTIES=live
+RDEPEND=>=app-editors/emacs-26.1[imagemagick] media-gfx/ansilove media-gfx/imagemagick[png] >=app-editors/emacs-26.1:*
+SLOT=0
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	2347f8fe2d392b2a091191f94be37e6f
+_md5_=8fcf5c98601152fd6d2f7747ad78efc8
diff --git a/metadata/md5-cache/app-emacs/emacs-el-fetch-3.2.1 b/metadata/md5-cache/app-emacs/emacs-el-fetch-3.2.1
new file mode 100644
index 000000000000..4291403bdbc2
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-el-fetch-3.2.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-emacs/buttercup ) >=app-editors/emacs-25.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Show system information in Neofetch-like style inside Emacs
+EAPI=8
+HOMEPAGE=https://gitlab.com/xgqt/emacs-el-fetch/
+INHERIT=elisp
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-25.1:*
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.com/xgqt/emacs-el-fetch/-/archive/3.2.1/emacs-el-fetch-3.2.1.tar.bz2
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=cb5c522f16dc07d2722181681a87afaa
diff --git a/metadata/md5-cache/app-emacs/emacs-el-fetch-9999 b/metadata/md5-cache/app-emacs/emacs-el-fetch-9999
new file mode 100644
index 000000000000..9f41856c7c86
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-el-fetch-9999
@@ -0,0 +1,14 @@
+BDEPEND=test? ( app-emacs/buttercup ) >=app-editors/emacs-25.1:* >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Show system information in Neofetch-like style inside Emacs
+EAPI=8
+HOMEPAGE=https://gitlab.com/xgqt/emacs-el-fetch/
+INHERIT=elisp git-r3
+IUSE=test
+LICENSE=GPL-3+
+PROPERTIES=live
+RDEPEND=>=app-editors/emacs-25.1:*
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	2347f8fe2d392b2a091191f94be37e6f
+_md5_=cb5c522f16dc07d2722181681a87afaa
diff --git a/metadata/md5-cache/app-emacs/emacs-websearch-2.0.1 b/metadata/md5-cache/app-emacs/emacs-websearch-2.0.1
new file mode 100644
index 000000000000..9df1aa8b39d8
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-websearch-2.0.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24.4:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Query search engines from Emacs
+EAPI=8
+HOMEPAGE=https://gitlab.com/xgqt/emacs-websearch/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-24.4:*
+SLOT=0
+SRC_URI=https://gitlab.com/xgqt/emacs-websearch/-/archive/2.0.1/emacs-websearch-2.0.1.tar.bz2
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=651d3360b4d53b0c2148e7602ef50a47
diff --git a/metadata/md5-cache/app-emacs/emacs-websearch-9999 b/metadata/md5-cache/app-emacs/emacs-websearch-9999
new file mode 100644
index 000000000000..5ef5592ed074
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-websearch-9999
@@ -0,0 +1,12 @@
+BDEPEND=>=app-editors/emacs-24.4:* >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Query search engines from Emacs
+EAPI=8
+HOMEPAGE=https://gitlab.com/xgqt/emacs-websearch/
+INHERIT=elisp git-r3
+LICENSE=GPL-2+
+PROPERTIES=live
+RDEPEND=>=app-editors/emacs-24.4:*
+SLOT=0
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	2347f8fe2d392b2a091191f94be37e6f
+_md5_=651d3360b4d53b0c2148e7602ef50a47
diff --git a/metadata/md5-cache/app-emacs/marginalia-0.13 b/metadata/md5-cache/app-emacs/marginalia-1.0
index 7e8a28a7a9b7..7d2ef49981f4 100644
--- a/metadata/md5-cache/app-emacs/marginalia-0.13
+++ b/metadata/md5-cache/app-emacs/marginalia-1.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26:*
 SLOT=0
-SRC_URI=https://github.com/minad/marginalia/archive/refs/tags/0.13.tar.gz -> marginalia-0.13.tar.gz
+SRC_URI=https://github.com/minad/marginalia/archive/refs/tags/1.0.tar.gz -> marginalia-1.0.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5d2549f894b0eeda316b2e0831fa17e4
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 58a35453aeb3..97dde9ff18e6 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/colordiff-1.0.21 b/metadata/md5-cache/app-misc/colordiff-1.0.21
new file mode 100644
index 000000000000..9fe30b509292
--- /dev/null
+++ b/metadata/md5-cache/app-misc/colordiff-1.0.21
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Colorizes output of diff
+EAPI=8
+HOMEPAGE=https://www.colordiff.org/
+INHERIT=prefix
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl sys-apps/diffutils
+SLOT=0
+SRC_URI=https://www.colordiff.org/colordiff-1.0.21.tar.gz
+_eclasses_=prefix	eab3c99d77fe00506c109c8a736186f7
+_md5_=afdb870c995fd81d270d42109cdfe4e7
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 7b3d3d09fc8e..0b2bbffa2e33 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/scrcpy-1.25 b/metadata/md5-cache/app-mobilephone/scrcpy-1.25
new file mode 100644
index 000000000000..d2a83ebcf49d
--- /dev/null
+++ b/metadata/md5-cache/app-mobilephone/scrcpy-1.25
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=media-libs/libsdl2[X] media-video/ffmpeg virtual/libusb:1
+DESCRIPTION=Display and control your Android device
+EAPI=8
+HOMEPAGE=https://github.com/Genymobile/scrcpy
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=meson xdg
+IUSE=lto
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=media-libs/libsdl2[X] media-video/ffmpeg virtual/libusb:1 !ppc64? ( dev-util/android-tools )
+SLOT=0
+SRC_URI=https://github.com/Genymobile/scrcpy/archive/v1.25.tar.gz -> scrcpy-1.25.tar.gz https://github.com/Genymobile/scrcpy/releases/download/v1.25/scrcpy-server-v1.25
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6a0ee74ba97e7eda04e5b42911ab4673
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 41444f95f403..719b64b0645a 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/glib-2.74.4 b/metadata/md5-cache/dev-libs/glib-2.74.4
index b572e5a58328..b87872e9d0ee 100644
--- a/metadata/md5-cache/dev-libs/glib-2.74.4
+++ b/metadata/md5-cache/dev-libs/glib-2.74.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.gtk.org/
 INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 IUSE=dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.74.4 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,unicode(+),static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.4.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8f09a82384dcc750fc7645943302e451
+_md5_=87d21157d51597c04dd03f1f459f13ea
diff --git a/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r3 b/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r3
deleted file mode 100644
index 491b063096a7..000000000000
--- a/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/openssl-1.1*:0= virtual/pkgconfig test? ( dev-lang/perl )
-DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
-EAPI=7
-HOMEPAGE=https://github.com/gost-engine/engine
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~amd64 ~hppa
-LICENSE=openssl
-RDEPEND==dev-libs/openssl-1.1*:0=
-RESTRICT=!test? ( test )
-SLOT=0/1.1.0.3_p20181031
-SRC_URI=https://github.com/gost-engine/engine/archive/e5cc3684f3b3ad40e186e23b00b253d234df92ab.tar.gz -> gost-engine-1.1.0.3_p20181031.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fece73a272e35ecbd63bbb2c588dfaf9
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index c9d061643b21..f53ae536048b 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.9 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.9-r1
index 37f4a3975c47..808d87dccbc6 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.9-r1
@@ -1,5 +1,5 @@
 BDEPEND=dev-ml/cppo virtual/pkgconfig
-DEFINED_PHASES=compile configure install
+DEFINED_PHASES=compile configure install prepare
 DEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Modules for OCaml application-level Internet protocols
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=installsources strip
 SLOT=0/4.1.9
 SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.9.tar.gz
 _eclasses_=findlib	d8fa93cf137156660d0b72144b1e31d9	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=2824c8fcc4952cbb5ca2c34335fb2610
+_md5_=2a17233c4a28e176d867d781cc610bfa
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 16b2ca06d214..4b7f8ae95373 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/qtwayland-5.15.7-r2 b/metadata/md5-cache/dev-qt/qtwayland-5.15.7-r2
new file mode 100644
index 000000000000..77dfaa97f40c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.7-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/wayland-scanner dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.7*:5= =dev-qt/qtdeclarative-5.15.7*:5= =dev-qt/qtgui-5.15.7*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.7*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( =dev-qt/qttest-5.15.7* )
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=8
+HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwayland https://community.kde.org/Qt5PatchCollection
+INHERIT=qt5-build
+IUSE=vulkan X debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.7*:5= =dev-qt/qtdeclarative-5.15.7*:5= =dev-qt/qtgui-5.15.7*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.7*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
+RESTRICT=test
+SLOT=5/5.15.7
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtwayland-everywhere-opensource-src-5.15.7.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.7-gentoo-kde-3.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	b6c643c692be2aa94e7c88937a6ca685	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=9e8e4a5ec0e67cebbba1d28a6e9acfba
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 459682665b06..1eeecbc6d974 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/gdbus-codegen-2.74.4 b/metadata/md5-cache/dev-util/gdbus-codegen-2.74.4
index 2b521343e010..57a6f09cc7b6 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.74.4
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.74.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gtk.org/
 INHERIT=gnome.org distutils-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.4.tar.xz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	gnome.org	429073e99d7067d3462e875bf5c6e14a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3503e49fd1322a4ab0f456f40c42f21f
+_md5_=0de8244971b5ba3ced4377e643f9e74f
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.74.4 b/metadata/md5-cache/dev-util/glib-utils-2.74.4
index 87141177b3b3..90a6834691ba 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.74.4
+++ b/metadata/md5-cache/dev-util/glib-utils-2.74.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gtk.org/
 INHERIT=gnome.org python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=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 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.4.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=693d8649ce56ef1e7ccf644bd7e4c655
+_md5_=530d51c23d57227aec21488b9f1b6d5a
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index f0bb2fe31679..cea09f9dacd9 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.78.1 b/metadata/md5-cache/games-emulation/dosbox-staging-0.78.1
deleted file mode 100644
index 359f3878d48a..000000000000
--- a/metadata/md5-cache/games-emulation/dosbox-staging-0.78.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-cpp/gtest ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) mt-32? ( media-libs/munt-mt32emu ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) slirp? ( net-libs/libslirp ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] media-libs/opusfile sys-libs/zlib !games-emulation/dosbox dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Modernized DOSBox soft-fork
-EAPI=7
-HOMEPAGE=https://dosbox-staging.github.io/
-INHERIT=meson xdg
-IUSE=+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) mt-32? ( media-libs/munt-mt32emu ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) slirp? ( net-libs/libslirp ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] media-libs/opusfile sys-libs/zlib !games-emulation/dosbox
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.78.1.tar.gz -> dosbox-staging-0.78.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c2f343e01df3a33e0a6a5babba75cc35
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.79.0 b/metadata/md5-cache/games-emulation/dosbox-staging-0.80.0
index 816849dab1ac..790885032d9e 100644
--- a/metadata/md5-cache/games-emulation/dosbox-staging-0.79.0
+++ b/metadata/md5-cache/games-emulation/dosbox-staging-0.80.0
@@ -1,17 +1,17 @@
 BDEPEND=test? ( dev-cpp/gtest ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) mt-32? ( media-libs/munt-mt32emu ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) slirp? ( net-libs/libslirp ) media-libs/iir1 media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] media-libs/opusfile media-libs/speexdsp sys-libs/zlib !games-emulation/dosbox
+DEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) mt-32? ( media-libs/munt-mt32emu ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) screenshot? ( media-libs/sdl2-image ) slirp? ( net-libs/libslirp ) media-libs/iir1 media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] media-libs/opusfile media-libs/speexdsp sys-libs/zlib !games-emulation/dosbox
 DESCRIPTION=Modernized DOSBox soft-fork
 EAPI=8
 HOMEPAGE=https://dosbox-staging.github.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson xdg
-IUSE=+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test
+IUSE=+alsa debug dynrec +fluidsynth mt-32 network opengl screenshot slirp test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2+
-RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) mt-32? ( media-libs/munt-mt32emu ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) slirp? ( net-libs/libslirp ) media-libs/iir1 media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] media-libs/opusfile media-libs/speexdsp sys-libs/zlib !games-emulation/dosbox
+RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) mt-32? ( media-libs/munt-mt32emu ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) screenshot? ( media-libs/sdl2-image ) slirp? ( net-libs/libslirp ) media-libs/iir1 media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] media-libs/opusfile media-libs/speexdsp sys-libs/zlib !games-emulation/dosbox
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.79.0.tar.gz -> dosbox-staging-0.79.0.tar.gz
+SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.80.0.tar.gz -> dosbox-staging-0.80.0.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5f9debf48869095f5ef5700d57f78f65
+_md5_=303c4c012c18456235a05147f64886d6
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 345170ee8832..c16febdfe417 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/nautilus-43.1 b/metadata/md5-cache/gnome-base/nautilus-43.1
index b4ca50d5e6fc..3ff945dfb48f 100644
--- a/metadata/md5-cache/gnome-base/nautilus-43.1
+++ b/metadata/md5-cache/gnome-base/nautilus-43.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
 IUSE=gnome +gstreamer gtk-doc +introspection +previewer selinux sendto test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3+ LGPL-2.1+
 PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
 RDEPEND=>=dev-libs/glib-2.72.0:2 >=media-libs/gexiv2-0.14.0 >=x11-libs/gdk-pixbuf-2.30.0:2 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.4.0 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 >=gui-libs/gtk-4.7.2:4[introspection?] >=gui-libs/libadwaita-1.2:1 >=dev-libs/libportal-0.5:=[gtk] >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libcloudproviders-0.3.1 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) >=app-misc/tracker-miners-3.0:3=
@@ -16,4 +16,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/43/nautilus-43.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d0e625cb62e0eb33412e69ec7074028b
+_md5_=6884d8b2789e7dd45aa0ebeff9bf68ad
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index decb6bcef629..3351a9802060 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-43.2 b/metadata/md5-cache/gnome-extra/gnome-boxes-43.2
new file mode 100644
index 000000000000..e2d081488f6e
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-43.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/vala:0.56 ) sys-libs/libosinfo[vala] app-crypt/libsecret[vala] net-libs/libsoup:3.0[vala] app-emulation/libvirt-glib[vala] net-misc/spice-gtk[vala] x11-libs/vte:2.91[vala] dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=gui-libs/libhandy-1.5.0:1 >=sys-libs/libosinfo-1.10.0-r1 app-crypt/libsecret net-libs/libsoup:3.0 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.38.0:4.1 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:=
+DESCRIPTION=Simple GNOME application to access remote or virtual systems
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+KEYWORDS=~amd64
+LICENSE=LGPL-2+ CC-BY-2.0
+RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=gui-libs/libhandy-1.5.0:1 >=sys-libs/libosinfo-1.10.0-r1 app-crypt/libsecret net-libs/libsoup:3.0 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.38.0:4.1 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-boxes/43/gnome-boxes-43.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	6a75203e8a499f0fb42971452ce15388	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0bf52edd8ba67e0e2d1df4a8dff9a815
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 67b928249e97..e9e84b9cd638 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/gtk-4.8.3 b/metadata/md5-cache/gui-libs/gtk-4.8.3
new file mode 100644
index 000000000000..0bc4c228ee88
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/gtk-4.8.3
@@ -0,0 +1,19 @@
+BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) dev-python/docutils >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( dev-libs/glib:2 media-fonts/cantarell wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= >=media-libs/harfbuzz-2.6.0:= app-text/iso-codes x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3:1.0 >=media-libs/gst-plugins-base-1.12.3:1.0[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.25 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-core-2.46.0 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
+EAPI=8
+HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
+IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+
+PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
+RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= >=media-libs/harfbuzz-2.6.0:= app-text/iso-codes x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3:1.0 >=media-libs/gst-plugins-base-1.12.3:1.0[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.25 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-core-2.46.0 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
+REQUIRED_USE=|| ( aqua wayland X ) test? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://gnome/sources/gtk/4.8/gtk-4.8.3.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f7c49d6674ad8dedf53a9558c85707f7
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 8f4c89e87497..090ba37c9349 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1 b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
deleted file mode 100644
index 71b825b917f9..000000000000
--- a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen dev-python/docutils ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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 ) >=dev-libs/glib-2.40 media-libs/libpng:0= sys-libs/zlib
-DESCRIPTION=Library for rectifying and simulating photographic lens distortions
-EAPI=7
-HOMEPAGE=https://lensfun.github.io
-INHERIT=python-single-r1 cmake
-IUSE=doc cpu_flags_x86_sse cpu_flags_x86_sse2 test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3 CC-BY-SA-3.0
-RDEPEND=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 ) >=dev-libs/glib-2.40 media-libs/libpng:0= sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/lensfun/lensfun/archive/v0.3.2.tar.gz -> lensfun-0.3.2.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3dc6a56c8ab6aa160d1b86809ff67781
diff --git a/metadata/md5-cache/media-libs/libharu-2.3.0-r3 b/metadata/md5-cache/media-libs/libharu-2.3.0-r3
deleted file mode 100644
index ef863d84289e..000000000000
--- a/metadata/md5-cache/media-libs/libharu-2.3.0-r3
+++ /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=media-libs/libpng:= sys-libs/zlib:=
-DESCRIPTION=C/C++ library for PDF generation
-EAPI=7
-HOMEPAGE=http://www.libharu.org/
-INHERIT=cmake
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=media-libs/libpng:= sys-libs/zlib:=
-SLOT=0/2.3.0
-SRC_URI=https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz -> libharu-2.3.0.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=841a6a0d28161a23b155f2766297dae4
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 0952fde3652c..45ed2dee3de6 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/aegisub-3.2.2_p20160518-r105 b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r105
new file mode 100644
index 000000000000..8466105fb487
--- /dev/null
+++ b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r105
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig test? ( lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wxGTK:3.0[X,opengl,debug?] dev-libs/boost:=[icu,nls] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet ) >=dev-cpp/gtest-1.8.1 >=dev-lua/luarocks-3.4.0-r100 lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) ) 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 postinst postrm prepare pretend setup test unpack
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wxGTK:3.0[X,opengl,debug?] dev-libs/boost:=[icu,nls] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
+DESCRIPTION=Advanced subtitle editor
+EAPI=7
+HOMEPAGE=http://www.aegisub.org/ https://github.com/Aegisub/Aegisub
+INHERIT=autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot
+IUSE=+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet +lua_single_target_luajit
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wxGTK:3.0[X,opengl,debug?] dev-libs/boost:=[icu,nls] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
+REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( alsa openal oss portaudio pulseaudio )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Aegisub/Aegisub/archive/b118fe7e7a5c37540e2f0aa75af105e272bad234.tar.gz -> aegisub-3.2.2_p20160518.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9676ffe6250db46daee170dbd2290a8b
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 85f591460349..320f500d1244 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-recursor-4.8.0 b/metadata/md5-cache/net-dns/pdns-recursor-4.8.0
new file mode 100644
index 000000000000..69d1e83b0dc7
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.8.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=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]
+DESCRIPTION=The PowerDNS Recursor
+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
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.8.0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=82d877e92d4934fad1dc7031ba57dc4b
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index f4aec5504833..98d4819af59b 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/c-client-2007f-r8 b/metadata/md5-cache/net-libs/c-client-2007f-r8
index 5dfe4fa8e74e..25e8e7f7576b 100644
--- a/metadata/md5-cache/net-libs/c-client-2007f-r8
+++ b/metadata/md5-cache/net-libs/c-client-2007f-r8
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://www.washington.edu/imap/
 INHERIT=flag-o-matic libtool toolchain-funcs
 IUSE=doc +ipv6 kerberos pam ssl static-libs topal chappa
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=ssl? ( dev-libs/openssl:0= ) kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) !pam? ( virtual/libcrypt:= ) ) kerberos? ( app-crypt/mit-krb5 )
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z chappa? ( mirror://gentoo/c-client-2007f-chappa-115-all.patch.gz )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d38595fba4381621808a88e364644421
+_md5_=5acd04518b5cafde6061ba5ed56f4ff6
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.16.12 b/metadata/md5-cache/net-libs/mbedtls-2.16.12
deleted file mode 100644
index e6889036f3cf..000000000000
--- a/metadata/md5-cache/net-libs/mbedtls-2.16.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )
-DESCRIPTION=Cryptographic library for embedded systems
-EAPI=7
-HOMEPAGE=https://tls.mbed.org/
-INHERIT=cmake multilib-minimal
-IUSE=cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/3.12.0
-SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.12.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d137c4a75da3cde887e6f8803faee7db
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.28.0-r1 b/metadata/md5-cache/net-libs/mbedtls-2.28.0-r1
deleted file mode 100644
index 3dc0333562da..000000000000
--- a/metadata/md5-cache/net-libs/mbedtls-2.28.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )
-DESCRIPTION=Cryptographic library for embedded systems
-EAPI=7
-HOMEPAGE=https://tls.mbed.org/
-INHERIT=cmake multilib-minimal
-IUSE=cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/7.14.1
-SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.28.0.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=19bd1655ab7756dc24da5b1872342000
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3
new file mode 100644
index 000000000000..f53f16add78c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11[xml(+)] >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[xml(+)] >=dev-lang/python-3.8.16:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b642ca01a7a9024c09e190ffa613f32c
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r410
new file mode 100644
index 000000000000..ae03387ea24c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r410
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11[xml(+)] >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[xml(+)] >=dev-lang/python-3.8.16:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4.1/0
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0701f33a4b7530861fead460d5b55177
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r500 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r500
new file mode 100644
index 000000000000..3138228682b5
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.3-r500
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11[xml(+)] >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[xml(+)] >=dev-lang/python-3.8.16:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=5/0
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f8218e553c7148f8be7539b5a678c9d8
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 768c182aad09..8980e23b76c5 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/man-pages-6.02 b/metadata/md5-cache/sys-apps/man-pages-6.02
new file mode 100644
index 000000000000..2b6a9dd93eb9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/man-pages-6.02
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bc
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=A somewhat comprehensive collection of Linux man pages
+EAPI=8
+HOMEPAGE=https://www.kernel.org/doc/man-pages/
+IUSE=l10n_ja l10n_ru l10n_zh-CN l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv l10n_uk l10n_vi
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=man-pages GPL-2+ BSD
+PDEPEND=l10n_ja? ( app-i18n/man-pages-ja ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) l10n_cs? ( app-i18n/man-pages-l10n[l10n_cs(-)] ) l10n_da? ( app-i18n/man-pages-l10n[l10n_da(-)] ) l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_el? ( app-i18n/man-pages-l10n[l10n_el(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fi? ( app-i18n/man-pages-l10n[l10n_fi(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_hu? ( app-i18n/man-pages-l10n[l10n_hu(-)] ) l10n_id? ( app-i18n/man-pages-l10n[l10n_id(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_mk? ( app-i18n/man-pages-l10n[l10n_mk(-)] ) l10n_nb? ( app-i18n/man-pages-l10n[l10n_nb(-)] ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_sr? ( app-i18n/man-pages-l10n[l10n_sr(-)] ) l10n_sv? ( app-i18n/man-pages-l10n[l10n_sv(-)] ) l10n_uk? ( app-i18n/man-pages-l10n[l10n_uk(-)] ) l10n_vi? ( app-i18n/man-pages-l10n[l10n_vi(-)] )
+RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
+RESTRICT=binchecks
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-6.02.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.02.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
+_md5_=04bb75db491c3f85dd36557e1a1c6b33
diff --git a/metadata/md5-cache/sys-apps/man-pages-9999 b/metadata/md5-cache/sys-apps/man-pages-9999
index 5c14192352ce..2861ca4c6c1d 100644
--- a/metadata/md5-cache/sys-apps/man-pages-9999
+++ b/metadata/md5-cache/sys-apps/man-pages-9999
@@ -13,4 +13,4 @@ RESTRICT=binchecks
 SLOT=0
 SRC_URI=mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f
-_md5_=a3050164d212776d11049ab971def768
+_md5_=04bb75db491c3f85dd36557e1a1c6b33
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index f4723954579d..69e9d68c09af 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221222 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221222
new file mode 100644
index 000000000000..30dd0544f841
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221222
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20221222/gcc-10-20221222.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	819832f115fcf93d626ced5444c725d0	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=1dca774cddeb50baf2629f66689b1337
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 8847c9e8bdeb..c852d5614be3 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/stumpwm-18.05 b/metadata/md5-cache/x11-wm/stumpwm-18.05
deleted file mode 100644
index 53f578739b01..000000000000
--- a/metadata/md5-cache/x11-wm/stumpwm-18.05
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-lisp/alexandria dev-lisp/cl-ppcre dev-lisp/clx >=dev-lisp/sbcl-1.3.0 emacs? ( >=app-editors/emacs-23.1:* app-emacs/slime ) sys-apps/texinfo doc? ( virtual/texi2dvi ) 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
-DESCRIPTION=Stumpwm is a Window Manager written entirely in Common Lisp
-EAPI=6
-HOMEPAGE=https://stumpwm.github.io/
-INHERIT=common-lisp-3 autotools desktop elisp-common xdg-utils
-IUSE=contrib doc emacs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=contrib? ( x11-wm/stumpwm-contrib ) virtual/commonlisp
-RDEPEND=dev-lisp/alexandria dev-lisp/cl-ppcre dev-lisp/clx >=dev-lisp/sbcl-1.3.0 emacs? ( >=app-editors/emacs-23.1:* app-emacs/slime )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=https://github.com/stumpwm/stumpwm/archive/18.05.tar.gz -> stumpwm-18.05.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	common-lisp-3	747af8b5a3e934f3087352abaaaa4518	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e2c849f502e85d1cbedbf65c3b17a593
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 6af221e438b3..5c62d40a3f50 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14603 BLAKE2B e2577f15dd9e0d475df5b593952aec19dbd6bd1d98fe3cf3f0798f0d5c069ce285e42d594e3b05990923eecd40549b08f04abe17b02a4fc3856c0cce38640336 SHA512 af95e49316b05b0546f6bd6ea11a1d52c27280a7719f4e850d4b026ff56a8948fca0d992cbe3c778a8a17737da71c2aab3027a71ea2d1805575ee1cc97e3095b
-TIMESTAMP 2022-12-22T19:10:02Z
+TIMESTAMP 2022-12-23T01:10:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOkq4pfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOk//RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAwEBAApHEjS3CzAYkyW2TxcALkQ6W95pbyFGbmhqtSjFUOPLJiuKjttn2mJDmO
-JGlhsdGEfxQez4opv4vnk6YmF8iAPLsg2blIP8t1ulgPf00FksHALtoFp58liKD1
-L4VzyhMI5xY93OexSh/flrCe2fcCeWLemBXg4Uyv72J+C8MgWS0sAuoedH0Cwvin
-BNWkHrS5OYWrDZuD3t9cqEgQHUc8NUMveGcp0EelDZ9QkL9+edjBz0boDreJybp5
-Dla+Ru1rGyTQs5gWi0QXko8sLJEcFylxhe9vnoL8Su4gLp4bgBbe/tzP4fsEnyok
-aCanq2Y/v0WXDGeIoQfcxxpv6BQ9h7gwVjcj7rUBw0awhz1lX81wVEEmDoLr6HS2
-sO+uKlS4Y/BPpVnIm9SP0V1G3uNVicwgGFeb5v/Jwr8NLXR/27WylfzHdJNskVHW
-wFyCaH7R7EG/QpfXnC6ETeYMn4rnhBFSx2u1Eo12k97sJXyXrRpBOt25ZISUW+Yh
-QkWA8wGmaycLDUEFvDdO0VW7wSxgCyKlkxvgD2NxGn5leqVR3JhV5jziyKu8KFZw
-fW0oZeuTx8ceQl3GJ9IRTK58+hYLVPXcHwwmkwRNuAXhn6NIOuvb0oX5cQ0BltI+
-ENdmvSwvd42bPMOERFucKNVZfrsWd7GsH2k6u4/qbl7aI8SpAV4=
-=B5oZ
+klCiLw/8CI81gA7QATWtOqNIK9kNvzsQIoYPqHeBtAgCmEaTEU75h6pioRy5KK8e
+QrWHLEruwXEGEmVdP2k5iy0x5XcEDDPgl+S0L485IUe6n1Q7aNbs03ranQGhRSE/
+IWT6ODGVfgVxHcQIFK7v1nXWdSReePUOcue3yHL9l676ldxDO3KTOMSekSy2PnWo
+wjeKbFxwHd3GslX5JInaSFy+F0WDXfGnPLR+K9HD7PT4Fne+VvqA7UBqUkzxTndU
+SgCsyKMIXka3aXjXhZWuFMrMegZ3AalooO00TrjlRFN2vKAGvDp7xKMfQiA8kGWM
+vO5C8K4k6HDb0gXfDgEtslSSNqz58wijCsyJ9hhSOpdde8gHHCO/0H3+lmTFkxs3
+7EIc/oo74sXYzMJU/0yEADbzi6Hyla+Z0QsydSnM+Sq10K6aBlWqWlt+FZiKdjse
+062MveMVIIm6OkGI/GRJFkJGhs2LTVJoACYXACNc95uzVntfWzIc1NF9x17D73y3
+AjSOakNXU+ME6KGcQIa678FlTmC3Rq0QLVshjKMW5FdjjD0MBTi0mRbelvR7o2cz
+z3HMtCr1LQdoyCUubhH/WkD5gQ/b77BJAimqBCAeKmjl7oIdHbD8VRiAlO8lu/KJ
+4t9AJ5IHHGAm2/F1iphjlG2hDGQxU2TUV08NMLc9KMnkw0Y6mdQ=
+=CeCF
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f5e1feedd1cf..fef88fc3698c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 22 Dec 2022 19:09:58 +0000
+Fri, 23 Dec 2022 01:10:10 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ef3fae51d050..b7a546851f63 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Dec 22 07:09:58 PM UTC 2022
+Fri Dec 23 01:10:10 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 547cd939dfd8..f4cff8b2d736 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 22 Dec 2022 19:15:01 +0000
+Fri, 23 Dec 2022 01:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 5b56414133ed..12d847dd1603 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-2d0fbc55fa84ed13f7de6b8205b6de249ee97ff7 1671735785 2022-12-22T19:03:05+00:00
+51168520f6f8da312d68ea778d8a0e0b9cca54b6 1671754743 2022-12-23T00:19:03+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index db2e6fdaa5c4..1121d77973d9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1671736201 Thu 22 Dec 2022 07:10:01 PM UTC
+1671757801 Fri 23 Dec 2022 01:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f5e1feedd1cf..fef88fc3698c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 22 Dec 2022 19:09:58 +0000
+Fri, 23 Dec 2022 01:10:10 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 9430b26d4cdc..7f78aa5b6dbb 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 c0fe351551de..6735d8a2594f 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -2,7 +2,9 @@ AUX pdns-recursor-r2 1426 BLAKE2B 4407525f88d6e4299acdaa015e13866b70b2f697493218
 DIST pdns-recursor-4.7.2.tar.bz2 1580602 BLAKE2B 2d32d553629f665f9060e58f994a0256adc936f6fdb32ecd236ba202731342fe7e17db6678649292b4d1dd97e8579851e38fe41fd4f122dbf3d63f3d71c5de13 SHA512 b80fb1f403d5b81cf7500f6fce64914ab858b7bd7f617265db9a11ea78786de702563482c5b9daa5c9da1c19a0d02d90fd1f4f14b740d2fd492def7f4b1a7def
 DIST pdns-recursor-4.7.3.tar.bz2 1597064 BLAKE2B e5732c20f18b6711b854a2bcce36705f0f5fbf106e615a646b0a823e0eb4be8ff315f28ebbae77b67935c77255108b92f4ee6515f61019729f5191dfe147ade9 SHA512 e7d9fa32dd53e9b382689e6e735f35b12dbd9f2bb0e8b3031ab58f53a61b5cdc947cb5e857a991768afd1b403bc02d20d434dded5800be450ad45368c9d1dc0e
 DIST pdns-recursor-4.7.4.tar.bz2 1609031 BLAKE2B b051a77f1c734546b26c3bb0030c0e57ee4621b14f0e92d7d294fb80fde599aa813f56a64750e1a00587fee8f05aa9ae1def94f3c3709b103223ed48124b66a7 SHA512 51ecccb557a5a9f3aa28144b60ab75b0fe5534bb2534b0a44662b474a01a0fae61f08b8ca787fc27f22b2a89b721ae66e1a954c4ceb829e66f89f286d5e174a8
+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.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.8.0.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.8.0.ebuild
new file mode 100644
index 000000000000..c8d6a1da1b22
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.8.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	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]"
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	filter-flags -ftree-vectorize
+	append-lfs-flags
+	append-cppflags -D_TIME_BITS=64
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(use_with sodium libsodium) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index c33e7cb44d8e..97c8d1456c58 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 949f4169cf8d..e5d398003772 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -8,5 +8,5 @@ AUX c-client-2007f-topal.patch 1078 BLAKE2B 5224ac12119e25c3208865bf1904a21c9d4b
 DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142a4e0c4dd561d0a387cb72fea16de656a01bc21a0b30600dc121c8af090b76188d0131852ca6f3d40b9bba8745696faed5a79fb8c59 SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
 EBUILD c-client-2007f-r7.ebuild 4468 BLAKE2B 206c259a1d784ac165ce5432586d30acc9e68c95fc4c2b76366a8373cbe5b2b12c5f41665ea5465f4ab55a117153c586b3086b2b56dcc2f45aaa647ff64bdd4f SHA512 1182b7836da519f3f920347234f5b43b7e32074198ae674bbec2389f162819a0b5c54b4cde2b3f2842cc910657b24f44786bf70cb73f09ab02419b13cfe29a35
-EBUILD c-client-2007f-r8.ebuild 4689 BLAKE2B 6db7eeefd62d593799a00a222a7b5d2226c1172051c76cb7b9b924851a855460621d86776388963dec29c6f447d276bfd032a02e13dfd0abd8d5af315fd219bf SHA512 a9b026604885e3dca8f8431fbbd54b83b66b7c05f96847ca7ae57357cc1bfce5af646dad909f393dbea5cb0c42d8d27df9522d4a19e7c303a2f73a14eece05b2
+EBUILD c-client-2007f-r8.ebuild 4682 BLAKE2B 112dc23a462b3bb2c6655e7a76250346de062dfa59edd0112c3bc410a1195f6e80e81d535c3bacd786b9c1965e2a60ba5464236e714d900390a30c7844214d20 SHA512 c076573cc0df3983119f0a0b30cf25206d2072091d7ba108b68681c4a3650cd5d726b468183c17ab429ac083ecf1cdbc248332d24830989d916a35d0997e9f05
 MISC metadata.xml 481 BLAKE2B c10dea9f32197ea0f48c7d4c4de5d082640bbb424be1e8e371668bcaebfdbd878b21dbe1a43dda5d347f186874c119047485f27ea067495f2eb2d7fa7fbbdb5d SHA512 b153757f61ebba9aa79b1a57b52e3c5e7a3299c17f9ccb2b0f815b2799469c5b29dd4a598f923f9037c6804175f2014c2ec3803cd092a9b21f470b0e5e764c53
diff --git a/net-libs/c-client/c-client-2007f-r8.ebuild b/net-libs/c-client/c-client-2007f-r8.ebuild
index 35eec668dd24..6e853ee675f2 100644
--- a/net-libs/c-client/c-client-2007f-r8.ebuild
+++ b/net-libs/c-client/c-client-2007f-r8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc +ipv6 kerberos pam ssl static-libs topal chappa"
 
 RDEPEND="
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index fadbe645d35b..a76ada2df65a 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,10 +1,6 @@
-DIST mbedtls-2.16.12.tar.gz 2702190 BLAKE2B 3cbe0bcfd0eca279d9b4b3816416b8e778f0aa38d368d810701e65140f0d1524afabe4fd1a1a65297f872a7dfafb7d2feeb7382fe8ea2b180f24551ceac53c26 SHA512 40c4487cc40afcf929bc7158d735a869ebada41c811f63a10d74e9b9644960e2a0aeb7c7c9841c0aef815425990847d47e7f42f9bafe0b2a959e769e3d74ebe9
-DIST mbedtls-2.28.0.tar.gz 3712239 BLAKE2B 1141465bc5b73e7fd94bbd02c79290093fd075626be93aea839a54ebff81fb00917f0a4fe7911fee983a36147fa4922d258714a330b40b0da4764a3b2419df8b SHA512 2ddc161caeebe8bf1e8cf23c398f65ceff699eb6487a7bcaf6a665879aac5458e21e26b06370085cbdae6ce6b5394afece656aa6307bbb3f5b701bcb41f3dd64
 DIST mbedtls-2.28.1.tar.gz 3914438 BLAKE2B 85969895b50b63537438e0b67e1dec97a0ee4ac188c55ebcb109d5e0cc8f4a3f66f016b2ac5f920d7b10f094c9626029d19ab86be0cb5941224a7f3eed2dcc06 SHA512 cc75027ebbefb4ba1aecdc386cf6b60cceeceda79a474ff5ba67411e41aac9fc2c43c2fb0158be667f1b91e6c19082e17e4e61409acc1498b568f5efc7b00a2c
 DIST mbedtls-3.1.0.tar.gz 3766628 BLAKE2B a52e8fb9a3b88c1cf7cb0c8f5598f90a1c9ca05dbc399432293c3acb77aaf0a1b92a9792bda986b47e925736b21c83de1c891b21d45fd2dc8cb5d7d1b09168e7 SHA512 c374fafad89f8793ed1a302634a403b855317d9759377d4bade13c61857d0317a2fc144ab3a9aaee52901ff7a3c4b4b0e7e81ebe5510ab4d228103def01ae628
 DIST mbedtls-3.2.1.tar.gz 4097571 BLAKE2B 4f33172c9c7a3ffbad6600c41d9b574a79e512ec417c3ec90a04085cce393456e8502e94150094bc80a217c352c8148d67bdab1bf0cb311c8dc88d653475a003 SHA512 e7f1726d2cdae6c580d588b40c8a51b9e353786efdd2e50fd1c11c7f46a2b6fe2622cfe2ee5cf998ec762b5ebf8f4720cfc1a1ecaebc497489f9d6a263a83523
-EBUILD mbedtls-2.16.12.ebuild 2646 BLAKE2B d3ec300834294fa08d45e57f47f970f3c69b903ceea0b83a9a65ad19ae79570f94876583c39e1a88269f6a08c768524c1c4a1261bffc77ad46189f4d4152b81c SHA512 07c7991767aaee6d291ae6dc313eb49d9344aca3b9cd9aa76cd5110d3a71f394074cb6f83b6e785c2eedaf5f63d4a491280a4a9533a678a62627202c5293cabb
-EBUILD mbedtls-2.28.0-r1.ebuild 2720 BLAKE2B 781b05a071956af3239ce4de1a6de608019154aa60160baffe16e16cadafc0df6a0ec051147651a795c3a6b42fdf95f5aea10e4df0adc7751163c12fe723f4ab SHA512 f8b02c202c3a59d345be3109a1d7cff9ced43977ef207f30d8c09d4a1191fed238c76f892651b1b698ab115580b5e8031587b3df0a629c59a0d26d1764c0e5c6
 EBUILD mbedtls-2.28.1.ebuild 2720 BLAKE2B 9eb6fdd05100c85e3eee67c35ea6a32dcf35f864760891845158d58987e28bd255d0c431533e3a5f0655d62c85b23be0833a915b8bafbdcd0b48a1ff30d9c2fc SHA512 b3d181116d8cd08a108bff77c67824bb91666dec81d648aacf342d1b8f124518014cfbe918ed6762f01e4b2b7566863ddc7fb2e944d2ef6cf961cb02c43e02e9
 EBUILD mbedtls-3.1.0.ebuild 2416 BLAKE2B 1f10d91faee5f4d8db8a3dd82da4308e156a280ffd1860764726189212cda26f5d4c8f71abf2de81002c16b5335f39ba5a08605c9eb023668cb25b7b6bb6add1 SHA512 95baf23bb04e80b76c4a394d30712a28dd7575b68aa84730b9293733492dc463b6b3533c620608551828d3c48c39a2b7eccf7832ac4e59afffb06b0b550285fa
 EBUILD mbedtls-3.2.1.ebuild 2416 BLAKE2B e1ec53b24f5af4e5af4470e7163599b454944b207573d2ee551422cbc862e1c9216b3688330f71f28d39fc1906ce6351b92755b4b28c125f79dd958365220555 SHA512 21bbdcb3c0f4366ca2859e1ea799f9a85e3c98768eaf387c5861856a4e621204653452ee64ef4eff26dffcc767902092ba2bfba909cff42e468161b3f5f48814
diff --git a/net-libs/mbedtls/mbedtls-2.16.12.ebuild b/net-libs/mbedtls/mbedtls-2.16.12.ebuild
deleted file mode 100644
index 0ad3fec46cf1..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.12.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		dev-libs/openssl:0=
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cmac && enable_mbedtls_option MBEDTLS_CMAC_C
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	# psa isn't ready yet, it might be in 3.x(?) but certainly not
-	# at the moment.
-	# bug #718390
-	local myctestargs=(
-		-E "(psa_crypto|psa_its-suite)"
-	)
-
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild
deleted file mode 100644
index 388cc9abaff0..000000000000
--- a/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/7.14.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		dev-libs/openssl:0=
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cmac && enable_mbedtls_option MBEDTLS_CMAC_C
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	# psa isn't ready yet, it might be in 3.x(?) but certainly not
-	# at the moment.
-	# bug #718390
-	local myctestargs=(
-		-E "(psa_crypto|psa_its-suite)"
-	)
-
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 67aa6674a0d4..1c6a3c590e89 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,6 +1,10 @@
 AUX 2.38.2-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch 914 BLAKE2B 44525071481e9cfc75e972d5da2f516d9ca5b762d0f3ccf9a715232406bc4ed0cca6e9971c9df2c0ed3299d7fe73e70b6ed22773b2ad37c379e39042a5bd90f0 SHA512 cbdcde3fb6abdef8faca0fc7d4aef25155f4268b97128f98ff1e0bb6282941aa00bea06a1686c97086aedf13c5e4819a29b9bc470d8a09c1f1eec9676e32b575
 DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
+DIST webkitgtk-2.38.3.tar.xz 33003928 BLAKE2B ae2ab019a765e91110e12277954bea9ae16fd898f854f58e665d273bcbd9ca43ee3219eea7ba0fb5716b17b8efdfeeb395c5976b38848562be95ea372b9b70bc SHA512 1e5f0d73d6b1d64faf20ab909f1765439fab230dd360dd1906962f03a24725cf9f50a375b1987b615c64fb161ab32d29d6b1d49ea75c7b2b32f495e4ad0f38ce
 EBUILD webkit-gtk-2.38.2-r410.ebuild 7807 BLAKE2B f7db6217f3a6e8ac67c46d8d040cf75a060bc0185a835c76eb6bdfe7b83ba9014c2272af36a8cba2684ac5f051f18b2cd7f676f64422475791faa83607a17eb0 SHA512 64067852c656f1967645731df9e282c6ba65f0f0bdef726c016dacd3610f3677a03eb186552b2cd1086f0b9cd2bfc52462c23c59040b4c3fd88aa14031db319a
 EBUILD webkit-gtk-2.38.2-r500.ebuild 7767 BLAKE2B 946fd41d884b8769e774aea8f1029488fb275ed9550d6bff34e8b8a142283534db497a40a68409c2f6730e96491ca52ba0cfd9e2d0fe39a68984e19b9fff92ec SHA512 73891d1296e6cf99ba6ab0bbf908c7a87e5ad101659402a7d1c3db193664661ff58f7ac16c6ce683de2ad125ddf2430392b2aeaff082e0a8315e51abe57527ac
 EBUILD webkit-gtk-2.38.2.ebuild 7533 BLAKE2B 968495c780fb92563a3211868899876b264cb7d02ac8a5d14eb367e1e1d4770f46eb515ebe6195ceb0295908a1bd9e4abcb35ddce83cb9532dcab64e3888bd16 SHA512 a452b2fafef0f34a59245c572c9e3cdc66acf465908e8a4e4c38e023715ed646457f68084ad336745fc7e70b4f2e19e073644839565a696a5be0c737e2dcea8e
+EBUILD webkit-gtk-2.38.3-r410.ebuild 7813 BLAKE2B 1b428ecd3d3ebbdd9001f2d84cf570a3d8bcc7fcfce9280215e052b08f446814c3833fb0c7cfa3168d9e6d847183b16795ad42c71605ba0ee33455e05e89fe98 SHA512 02aab8f6a0e8a5cba84156a11d9eab4c35b677c02cae6fa5762cb4c42fa733cfb81518b83574bfe5a0f192980d68a262a0745741e90d7612cbfb14a50f107771
+EBUILD webkit-gtk-2.38.3-r500.ebuild 7692 BLAKE2B ee284ac313e5fdcbd00a744957e787d708a3a45cea858421aec0e0e4443f0480a33f467dfe3da2563a3d8718f8beb0db487ccfd46f82427877e169903bb05828 SHA512 15ced5b987317cc76bd8471463a75e8215df3946b572f6013cb2d7db52a9a5a59471b792f570fd22f9ca5c2c78391baaed41d4b67e13179e32c78fb34f75d20b
+EBUILD webkit-gtk-2.38.3.ebuild 7539 BLAKE2B 90d4bd642a7d512cb22cc5e2be83d63acd3b8fade2a714d91522463cbaf3a76552b5a4f71e083051fd785a42ab10cc90c28d02f2ef45189aef72f9a4fd441ec6 SHA512 9fff20b27bb349e5657c8b3948d9498f772d1e0dd18b85e0ef74223aedf166a5b2757d23be413698d2584a9310a3054416a95b200390b869b305011830e461ce
 MISC metadata.xml 756 BLAKE2B ac278b1ed9ad7d7dcce220e686ef4c67c79f7d4c25e43e0fedaad14925eb03c74140e49a4e86d2146d6d467f14a737fb2ff1e90b506ab4d43b79d3462d58cb24 SHA512 584ce6c8dc66e3e3b3677dbffe8b2a58bb81146f3dc8eaf830597781f03580e0b94620322834b6e558ac9fcb06b3eda02645803f63d78e88104ecc0950c6f369
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
new file mode 100644
index 000000000000..2ce906d0bd00
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
new file mode 100644
index 000000000000..71c036b210ae
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="5/0" # soname version of libwebkit2gtk-5.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=ON # wbkit2gtk-5.0
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
new file mode 100644
index 000000000000..a62b480222e4
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 801841e5f13c..5317fce1405f 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 06dbcc40cb0b..fbb186226ce4 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2977,6 +2977,7 @@ games-emulation/dosbox-staging:dynrec - Use recompiling cpu core instead of dyna
 games-emulation/dosbox-staging:fluidsynth - use media-sound/fluidsynth for MIDI emulation
 games-emulation/dosbox-staging:mt-32 - use media-libs/munt-mt32emu for MT-32 emulation
 games-emulation/dosbox-staging:network - Enable networking features (modem, ipx)
+games-emulation/dosbox-staging:screenshot - Enable screenshots of rendered output using media-libs/sdl2-image
 games-emulation/dosbox-staging:slirp - Enable Ethernet emulation using net-libs/libslirp
 games-emulation/fceux:ffmpeg - Use media-video/ffmpeg for video recording
 games-emulation/fceux:x265 - Use media-libs/x265 for video recording (HEVC)
@@ -9056,7 +9057,6 @@ x11-wm/pekwm:themes - Install additional themes
 x11-wm/ratpoison:history - Use sys-libs/readline for history handling
 x11-wm/ratpoison:sloppy - Install sloppy, a focus-follows-mouse implementation for ratpoison
 x11-wm/ratpoison:xrandr - Enable support for XRandR
-x11-wm/stumpwm:contrib - Install contrib modules
 x11-wm/stumpwm:doc - Include documentation
 x11-wm/subtle:xrandr - Enable support for the X RandR extension
 x11-wm/subtle:xtest - Enable support for the XTest extension
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 92b0141508b2..e9cd9e796bb7 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 11364ddf5568..ba1dd668b883 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,9 +1,11 @@
 DIST man-pages-5.12.tar.xz 1778220 BLAKE2B 347c5ef63cb80134018f322f810545354ccc7afdb8acb62f83e3b06ef15d7fbe6c0c68db37f52ce9727682a856a7810a5e64f1dcbe1cc11b22f83fb0273f7add SHA512 455794ed6e3bf20649f78b464300d5c1adad5000668a82a1194c1af8bdcbd064e4d930696cbe534481368d6526c7cda69927e958b9a868d95891202476fb4608
 DIST man-pages-5.13.tar.xz 1788980 BLAKE2B 7cca88b7f201d177b087893f60e6a87fd3ed8c78a183bd6ebcd0c28961f5f5d24aa2ba9d3a1d9cec4e0fc9cc0b26489c91e991a2d4420c28e1f61b850b882752 SHA512 a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499
 DIST man-pages-6.01.tar.xz 1789204 BLAKE2B 37005b45af798315992fe4836457982d4203245eb546a6f1dcb02b67d63db1ba7e872b1259ebb58ee01178c726fff5f2276ec548ba768f73683edaee9a3233ca SHA512 93d09380a08c36740dbb2f3f246d190e5467147344b584253a2e0248fa764559008c21bb567f379f6166952ee1635ae3c2145e2a63aaf6d30728ca680d7b57a9
+DIST man-pages-6.02.tar.xz 1800876 BLAKE2B 005bc57d2abca18516502faa7ea31798e6fb992d4a2fa1ce83dbba2992d9cc29e3b48fef97f1faa55bc40eafcb4eedbafb113dc2561f4a438f0a7fa711e259f0 SHA512 124e5157c25b5a3c62d225be1da2879f436d7fd8fe2f116c11982178e34085d1e50ef47e13fde413a7bf16d1177cbe744d00b2a178be3dfe4c4828371812ea5a
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-5.12-r3.ebuild 2227 BLAKE2B 3b3bd8ef026cdd916dd380a88a79e0bf79752309440629bfaed6791c18e09e86c7703b042f241e86c69d4bbd92b9cd37f9b450c05628555f2eb4d79a85026cb0 SHA512 7c054aeb1a8dee95e8f94ddc7226e83fb21fb8d8080111b0f20173c911fa37c6d63976af8db7cfaadfb6223ca205cc29fe33ec3c84aa7a78a71bf0b1a2034ed9
 EBUILD man-pages-5.13-r2.ebuild 2235 BLAKE2B 69ccf3e43c912486f4a10dd6a96a084eb51e2373d6eaf5fb2d1bdb1168d6b7c6a2157f97ebd3a30c9b3e562b1d047156f6ad92b1cf7aa593c84b3a2bcccc14f6 SHA512 9b48404aed7680bfecda777399c24c9e93d4415ec4585832e9a6eb2f621a9ed471e3773be86d798e96b45784b03b42df28528af7cea228f024fb1ca4586df26b
 EBUILD man-pages-6.01.ebuild 3344 BLAKE2B db39439c12f46b6b456247193af1bb5eade15786f803bedd597b00d7cf9cdb28dd3d5d3e20b75bb016c538ee5200af7d6e2880026dd4beb8cdf70785b6e9357a SHA512 20650bc9bb7c40f448839c8a6c333473ca2c81d9ff7513f8eee2a07cdb305ca2c02fcf3bdc028fbfc2fdf8003fc10814b99ffa5ecf59a166cc3e9f49a11c3741
-EBUILD man-pages-9999.ebuild 3352 BLAKE2B 8b11a197e756847c0a3e4befc9cfc120a3d235ec1ae651c35599157cd5bd26e8313d78cafb5b1f1e0d27d9160d6917ace7aabab57b8fb7f3d8f1c0ae070bca2c SHA512 e13536dced92ef55c52bc70e664f77e1b4eecedbe2ccdd01ace9e43b0ee15a34c1bd94cefce7b974c167cc60ef17c2f6080e64c96edd7d5cc77a179408e7166e
+EBUILD man-pages-6.02.ebuild 3331 BLAKE2B f2c4dc45fc55921d9469d70e22c0f8338a87323b034c85da25c2a5b75308a313c19ffa79b42900fb2d659daa45c54896f7913348e8f9b4f97f78653d73712abc SHA512 cc64c8a1208cbda742acb6edd48400ece591ac5b57b742c1a25edc3e4c1abc3b15e061654659cc931b4aa41ecce42a36dcc8d0e0f90ce27399e9572374229e1a
+EBUILD man-pages-9999.ebuild 3331 BLAKE2B f2c4dc45fc55921d9469d70e22c0f8338a87323b034c85da25c2a5b75308a313c19ffa79b42900fb2d659daa45c54896f7913348e8f9b4f97f78653d73712abc SHA512 cc64c8a1208cbda742acb6edd48400ece591ac5b57b742c1a25edc3e4c1abc3b15e061654659cc931b4aa41ecce42a36dcc8d0e0f90ce27399e9572374229e1a
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-6.02.ebuild b/sys-apps/man-pages/man-pages-6.02.ebuild
new file mode 100644
index 000000000000..f6d7d59817fe
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-6.02.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintenance notes:
+# - Upstream are very friendly, do approach them if have any questions;
+#
+# - It's considered fine (and somewhat encouraged) for us to make snapshots
+#   if we want specific fixes, perhaps aligned with newer kernels, glibc, etc.
+#   Just generate it with 'make dist'. We can set DISTVERSION if we want a vanity
+#   name or if the comit hash is too long;
+#
+# - If we do use a snapshot, *don't* grab it directly from git and use it
+#   raw in the ebuild. Use 'make dist' as above;
+#
+# - Sometimes there's no dist tarball available post-release and upstream
+#   encourage distros to make their own. Set MAN_PAGES_GENTOO_DIST to 1 if none is
+#   available, 0 otherwise.
+MAN_PAGES_GENTOO_DIST=0
+GENTOO_PATCH=2
+
+DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
+HOMEPAGE="https://www.kernel.org/doc/man-pages/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git"
+	inherit git-r3
+elif [[ ${PV} == *_rc* ]] ; then
+	MY_P=${PN}-${PV/_/-}
+
+	SRC_URI="https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/snapshot/${MY_P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
+else
+	if [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] ; then
+		SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-gentoo.tar.xz"
+	else
+		SRC_URI="
+			https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
+			https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
+		"
+	fi
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+SRC_URI+="
+	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+"
+
+LICENSE="man-pages GPL-2+ BSD"
+SLOT="0"
+# Keep the following in sync with app-i18n/man-pages-l10n
+MY_L10N=( cs da de el es fi fr hu id it mk nb nl pl pt-BR ro sr sv uk vi )
+IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}"
+RESTRICT="binchecks"
+
+BDEPEND="
+	sys-devel/bc
+"
+# Block packages that used to install colliding man pages:
+# bug #341953, bug #548900, bug #612640, bug #617462
+RDEPEND="
+	virtual/man
+	!<sys-apps/keyutils-1.5.9-r4
+	!<dev-libs/libbsd-0.8.3-r1
+"
+PDEPEND="
+	l10n_ja? ( app-i18n/man-pages-ja )
+	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
+"
+for lang in "${MY_L10N[@]}"; do
+	PDEPEND+=" l10n_${lang}? ( app-i18n/man-pages-l10n[l10n_${lang}(-)] )"
+done
+unset lang
+
+src_unpack() {
+	default
+
+	[[ ${PV} == 9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	default
+
+	# passwd.5 installed by sys-apps/shadow, bug #776787
+	rm man5/passwd.5 || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
+	dodoc README Changes*
+
+	# Override with Gentoo specific or additional Gentoo pages
+	cd "${WORKDIR}"/man-pages-gentoo || die
+	doman */*
+	dodoc README.Gentoo
+}
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -lt 5.13-r2 ; then
+			# Avoid ACCEPT_LICENSE issues for users by default
+			# bug #871636
+			ewarn "This version of ${PN} no longer depends on sys-apps/man-pages-posix!"
+			ewarn "Please install sys-apps/man-pages-posix yourself if needed."
+			break
+		fi
+	done
+}
diff --git a/sys-apps/man-pages/man-pages-9999.ebuild b/sys-apps/man-pages/man-pages-9999.ebuild
index 4da3d9ecbf1d..f6d7d59817fe 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.ebuild
@@ -92,7 +92,7 @@ src_compile() { :; }
 
 src_install() {
 	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
-	dodoc man-pages-*.Announce README Changes*
+	dodoc README Changes*
 
 	# Override with Gentoo specific or additional Gentoo pages
 	cd "${WORKDIR}"/man-pages-gentoo || die
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 911762ee40a7..d8557d721177 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7308052dc82c..23226c025b8f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -2,6 +2,7 @@ AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20221208.tar.xz 72098912 BLAKE2B 8167b3d91fb95c727caa3a76d8bd6d70e0d0bd79eda72305f3005c9f7163dcd425c75386ba55b2d71644ecf83d998a4bccb6fd265bb615dcdd104f27cadb8e76 SHA512 5e49159d86300eaa4c2f34fb3537b5f257931e861a1a1217dbabcfcd5ef9da224d4a6023aaf8d24c8893ecd204ec0cd6e96349ae0dd445d62d92ebb041aeb054
 DIST gcc-10-20221215.tar.xz 72113292 BLAKE2B 141c2fa7fee0e6a461ca6008705b031b4fdce9a39340751bfca9045c70adbfda6f9ea2d792c688223fd25340df028a6d5d6347d6629d798179bfed7b0fac5736 SHA512 21796821a2fc4c5b46be29deb010db69380265a9732efe3e05a714929c4363a2e9b92556a666fee37b85bdc7069fb4bba9d7de4c5750fb327916627d6e9ad998
+DIST gcc-10-20221222.tar.xz 72112292 BLAKE2B fad78a6bc00e23909fa4c441592e61311709efa770ec713c44923f6f088c1185c52022cb9fa2e13185e644b655b16f7b4f4247e93bc82925ae44b2580feab8dd SHA512 34ecb5def4152e69c6b2a5fcd111c244447f6c53ed4359516923331af4634e67b803635ec770f24fc7dc12a571918d523fdf4f23d13e7aec927a05f8c5b83090
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
@@ -36,6 +37,7 @@ DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f7
 EBUILD gcc-10.4.0.ebuild 1445 BLAKE2B 05518ec2cdf0180f4db63dcab413097ca777381b496d6b7b7cebc0bf2b04395d14b74daa398ea2e2d916df4f6034357cfc740939e0fb346bbea71a8a09603fbb SHA512 8fd4642dd974006efe35f6d45ebfda66fe5dac0d4e2371804ede5d94e6e820b95cedac08c11de766c0c711bef7c55900cdaeaffe889691f7acd7470c32e7e3b4
 EBUILD gcc-10.4.1_p20221208.ebuild 1446 BLAKE2B 81b537066cd4a53c08b2bb6d037f8981e70f31fd9563dda1d825057e186f6d206e9a283fcde619cbaf323ef3bdff45a1bd84a530c2275c7e28204716bd0b012b SHA512 6e790aa4d4dfbfb77374a75c9f8ef72c6c14610c7f4778822d8fd16520350969345574104aa28f5656d1fc2ef0d6ab6b2177e12fb2ea1c62bd6e7975fc0d8c64
 EBUILD gcc-10.4.1_p20221215.ebuild 1456 BLAKE2B 014f5952516db908c032640a8cb21edf518bc86cd4a70bb9a407b67e9276a77dbd05410c94dbef49e11093da21215f58d8767a2b1baeae67e20bce8e5014659e SHA512 3403908e152bddfdf1b74a9323d52e9fd5b57d06c0b8a7a1ef2242727570694e55cabe0e94865cd8064cd99c0473e555e07565601d843ff773fab3e3065a3264
+EBUILD gcc-10.4.1_p20221222.ebuild 1453 BLAKE2B d173e10d77d8cc68c4bc2ba3874f8c3d2a0741c62efc17568bfcf06e0a0f0d3443662ef6551c9604c925b5e8d733f67ef5e1d25857b785d76b068007aea55a17 SHA512 8339e204e3646ee3b450a0c0463334ab372a22476195b43559948b35c74ad47b81723562345b4807bcacd93374bd63ba841fabb4aa5e25f9434dcf8b4c10d0b7
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
 EBUILD gcc-11.3.0.ebuild 659 BLAKE2B 310352b879c732515ce63983db79b32bf7c8c200a650627a14b5284fceea9a7e7f3e545044a8c00ccc44cd760b18123542bd233242cb3ebc48ef422439c8e430 SHA512 44c89a7782e5e37c5ef61c50d5aa6d07c09f19bada293ed657d7062837a5a9be9483fda0b1845ee794f42031ea098a1b88d439f7be202f4276f77748ff45815e
 EBUILD gcc-11.3.1_p20221209.ebuild 1286 BLAKE2B 5bb5bb1dfa617deb42fd1194fd51172e7865f6890bf430d2269ce0a5c27854b494e2ef2a997371dafd6328b2c59656718201ad0dae946911d18ddfae01ad9904 SHA512 d8242777dd4aec49d56319b7da0423a3d39a906cc78650e733db27a3021603fe7043cfd5f2e5497847ca64f7439ebaca20b01a2fb7264d790748d300d87377ab
diff --git a/sys-devel/gcc/gcc-10.4.1_p20221222.ebuild b/sys-devel/gcc/gcc-10.4.1_p20221222.ebuild
new file mode 100644
index 000000000000..bbed5b020bcb
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20221222.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.5.0"
+PATCH_VER="3"
+MUSL_VER="1"
+MUSL_GCC_VER="10.5.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 9358eab64091..04b8c7662fbe 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 7309e15a4bd5..da5be25bbba6 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,3 @@
-AUX chromium-105-swiftshader-no-wayland.patch 401 BLAKE2B 2ebed22d234c2ab5d21515af9cecc932da39f8ae832671b447bcbe57c904a751dd0782f48b940094eb11b74e05533a96c72ecaa4a5d524c4c036361e0c91e893 SHA512 962d97e73a77e1c0e17822d4736683f25a7d48a430c9da455c1ca22014816518b8b44577af7be8155b03365dc0145b2bda418cc80766c6a189878e3660d115ad
-AUX chromium-106-python3_11.patch 274 BLAKE2B ead8672e3282994444ed28660ccc99d4354b39b8026fc8906469bcc30f2f2c78916ac97be75b8b90b9654680a2ca23cc3eb794003fac42fb07db5c3ddc1211e9 SHA512 2e189ee099fd940320eea71d282565a2730bef76aa9dc6b467f2828c756359660aa1bf7a1a80aa27ace8de7fab5793b9fe76bad0c1b3383f8a1130484e391d2b
-AUX chromium-106-revert-GlobalMediaControlsCastStartStop.patch 1472 BLAKE2B 2d2fd29509037d7f8a965edcb6e15f1ea76efad9f99ff7bb5620cd36a4952c21edc763ac302886b8b6314b497a4e984d872ba52e39b6758249b03474c2853ce9 SHA512 a843a404c4e9c7504fa3f116079868393bad68afcf1a63a3498dd95cb86f25a6fecf4c6e96841ff72c8a9e6f00e80cb66a480c685e7bfbd625fb7f358d23aece
 AUX chromium-107-system-zlib.patch 423 BLAKE2B 041cfcf5840fcf28b382f27275b3ab05751f5ae75fd404175d6f4ffaf3b029fb47fde473bcdf4bd99289f10d878f9d9725b3557ce97153abc7e4a1ee0d7959b9 SHA512 70ca4fef99b3bd8e533b6a223a6d6f4989ffba890728453434e5828565d0373319a7dfc7f272cbab9064308ab35b32cf9a7b0c34e13cf71fab0de913e73392aa
 AUX chromium-108-DocumentLoader-private.patch 1310 BLAKE2B 113a73429cb8cd9055bcdcb52c365800e814309f38285c36e1a691db26d2137383cfec47954b4712df0efde2b48481572f5311aedfa8f8b66caa105a23f7ce90 SHA512 218e28848a2d80c60905c0b8c032317e68707ce72f4d360a0d8cfe48aeb0e04d27f0880beadd6010da90f0204b60fcbfea746d66ce0cdbc0d7566d3c34ea6421
 AUX chromium-108-EnumTable-crash.patch 2974 BLAKE2B b2d58b6b2b67b3bc2f04662749c3fd77b019356a6f9eaaad154cdae03e63f52c3bfa8bb0ed90467ac0806c58f6a2e7a351fd48c7e7a5e9b7ab317b4b8e2a75cb SHA512 3419e3dd6da21c8791d1335170547b3ac9fca593fe8eb01e17dd3eb916e6795a32848c4762051558cf98d0379592910ff9b267f05fd6b3c83d5e1c1073ba717c
diff --git a/www-client/chromium/files/chromium-105-swiftshader-no-wayland.patch b/www-client/chromium/files/chromium-105-swiftshader-no-wayland.patch
deleted file mode 100644
index 71326dbd8011..000000000000
--- a/www-client/chromium/files/chromium-105-swiftshader-no-wayland.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/third_party/swiftshader/src/WSI/BUILD.gn
-+++ b/third_party/swiftshader/src/WSI/BUILD.gn
-@@ -84,7 +84,7 @@ swiftshader_source_set("WSI") {
-     "../Vulkan:swiftshader_libvulkan_headers",
-   ]
- 
--  if (is_linux && !use_system_libwayland) {
-+  if (is_linux && !use_system_libwayland && ozone_platform_wayland) {
-     # Use third-party targets
-     deps += [ "$wayland_gn_dir:wayland_client" ]
-   }
diff --git a/www-client/chromium/files/chromium-106-python3_11.patch b/www-client/chromium/files/chromium-106-python3_11.patch
deleted file mode 100644
index 795f48547490..000000000000
--- a/www-client/chromium/files/chromium-106-python3_11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/grit/grit/util.py
-+++ b/tools/grit/grit/util.py
-@@ -209,7 +209,7 @@ def ReadFile(filename, encoding):
-     mode = 'rb'
-     encoding = None
-   else:
--    mode = 'rU'
-+    mode = 'r'
- 
-   with io.open(filename, mode, encoding=encoding) as f:
-     return f.read()
diff --git a/www-client/chromium/files/chromium-106-revert-GlobalMediaControlsCastStartStop.patch b/www-client/chromium/files/chromium-106-revert-GlobalMediaControlsCastStartStop.patch
deleted file mode 100644
index 5b28ff461bb1..000000000000
--- a/www-client/chromium/files/chromium-106-revert-GlobalMediaControlsCastStartStop.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b58f0f2725a8c1a8a131f9984b5fd53b54119dba Mon Sep 17 00:00:00 2001
-From: Muyao Xu <muyaoxu@google.com>
-Date: Thu, 20 Jan 2022 23:46:21 +0000
-Subject: [PATCH] [Zenith] Enable GlobalMediaControlsCastStartStop flag by
- default
-
-The feature is rolled out to 100% stable through finch for M96+.
-This CL enables it by default and fixes some unit tests failures.
-
-Bug: 1287242, 1287305
-Change-Id: I7e5c9625b77379fef253c41ef292a0dd6fc366fb
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3388416
-Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
-Commit-Queue: Muyao Xu <muyaoxu@google.com>
-Cr-Commit-Position: refs/heads/main@{#961658}
----
- chrome/browser/media/router/media_router_feature.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
-index dcb025a..f7ea08a 100644
---- a/chrome/browser/media/router/media_router_feature.cc
-+++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -48,7 +48,7 @@ const base::Feature kGlobalMediaControlsCastStartStop{
-     "GlobalMediaControlsCastStartStop", base::FEATURE_DISABLED_BY_DEFAULT};
- #else
- const base::Feature kGlobalMediaControlsCastStartStop{
--    "GlobalMediaControlsCastStartStop", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "GlobalMediaControlsCastStartStop", base::FEATURE_DISABLED_BY_DEFAULT};
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
- #endif  // !BUILDFLAG(IS_ANDROID)
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 81f85b4abc0e..e1687737e44a 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index 5a36733499ba..d3860146bc63 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,7 +1,5 @@
 AUX 70stumpwm-gentoo.el 84 BLAKE2B 12ce0e9a1b53a1c1c84a9f350484b9620a2db9a30eaefb11bb409b89aae7f1226173930c52d018ec8a845c8e6ff69efd5570a369444537d070d21427a6960c09 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1
 AUX README.Gentoo 1894 BLAKE2B 23dd829621f92b2e5ab22bd3d54d9338d1034bd55d4adcfde24f6c0a780e41dddd747ee2baecdfd9b03a54de7e4acf08d903205dcdc68851afea5317401681aa SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09
-DIST stumpwm-18.05.tar.gz 199467 BLAKE2B d532a531b7ceec7a80be66563dc2f36a6f1957d1e0f014ccf61cac1edf23073370dbe7cf3d7004f6dab144a88a4b54360e82ce7b13bdbc40cba59adfcb8e8af1 SHA512 a28c0af3a82670c0f31a5839227301672cc0706c47fb353355f90f791944556fb6125f3fa4d8547e6fbcf4817cdac5b0fe47de2dbae3a304d631a895af6ddb35
 DIST stumpwm-740e945d742d85aef36e0ed9467de9bbbf5eafd2.tar.gz 273172 BLAKE2B 00756081aed915af18af4534414659e29856bc1a98df2cd35b48bb5bf4f06fe2dc76c4016cbc39e296ff19d51b3e959ef84dbc57972da0a634bc6cb3ca0b881e SHA512 313f430da8ecb7919940b37f2353969c8bf3a3be6a1d380e1655a7a6aebb83a3890cbd99a292a414f71f934adcae1350c24650fe5d5d35cf30788ff392feaac0
-EBUILD stumpwm-18.05.ebuild 1641 BLAKE2B 4eca6846a653c010f7b6bbaa2aae4508565411d16ef77e0daf2ced2633d49b7ee5594f6a3c7d86b84e0a4126696655b0ba7030ffcfe12955292430137e0ecfbd SHA512 7e0a0892f9c4b46c8443379c8bcb45c9f801a602c14445849c4345b6c286f2d329977332f1ca2c7204862ab314e1ad3ba38b1cd19c2fd9055a84c75f068d229c
 EBUILD stumpwm-22.05_p20220818.ebuild 1740 BLAKE2B 5f47a5f705dc8fa9f617d74059f0fdaf5a3f48461a8507a65ea5af529561b3435e830ea8be3fb6703865e1425786bcf9ad3dd3da28b65f6ed088e81b2e244a3b SHA512 9515ea217df0e9ee04f790fa275ffe25cec7e4a6156b2e2dba80e533bd3a56681a7bbbb281dac868bd15b5c1754baf2568b8f4801b07275781ccd646181fe543
-MISC metadata.xml 2221 BLAKE2B 2e1077d96b80fc4fbca1ef32854f23b25a411c7d9d361c6e04e4cb9f04bb06cb4c3511e28562620213b71d422ab085252762435bf8ba7178e79a41c6ad136c7e SHA512 28e99b6633af27038bbbb1c61ac41e2994fbe1fe7b70a758db34bbcf7cdf162a4e4363e9ad195e35a278d3fbd480b40584c0f7f47627c00c8b6d9f451f5e01a4
+MISC metadata.xml 2165 BLAKE2B 11cb1d12cc85d157776d6f67019adb7174653ae39f5dd1411f944c9f17ea6efc084803041ee9a994ac4f3c3fc8ca07f130f4fcb83cd947fdfbcc5e5f8d6eb977 SHA512 46757ef2bc9375990b304cef5591f39d8d72b465f8f55766a5f9707afe4db0876eba58be10e15f21cfb5a1860164a671b9a762ab40235743c96d7a8d7ba42cee
diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml
index c365f50656a9..dc14e4b896ea 100644
--- a/x11-wm/stumpwm/metadata.xml
+++ b/x11-wm/stumpwm/metadata.xml
@@ -45,7 +45,6 @@
     reevalúe y CONTINÚE!
   </longdescription>
   <use>
-    <flag name="contrib">Install contrib modules</flag>
     <flag name="doc">Include documentation</flag>
   </use>
   <upstream>
diff --git a/x11-wm/stumpwm/stumpwm-18.05.ebuild b/x11-wm/stumpwm/stumpwm-18.05.ebuild
deleted file mode 100644
index d4d35a31bf30..000000000000
--- a/x11-wm/stumpwm/stumpwm-18.05.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3 autotools desktop elisp-common xdg-utils
-
-DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp"
-HOMEPAGE="https://stumpwm.github.io/"
-SRC_URI="https://github.com/stumpwm/stumpwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc emacs"
-
-RESTRICT="strip mirror"
-
-RDEPEND="dev-lisp/alexandria
-		dev-lisp/cl-ppcre
-		dev-lisp/clx
-		>=dev-lisp/sbcl-1.3.0
-		emacs? ( >=app-editors/emacs-23.1:* app-emacs/slime )"
-DEPEND="${RDEPEND}
-		sys-apps/texinfo
-		doc? ( virtual/texi2dvi )"
-
-PDEPEND="contrib? ( x11-wm/stumpwm-contrib )"
-
-SITEFILE=70${PN}-gentoo.el
-CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
-
-install_docs() {
-	local pdffile="${PN}.pdf"
-
-	texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
-	cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die
-	dodoc AUTHORS NEWS README.md README.Gentoo
-	doinfo "${PN}.info"
-	docinto examples
-	dodoc sample-stumpwmrc.lisp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf --with-lisp=sbcl
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	dobin stumpwm
-	make_session_desktop StumpWM /usr/bin/stumpwm
-
-	common-lisp-install-sources *.lisp
-	common-lisp-install-asdf
-	# Fix ASDF dir
-	sed -i -e "/(:directory/c\   (:directory \"${CLPKGDIR}\")" \
-		"${D}${CLPKGDIR}/load-stumpwm.lisp" || die
-	use doc && install_docs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}