gentoo auto-resync : 04:08:2022 - 08:04:47

183 files changed, 1930 insertions, 455 deletions

diff --git a/Manifest b/Manifest
index ee4c644a3c3d..14505ff80388 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29609 BLAKE2B f1a9720eeb57ed0982bfac47d8ead475a7e0d768bb9b2f72849d08cea781ff7ec7b84fe62e3896852e3e7a5e382da35812e88503bcc9d8b59b6376d699859541 SHA512 65945d15fa9bda85448b1517246b753a4ce3cd6aeb19744e1b38128ab78e110159381aec837fb9cb87fc4c1ea9a34e9cb83c2b31646a88aefceb53e5b9644a3e
-TIMESTAMP 2022-08-04T00:09:46Z
+MANIFEST Manifest.files.gz 29623 BLAKE2B e0001ad96c787dc425002a411c8542a4eccf26cb07362d1b20949b7bec1d3f3ff2d1073b08b2dfd75bb7ff16a6c7c022af565a00818ea7b2900067dcff1a8e9e SHA512 95a59b9807c82e60c616070d16b3c37375b451f2e3039023b82f5bd85d2708f7b9d100fce337bd7394a21d6a7a75adccc6dad520cebd9ac6b1a16643c0c4bcc0
+TIMESTAMP 2022-08-04T06:09:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLrDkpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLrYrBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBiyQ//Qq5y2OWWrE/DQlHy/IMlEnqyq4OpJtstbAy5s/FWvMW0a+Zk/bEfM+Ki
-OKiInAu8uD+Ov6Yw388CdTCfP2o77aznxG3cMb5wi1aJnDonS+G/s30exiWVi0iQ
-Vzc3LNzPcBPrtP++ub1Y/sWpLQYEdkckUJCq6QxxS3ucUGLGIdGN9Jh7BQELjOd7
-gNcuKkk7aVuAeFrQqjgQ/hLJIVvmfOT2e1n5BrNvGI0+JaaFl45C3Lm7GQDHmvq7
-bJvS53OXsKfP1jUNaxcOVPGTSdunScNG26NZaXfKVT+E8YoYsYF/HVq5kQFfW1mS
-Xv/kphH6p8Bpf6969iY6+CxG9NniEn8wVjUsEnKBUiWroa/WHW2JbVWKnxFeWo6I
-OvqofnDJ/z/LPas4Zm138bRPbIPAfhUNw5DbjVpGh6Cs67sbRLPQu2vsTNW5VbR5
-/J2Q+b/BktdeJQ8SMEHPdfcsk0xAurUKP4ZNWaxEd0ZhFP+VhVPvv0OVBoZkGuBm
-Cpfg2hw+x19FTGIj9KoErRb9l2Xg0H9Kytw1HMhDE+0SmHhccaVZNi7KeN/jj2vM
-U81QijVXyx6iVubCga2QxT6bktzqoM4HiLAgTzd9YciauisjQ3wHjaDKu3EI9BZU
-b+wQg59bW+vYlMyZkGbQg/tPEVmS+FHWMxxu90xMQflgcYOakEc=
-=aaA5
+klA3qRAAruOzfFhCdHxlnkgC9szlSjHuaVR6466AjGLeuz0+wOjis56PMev0BmVk
+DIJ4fHS/uppSAtYLrGPjnq6csWv9OqLoRo1+LoCPytAPgLQYxnYs1m653BXPzgCQ
+jx27M/ajrpRLdDTgaTEKd8WDPWMpEyR+QEjP3sv3fIFGVYjIwnMgj5Sme65Pd941
+obyZsAFB7K11XCJ1JPOu2NTvgUrIVzmFyw47VQxsP/6zefRFKNTClnN4L/sou+Z/
+w9ahdRPWunRv0bDkP9q4nygUNxZYHI6iOsb3t/geglMe2ovZ+V46zlh3VQr+Mgfw
+FMQQD6Vc2xjx6e+pF0vTjV1dGYkLuBH6oRhEmjaA7Jmc3a2wYh96o5Cvj3H5ABXc
+BT9SFqynKFHLbgjxyH9P+8U107Eh4HLFWdknXFEKm7i8TLoQZiSW7vq2VYelAzHV
+oWekZv8R+pQgSNDWzVNpY0gSGCB59KfrTIZe+qTcpgkrDI1HTk53+5fiRW3PcVde
+MFP/OhuPdmujAZoEt6GExc9tN1L/d06pwD+yIe5Y2Bd3HPOFVNAWWZEZhwDDBoOa
+eSMsJVG6KbiM95nmuDjvhh35IhUmabrEnkpfGMWco2dvDivu5PtBX164Ey0ZsMH+
+RVFqCByrMIC5uCfcUO2DQU6BIoN2TwJ27t70QMi3AAC5ZYJRQUs=
+=hNNW
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 1fc0c5874986..269bf3ed3270 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index aedbce80aabb..9d1022abdc59 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 167a3fe12aaa..2161c490a166 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -23,8 +23,10 @@ DIST clamav-0.104.2.tar.gz 11950409 BLAKE2B 7d7eb9d22ca519f7ad0c171b6cab4b59cb52
 DIST clamav-0.104.3.tar.gz 12017176 BLAKE2B db97a3d3ca0a2c5273a175ee3a30fdd07eecd13588a39d39e4d07f91034016ee6eca626b0ab7bf548121e4093ea612f9932512bc021326e4bba8b0844af73664 SHA512 d38a2427df29813e4d0f41d480cda85f6175e617c397ab39d913000fa43fcb44f1e0b97d7bd558bc62369e8caeeb2b3aeb4b3dd575b9da4abb91f8b67a6b8431
 DIST clamav-0.104.4.tar.gz 12027448 BLAKE2B e8627b49b46e9bf5669b7186d829fd2caa76d9071b1533da252fea1bdeed1b78ec4a138db8957b0d121df1180eb37a6230f5f0db1e4d3f2de80bf7dddad5b47e SHA512 5aa8abe96ff49548cf74df47a7e56279c3082dc8ca98cab02f64f44b2da0230e75b5f634b3086ba8ca155052cbc22a2a47ab3dd159ae033d3f599dcde1f2420e
 EBUILD clamav-0.103.6.ebuild 7353 BLAKE2B 9849983170e473ed2c906cec47b2e99727e603e0f3f5c72ddcab1cbce3f9255101bc5be34544b89037b90bb967d1ab29c93ed77d8e35ac611493020d0165f5d2 SHA512 b70196e273dc8668bc77211c702dcafd218d7aca2a3ea444ece7a9c132aa3bcc551ba0f07a016fa13963f7642a3716682e00a353c3bc044779081b399226301d
+EBUILD clamav-0.103.7-r1.ebuild 7336 BLAKE2B 3a012365bbb6eb2a5486b3180f2514e057cef10fd1d0c4513387352cac0cd16206e332662e0b0f4aaf61cef0abf9b03bb022093b5819bd05cb01f3df18c4626e SHA512 d3609859db9dd5c93bb930ec9799c7827d3929da1b54ff67f8d166723cdfe5e872d57d8cd6000e2e0e9c7724311e95a264a84a12ada648039413a178c39a0773
 EBUILD clamav-0.103.7.ebuild 7359 BLAKE2B 95f3aebd8de5b0cac2ea20d5bc30848dce838d0cf4b56765c4b9a19aded0e430f132ab82eccaa08fbbe5e718c1d0bb6bb9b9fb904964e438087dd9b2ead6b848 SHA512 158ca8a5f39932198e0fcb89c07ca492f0db9b527f2d321e11d36403f7830257412d5a6cbb5aece5fb7f3f643cbaa338f1ffc377e69b84a10ab69ba64ddf88fd
 EBUILD clamav-0.104.2.ebuild 6847 BLAKE2B 64117138433379a4432fb98c844745eb298875de45cdb08ed866489b4f40847f74ffd41591520d788a3e1468340b77e0170f78475a18eeecd93e1669a79c2103 SHA512 215f1b11136a888e612b32f05367f19d4a68add3d7415dc0256946e54c0f31ef9afd442182a54bd4532404fa4d7484accd945d8c6dfcc84fc3fee69bdd719c96
 EBUILD clamav-0.104.3.ebuild 6847 BLAKE2B 64117138433379a4432fb98c844745eb298875de45cdb08ed866489b4f40847f74ffd41591520d788a3e1468340b77e0170f78475a18eeecd93e1669a79c2103 SHA512 215f1b11136a888e612b32f05367f19d4a68add3d7415dc0256946e54c0f31ef9afd442182a54bd4532404fa4d7484accd945d8c6dfcc84fc3fee69bdd719c96
+EBUILD clamav-0.104.4-r1.ebuild 6824 BLAKE2B 3ae09db7b19efeab2c335de27603f5b07832e71310afe03bb4c8ba453f6f18dfae0a059307c4bb86e2d31a57508db739bb92f6e7ad88220c967aacf498fd8f78 SHA512 722d48097dc6a069a56909af1b6ea86d3a6ae639e04c8ec538e22e657fc40cc407c3e4e296d5dea1519098446307372dfd12d34e54f6b9b1c504942bb8724870
 EBUILD clamav-0.104.4.ebuild 6847 BLAKE2B 64117138433379a4432fb98c844745eb298875de45cdb08ed866489b4f40847f74ffd41591520d788a3e1468340b77e0170f78475a18eeecd93e1669a79c2103 SHA512 215f1b11136a888e612b32f05367f19d4a68add3d7415dc0256946e54c0f31ef9afd442182a54bd4532404fa4d7484accd945d8c6dfcc84fc3fee69bdd719c96
 MISC metadata.xml 1345 BLAKE2B 69cd13c896ae294e700070936be046d20b6f384d0adfb1fdd5907213f54ae4ed81c9c5236e719da2b1c8ec14121bbf9778c325390be49f9f1c0473f2e4a83838 SHA512 04f26b4f043a19b93dabbcb9a287839b406054abee8d30877c8b9d95cbac3af6e258850167b58980781cab8b59f3453a5f8d6b9964f2ec37b6d91484efc83689
diff --git a/app-antivirus/clamav/clamav-0.103.7-r1.ebuild b/app-antivirus/clamav/clamav-0.103.7-r1.ebuild
new file mode 100644
index 000000000000..af61b4ee3350
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.103.7-r1.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd tmpfiles
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml"
+
+REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
+
+RESTRICT="!test? ( test )"
+
+# Require acct-{user,group}/clamav at build time so that we can set
+# the permissions on /var/lib/clamav in src_install rather than in
+# pkg_postinst; calling "chown" on the live filesystem scares me.
+CDEPEND="acct-group/clamav
+	acct-user/clamav
+	dev-libs/libltdl
+	dev-libs/libmspack
+	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+	dev-libs/tomsfastmath
+	>=sys-libs/zlib-1.2.2:=
+	bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses:0 )
+	clamsubmit? ( net-misc/curl dev-libs/json-c:= )
+	elibc_musl? ( sys-libs/fts-standalone )
+	iconv? ( virtual/libiconv )
+	!libclamav-only? ( net-misc/curl )
+	dev-libs/openssl:0=
+	milter? ( mail-filter/libmilter:= )
+	xml? ( dev-libs/libxml2 )"
+
+# We need at least autoconf-2.69-r5 because that's the first (patched)
+# version of it in Gentoo that supports ./configure --runstatedir.
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	metadata-analysis-api? ( dev-libs/json-c:* )
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
+	"${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
+	"${FILESDIR}/${PN}-0.103.0-system-tomsfastmath.patch" # 649394
+	"${FILESDIR}/${PN}-0.103.1-upstream-openrc.patch"
+)
+
+src_prepare() {
+	default
+
+	# Be extra sure that we're using the system copy of tomsfastmath
+	einfo "removing bundled copy of dev-libs/tomsfastmath"
+	rm -r libclamav/tomsfastmath || \
+		die "failed to remove bundled tomsfastmath"
+
+	AT_NO_RECURSIVE="yes" eautoreconf
+}
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+	use ppc64 && append-flags -mminimal-toc
+
+	# according to configure help it should be
+	# $(use_enable xml)
+	# but that does not work
+	# do not add this, since --disable-xml seems to override
+	# --without-xml
+	JSONUSE="--without-libjson"
+
+	if use clamsubmit || use metadata-analysis-api; then
+		# either of those 2 requires libjson.
+		# clamsubmit will be built as soon as libjson and curl are found
+		# but we only install the binary if requested
+		JSONUSE="--with-libjson=${EPREFIX}/usr"
+	fi
+
+	local myeconfargs=(
+		$(use_enable bzip2)
+		$(use_enable clamonacc)
+		$(use_enable clamdtop)
+		$(use_enable ipv6)
+		$(use_enable milter)
+		$(use_enable test check)
+		$(use_with xml)
+		$(use_with iconv)
+		${JSONUSE}
+		$(use_enable libclamav-only)
+		$(use_with !libclamav-only libcurl)
+		--with-system-libmspack
+		--cache-file="${S}"/config.cache
+		--disable-experimental
+		--disable-static
+		--disable-zlib-vcheck
+		--enable-id-check
+		--with-dbdir="${EPREFIX}"/var/lib/clamav
+		# Don't call --with-zlib=/usr (see bug #699296)
+		--with-zlib
+		--disable-llvm
+		--enable-openrc
+		--runstatedir=/run
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav || die
+
+	if ! use libclamav-only ; then
+		if use systemd; then
+			# The tmpfiles entry is behind USE=systemd because the
+			# upstream OpenRC service files should (and do) ensure that
+			# the directories they need exist and have the correct
+			# permissions without the help of opentmpfiles. There are
+			# years-old root exploits in opentmpfiles, the design is
+			# fundamentally flawed, and the maintainer is not up to
+			# the task of fixing it.
+			dotmpfiles "${FILESDIR}/tmpfiles.d/clamav.conf"
+			systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
+			systemd_dounit "${FILESDIR}/clamd.service"
+			systemd_newunit "${FILESDIR}/freshclamd.service-r1" \
+							"freshclamd.service"
+		fi
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/clamd.logrotate" clamd
+		newins "${FILESDIR}/freshclam.logrotate" freshclam
+		use milter && \
+			newins "${FILESDIR}/clamav-milter.logrotate-r1" clamav-milter
+
+		# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s/^#\(PidFile .*\)/\1/" \
+			-e "s/^#\(LocalSocket .*\)/\1/" \
+			-e "s/^#\(User .*\)/\1/" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+			-e "s:^\#\(LogTime\).*:\1 yes:" \
+			-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+			"${ED}"/etc/clamd.conf.sample || die
+
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s/^#\(PidFile .*\)/\1/" \
+			-e "s/^#\(DatabaseOwner .*\)/\1/" \
+			-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+			-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+			-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+			-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+			"${ED}"/etc/freshclam.conf.sample || die
+
+		if use milter ; then
+			# Note: only keep the "unix" ClamdSocket and MilterSocket!
+			sed -i -e "s:^\(Example\):\# \1:" \
+				-e "s/^#\(PidFile .*\)/\1/" \
+				-e "s/^#\(ClamdSocket unix:.*\)/\1/" \
+				-e "s/^#\(User .*\)/\1/" \
+				-e "s/^#\(MilterSocket unix:.*\)/\1/" \
+				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+				"${ED}"/etc/clamav-milter.conf.sample || die
+
+			cat >> "${ED}"/etc/conf.d/clamd <<-EOF
+				MILTER_NICELEVEL=19
+				START_MILTER=no
+			EOF
+
+			systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
+		fi
+
+		local i
+		for i in clamd freshclam clamav-milter
+		do
+			if [[ -f "${ED}"/etc/"${i}".conf.sample ]]; then
+				mv "${ED}"/etc/"${i}".conf{.sample,} || die
+			fi
+		done
+
+		# These both need to be writable by the clamav user.
+		# TODO: use syslog by default; that's what it's for.
+		diropts -o clamav -g clamav
+		keepdir /var/lib/clamav
+		keepdir /var/log/clamav
+	fi
+
+	if use doc ; then
+		local HTML_DOCS=( docs/html/. )
+		einstalldocs
+
+		if ! use libclamav-only ; then
+			doman docs/man/*.[1-8]
+		fi
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	if use libclamav-only ; then
+		ewarn "Test target not available when USE=libclamav-only is set, skipping tests ..."
+		return 0
+	fi
+
+	emake quick-check
+}
+
+pkg_postinst() {
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			tmpfiles_process clamav.conf
+		fi
+	fi
+
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+
+	local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
+	if [[ ! -f "${databases}" ]] ; then
+		ewarn "You must run freshclam manually to populate the virus database"
+		ewarn "before starting clamav for the first time."
+	fi
+
+	ewarn "This version of ClamAV provides separate OpenRC services"
+	ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The"
+	ewarn "clamd service now starts only the clamd daemon itself. You"
+	ewarn "should add freshclam (and perhaps clamav-milter) to any"
+	ewarn "runlevels that previously contained clamd."
+}
diff --git a/app-antivirus/clamav/clamav-0.104.4-r1.ebuild b/app-antivirus/clamav/clamav-0.104.4-r1.ebuild
new file mode 100644
index 000000000000..6514459df831
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.104.4-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake flag-o-matic python-any-r1 systemd tmpfiles
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc clamonacc +clamapp libclamav-only milter rar selinux systemd test"
+
+REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
+	clamonacc? ( clamapp )
+	milter? ( clamapp )
+	test? ( !libclamav-only )"
+
+RESTRICT="!test? ( test )"
+
+# Require acct-{user,group}/clamav at build time so that we can set
+# the permissions on /var/lib/clamav in src_install rather than in
+# pkg_postinst; calling "chown" on the live filesystem scares me.
+CDEPEND="acct-group/clamav
+	acct-user/clamav
+	dev-libs/libltdl
+	dev-libs/libmspack
+	dev-libs/json-c:=
+	dev-libs/libpcre2
+	>=sys-libs/zlib-1.2.2:=
+	app-arch/bzip2
+	clamapp? ( sys-libs/ncurses:= net-misc/curl )
+	elibc_musl? ( sys-libs/fts-standalone )
+	virtual/libiconv
+	!libclamav-only? ( net-misc/curl )
+	dev-libs/openssl:=
+	milter? ( mail-filter/libmilter:= )
+	dev-libs/libxml2
+	rar? ( app-arch/unrar )
+	test? ( dev-python/pytest )"
+# TODO: there is no way to use this with the new build system instead of the bundled one
+#	dev-libs/tomsfastmath
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+python_check_deps() {
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+	use ppc64 && append-flags -mminimal-toc
+
+	local mycmakeargs=(
+		-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
+		-DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav
+		-DENABLE_EXPERIMENTAL=OFF
+		-DENABLE_JSON_SHARED=ON
+		-DENABLE_APP=$(usex clamapp ON OFF)
+		-DENABLE_MILTER=$(usex milter ON OFF)
+		-DENABLE_CLAMONACC=$(usex clamonacc ON OFF)
+		-DCLAMAV_USER="clamav"
+		-DCLAMAV_GROUP="clamav"
+		-DBYTECODE_RUNTIME=interpreter
+		-DOPTIMIZE=ON
+		-DENABLE_EXTERNAL_MSPACK=ON
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_UNRAR=$(usex rar ON OFF)
+		-DENABLE_TESTS=$(usex test ON OFF)
+		# Used to enable some more tests but doesn't behave well in
+		# sandbox necessarily(?) + needs certain debug symbols present
+		# in e.g. glibc.
+		-DCMAKE_DISABLE_FIND_PACKAGE_Valgrind=ON
+		-DENABLE_STATIC_LIB=OFF
+		-DENABLE_SHARED_LIB=ON
+		-DENABLE_SYSTEMD=$(usex systemd ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# init scripts
+	newinitd "${FILESDIR}/clamd.initd" clamd
+	newinitd "${FILESDIR}/freshclam.initd" freshclam
+	use clamonacc && \
+		newinitd "${FILESDIR}/clamonacc.initd" clamonacc
+	use milter && \
+		newinitd "${FILESDIR}/clamav-milter.initd" clamav-milter
+
+	rm -rf "${ED}"/var/lib/clamav || die
+
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			# The tmpfiles entry is behind USE=systemd because the
+			# upstream OpenRC service files should (and do) ensure that
+			# the directories they need exist and have the correct
+			# permissions without the help of opentmpfiles. There are
+			# years-old root exploits in opentmpfiles, the design is
+			# fundamentally flawed, and the maintainer is not up to
+			# the task of fixing it.
+			dotmpfiles "${FILESDIR}/tmpfiles.d/clamav.conf"
+			systemd_newunit "${FILESDIR}/clamd_at.service-0.104.0" "clamd@.service"
+			systemd_dounit "${FILESDIR}/clamd.service"
+			systemd_newunit "${FILESDIR}/freshclamd.service-r1" \
+							"freshclamd.service"
+		fi
+
+		if use clamapp ; then
+			# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+			sed -e "s:^\(Example\):\# \1:" \
+				-e "s/^#\(PidFile .*\)/\1/" \
+				-e "s/^#\(LocalSocket .*\)/\1/" \
+				-e "s/^#\(User .*\)/\1/" \
+				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+				-e "s:^\#\(LogTime\).*:\1 yes:" \
+				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+				"${ED}"/etc/clamav/clamd.conf.sample > \
+				"${ED}"/etc/clamav/clamd.conf || die
+
+			sed -e "s:^\(Example\):\# \1:" \
+				-e "s/^#\(PidFile .*\)/\1/" \
+				-e "s/^#\(DatabaseOwner .*\)/\1/" \
+				-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+				-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamav/clamd.conf:" \
+				-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+				"${ED}"/etc/clamav/freshclam.conf.sample > \
+				"${ED}"/etc/clamav/freshclam.conf || die
+
+			if use milter ; then
+				# Note: only keep the "unix" ClamdSocket and MilterSocket!
+				sed -e "s:^\(Example\):\# \1:" \
+					-e "s/^#\(PidFile .*\)/\1/" \
+					-e "s/^#\(ClamdSocket unix:.*\)/\1/" \
+					-e "s/^#\(User .*\)/\1/" \
+					-e "s/^#\(MilterSocket unix:.*\)/\1/" \
+					-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+					"${ED}"/etc/clamav/clamav-milter.conf.sample > \
+					"${ED}"/etc/clamav/clamav-milter.conf || die
+
+				systemd_newunit "${FILESDIR}/clamav-milter.service-0.104.0" clamav-milter.service
+			fi
+
+			local i
+			for i in clamd freshclam clamav-milter
+			do
+				if [[ -f "${ED}"/etc/"${i}".conf.sample ]] ; then
+					mv "${ED}"/etc/"${i}".conf{.sample,} || die
+				fi
+			done
+
+			# These both need to be writable by the clamav user.
+			# TODO: use syslog by default; that's what it's for.
+			diropts -o clamav -g clamav
+			keepdir /var/lib/clamav
+			keepdir /var/log/clamav
+		fi
+	fi
+
+	if use doc ; then
+		local HTML_DOCS=( docs/html/. )
+		einstalldocs
+	fi
+
+	# Don't install man pages for utilities we didn't install
+	if use libclamav-only ; then
+		rm -r "${ED}"/usr/share/man || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			tmpfiles_process clamav.conf
+		fi
+	fi
+
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+
+	local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
+	if [[ ! -f "${databases}" ]] ; then
+		ewarn "You must run freshclam manually to populate the virus database"
+		ewarn "before starting clamav for the first time."
+	fi
+
+	ewarn "This version of ClamAV provides separate OpenRC services"
+	ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The"
+	ewarn "clamd service now starts only the clamd daemon itself. You"
+	ewarn "should add freshclam (and perhaps clamav-milter) to any"
+	ewarn "runlevels that previously contained clamd."
+}
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 600db5913e5c..5e9791fe8fce 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/yara/Manifest b/app-forensics/yara/Manifest
index 91b7c282d9b3..5551bdb3f154 100644
--- a/app-forensics/yara/Manifest
+++ b/app-forensics/yara/Manifest
@@ -4,5 +4,5 @@ DIST yara-4.2.1.tar.gz 1285173 BLAKE2B dc290bf7fe85d468fd519e68a12d88097d817ca06
 DIST yara-4.2.2.tar.gz 1287486 BLAKE2B 956a9ed4dab64d24cff680248b4f95b06287e96d27b3f94ff80e97641b3dc4581eaee59cf0d19dfffa9f90a6f0a56f95d3f90f9e9472b65e133bf4aac3e42da3 SHA512 6eb42e63eff93ce636e1d2ae84e30621eeea0d91e1d72bb2cbe826aca6af306bb3564ac2314bc090fb59c9aca5436e72d33658009722ce0cfbaae7ef87cc894e
 EBUILD yara-4.2.0-r1.ebuild 1235 BLAKE2B fb9a2aadf66a8e0d31d4be0028c3d1c6d300fb9c211aaf2c1cb0944836105a0e7ad8e2dad93427464a0fb595473efcd3bb4ec9fb5718e280b2b0ee1dfd503e45 SHA512 20261ad386daae1b9de122eef6794099a661134c6efbcdaf84f64c687465040743187ebbcad5f7b8c56543db6a41cbf442a63c71ddf608112c1504a7f2f9c75a
 EBUILD yara-4.2.1.ebuild 1233 BLAKE2B aa908f1492fd17c96c5a8a2e6cc392873557ccb81e74e52cbdb1996fb82b842da003780359a18233a259b7cedb31c03acd2910d64a79d2b46b4ee9806a94a777 SHA512 a53cf98779c89ee447fbc7ae4254a055ece4ea8da4b6731a798d03fd27b72605b30b5a68e2fc3526ea8167dec12971e98a152af38f19e1eecf7488e5938a2c8f
-EBUILD yara-4.2.2.ebuild 1242 BLAKE2B 86e47f4928b80eb685ad88e98b3130bb696cb9da7fa0d15271e2b9b49760b853393003016810b1f3da2f655e5f343acaf83b852185d2ce8bddac2a036e6cdc8b SHA512 8c63f241bdb49cf02b117186c6f23460f20a47bbb4d2ab6a445585e541a0f0962624790c881e8ec95e1d4d5291dd89d73ebe138dc11cf6159fdcbe0f97377f67
+EBUILD yara-4.2.2.ebuild 1240 BLAKE2B 4235ee311bb9f895a9ac4b8739bb74d5596bcf90e84b62c59c9e7ef7387bf2f85d5613fbaed7da418626148aff89eeecf482b49c0a998e2797ff26359262ed6f SHA512 8ec8cad2ae58afae46b1e08d226d13707b8931cee6dae1c30412551ac0a8ba9c04403522a867db6e852606518b8561c8b4ff525eea7206f965636399cf3d886f
 MISC metadata.xml 1151 BLAKE2B a2f641c9c0f851884cc6482248446d7b509e4ca2c5cec26159063a0fec025b8928955cfefbdf87e26ace0d06a01a2cec7d1f3d10b09b99b1cf1040c09519adfa SHA512 5001e3a14dc458a6b27f69226fb346dc8bf07058270e20b81f325c0742300ccb6e241b3d3dc6f55eccc43b68f0fea74977d33d8bcca6d0612057f6015f857500
diff --git a/app-forensics/yara/yara-4.2.2.ebuild b/app-forensics/yara/yara-4.2.2.ebuild
index cf8905b87957..2c2cc68a11ab 100644
--- a/app-forensics/yara/yara-4.2.2.ebuild
+++ b/app-forensics/yara/yara-4.2.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${PV/_/-}"
 LICENSE="Apache-2.0"
 SLOT="0/8"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 IUSE="+dex +dotnet +cuckoo +macho +magic profiling python test"
 RESTRICT="!test? ( test )"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 362fb3c092ad..19796a716d39 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
index 5764683af5bf..8e44aeea2b3b 100644
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@@ -3,7 +3,7 @@ DIST sqlmap-1.6.5.tar.gz 7204055 BLAKE2B 0ab5ff3ab8f27e0f944c65d84e9d66627dd09c2
 DIST sqlmap-1.6.6.tar.gz 7204158 BLAKE2B 40e4a896855270b98c89fc0a5d6060af51ec7d24da101688dbf2ec470741129a6193330be45e3ddd8d450bdfbcf4ccdf29bac47ba9e1d27eddf76490fc0777dc SHA512 9d680754ad82db660770d29b96c74a20c271dec8feff19f57f20c726a1776c86f685e538bb33c026ec49d48fadf981eb41cf6dd970c6100dc7a0c9dcd39c43cf
 DIST sqlmap-1.6.7.gh.tar.gz 7205694 BLAKE2B 35498643389a8393b4941665d33349b0e0a6263e3ed10e40b12631bf9d8e495374fffa6354c69f032b6da94fa07b667f5393def9cacf9069c088b63de4b13a67 SHA512 35707755a93fe4d23ea67670d08014acb4eb8d49d6743b5031ad02ef72939181099523cc768be9d4f7a4fb5773ddaad5eac22758ecd1aadcb36e33679fff36d1
 EBUILD sqlmap-1.6.5.ebuild 1329 BLAKE2B 758cf03ec727a1e179b4c0bd26247874aa4ac5aeb6f10ab12bebfc0f1a55694d723d8cf0377f48451352f2c369246070647094324f907aebbd80ba94a68aea92 SHA512 f3eedb27fb4fb691591cfa8d7fb4b3e8e21d8aed8bd9cdf1c0d0e1b84fd20cb6bc117d88a84b3c396a12498cf8c68894546152a0170fd347f584bc8591dffa26
-EBUILD sqlmap-1.6.6.ebuild 1331 BLAKE2B 7e9ed70fc509dd8251ff7652b7b53415b3ef43139fc04b4ad0ea6458db3048aff5eb1b44410d5f60d77f6a238eb234413b9e0d69043927afba5b559553af21c7 SHA512 ad034e9044054aec4796c7efbb090d2066124d670c83753f63ec16777d3b150c8763ed60dd46d39bfb74374b1aca84e27ff5fa14b0e94c2ec03efb43081b4ea0
+EBUILD sqlmap-1.6.6.ebuild 1329 BLAKE2B 758cf03ec727a1e179b4c0bd26247874aa4ac5aeb6f10ab12bebfc0f1a55694d723d8cf0377f48451352f2c369246070647094324f907aebbd80ba94a68aea92 SHA512 f3eedb27fb4fb691591cfa8d7fb4b3e8e21d8aed8bd9cdf1c0d0e1b84fd20cb6bc117d88a84b3c396a12498cf8c68894546152a0170fd347f584bc8591dffa26
 EBUILD sqlmap-1.6.7.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
 EBUILD sqlmap-9999.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
 MISC metadata.xml 714 BLAKE2B e1afbf31fcc7a0ed38af080c7b85248b0ca50ac6865252fff3eb8aacafae02380d833e3852601c7a5733d5947ea19818c7db303f49465fea337b4cd6cc373ff2 SHA512 0349fb06cca9483950d5325c4fea54b07c1621ae25296c6a743d235b95eaabf0533eb0396bbf1c72963097eda7b7f8d829a7a675dabd6a8a6ce4a2ab0fc96b16
diff --git a/dev-db/sqlmap/sqlmap-1.6.6.ebuild b/dev-db/sqlmap/sqlmap-1.6.6.ebuild
index 7fe00f1370cf..a1ffe637309f 100644
--- a/dev-db/sqlmap/sqlmap-1.6.6.ebuild
+++ b/dev-db/sqlmap/sqlmap-1.6.6.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
 else
 	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # sqlmap (GPL-2+)
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f62c4b9df4db..f9e40b39d9c8 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 82ea28855437..e6f3b004dd0c 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,9 +1,7 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
-DIST go1.18.4.src.tar.gz 22845866 BLAKE2B 9997100ab5ae8a8ffdf4d2515d45d0bf29decf6d117d8f0079f0ec3fe63b3c5a32181e17c13de2ea656a5e8c87c1ed3f0e00945f717a306d23542bc0425d1d26 SHA512 4872956e31fa5d681021db12e876bc60a1815cf45203e75db83d6c54e9b7138766ae44bf1659db5333eba0b6097aea1990519795fffd2f124e7a78b78df1339b
 DIST go1.18.5.src.tar.gz 22847094 BLAKE2B 8edf133aa5b1fa4076db72bd7c63240db6cbd6b9b4725c2a71384ff302bee77e193bcfad6b55bfd31ee58f08fc59d9bbee5750d9227598fe402d6293863595ff SHA512 4ba69ad49b5c17963fdc39ae7f5360fa38950db39ec1fb9b52744d6a209abf177dab6bd587e7457c83a4fd265589907ec241d8b09d0eac76cf984243a14500ef
 DIST go1.19.src.tar.gz 26521849 BLAKE2B 2f985c4a9a125fa81fb6bd83e47d2382b4f256b689da1e16b53cdd83c896894d89b8601fc6263e8cb344d9e45c9b647d0d3c88fdf65bb304a352612d98e4bb7c SHA512 c4460d54957a0bcf3407ea72cd1c6b3c645ef4ef6cc0fa142a80cb43c06ca4af31d52b0ccd723c81d17a62004bc96559cad23da874a4b668b4d8b168f1da2186
-EBUILD go-1.18.4.ebuild 4798 BLAKE2B 8857c2432424a27febc299a46ca61bfd267d9a1d2fad7116096e5938a519410d35bf90b61a1827e2ad769986b9406ecd0bf1b9197e64b8a176e0a8d9dbb600eb SHA512 9e2efbcb8652fd203e239626f2ace311dba12c591829ce00e4204f28c3d908adeca69d1a17855c2544f2f8bc5d88a636a3d1c806d36542788c1949204b5535b8
-EBUILD go-1.18.5.ebuild 4799 BLAKE2B 0d764bfef4365902950fdf72ee7ba01a6d09791e342bfc12dc8f113634549b323d997f653399e62a9f5b47670607683580b42b83c8434521c3d99f77ab3123b5 SHA512 2104e572fd37817cf5b66a765bbd533c8ee93c82c4672059f68eba83210363664a16c8e7721ba92622f2238e52f0d12137b0a8d92e453946eed99adde8b57a4a
+EBUILD go-1.18.5.ebuild 4798 BLAKE2B 8857c2432424a27febc299a46ca61bfd267d9a1d2fad7116096e5938a519410d35bf90b61a1827e2ad769986b9406ecd0bf1b9197e64b8a176e0a8d9dbb600eb SHA512 9e2efbcb8652fd203e239626f2ace311dba12c591829ce00e4204f28c3d908adeca69d1a17855c2544f2f8bc5d88a636a3d1c806d36542788c1949204b5535b8
 EBUILD go-1.19.ebuild 4799 BLAKE2B 3433ebbdf6313194cdc57fc5c53debefe00a8fdec5702d7c6e5c30009582cc696a8e5ad8717af3f3b8324cdcbbe74e493acd0dbc696bc7d68b95b3bfaef82353 SHA512 7690654033f336486269430230c7488d2fd683239cf3c623305fe0b307a324f83e73152db23a6828733d2418de14c544727b1b384c485dbfb5b1eda1d9be9379
 EBUILD go-9999.ebuild 4803 BLAKE2B d2b93e9fca1ebcc0619b6c72c724c95da3b7b0223f2d0ac95081096fcf2c5123f0c4f8284fc935450780545c1d408f71ad905ad12029c02dee9eec1f2e4f45b9 SHA512 356f3323b209c69113a81920367ac38793bf3d8599fa71d64838027da0db878430fa0856ec0d74db943752e211c2fbc410eec30fae3f15a4fb8cc53b15f63580
 MISC metadata.xml 537 BLAKE2B 8017fd0edeef2ec4b17f75e8686f6014ce3c3e39b7083c347f601de9b15f34896305d6041edd0bc2b6a0687a69827c9dcecb2f07ca5994f29a3c0f8014c0604b SHA512 5f6b42721e1602efab24f33955806c33ace6433e17b41755dbee47abea79a2744292148c330d6e5a04612b0b451545c32241236cc8f211c5e7cf22c8cdebc778
diff --git a/dev-lang/go/go-1.18.4.ebuild b/dev-lang/go/go-1.18.4.ebuild
deleted file mode 100644
index b8ededbce758..000000000000
--- a/dev-lang/go/go-1.18.4.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://go.dev"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="cpu_flags_x86_sse2"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-
-# the *.syso files have writable/executable stacks
-QA_EXECSTACK='*.syso'
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# This package triggers "unrecognized elf file(s)" notices on riscv.
-# https://bugs.gentoo.org/794046
-QA_PREBUILT='.*'
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local tc_arch=$(tc-arch $@)
-	case "${tc_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		riscv) echo riscv64 ;;
-		s390) echo s390x ;;
-		*)		echo "${tc_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="${PWD}"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	use arm && export GOARM=$(go_arm)
-	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	elog "due to the static linking nature of go."
-	elog "If this is not done, the packages compiled with the older"
-	elog "version of the compiler will not be updated until they are"
-	elog "updated individually, which could mean they will have"
-	elog "vulnerabilities."
-	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	elog "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.18.5.ebuild b/dev-lang/go/go-1.18.5.ebuild
index 7b657c57834f..b8ededbce758 100644
--- a/dev-lang/go/go-1.18.5.ebuild
+++ b/dev-lang/go/go-1.18.5.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index fb3a20d48883..2718110aef40 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index c0e4812836c2..4c397c4521a5 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,5 +1,5 @@
 DIST luarocks-3.9.0.tar.gz 252777 BLAKE2B fba01692057ea5f4a926db4b31d4a299238079af1dfd15078cbff6d3d17d1b87f9f30db8477b1b706ec4602fe9ef82533ad3cc58f8059fe84490b464da0b3c15 SHA512 ccdee2ff14f52428923d5148f3d86d2ad40f84685988a12419c191c73a4df6cfacb0defbea40556493645619fdbef807e198fbae85be69c4075b5212353c1f2d
 DIST luarocks-3.9.1.tar.gz 253375 BLAKE2B 6d622e87dc385d0851ef6366e0b6832f1a453d2590c090b06ec6ab81b8a15930c1496bf2ac00ed6b15a44dfbc43b1f235092947389714b72f3442f802236fab3 SHA512 2dfc1326118c2868b05a17acc5fe8d2c07503ef2bb3f2560a3d7ce385b85893d593bacfab7086c57923f042d7e7cfd09a0a9795afc473a73edbba0a44d23ed60
 EBUILD luarocks-3.9.0.ebuild 2032 BLAKE2B e45bdc7e716298f0834e042a2693a012483fadc1136feb43a7b6cd1dd1aafffcf9c66fd89bd4b9a5862bae63ce33f3dc92700a65f503b9b4e0fadcae4d8ec5d0 SHA512 66cc22c41de85c3c49defe5b0b031a375c1e9eebcee8779a91fb89784e237d4ce0648a7198daa64b2812f74fba7daedb2fcab84413a7005a891176f80c48b4fd
-EBUILD luarocks-3.9.1.ebuild 2035 BLAKE2B e0b6929cdc2cb11c78a134edf768b7ee072f6c50d7e76d5cccf1d1ac0bebca33eaedca25092530439103eb08714f1e3d1830e2c96e1e13545887f9c398476c30 SHA512 beb50d9d773899c7832d97b04af2b26ac7a7f404f5e39adba6e9fd5e0641f6d1b2da9ec7455592584839fdfd276f703b0a07fb6d3ba28f068b319f4beee5ceeb
+EBUILD luarocks-3.9.1.ebuild 2033 BLAKE2B 004bc0d78658bd0c56a3abca2fb1c0f3c576b9cc68df7db5d53e8c075cf270862b851b5fec8f7caa4b27064db228f66744eee7b1bea331e4a55090e03355e41d SHA512 53b606d1d25e54dc3b7d8d902a926f42c52ca71f28af3a823fa3643c437a30dd6b4656ca578d962c7058e85fa4cbc78c5d3645b55a5729c6236863f86e5d6555
 MISC metadata.xml 501 BLAKE2B 0a2a3e7358a2ef2a4cbb79853408dfdf6015d49348bbb879a59253a88c73cf3d96c2ce708076844344468136d70962be74e639d24331a007fbd02ce6ccc18cee SHA512 43f147be67209e542e02733b6a57ce7ee05b61a7eb0d15662c0fb137db4f57c9f519cc98cf5dceb0e6f626f0dc6f04dd5b67da96a155b1e3884dca55896722f3
diff --git a/dev-lua/luarocks/luarocks-3.9.1.ebuild b/dev-lua/luarocks/luarocks-3.9.1.ebuild
index 1399a4825647..6607f43ed0ea 100644
--- a/dev-lua/luarocks/luarocks-3.9.1.ebuild
+++ b/dev-lua/luarocks/luarocks-3.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://luarocks.org/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 555954e5d868..85ee0d1a70c3 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Template-Toolkit/Manifest b/dev-perl/Template-Toolkit/Manifest
index 54530693f3c6..72972f4d69b9 100644
--- a/dev-perl/Template-Toolkit/Manifest
+++ b/dev-perl/Template-Toolkit/Manifest
@@ -1,3 +1,5 @@
 DIST Template-Toolkit-3.009.tar.gz 523388 BLAKE2B b33569ef066d6896861f84299c36802fac81e48ff71460ea6acc41ca39e78cd5a37fecac4c5603077395a448a872b10b8c801eee1491b3da7d00479f70c337ed SHA512 940992d7e3059a64c273c2f0441a81e095560c35f4bb9ab75afb9eeeb58d043cc5ac9785e2eb79a6635480ade12771c75c632c755977124dbe7cbfae399f9972
+DIST Template-Toolkit-3.010.tar.gz 522731 BLAKE2B 46b8f540ecda0def1b3a41dcd0beeb3d37863aeb85ba7e6ede0fc19fdaa93aa4c22675f4e2369e502a654aedd82698cf2fc1e8626bff3e60814c3b877acf7814 SHA512 9f6215eebe4151f93c0b83a49bc75fc6b2f00fff31729df9358b5bfd872e7a98207d146f4c1cb384a8cab002896b44cf09803a9049f9c8db0354b1d553c67452
+EBUILD Template-Toolkit-3.10.0.ebuild 1052 BLAKE2B b2f927c6d07afb19889865175692560d70aad602b2b05725a6219dda5bcc4988929c5abb5c0392c0e938463a8fe5187cebca6a515f4f17bdafb71439caf4a798 SHA512 ade1303c528b38eb5055466a261dd21ecde607103fa2bcebcd0bc728f34289f2cae397871efbc538f56ea755287fb961b4bbebc05fa74e0e75228f79f4124036
 EBUILD Template-Toolkit-3.9.0.ebuild 1047 BLAKE2B d9b62bdc860a6ac00069c09206d48253e7383d63319904872246e36572927b67dc309a9600fbdbcacf79702ab3aefbc07669f99fddfe255092941c1c2426f14d SHA512 2d6a6335379b04bc34d275532ff78a824c7914cf866ffd612101b64d927afde014158733fd0dfc40ceddbb3fb1956f914d3ae09b3326977f59ea5ac9879ea4e1
 MISC metadata.xml 3835 BLAKE2B c935c76b9dd434401a096c28de95f24e252d9f327a80ff5f4ecc8fdd16bbc97fe6d365ef7df458810774cdc3a21786d68c6fa148ccea8dea890f53f200d7b69a SHA512 e8cf3c46df8dbf266bb0574aa6f1d670b7fcf3ae4e40c78f6c971ccebcf255af708698e7ffc6a69f5955a6cda8c655f3527940956923d2f5a1ba29df61b176f8
diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-3.10.0.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-3.10.0.ebuild
new file mode 100644
index 000000000000..8c13fcac8e75
--- /dev/null
+++ b/dev-perl/Template-Toolkit/Template-Toolkit-3.10.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ATOOMIC
+DIST_VERSION=3.010
+inherit perl-module
+
+DESCRIPTION="The Template Toolkit"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="xml gd mysql postgres latex vim-syntax test"
+
+RDEPEND="
+	dev-perl/Text-Autoformat
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	>=dev-perl/AppConfig-1.560.0
+"
+BDEPEND="${RDEPEND}
+	test? ( dev-perl/CGI )
+"
+PDEPEND="
+	dev-perl/Text-Autoformat
+	vim-syntax? ( app-vim/tt2-syntax )
+	xml? ( dev-perl/Template-XML )
+	gd? ( dev-perl/Template-GD )
+	mysql? ( dev-perl/Template-DBI )
+	latex? ( dev-perl/Template-Plugin-Latex )
+	postgres? ( dev-perl/Template-DBI )
+"
+
+myconf=(
+	TT_XS_ENABLE=y
+	TT_XS_DEFAULT=y
+	TT_QUIET=y
+	TT_ACCEPT=y
+)
+
+PERL_RM_FILES=(
+	t/zz-plugin-leak.t
+	t/zz-pmv.t
+	t/zz-pod-coverage.t
+	t/zz-pod-kwalitee.t
+	t/zz-stash-xs-leak.t
+	t/zz-url2.t
+)
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8e73c61819a3..0babd3535059 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index fa3f265c3935..252aab1eb7f9 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -2,5 +2,5 @@ AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534d
 DIST cffi-1.15.0.tar.gz 484058 BLAKE2B 0d2d470c7eb11b8a9526be816b153c4483a5cfb529d3d220a804842facae1f06e2a822aa2be9abb1b5648cb36a97033bffc1dd235d83bdf8c075d67a907aa7d9 SHA512 ee83efde6f77f4a0c5889088c4c208ed7b9071fe06dfc16a8d2396de07f78fe859e1e39866760198a9d700f3b7359e8715e8a3e4907feb81d3fc4b8dd0dbaca1
 DIST cffi-1.15.1.tar.gz 508501 BLAKE2B accc317385d9af7dbed3397afde63fbab63bfc935376d951802055c63796863ed102a940f192789924480b9b16751c8cf3d21caf9b262c479c61ffc977aac83c SHA512 e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5
 EBUILD cffi-1.15.0-r1.ebuild 1749 BLAKE2B c710a237cfe7792896a08d61896fc195ba5cc4f50a2a545dde4ed54dfed4a37baed202d5a94717805375caf853ed82ec68bae4abb81a995d2755c65f091b2b6c SHA512 3ede32681e8ce94d3988ac3d58e5788bb73f5bacc6c52c98df654aedae1f07b1377bd33ae133a7d79ee155bedce36a07bd46be7e4516423c77b93c70d932a12b
-EBUILD cffi-1.15.1.ebuild 1570 BLAKE2B a0d736ac900f5dac784bbf76796b76a4dd82a6cd672c464a085381ef11c335162ab34b2269a3bd6c389051a047fa837cf448ed148571d5b0470220f21806cca1 SHA512 88c8eb9708b9929410d7e21cc17ebde7f7800f3ac1cf8476f0b4610a1c2bd49f6c418d8fac7f45b4b0a721e7ebcd0837580571603992925a44248d9864a7fff9
+EBUILD cffi-1.15.1.ebuild 1569 BLAKE2B c19d4498f52266a39012671c92e84af57524f1e3ba6ded0966ad28176b48fb85c512a8b58381586797b44e5258e6cc71f29439a273a491996b430b82c7d79e29 SHA512 f90e6636057b4b76e278792182f883f0d13631a6a2e1f1b43f1fd69e3fe77d1ad1e14bfc8f94f60163a194445a60cf4ab6323c153d18cd3cd75f0d5b2dd8a221
 MISC metadata.xml 318 BLAKE2B f914459fac4ae3d8ac9273fb721c52494513b932676f570f02cc4cfb2283705d8cfc761806ffed23c6f31c95a967398edee01c1536547c1830def5ca4144c003 SHA512 ec451f8c535f0d01dc7bcd248c002745947982cd469a02ac247d0d34f4d7a33374fa10c28d8f074932f0548dc500c3270b499dd08b18acbb9d308777bcc7e4f0
diff --git a/dev-python/cffi/cffi-1.15.1.ebuild b/dev-python/cffi/cffi-1.15.1.ebuild
index f5e04846d0e8..93761441679b 100644
--- a/dev-python/cffi/cffi-1.15.1.ebuild
+++ b/dev-python/cffi/cffi-1.15.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-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"
+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"
 
 DEPEND="
 	dev-libs/libffi:=
diff --git a/dev-python/furo/Manifest b/dev-python/furo/Manifest
index c91448521c09..d626d99c4661 100644
--- a/dev-python/furo/Manifest
+++ b/dev-python/furo/Manifest
@@ -1,5 +1,5 @@
 DIST furo-2021.10.9.tar.gz 69755 BLAKE2B d9dec7f2161491c1b9806fe8e1e98bf6d8f405ae17931e86da6edf44121a0bfbfef4db26f35b53cc929e143926bdbfb4f223aa52fdd65912cd49bd423e574a43 SHA512 4100cb08f6f97ffde2527ec5678e94da759323521bf26ba49dfe4c0851aabc59556872b494a7dec26fbf6e4ac2f2dbc4c7d92f7ef47cae7f9d256af38da91f7e
 DIST furo-2022.6.21-py3-none-any.whl 323874 BLAKE2B aac38e9aaa8d4fc6fdb00a7da9df8781b18229146970a005077075b0049b6493f280377ed735e9dd5425fdce0c43f8cad5b149957018d9a084ad83c5e5fcabeb SHA512 096c9fd0a18c8c4263607a77703412fcc5d7334b08bb6c448e5369b93572f2176f7fbe3fc7eb0b8c72f09d00eeca379debfec2f6565305d2f5e1bd0518af1558
 EBUILD furo-2021.10.9.ebuild 690 BLAKE2B 01e614573d0aedb74def04b3762442520f3df7f2ec5dfa1232c65c003614e61ce3a5f2b03f139c4da8234c4fc7b6ef86f62b4041f5b760c2b12259949b79ac3e SHA512 34237d0f5a40b8ae1165ea7b359ef11d261d7f783bbfee4b73e024c986b5bc789df3f90da81d29385466fd23100c835440c18245fb5fad76005fc819930397f6
-EBUILD furo-2022.6.21.ebuild 977 BLAKE2B 4430cd379ad2611652a26dcff5d1ec6d62fa30d0d361d7a8bf974b661ab0f9aaead29547141fce29d71ae2cc0a3cb4360dc74da00b27a8d6a3cd58ff42174a45 SHA512 50f8e4f712d30ef1bed176dbd6171afb8c81bd56cca57a17167b1c322dee4ab9f3ad98b8e94529f1bc31c128d71f359f23c54212c0768e840d83cf39d7ce6ca4
+EBUILD furo-2022.6.21.ebuild 976 BLAKE2B fc872e62d4ca2210695a3433dc499c133032fa2f762d1f5bd3228afbebaa316a96c3c34b67ccd74a06e0bcb8cb6fa7b680cc51a551101b49b596add8bfc8b965 SHA512 86354d69c9fd7fabe934ce4c970dc1d4a6d3341dc5b4f75869d7ed690deb9d980a66bd71c63492f9792c4fcfd422d603fd06eebff3df68e6a23793fdeb3243ed
 MISC metadata.xml 412 BLAKE2B 8152eadd336ba3c73fb48a1ff4bbc236e9857dde77e354811a131794f0b750c0871239fbc2fd773979ec306ca3ddf62166f784559d486e6cd6f5d6b5c3902818 SHA512 fc3918b91916a176ce85d9740caacc70aae03b74339a62c0d77ae1e1f1b92a3db055cf1a1bc655a822ed800178971c39f29c2e45178c5e0ad6ae96f05e42a0cf
diff --git a/dev-python/furo/furo-2022.6.21.ebuild b/dev-python/furo/furo-2022.6.21.ebuild
index 8cf1bb529583..d23703810acb 100644
--- a/dev-python/furo/furo-2022.6.21.ebuild
+++ b/dev-python/furo/furo-2022.6.21.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/pymilter/Manifest b/dev-python/pymilter/Manifest
index 65b0531bc6e4..409ee3019cc8 100644
--- a/dev-python/pymilter/Manifest
+++ b/dev-python/pymilter/Manifest
@@ -1,3 +1,4 @@
 DIST pymilter-1.0.4.tar.gz 1023222 BLAKE2B 1e5ce42af76ae1ac2f7cda87d40bdce404ed7e9fce9e88909572ec065f05e2c9effc8bc62d4fad113753ff7dc7e87c790515a9116615191745097cb2c3390042 SHA512 b356a10ffc0ba0172cdb228e4e15034e67c0fd82b4b8bbe1193e54e45e518626fd647033d824f2cd5a9d456154c528027726977d3ad2f2c2fe0e0155ad50d294
 EBUILD pymilter-1.0.4-r2.ebuild 617 BLAKE2B 8318f0f8c532175ee9c4c1417942019ee44b9253373e4083d2952db3342f62d9ba3bd8a525ea69d23eda458da970b2657b5c03a4572357db54457524556fb36b SHA512 85c107d27b40d4ce1730875e3567606d482916630d4147e21ac2e3760d65675951879862d3de06f852dff096e48b6000b2eb8cf0def15b2bba6ea33b338581db
+EBUILD pymilter-1.0.4-r3.ebuild 586 BLAKE2B 6baf8891a4253aee6f16b88c5e2f60e5e0953c1e2a1931b5c70f003bc34a9424e92022d722cdee16c3d61f342cd84bdac09182b2aa246e5a1f22a6b01d3eeea6 SHA512 4e374677131a874587ef3d52a693728c5e8db3de3f35a6e35279607e65f7395c734d502d1c968096c7e9e38083c0a3d50324360f2f1d1f237f5e683ae81d0ba8
 MISC metadata.xml 781 BLAKE2B 99f1de330652ceb0c2032430a6ae102a23e3c1eb908e1a6570c046c98524f77aa7cd0c1a91f3a110b56a8ee5f8af5d11b6a4d9c78bdbc43e26a462fda19722aa SHA512 9acd45710b1e5bc3b4e092962227399749e959ba7499712365513a7d4689ea033b89ccd110c5a28cab84fbe980bdb830743c4095a3d08a7e8ea22a9d1cb74db2
diff --git a/dev-python/pymilter/pymilter-1.0.4-r3.ebuild b/dev-python/pymilter/pymilter-1.0.4-r3.ebuild
new file mode 100644
index 000000000000..268e99b48bdf
--- /dev/null
+++ b/dev-python/pymilter/pymilter-1.0.4-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to sendmail milter API"
+HOMEPAGE="https://github.com/sdgathman/pymilter"
+SRC_URI="https://github.com/sdgathman/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+
+RDEPEND="mail-filter/libmilter:="
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index b11ba96acbb6..4fb0a8d6e837 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,4 +1,4 @@
 DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
-EBUILD pysvn-1.9.15-r1.ebuild 1274 BLAKE2B 4e3a440451e51bcc6e25114cb3ecc904fbf3a96661e45a953880a0eaa2f444fd17a38a696a56156128daff8ac373f4ebef38bf125eaba9daadd1bc074a271997 SHA512 67f6c2f99816ad0fa6b63337243b8885cce6ec7cf586b3807ad83be2eee62ea2e7cb264994cef9a37be9b3e1d3e2afce776f6c568aec6f68bdc4455b25164810
+EBUILD pysvn-1.9.15-r1.ebuild 1272 BLAKE2B d2ba9aca8484b8006bd6a1c2fd76995123b0e99070817585ba6013261924091c9ec0bbc2932a69e8aa88647a4b885e2444e7b40983e03d497096b709cd98b767 SHA512 1890856b74902478cd993e40034998f4a9e61528f420ee88877a0210474f6f77119189348764dfa4c13a19f9f4510dd4c2737587fb0a78059c9cb9b119d8e9af
 EBUILD pysvn-1.9.15.ebuild 1272 BLAKE2B 0102cbd80681f495c9ebce636dbb417a2655a3ea3bba6f34298d82a5fb8ca3e0ed15ecb9a6d51a10fb5dd1b89c00a57b35d7f3375d16bd84ea84fffc86398bcc SHA512 1e847b4f98454ab1fa96eda0719dc80d18064271a6c02914851d3fc5e646eeff53764153908673c955639cc6868da6aa1815db0c140280be7e2f182326c4b068
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-python/pysvn/pysvn-1.9.15-r1.ebuild b/dev-python/pysvn/pysvn-1.9.15-r1.ebuild
index bd402ba42a47..d24d0cde9d51 100644
--- a/dev-python/pysvn/pysvn-1.9.15-r1.ebuild
+++ b/dev-python/pysvn/pysvn-1.9.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/sphinx-basic-ng/Manifest b/dev-python/sphinx-basic-ng/Manifest
index a4cd221fa5e0..86b97a4287fa 100644
--- a/dev-python/sphinx-basic-ng/Manifest
+++ b/dev-python/sphinx-basic-ng/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-basic-ng-0.0.1.a11.gh.tar.gz 21539 BLAKE2B 31707bc8f3c6cd0c1af1aeff309543889119d33e5f5ae33194b58f88a0ff6ec424c5b876fef36b64161932ebb69c0f6108801697b49d47e10ad13affcf89e1fa SHA512 e9f9278a360d2c8d25a6679134d2d54b37c9f2e55285592fa910c85b2f8bfd4ab13d117b7078cb67d862703f8054c3d3a3ca68152551d67a26d7c1a8b75952ff
-EBUILD sphinx-basic-ng-0.0.1_alpha11.ebuild 932 BLAKE2B 63c8dce2ce3f1d8e721f27836e67933274faf883f54f58860da5d41563695d37241e1f36f86031274a2bc8c11dddeb67fe885168b92ac955cbf41c02f1b7bcf2 SHA512 3015486c318e505f2204b2c43b1bc494f2cb00cc9d061582a4a972a3b95c3db9937d43b60276ad44260933716967531da32626e3b6f3bb5d9cb3ed4e80a2bf0b
+EBUILD sphinx-basic-ng-0.0.1_alpha11.ebuild 931 BLAKE2B bf63661aacb299ce2c685d940f4f4219caa3037b6f74131d74101152c4ec5264fa387262bee454821e8f7df2ed89be26903a22542010f48c2486a19785ba6ef5 SHA512 311b332f6b3fef12a4e2d0488a4841793fa7f7faf39991ef9b9696b1f76ab62e5c17a81b0b5360ce6a9f02ece335dec52cf5423ab2a0e2ebe4e8676400c2f668
 MISC metadata.xml 362 BLAKE2B a93dc662c8ab618397c8d0504342e8f1bd74226b131ea4ca07771cdeb75eb8947451b4353c0da16760f07f935ebb75adcdef4f189ff39e0cf707d03e8fa319e2 SHA512 fb27130b3fcff9043b3ad33e34c92f638cae46d526dcbe77cfe088abf80e6b89992edb1e0b571a5a2447bc6c8ba31ae84776d153067a33b5d6d14326149e7f46
diff --git a/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild b/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild
index ff3a7128264c..816e140e46e4 100644
--- a/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild
+++ b/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index ec1b3ddf4f99..b8d19e1315f6 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -3,5 +3,5 @@ AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ff
 AUX wxpython-4.0.7-ultimatelistctrl.patch 4121 BLAKE2B 0fdf74a0131c9d5c49dd867c3867ac212d26f4d877dc4f4e48680d90956c1027bbc776d19edd235d8f1e4b619d616c4ca1ab28b45a3b2dc79aa97a59c48adb2f SHA512 9d766d9724613e269215db81ecaad7d836b65c4d17f8b522bd688881bce1176241965d05539886da42755f0c7be65ef55c4ce340c21fddd512abb6577ece5482
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
 EBUILD wxpython-4.0.7-r1.ebuild 2311 BLAKE2B 563169aac0ee52d5270eaaceb298d19aca4c6ba00afd96a7a43a9474f21733aabfc91a4ce64c7d52f0ee57fa26b64b77cf2a8d556f08d2b226db9cd8191b11e8 SHA512 dc2659b721faa6f3c9d36cc05659eb6350efa9e7fd6c633be6c67487cca2cc93ab49bdf7a8f43a994d6873ae82a9c773c4f0d9724240a26e405403488977c8a4
-EBUILD wxpython-4.0.7-r2.ebuild 2365 BLAKE2B 19d5165e3ce024bae378121df739996cfab8b39167fac433eca9afd1953c16b90e6ea6137122880854023a11e40dcc06b3f6d2294e8583f27e0b13d4582b78f3 SHA512 916268029fd8f8a0e1a579123ee672fa46491951eaa7fee073286ba802f9b285a15c48314e9c275334c9413d3a2053afdb1607c4f0ce86f245c22ce2ffb53cc3
+EBUILD wxpython-4.0.7-r2.ebuild 2364 BLAKE2B bc1527517d2c7edbac8fa3d230c6897807add6e21f2a416951a2e8e7d2a672bd8512e0d7fdba5a34ef7d39036c8085b957018e16c06161af88f6e86a18a6129e SHA512 cf936f3ec753494a8816ae6468d64091bffa119ad0302c4903434523d61261b5d863b7157b22584de4f5b8ddc8b62aff8317d0091461f21dc257e4a5584db44a
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
index 97ea7c2d1819..a8e8cec519d7 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 RESTRICT="test"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7e508c8f86d4..1d42b9440c0d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index d2095de63dcf..59efd914549c 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -13,9 +13,12 @@ DIST gitlab-runner-15.1.1-deps.tar.xz 140961196 BLAKE2B b3818572b2b5c01c78290572
 DIST gitlab-runner-15.1.1.tar.gz 1287440 BLAKE2B 0648132a2de277865d3899e460d0f444a26d3d827ee6efdf90abd195b243f31e138f57ca968c702089245e92763ab3cbb7e997fb8dc409a373689ed4e75016bc SHA512 538fc769e0aed90ffe4df9e2afe81b3c89f0c3d9ad9d48e52f12cde5df3b36326f054c1ab88c3d532cf573cdcd7a6e1733d3041cff133a665db5c91c4b8ddd0c
 DIST gitlab-runner-15.2.0-deps.tar.xz 141451528 BLAKE2B a77b8ca5c1570fc80f2d9f2bf3ebd9291997cd7f017eb1eaefb68d7bdba219d9fd14fb86c313a8c4fdc8169d81488244905d971a9b7c8393000f85253fd69ae2 SHA512 0aca328527b8b769015ea8177e22c8e232dd840b6427bf6e7ae7e0acccdc3cc6630ad10c2bc3fc42729107509fd37eaa5441846aa5f1ce934d68786335b960a4
 DIST gitlab-runner-15.2.0.tar.gz 1291980 BLAKE2B 06194f6dfba94a1d071b3f29f3065475b8a9c08669ee0ec43917340a54dcdf79843f43b3f7fbe2e57560184c58166d7c107ed465742cfff05163faaca7ef491f SHA512 74f6a8941909c189bbde534d1cf5e1b8a60f595fa6046ca98dd4fb3a9f7406f988dfb9b2c2a6c777813fb24e4f5c23975f74163f7d5584b553acc4ca28ec8331
+DIST gitlab-runner-15.2.1-deps.tar.xz 141242072 BLAKE2B 598850f3614772cad485a994ed156074c5f3aeb9b2bbf085fc9f77ded820d1facc6fafdc8b8fa9d763156cc15a454821113bfd47f2d943f2fb28723bc10a8cb7 SHA512 ac3f2b0272f9a6135c953b55e36623117c5e09c70ce88c2989fca4689eba699d12bffe6d5331876f942cfc69ae704b13f73f01ca9a681d02c113e2638420aad5
+DIST gitlab-runner-15.2.1.tar.gz 1291638 BLAKE2B 7f2c7100ab5a7e670f8d50ea9dccd5f96b23b4e7ba60f928d732edc3a5f50b10afcfe9ffb052c4242ee401a21a0ddfad14e398a6a133ac093f3bbab84b620b0e SHA512 ed165fd95094dd00450bd2ffbbe876235849fdd98ff0ffc6ce635a103f426d4380573ef8c71f5a40d115fa6fe7ec9416b1c7b780f1563e8b3d4c4a09c02519f7
 EBUILD gitlab-runner-14.10.1-r1.ebuild 1784 BLAKE2B b636c54c786ebfa4055dcc159c4350ca9cc9de020be99a6b795b56f9f696a611558284b14aa920be4e3fa48d3c7250b815608c4e4d5836b7df4b6e37f94f5a34 SHA512 71a244482be2d8f8d21d874db99a4b38ef9135876eae259a1debd58245fbf0c49afbd087587d686855ec98b7317e4cbbc4ba7ced1375b5949f35ebcfddd2a51b
 EBUILD gitlab-runner-15.0.0-r1.ebuild 1784 BLAKE2B dfd874f9aa65ad955c8091f002e71a4357dc5a262018e53e38726d07e4149400abdf6f4ccdd24bfe04a67a1641e77249f678e7ab28ecca5b365cf9f461ea8a2d SHA512 d9c482c77a7b29028400a30259baafd309cf08586e6044061afbc150eb01747dece3a36eab08f714c96751a5d76bed5ec90416b982afe90247ff123278e07b4f
 EBUILD gitlab-runner-15.1.0.ebuild 1784 BLAKE2B 6133e7a415764be2d232faf807521c8b12cbc5689e3f1983d3c56f9c0c942c096e28862227d2b775bf96d9e4dfa9e079d5877917124aa1be586cfb3ad29cc08b SHA512 d2d2234d103770ba859d9daf1b63f483584c6fdd6340ad76a997a7b23bcfdbcce2c8cdc2895ca6781bc44c50aed2fc0828dc794d87b391397e804341c3e88aae
 EBUILD gitlab-runner-15.1.1.ebuild 1784 BLAKE2B c17c2a1c0f0e1be690b8a431fb7390b924c5867f8f4943a308975bef90f0b9a393062ab4229c39af026e34271d4792c015ec4ae201a4298b0de3e3c844e688e5 SHA512 f9150a22106f18eccff02ccb5681cb08364c93f6dd3988c7ac9a546711a29728db7cdc2cf611a0763cceaa72078adc12bfd42ddeaf383aa9869562f9874afafd
 EBUILD gitlab-runner-15.2.0.ebuild 1784 BLAKE2B d91ad1c66bceda48667acdf56f3e43074d330cc0b1477d88408c6b1313205d220991bbff1c53162ca17d36cee58d51af701d4e53dd88bcd16ce8e909d7210f99 SHA512 eb26a787d3cd9cb72eae7279f109dd1c0ee683369a4c9eea2f273bc05d203f2a91e509bbfb1a60bdc9348a9dd5ff33d72266701b33ce880b1986a036d78e847e
+EBUILD gitlab-runner-15.2.1.ebuild 1785 BLAKE2B 7a81c3581d9493c95b5de44cd2de104774453a979388279fff756071d05470baad90211295c612a7b2713d64979a156e09d38e639be206af7f6e841a2dde5b09 SHA512 2838a97c26110d148c7b9303b310d4b803a5602cb14024c7284292f5b5c8760a8796598434c67ee8f51dee8add672e396441319a6ddfc587061def8061bf2414
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-util/gitlab-runner/gitlab-runner-15.2.1.ebuild b/dev-util/gitlab-runner/gitlab-runner-15.2.1.ebuild
new file mode 100644
index 000000000000..eb76a2210290
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-15.2.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+# make sure this gets updated for every bump
+GIT_COMMIT=32fc1585e
+
+DESCRIPTION="The official GitLab Runner, written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
+SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/gitlab-runner
+	acct-user/gitlab-runner"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/gox"
+
+DOCS=( docs CHANGELOG.md README.md config.toml.example )
+
+PATCHES=(
+	# https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3498
+	"${FILESDIR}"/build-for-arm64.patch
+	)
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_compile() {
+	emake \
+		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
+		GOX="${EPREFIX}/usr/bin/gox" \
+		REVISION=${GIT_COMMIT} \
+		VERSION=${PV} \
+		runner-bin-host
+}
+
+src_test() {
+	CI=0 ego test
+}
+
+src_install() {
+	dobin out/binaries/gitlab-runner
+	einstalldocs
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	keepdir /{etc,var/log}/${PN}
+	fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
+	fperms 0700 /{etc,var/log}/gitlab-runner
+}
+
+pkg_postinst() {
+	tmpfiles_process gitlab-runner.conf
+	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
+	elog
+	elog "To use the runner, you need to register it with this command:"
+	elog "# gitlab-runner register"
+	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 5a8817ea9a8c..8045871263de 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index 7a5d815e70ac..f36b8093e87b 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,3 +1,5 @@
 DIST libwpe-1.12.0.tar.xz 54548 BLAKE2B d2eb3f410ba0691c6e9ad4638de517be36d5b9729c7b09c44a316d91822071b527c1ea4a4fda5248d623bf61250cc398cffdf19ec47059621323ed726a5d0889 SHA512 d85865fd6f2dd907589a4d2c1b956d9a2093f72f5b7f755ab2bef040f7f26a73ddadd47a607a78578dec6eb6d59f44e18fa8b96a71f7bd19f3d62073f3ca6fee
+DIST libwpe-1.12.2.tar.xz 55416 BLAKE2B ac0d1f824b3cb82f1068cf4536b2481be6e1fb243582b3bc48afaa2b15450dbeeb374e52cf607ca3c758f314382a5090d5376be9b7ccf07bb06b654afa99844d SHA512 ff09d80ef896c22091169d62f25cf03213149b592a65029c4e1190c48068f023a81cb8191c7f4e6e27dedf8ba3dd6c28588dac6c6571cf634b3f3093115d6562
 EBUILD libwpe-1.12.0.ebuild 583 BLAKE2B e20ea645064b23b28f248850abcbd75a782d603311cfbf167917ed4859a366542826a450293f95581d666fc8056282033f0385c8a51b6721939a185cb1975cb5 SHA512 a5b4e1e72504d208d0b2cc4aef69c09499eda76f66010a47a004abdbeb35bd2befdbe8aa167f14c0a078516108c70162489113b1055be12d2d8a093a51655bcd
+EBUILD libwpe-1.12.2.ebuild 589 BLAKE2B 09fd6a56012dcdfeecd51d57bab21347964dce8cc68620187aef30368a30cfda8025abb10ce912c3e26d909b52136b0651b0b609488f29c594fa29b269d10dc7 SHA512 c93e3e19c772f79d0e0883aca56114ffa08a6c6ba8bde8025dfffa6dbfcc364db6c85cbe5101bf4ba5fdf76d404272259b0467636db8dbd613c79b2e49bab79c
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gui-libs/libwpe/libwpe-1.12.2.ebuild b/gui-libs/libwpe/libwpe-1.12.2.ebuild
new file mode 100644
index 000000000000..c7b2ec058f58
--- /dev/null
+++ b/gui-libs/libwpe/libwpe-1.12.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Platform-agnostic interfaces for WPE WebKit"
+HOMEPAGE="https://wpewebkit.org/"
+SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="1.0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	media-libs/mesa[egl(+)]
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dbuild-docs=false # hotdoc not packaged
+	)
+	meson_src_configure
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index eb8f838e59d3..4e1a4c7cd10d 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index 805e8fb25044..f06b1d58966b 100644
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -5,5 +5,6 @@ DIST amavisd-milter-1.7.1.tar.gz 193425 BLAKE2B e93f7f8f4c3b5e59fbfc160e60c86202
 DIST amavisd-milter-1.7.2.tar.gz 191224 BLAKE2B 82865acacec1004e611bbafd940d5721660b0daa1af1aea742d4176c613ce2af0e4bde523d0363b97e3f361270641acda477797eab9e8df9feb266c80ef6009c SHA512 639a5a4f92131f9b8d004255819e36dedd529ec95f8290663c6ea5860dbbce049a822ba0e68158228716778265009b93024e9102defdf9250d4e889157008181
 EBUILD amavisd-milter-1.7.0-r1.ebuild 650 BLAKE2B 40e8095761fd9ca4e873283291d89ccc1350b0eb06d84d8ceebff1dc2ca2321b01e29b90709c64d49dde1ee045288eda0c176190ffce4e3b4bab396f23c92e66 SHA512 1b685eb610e6aa50593325378c76e8501297354256a06fe10e6e6463634d21e97ca0d360e96e7298b90940d784929391149a632d69dbd0fc6410ba6b0ec2ed45
 EBUILD amavisd-milter-1.7.1.ebuild 652 BLAKE2B 09317271c519d835155c510ed1ab6cb55502066eb4849cb00b7da8efd85c41ea16f1b540b9e8826751b6d6ac36910902f1a110b7e737ad958b18a03abbbf095a SHA512 7a51d4a44c20a186476fb29d92d2901477cc3c01e06b03c93ddcd583a2cd2f63e936486111a7446b7d1ad5298de15cb3fde53cd89fcbfe4de7430ffadd6f1a69
+EBUILD amavisd-milter-1.7.2-r1.ebuild 622 BLAKE2B 53e4ca91bdc13e0c07113ab77445f355c28abb8bdbb6dcfd64e7920ed59857b2d92b7b5c87c01cb2e1888786ba246922f5a25216c5fef59ca07519e3325ea3a9 SHA512 f0d519838ed9d276d20100443ef6d8c9cc105d72bdd83f4f0d5799d6c90540fa1f08529411827848bb7d3db363247bbddce7f4ff617ee6ef45a85e9ac6241517
 EBUILD amavisd-milter-1.7.2.ebuild 652 BLAKE2B 351952943ca9b1cd61f1b0fd6e7ad5c2617547d41322eb7d9c1388079df8cd6fdcf335cdc779cb4e84430b2c2124ea25799a463dd59fa9107d064d26e5e8b5ab SHA512 7ec8bf28179f7e671d1072daceb199e212ee365228d9e04846f836ed6238e94b48ced3e8eecb4fa1b60e1c77a65a79d82ede28e2c15df90e4cf24dcfcc7bc3fb
 MISC metadata.xml 333 BLAKE2B 612ff1239b67cc232069226263c42531349ec44f51a249afd1db683761a99bdac63a1b19ea96707a809af26f9cfcd52d90ffe343e1f32dbd20317cbff7f2aad0 SHA512 845a38e47210175bc6a4a4cd2927135d7463514c0d5907e702064a1ce4670faef0675a41e17873616a1bb6c779756ace4344122d32a707783d075770d1acf0ce
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.7.2-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..059749c766a1
--- /dev/null
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.7.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="sendmail milter for amavisd-new"
+HOMEPAGE="https://github.com/prehor/amavisd-milter/"
+SRC_URI="https://github.com/prehor/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="mail-filter/libmilter:="
+RDEPEND="${DEPEND}
+	mail-filter/amavisd-new"
+
+DOCS=( AMAVISD-MILTER.md CHANGES INSTALL )
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/amavisd-milter.initd-r2" amavisd-milter
+	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
+}
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index ead90d1ee6bc..f30ae3e58b59 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -4,4 +4,5 @@ AUX dcc.confd 274 BLAKE2B 757f3e751028b0c35c166f708c328b506721549267bf1e87e841b7
 AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc96207fa80a7331d15ba77ac8b5e369c2bec5e164819da876e2ba022f31db3a455d72a6e52387a014d8de38 SHA512 e171e4333d735aa7da99ae322ce04954554a6738b943ca085e51707dd0bf231f7c170211f019027ddf01ec750ed1b8728b5d54b48dee6ee7fc37f8a810aded01
 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
 EBUILD dcc-1.3.158-r1.ebuild 3750 BLAKE2B 976ca6b2cd285416c6d2703ec294207dc0a45685537a2cbaf2a2f343f4e478ecaa40a8a9ac064e8ae0d3e36540ac83bec3e58b9fc3c18ee4b19a816afdf57e6e SHA512 3d8e190823ec4a46e00262a51a68a4f9d4869fe928de2657659080295647d4eb17a33de488991676d11c6f0ff45d8fd42dbb81b5ac14582084fb3a8fa42d1630
+EBUILD dcc-1.3.158-r2.ebuild 3716 BLAKE2B 2d4b40676751ad4d82c638b938900a8d54c2a9e206d97f28fcbb797d793bac38a6e672b359117138a3b168a4a466510120a92953bf8ea1719028a6bde1d1764a SHA512 103b8d4d1a66bda07562c5d3bfa28e6cfcee5e1aa93038e2cb764ce23d6116ea4bb06ea9e01ace141dd3838d9f2ff9b33f527840b37238b5a752619fddd4b17f
 MISC metadata.xml 317 BLAKE2B 92e853d40d112a562ad2e3afd351af700b6f751f7f2451e41d5db02100be2732730d40df236cbc11354077f0818771715174f0839f36aa824daa69e2218eded9 SHA512 7fe6a76ef0450fccc2121d94e03a45dc87fb21fcc3ed39a5016423a658e61c6ddf7cdcfa9d23fe4269662987268c50ddc25335ccb61f65f5fc2bba6131027b4b
diff --git a/mail-filter/dcc/dcc-1.3.158-r2.ebuild b/mail-filter/dcc/dcc-1.3.158-r2.ebuild
new file mode 100644
index 000000000000..7a01e900a63e
--- /dev/null
+++ b/mail-filter/dcc/dcc-1.3.158-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Distributed Checksum Clearinghouse"
+HOMEPAGE="https://www.rhyolite.com/dcc/"
+SRC_URI="https://www.rhyolite.com/dcc/source/old/${P}.tar.Z"
+
+LICENSE="DCC GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="cgi ipv6 rrdtool milter"
+
+RDEPEND="
+	dev-lang/perl
+	|| (
+		net-ftp/ftp
+		net-misc/curl
+		net-misc/wget
+		www-client/fetch
+	)
+	milter? ( mail-filter/libmilter:= )
+	rrdtool? ( net-analyzer/rrdtool )"
+DEPEND="${RDEPEND}"
+
+dcc_cgibin=var/www/localhost/cgi-bin/dcc
+dcc_homedir=var/dcc
+dcc_libexec=usr/sbin
+dcc_man=usr/share/man
+dcc_rundir=var/run/dcc
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.140-freebsd.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+	local myconf=(
+		--bindir="${EPREFIX}"/usr/bin
+		--homedir="${EPREFIX}"/${dcc_homedir}
+		--libexecdir="${EPREFIX}"/${dcc_libexec}
+		--mandir="${EPREFIX}"/usr/share/man
+		--enable-dccifd
+		--enable-server
+		--with-DDC-MD5
+		--with-installroot="${D}"
+		--with-rundir="${EPREFIX}"/${dcc_rundir}
+		--with-uid=root
+		--with-updatedcc_pfile="${EPREFIX}"/${dcc_homedir}/updatecc.pfile
+		--with-db-memory=64
+		--with-max-db-mem=128
+		--with-max-log-size=0
+		--with-make-cmd=${MAKE:-make}
+		$(use_enable ipv6 IPv6)
+		$(use_enable milter dccm)
+		$(use_with cgi cgibin ${dcc_cgibin})
+		$(use_with milter sendmail)
+	)
+
+	einfo "Using config: ${myconf[@]}"
+
+	# This is NOT a normal configure script.
+	./configure "${myconf[@]}" || die "configure failed!"
+}
+
+moveconf() {
+	local i
+	for i in $@; do
+		mv "${ED}/${dcc_homedir}/${i}" "${ED}"/etc/dcc || die
+		dosym ../../etc/dcc/"${i}" "${dcc_homedir}/${i}"
+	done
+}
+
+src_install() {
+	# stolen from the RPM .spec and modified for gentoo
+	export MANOWN=root
+	export MANGRP=$(id -g -n root)
+	export BINOWN="${MANOWN}"
+	export BINGRP="${MANGRP}"
+	export DCC_PROTO_HOMEDIR="${ED}/${dcc_homedir}"
+	export DCC_CGIBINDIR="${ED}/${dcc_cgibin}"
+	export DCC_SUID="${BINOWN}"
+	export DCC_OWN="${BINOWN}"
+	export DCC_GRP="${BINGRP}"
+
+	dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc
+	if use cgi ; then
+		dodir "${dcc_cgibin}"
+	fi
+	keepdir /var/log/dcc
+
+	emake install
+
+	# branding and setting reasonable defaults
+	sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \
+		-e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \
+		-e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \
+		-e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \
+		-e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \
+		-e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \
+		-e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \
+		-e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \
+		-i "${ED}/${dcc_homedir}/dcc_conf" || die
+
+	if use milter ; then
+		# enable milter
+		sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \
+			"${ED}/${dcc_homedir}"/dcc_conf || die
+	fi
+
+	# provide cronjob
+	mv "${ED}"/usr/sbin/cron-dccd "${ED}"/etc/cron.daily/dccd || die "mv failed"
+
+	# clean up
+	mv "${ED}"/usr/sbin/logger "${ED}"/usr/sbin/logger-dcc || die "mv failed"
+
+	if ! use rrdtool; then
+		# remove rrdtool interface scripts
+		rm "${ED}"/usr/sbin/dcc-stats-{collect,graph,init} || die "Failed to clean up rrdtool scripts"
+	fi
+
+	# clean up
+	rm "${ED}"/usr/sbin/{rcDCC,updatedcc} || die
+
+	# place configuration files into /etc instead of /var/dcc
+	moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist
+
+	newinitd "${FILESDIR}"/dcc.initd-1.3.154 dcc
+	newconfd "${FILESDIR}"/dcc.confd dcc
+
+	rmdir "${ED}"/var/dcc/log/ || die
+
+	dodoc CHANGES RESTRICTIONS
+	doman *.{0,8}
+}
diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index bf11dce50345..c8d58f9e685b 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -2,5 +2,6 @@ AUX milter-regex-2.6-gentoo.patch 1078 BLAKE2B 30b782e70b2b9b23d3bdfb22ac5bdecfc
 AUX milter-regex-conf-2.6 459 BLAKE2B d15f232945a919e49f26df7a5489701b1a13567fca10d877e93943e2ac31865bdf6af26a10da196a64ce0d42238e58631b041e2b846187e82dff0ff38e8aac83 SHA512 2178c0b11ca6fca9121da66a2b4c828105efe9e94ba4b4b6dd56b235dfe3b3ab14a6f7ac9004d7a1fb2b50ff4730f875e85afa0d11c72ab2949aa150b28f1c8c
 AUX milter-regex-init 818 BLAKE2B 9130db7e295262a02cfc61464945029810f61fba4947e422fca9820d0d58762db228bcc760bc8e1f55aaa61cff9455abed19f66ff7bd910aecd9a969eaa3c12d SHA512 04549ec85a8b3c9fe4e65bcfe903aefbd9019b8324041448586bb3ed3bada20c0bf60fbe485e90bb1cf777703c696d2a0c9b3630c218d7037e1c6b2680eace75
 DIST milter-regex-2.7.tar.gz 20579 BLAKE2B e48c5747537d439372d8f473d9b39e337501c24b46d52e13f727b32ee29bb58f266e45ecabad01937f5e56a4a773659daf34d12c6728b6700679b04a2cb595d0 SHA512 d698a7c35768846bcc87a31167cf9a5c41c99d8fa3f3cb5c231e100a7e149d9bca6fc689ece805bd80688787b6d3fa0d9ace49592e1d6c53a25fc2086ebf9962
+EBUILD milter-regex-2.7-r1.ebuild 1110 BLAKE2B 8e3ce76e1d1db9231bd6bb2454219a85e598e4c6daee7bce7213fdfa5638db11e4a18faf2f838f528786d49005aa78de1dd0e6d48548006ae426fa11b7e85446 SHA512 2972ee083e31f5cb884ade0d0834f5610d319dca7faecef679996dbe96a32b418fbe9e4e4683e780817c7c4f66b6d0e0e849f0210f62216d54bc816c70432aa2
 EBUILD milter-regex-2.7.ebuild 1122 BLAKE2B 7974a8b954484fabec28215b75101f07a71ba4cee8228f2ab9c0b99123ff265bba062fd8ef62be5e0e06f5931f402daff79429a77baa5e987dd935fe3256c182 SHA512 d5d0a071a6c461186c14fc0416f4bd6290e0057290fc1e027bf93fc9855b654a8acd4060aa1aa02c4820701973c3cb55f3c6982e47d11fbff5d914fa4b217177
 MISC metadata.xml 727 BLAKE2B 46c3ce4f04ed4db2d8ce595744c16f46a0270186c4620d5245db9b0aedf4867bbd04c2b44e59591def9a01da8b5387baeaf77aae32dd9f7a18267ff2984ccc21 SHA512 a13def0da2410e52c7c63ec9cf1b72c304652e9f7ddce89cadec60285794dc70fc90c714e8a5860525426fd3768ce31a82375059c12ae42528fef57854cad282
diff --git a/mail-filter/milter-regex/milter-regex-2.7-r1.ebuild b/mail-filter/milter-regex/milter-regex-2.7-r1.ebuild
new file mode 100644
index 000000000000..a4095fb37dbb
--- /dev/null
+++ b/mail-filter/milter-regex/milter-regex-2.7-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A milter-based regular expression filter"
+HOMEPAGE="https://www.benzedrine.ch/milter-regex.html"
+SRC_URI="https://www.benzedrine.ch/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="acct-user/milter-regex
+	>=mail-filter/libmilter-1.0.2_p2:="
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.6-gentoo.patch"
+	eapply_user
+	# Change default user
+	sed -i -e 's/_\(milter-regex\)/\1/g' ${PN}.[8c] || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" -f Makefile.linux all
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc
+	newins rules ${PN}.conf
+	newconfd "${FILESDIR}/${PN}-conf-2.6" ${PN}
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+	doman *.8
+}
+
+pkg_postinst() {
+	elog "Postfix configuration example (add to main.cf or master.cf):"
+	elog "  smtpd_milters=unix:/run/milter-regex/socket"
+	elog "Sendmail configuration example:"
+	elog "  INPUT_MAIL_FILTER(\`${PN}',\`S=unix:/run/milter-regex/socket,T=S:30s;R:2m')"
+}
diff --git a/mail-filter/mimedefang/Manifest b/mail-filter/mimedefang/Manifest
index 60cdf224ff88..203d8fda883c 100644
--- a/mail-filter/mimedefang/Manifest
+++ b/mail-filter/mimedefang/Manifest
@@ -4,4 +4,5 @@ AUX mimedefang.conf 4760 BLAKE2B 14457894f4f42557ee06aca1454a85978fee1d0dd21dca7
 AUX mimedefang.init 1740 BLAKE2B bf00f5797e2dd72a29dc5b955a18a7faff1e9fd2b82d011f0628222ebc2b4117e1a9262d096706b83729c4e3851a09a65a0d1c0ee57d68c155c9136c63b569a2 SHA512 f45b3ce8a085b3559c80e4bf361ecf3cc16c360322986ac5381a1707e217a282fec4a9bec7856dd153107557911bd6eb9a9ec66b160c0b6bfec3e783aaef321a
 DIST mimedefang-2.84.tar.gz 371596 BLAKE2B b9b871d6a438792afbcebfcd99a77a1f9bb2c0dc7826abea74db913c6dc154403753a3016dc0647e9873256fe354649dea096c0e50d54f8db16ff8d2b91f54f4 SHA512 ffe039654d2e3f649219efc559380e39b21ce910becc36e262356d59d50129f8683ee2e59dd9680aff46478ccebd6b3d9c4567f85ade9a8464077350f4e52f48
 EBUILD mimedefang-2.84-r1.ebuild 1795 BLAKE2B 8f9134d7f5c9236e294a09d2bc8a8126b18d0de1a3f6b8587bf82f1631feb1814d36f46e781b881bbfa47526edec916779684582c4af997897d9cf5df209995b SHA512 dc0e51681879d2fbb00979e035f9e7ef8e9af99b91ecc0b94a52714850afee97b6391b88a327da79fb05184cde3e3d0d97833ef1a74fa8ae171b2913ef2c5b56
+EBUILD mimedefang-2.84-r2.ebuild 1772 BLAKE2B 0adfb92ea77a804bbdba8148e98dc5de53141edaa5ebaf750c77e774349cba136fad5989ec325150d6da8b9fee9cdf0b0da8d2081dbdf27b6cf5528f829df439 SHA512 51934b795a546a48f2bfc021db0dfd69ad284ab9cb4444d782777ad7635fc054e50b4f5656e3e0bb9c719ca5b6c61c4484f3ffa942e4e7b1b4e1497ac32cc413
 MISC metadata.xml 651 BLAKE2B 0cf985310000a64a001cf88c0714b3f64c8c6e87b120a861389c2c25b454d43712ff0223a7288af9a46685851eb0ba5965965129d292c6dac0d3de5f5240f240 SHA512 7024c53bfd408a46ac3f91bdecc7b26b783a71b0ed6f60c37ad640ee1a9274aa43f192da16ab7611e7ffe1b122c1e5fcaf81b46cf41b459b9da2cf8697be8c3a
diff --git a/mail-filter/mimedefang/mimedefang-2.84-r2.ebuild b/mail-filter/mimedefang/mimedefang-2.84-r2.ebuild
new file mode 100644
index 000000000000..5b86e55f2dba
--- /dev/null
+++ b/mail-filter/mimedefang/mimedefang-2.84-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Antispam, antivirus and other customizable filters for MTAs with Milter support"
+HOMEPAGE="http://www.mimedefang.org/"
+SRC_URI="http://www.mimedefang.org/static/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clamav +poll test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/defang
+	acct-user/defang
+	dev-perl/Digest-SHA1
+	dev-perl/IO-stringy
+	dev-perl/MailTools
+	dev-perl/MIME-tools
+	dev-perl/Unix-Syslog
+	mail-filter/libmilter:=
+	virtual/perl-MIME-Base64
+	clamav? ( app-antivirus/clamav )
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/Test-Class
+		dev-perl/Test-Most
+	)
+"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.72-ldflags.patch"
+	eapply "${FILESDIR}/${PN}-tests.patch"
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-user=defang
+		$(use_enable poll)
+		$(use_enable clamav)
+		$(use_enable clamav clamd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_STRIP_FLAG="" install
+
+	fowners defang:defang /etc/mail/mimedefang-filter
+	fperms 644 /etc/mail/mimedefang-filter
+	insinto /etc/mail/
+	newins "${S}"/SpamAssassin/spamassassin.cf sa-mimedefang.cf
+
+	keepdir /var/spool/{MD-Quarantine,MIMEDefang}
+	fowners defang:defang /var/spool/{MD-Quarantine,MIMEDefang}
+	fperms 700 /var/spool/{MD-Quarantine,MIMEDefang}
+
+	keepdir /var/log/mimedefang
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	dodoc -r examples contrib
+}
+
+pkg_postinst() {
+	elog "You can install Mail::SpamAssassin (mail-filter/spamassassin) and"
+	elog "HTML::Parser (dev-perl/HTML-Parser) even after installing if you require"
+	elog "them as they are loaded at run-time."
+}
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 02b386a6af06..fa788debf893 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -5,4 +5,5 @@ AUX opendmarc.initd 1521 BLAKE2B a397bbcbd6eb773ec8b80ac1243578391b1afb65830c726
 AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
 DIST opendmarc-1.4.1.1.tar.gz 426618 BLAKE2B a74b2623bc35abb5c34f8d1eff737c71af8f5cadfd6a5d0a85adb6536efd2958118f9da25dd9b736dc24563221968c4ee1ff99b101fa30909764563bda2a8d88 SHA512 ee034386c70c75b87ca2fce0849a1a3538e10e0aebfb0fc9dcba6817d2cf71f52aa5586ccaacdee620190c5fbb81498419fb8e8db9fac15d7c71a61a7da396a6
 EBUILD opendmarc-1.4.1.1-r4.ebuild 1739 BLAKE2B 6c3f8849951fa3a0e7215053a46dc8dd52d3dbb6ba380fd46812a7332e66cca3cad0bc734ea40e1b59c8f4b1cca973c61999c5e283a38622bb67a042c73584e7 SHA512 fe8ad02b7e8a53f34c012665fe75c465645c7c0390aec31da04cb6bb4c85ab6525f6179da63b5d5f9507bddc5b27589a0d745c674b1be0bddb190c627c7ba30f
+EBUILD opendmarc-1.4.1.1-r5.ebuild 1716 BLAKE2B 97d7af348a6c42a0a4db000e36fb9f5c48aa6bbf1549ff1a1f6aac50387a4444536161335dc1b5f96c5ba935e0f911ea88c0406428cc3b619826674f2e115de9 SHA512 2cce3c29b10bbc3464cf1437412522fe7d982f526d2db54d82c16ec5518078f0a914716e2cd792a28259705498aeae83f53d7009c9779942712eb4e87b283e2c
 MISC metadata.xml 513 BLAKE2B 6af2b5fb83bcc5e942e86f2d57455a54209186f8786fb6e76ce558c4bb0167d85ce419f7270e9b6e83914bdc8d0e963dc285227700bc5940096bbdbf78da93dd SHA512 eef3e5d89bf553098937118f2454cf0a7d715b31e2e49f5648260fd8c7abd03676f7a4047843e621406b54bb3c16bd4aa1409dc56d6d5ab0267a628a0cb15a99
diff --git a/mail-filter/opendmarc/opendmarc-1.4.1.1-r5.ebuild b/mail-filter/opendmarc/opendmarc-1.4.1.1-r5.ebuild
new file mode 100644
index 000000000000..c78d15504262
--- /dev/null
+++ b/mail-filter/opendmarc/opendmarc-1.4.1.1-r5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Open source DMARC implementation"
+HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
+SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${PV//./-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}"
+
+LICENSE="BSD"
+SLOT="0/3"  # 1.4 has API breakage with 1.3, yet uses same soname
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="spf +reports"
+
+DEPEND="mail-filter/libmilter:=
+	reports? ( dev-perl/DBI )"
+RDEPEND="${DEPEND}
+	acct-user/opendmarc
+	reports? (
+		dev-perl/DBD-mysql
+		dev-perl/HTTP-Message
+		dev-perl/Switch
+	)
+	spf? ( mail-filter/libspf2 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1.1-CVE-2021-34555.patch
+	"${FILESDIR}"/${PN}-1.4.1.1-underlinking.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+	if use !reports ; then
+		sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with spf) \
+		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
+		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir))
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
+	newconfd "${FILESDIR}"/opendmarc.confd opendmarc
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	dodir /etc/opendmarc
+
+	# create config file
+	sed \
+		-e 's:^# UserID .*$:UserID opendmarc:' \
+		-e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
+		-e '/^# Socket /s:^# ::' \
+		"${S}"/opendmarc/opendmarc.conf.sample \
+		> "${ED}"/etc/opendmarc/opendmarc.conf \
+		|| die
+}
diff --git a/mail-filter/sigh/Manifest b/mail-filter/sigh/Manifest
index 5000cce3181d..70e0868c0de4 100644
--- a/mail-filter/sigh/Manifest
+++ b/mail-filter/sigh/Manifest
@@ -1,5 +1,5 @@
 AUX sigh-1607.1.6-fno-common.patch 565 BLAKE2B 6c6c7e97a20a098ab7dd6924a5156f718a293cda0e0106ee0f96219d7183542cd7a363ae2b7cddcb85026a14cf60f9870247d8024822e8ebb57f99c956955e84 SHA512 4a80085b4da8df37bc8577d598f0966be402be77fed26f7d59e47c2c5836c45e0fba83bf00dc5b5e52be53e54eaa670364244f5405cf52653f41904347987523
 AUX sigh.initd 485 BLAKE2B 329efca4f269586b191e3cef3311d465ef1fbe760d34a7dbe8089cc187fe2c35b4b64be283edf8cef3efff1b3bd90cbc092a22bcdb9de3a2e118b204bbec5230 SHA512 34e1cc17fdc09ad0377604c951cc85682f56ed4a2a2f6f396d2e4d30777fa1bb8ddf693487eb100ff45fe15612bb68ba641eca3c28008431649b7f980cb3fec0
 DIST sigh-1607.1.6.tar.gz 58258 BLAKE2B 6d2743c4a850af4f28ba0f2b7a0d6fdef5b699f9521e0631b9bc534be872af4cfccd10de7648080389046faf3f34ba58e3ce68aa318d76ed8e1af5f495f47f70 SHA512 640fa35ea89d7aab956e597ef089a8b7f57af2a7e3de7087e6bd01b60715cc33263cd4fd84a8826ae37387ec802d4bb78c5fe9c83e5d404029d69de010b1ce6b
-EBUILD sigh-1607.1.6-r1.ebuild 612 BLAKE2B 7f583ba82990777fd20784686f8f00769f5e63c617c4c130faa2b8ea0603b3c724306a574bf02ba68f0e22f57c64ede168aa2edf6aba2f3ad9f073e55d2b0760 SHA512 7d403598c1bd858102282eb07665bc59215635b06b18626cfe58f4f21ed8b8c68118f16f380d0425e0495ff6aa383912a1b06ff555ac5cf921fe8f13c53b34a1
+EBUILD sigh-1607.1.6-r2.ebuild 614 BLAKE2B a422dd02896c40a00275a69c12f80fa5c607c7cfab70c7d88cd481762d5e8397ef54b6e9e42c1b4670dcc1fcb0a0b49d46c9692f27aa0cc58c32bd085d394c13 SHA512 855f7b2908499a55591d491feec09d9bbbddb24319feae27a04dbf467fa9ebf6a3208b971e060b920ffad7d0ff0860f5e5c6620b7b1e0bb476d456edbd5ba5b7
 MISC metadata.xml 330 BLAKE2B 0e4f30ad4acfb7ec48ec7a96a19100c39f7ab513de224e5dd2088a3a11187f83b76cf395527f45c0273f6d5d56cb069d153a5c4aeb87a7f17e78efb856a8be18 SHA512 2f154a9abaf0761b54bd57ef2247b1be36ab5a258ed59162b093cebff2ae0899fc5c5a26a69425e8b66cd34fefa69dfc4bc9d31e3aaa5e6fb25378e387ea36fc
diff --git a/mail-filter/sigh/sigh-1607.1.6-r1.ebuild b/mail-filter/sigh/sigh-1607.1.6-r2.ebuild
index 43bef3b3b138..bd79dd2d7237 100644
--- a/mail-filter/sigh/sigh-1607.1.6-r1.ebuild
+++ b/mail-filter/sigh/sigh-1607.1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ RDEPEND="
 	acct-user/sigh
 	dev-libs/boost
 	dev-libs/openssl:0=
-	mail-filter/libmilter"
+	mail-filter/libmilter:="
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 05b080708557..80248020066f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index b2ca7c491073..190688b5fa99 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -6,6 +6,6 @@ DIST fotoxx-22.20.tar.gz 8687337 BLAKE2B 013a1f154ea9971c5ff5c33f3ab62bcec9a364f
 DIST fotoxx-22.30.tar.gz 8692758 BLAKE2B 34688f3328af3e656ccaddd7f0656d4ac9e4f09d87e0960018ba773a80ead7f8776d4457986b9af537c46f9279da87c41b06d5ad6f3b3db108892dbd3819ab56 SHA512 9e10971e5ffed807bf0c6f1cc9c885d3a09f43b8a2004c1752863c4caf17a9d159fd1321f73e61f91f5e2e2cc737d2c45b60e44962de4976aa2605b713314b22
 EBUILD fotoxx-22.16.ebuild 2216 BLAKE2B 0a7ef8df9697f46b35ad214987da55beda2f15d5d8f07d13ad6489e26f069aefc44a1311ee8f9fa7f1f0842f985b07ac411465ae2651c0f495f13dd91ee40876 SHA512 c0e81b32e7bb8b7ffab608e7caf703460276d1e9f936abafa3e742b2b8053b534c5e820d2bafc7f82210a15c2f755e657a62ad8a88f0389a59d10d8922881ea2
 EBUILD fotoxx-22.18.ebuild 2218 BLAKE2B 82d2d2c45568c569ef3ce3e36a7133292c32eb42d016550e60bba6dce729df01305385e17630fe79fedc12e02264000ff2b435924ecc58b2b8895800068eaf3d SHA512 21f99c6bc7bf7ab7b8e05c8603f51551a59ab9b10a77b8aca5b1a797e5456d0111c8895845b7094251617876a7d2a800f1bf29c569bf6f8a1cc5baf3a5a06151
-EBUILD fotoxx-22.20.ebuild 2218 BLAKE2B 82d2d2c45568c569ef3ce3e36a7133292c32eb42d016550e60bba6dce729df01305385e17630fe79fedc12e02264000ff2b435924ecc58b2b8895800068eaf3d SHA512 21f99c6bc7bf7ab7b8e05c8603f51551a59ab9b10a77b8aca5b1a797e5456d0111c8895845b7094251617876a7d2a800f1bf29c569bf6f8a1cc5baf3a5a06151
+EBUILD fotoxx-22.20.ebuild 2216 BLAKE2B e9c7318d9e66e9fd23c6cad9cd786e6b9b7f59fde880c4d5f2132cfa1c297e16df3b03ff0177e325d5e4e2617e65dd6df010f3e8bf5724f15d51ec6b5b93ae43 SHA512 14d10237455ab8ca61f019b62977dea2e8e636d71862e2bc84806581205ae24597d2eed20e8f2d88d6c0a53c3c3811f76ca0195d0f1ffcae5361de67e2590905
 EBUILD fotoxx-22.30.ebuild 2218 BLAKE2B 82d2d2c45568c569ef3ce3e36a7133292c32eb42d016550e60bba6dce729df01305385e17630fe79fedc12e02264000ff2b435924ecc58b2b8895800068eaf3d SHA512 21f99c6bc7bf7ab7b8e05c8603f51551a59ab9b10a77b8aca5b1a797e5456d0111c8895845b7094251617876a7d2a800f1bf29c569bf6f8a1cc5baf3a5a06151
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotoxx/fotoxx-22.20.ebuild b/media-gfx/fotoxx/fotoxx-22.20.ebuild
index 5819421d21bf..33ba46fbbfd4 100644
--- a/media-gfx/fotoxx/fotoxx-22.20.ebuild
+++ b/media-gfx/fotoxx/fotoxx-22.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 # For required dependencies read doc/README, for required tools read
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index acfb2998d153..8a5ca07ae10d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index a23835bd14fa..314bb4124c0f 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,5 +1,3 @@
-DIST ncmpc-0.46.tar.xz 289332 BLAKE2B e57a931f5a512c543d48a9b6e532c7944e655d28d02fe9ec2b5b41563e2e6a5806924a668ae592f3fee58a2bb04a681fee0903b8046a61ce39a453092dfd8623 SHA512 34cbb9ff527bfa4d849069694b6d1a1e54c932b64538e799c9ef9b9ccc42ed24932b6bcbf3552af6ce846af6b7399916e1aabc6c79ac564f1c9fe56a33b6332f
 DIST ncmpc-0.47.tar.xz 291400 BLAKE2B 4b9e5bcc435b6064c054ad84000986942a699993e78decb26b73b4f3ec8d261e4e752e11d40ed5bdcbaab260b37f1a59b99708be05ade44973fee3f2b1e6d9d1 SHA512 6c9990ca9a0781eef67fae8b20ceec5fc00177b1db2b08cfdf122dd1f61f87a92030baadcaac154d73ddee622c963481d4e37d46f76a4ef21e51d4f18a6f3e6a
-EBUILD ncmpc-0.46.ebuild 1998 BLAKE2B df0ed8f7a833b4199a642f37c0b00b87ff74fcd9fe36d68f65b7873f842db2802fbfc27f8734d6419096973efdf63a8eac129c73f19363ae696a020519b7f151 SHA512 134fd475dc962dae8feca0994c9fe42dafc71f025c631bca508b184a078e39e9a3b41062a005a7a8d064706b85837e23501eb9a25a7ecfbc668ba53dc8e2cf19
-EBUILD ncmpc-0.47.ebuild 1993 BLAKE2B e0b6943689cc5eb468f3e5023427a8f6ac47932c562f9351ab8390d0f722deaf843b09bd838d1520bda3060e965f1d04de925cd4f40074dfc67b547b4c25e5ae SHA512 28f29a7ce848fb9d11abc90e9090c1b498f490039768f20a1cfc5f93229fbd763cd5a867202fa6f0267e9d0e14fe01e5b4b037e4822b618a882d708584ed21e1
+EBUILD ncmpc-0.47.ebuild 1992 BLAKE2B 58f10c1dc03f805e1a2c7c8cd3d5fe3bb6e4ec2016bbe62dd346b49e9d55305406eea81e079264e6458091e552c558e3466a0806a8be1e6c3bc7d2af7c5f6443 SHA512 66079bbc69e337527e79533cd65068f846ce72cf68ae452b5fbe37509b59f6a7ad3d3493ed2ea08b455788ab484e195b5adce3c3312416414916f25bfb28833d
 MISC metadata.xml 948 BLAKE2B 712f8c8832f3c6ff6c35609c2042ae62f00b59753ebd648457c919d78f03297b646fc704331e6a605018115fd25ed3752cb5ff41d12c2b072d7929d7357d5e14 SHA512 231ff1ad361ee547df64e26ab6a37bfcddcc373e8e8421e0bc8e594547c844fe3c73fa7d8aa3fb7594f4c2b83b91bb2f52a1268f711a6c8a2a295cdf94f59d72
diff --git a/media-sound/ncmpc/ncmpc-0.46.ebuild b/media-sound/ncmpc/ncmpc-0.46.ebuild
deleted file mode 100644
index a57957c157b9..000000000000
--- a/media-sound/ncmpc/ncmpc-0.46.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-RDEPEND="
-	>=media-libs/libmpdclient-2.9
-	sys-libs/ncurses:=[unicode(+)]
-	lirc? ( app-misc/lirc )
-	pcre? ( dev-libs/libpcre2 )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# use correct docdir and don't install license file
-	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-		-e "s/'COPYING', //" \
-		-i meson.build || die
-
-	# use correct (html) docdir
-	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
-		-i doc/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcurses=ncursesw
-		-Dcolors=true
-		-Dmini=false
-		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
-		-Dasync_connect=$(usex async-connect true false)
-		-Dchat_screen=$(usex chat-screen true false)
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Dhelp_screen=$(usex help-screen true false)
-		-Dkey_screen=$(usex key-screen true false)
-		-Dlibrary_screen=$(usex library-screen true false)
-		-Dlirc=$(usex lirc enabled disabled)
-		-Dlocale=$(usex nls enabled disabled)
-		-Dlyrics_screen=$(usex lyrics-screen true false)
-		-Dmouse=$(usex mouse enabled disabled)
-		-Dmultibyte=$(usex nls true false)
-		-Dnls=$(usex nls enabled disabled)
-		-Doutputs_screen=$(usex outputs-screen true false)
-		-Dregex=$(usex pcre enabled disabled)
-		-Dsearch_screen=$(usex search-screen true false)
-		-Dsong_screen=$(usex song-screen true false)
-	)
-
-	meson_src_configure
-}
diff --git a/media-sound/ncmpc/ncmpc-0.47.ebuild b/media-sound/ncmpc/ncmpc-0.47.ebuild
index e288f2b4fe37..969bcddf6853 100644
--- a/media-sound/ncmpc/ncmpc-0.47.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.47.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
 
 BDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d8c92056b276..707af8007c16 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 34b43bc015d2..e4936cc501e3 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 04 Aug 2022 00:09:42 +0000
+Thu, 04 Aug 2022 06:09:48 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0189529ae3d5..9da9192285b4 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518764 BLAKE2B 800d8c605261a8d2ca31eca4bde7d3bb3f684de4f3181019daf03f289f18680c6d96f494d58f96fe4ad07cdd9e1d88375337c122e7b8e08a991332389d887299 SHA512 aedc41e29d7be49299b1cb0ff40f391a2deff64b9b55c25130ff0d38269f249b737b1d372d346ecfc163d0044fae33a0e164e57a26c205b60f17269607a8117b
-TIMESTAMP 2022-08-04T00:09:46Z
+TIMESTAMP 2022-08-04T06:09:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLrDkpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLrYq9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAmig//b9YA4kp+5x79QjhVAxSVBh7ggbHhoSBDyQP3NKGV5oGG+MIcKqsvAZn9
-m4EU4b2DqVJmDeYPA6+yBbeF2xPApAXkjoFuB1fs5ggnOmYCETZjJ6ybGmHcIi/i
-jFE3AA7kUB4KyjIEIdxxxUhLjAbXLyb8EBZLVXrYTZxQOgimfMvg4ORySKDUPC0o
-5WnZ2FY7YHYoKDJmAN6URGPzRf1opbeZwwpzCyl3eVMRspC3klKPGDnozxPhgspE
-XnWAuiLddxYJIMhhg9DClKn0RlZKmzPhDLYKn4HWdTboQnS3i9w1BfXHZ6F+aeAH
-5uDUb1eqLZBZgJrB0ezNHLIOvMURKqR5UnGLIfkSg0gsCMs1suFjeFnjm2mJ1pYu
-U3V3yCyNKR2FxWa97M/kEZWEASNm/CRwncALfh2q0ms5Q3qR7xiWEcJzmgcAuf+x
-ZV30nz5ot47oxGAJ4zpsKy8HWXf4oRCtfYsGkIqlLkB/XjwT39sJmsKWDGJpb6B4
-D4FU2TFNIqNLIA2yy47BtZBOjlhovfdZ8jrpN7JNjdC+g6IeGeleFdtFi17VSL+N
-vj+dHfOjhDsrzDymGCrsjrrFztYGcr2itCIWagxvlwXdFt8HoptegNOjwqefjvrI
-8NnL2Gv1eOQ1C+hIfId+eJk38JA6LICh4g2klBjBibQSc2hioDU=
-=kCTO
+klAPrBAAoO2oWNLyckqoLQN+odLC7LdgT5y1f+jTkFQL4A8sAXRjqdEvXhKokdnv
+rHfQsP5+ZE3mZUruWoM5Ok3zCtniyvBIGEbtrA4isZpItqBOZ8de2MTyrk5uIuTh
+47IkfTQSln5WjVPYhqvWk/EZPuABkQL7KQgr2joZyqhD1W6/F1uxgXHcfzpEaK6N
+cVZnMEPNcQ/ZFQOUUz4wlrpEIrv2Bpv9DVdMji0IXjLrDmaQ0lzpiImiG5L+YeTO
+WlL6rbk/ZFeGG2vO/+X90rJElvEPylaSKViO5c45PCXkjMbhdkCXQ0YKHsmbkVrX
+zS21kCO2NSKlbV7WrKMwCwBQ7KGd+bc1tAhG3mcIVTJ70CJRHm6+HO4+53OmS5G4
+2dlVmMOcv/HEeEi0ilRAi4rcIzP1KnCkQSJOVmHYDxW0Y9aKMWjSEAJP4hkczxBT
+2kaks4i51RmTgri6kONi2yo0xyOV2H4tIXRrJ1O21WKECINQ+7kKYoDw7bPQFGyd
+vuHKf9kwb60da0mSyWAttDx5p3MgL2at6JiW5LqXdmL+3O9WQ4zz2CGi5oLsdwui
+kNy8scTh+b4Yp/QNvAzR3J+pgw1TAIaSHKH33V/u08v25ZOhyw2aF5ILNEvsX8Te
+64nYmAe96oQTxmdEayNQmuR7yD9X5BzKzDINms9SgnwcAK+ze54=
+=VdKa
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 271a13285575..e4936cc501e3 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 04 Aug 2022 00:09:43 +0000
+Thu, 04 Aug 2022 06:09:48 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 78b7ae666f4f..1c2bb0a5b990 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index a8bf397aad16..2b3823c1b9c9 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.103.7-r1 b/metadata/md5-cache/app-antivirus/clamav-0.103.7-r1
new file mode 100644
index 000000000000..831fa7333788
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.103.7-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/autoconf-2.69-r5 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/tomsfastmath >=sys-libs/zlib-1.2.2:= bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) elibc_musl? ( sys-libs/fts-standalone ) iconv? ( virtual/libiconv ) !libclamav-only? ( net-misc/curl ) dev-libs/openssl:0= milter? ( mail-filter/libmilter:= ) xml? ( dev-libs/libxml2 ) metadata-analysis-api? ( dev-libs/json-c:* ) test? ( dev-libs/check )
+DESCRIPTION=Clam Anti-Virus Scanner
+EAPI=8
+HOMEPAGE=https://www.clamav.net/
+INHERIT=autotools flag-o-matic systemd tmpfiles
+IUSE=bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/tomsfastmath >=sys-libs/zlib-1.2.2:= bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) elibc_musl? ( sys-libs/fts-standalone ) iconv? ( virtual/libiconv ) !libclamav-only? ( net-misc/curl ) dev-libs/openssl:0= milter? ( mail-filter/libmilter:= ) xml? ( dev-libs/libxml2 ) selinux? ( sec-policy/selinux-clamav ) virtual/tmpfiles
+REQUIRED_USE=libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.103.7.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ccf66708830412a82e120d6197b06448
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.104.4-r1 b/metadata/md5-cache/app-antivirus/clamav-0.104.4-r1
new file mode 100644
index 000000000000..059597acd4a9
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.104.4-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pytest[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pytest[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pytest[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack dev-libs/json-c:= dev-libs/libpcre2 >=sys-libs/zlib-1.2.2:= app-arch/bzip2 clamapp? ( sys-libs/ncurses:= net-misc/curl ) elibc_musl? ( sys-libs/fts-standalone ) virtual/libiconv !libclamav-only? ( net-misc/curl ) dev-libs/openssl:= milter? ( mail-filter/libmilter:= ) dev-libs/libxml2 rar? ( app-arch/unrar ) test? ( dev-python/pytest ) test? ( dev-libs/check )
+DESCRIPTION=Clam Anti-Virus Scanner
+EAPI=8
+HOMEPAGE=https://www.clamav.net/
+INHERIT=cmake flag-o-matic python-any-r1 systemd tmpfiles
+IUSE=doc clamonacc +clamapp libclamav-only milter rar selinux systemd test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack dev-libs/json-c:= dev-libs/libpcre2 >=sys-libs/zlib-1.2.2:= app-arch/bzip2 clamapp? ( sys-libs/ncurses:= net-misc/curl ) elibc_musl? ( sys-libs/fts-standalone ) virtual/libiconv !libclamav-only? ( net-misc/curl ) dev-libs/openssl:= milter? ( mail-filter/libmilter:= ) dev-libs/libxml2 rar? ( app-arch/unrar ) test? ( dev-python/pytest ) selinux? ( sec-policy/selinux-clamav ) virtual/tmpfiles
+REQUIRED_USE=libclamav-only? ( !clamonacc !clamapp !milter ) clamonacc? ( clamapp ) milter? ( clamapp ) test? ( !libclamav-only )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.104.4.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=efbcc8fab103534156a44e77f99eb5e9
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 88333a9cc940..8493d9a739d5 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/yara-4.2.2 b/metadata/md5-cache/app-forensics/yara-4.2.2
index e9689acace57..99d9948407be 100644
--- a/metadata/md5-cache/app-forensics/yara-4.2.2
+++ b/metadata/md5-cache/app-forensics/yara-4.2.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://virustotal.github.io/yara/
 INHERIT=autotools
 IUSE=+dex +dotnet +cuckoo +macho +magic profiling python test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=Apache-2.0
 PDEPEND=python? ( =dev-python/yara-python-4* )
 RDEPEND=dev-libs/openssl:= cuckoo? ( dev-libs/jansson:= ) magic? ( sys-apps/file:= )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://github.com/virustotal/yara/archive/v4.2.2.tar.gz -> yara-4.2.2.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ea09062bf7cbbe6c4f89152c0caa9048
+_md5_=df82e4fd0093c6d43c1c34441e274afc
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index ffbc12ef3893..92b5ca54d2dc 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/sqlmap-1.6.6 b/metadata/md5-cache/dev-db/sqlmap-1.6.6
index 0b46f21df8ef..04480c2e0fa0 100644
--- a/metadata/md5-cache/dev-db/sqlmap-1.6.6
+++ b/metadata/md5-cache/dev-db/sqlmap-1.6.6
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://sqlmap.org/
 INHERIT=bash-completion-r1 python-single-r1 wrapper
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] )
 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=https://github.com/sqlmapproject/sqlmap/archive/refs/tags/1.6.6.tar.gz -> sqlmap-1.6.6.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7e5b6e570b00bc712a6d5e1453236b9d
+_md5_=f15ec52958b664c8b8cd38e7aff8b814
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 05a5ca3a9955..73db148381ad 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/go-1.18.4 b/metadata/md5-cache/dev-lang/go-1.18.4
deleted file mode 100644
index adb32e4762ac..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.18.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://go.dev
-INHERIT=toolchain-funcs
-IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RESTRICT=strip
-SLOT=0/1.18.4
-SRC_URI=https://storage.googleapis.com/golang/go1.18.4.src.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9879ba0696ec1c9f8fc9cc3e4bc2f035
diff --git a/metadata/md5-cache/dev-lang/go-1.18.5 b/metadata/md5-cache/dev-lang/go-1.18.5
index d84575e6bb92..9ce0b9353498 100644
--- a/metadata/md5-cache/dev-lang/go-1.18.5
+++ b/metadata/md5-cache/dev-lang/go-1.18.5
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RESTRICT=strip
 SLOT=0/1.18.5
 SRC_URI=https://storage.googleapis.com/golang/go1.18.5.src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ee1fce6ec1fd247a0e16caf585fc1ac8
+_md5_=9879ba0696ec1c9f8fc9cc3e4bc2f035
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 613017ad8859..52cb66cf0c74 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/luarocks-3.9.1 b/metadata/md5-cache/dev-lua/luarocks-3.9.1
index eda1a31f34d0..38144f27243d 100644
--- a/metadata/md5-cache/dev-lua/luarocks-3.9.1
+++ b/metadata/md5-cache/dev-lua/luarocks-3.9.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://luarocks.org
 INHERIT=lua-single
 IUSE=test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 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 )
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://luarocks.org/releases/luarocks-3.9.1.tar.gz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=18dad514152beea3c7aa85e9b0842192
+_md5_=314b7ff2d7a5b183e3a3ae1de97f0a0e
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index a1a97e73717b..693f8309f251 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Template-Toolkit-3.10.0 b/metadata/md5-cache/dev-perl/Template-Toolkit-3.10.0
new file mode 100644
index 000000000000..9b1f67f4728a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Template-Toolkit-3.10.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-perl/Text-Autoformat mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) >=dev-perl/AppConfig-1.560.0 test? ( dev-perl/CGI ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=The Template Toolkit
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Template-Toolkit
+INHERIT=perl-module
+IUSE=xml gd mysql postgres latex vim-syntax test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+PDEPEND=dev-perl/Text-Autoformat vim-syntax? ( app-vim/tt2-syntax ) xml? ( dev-perl/Template-XML ) gd? ( dev-perl/Template-GD ) mysql? ( dev-perl/Template-DBI ) latex? ( dev-perl/Template-Plugin-Latex ) postgres? ( dev-perl/Template-DBI )
+RDEPEND=dev-perl/Text-Autoformat mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) >=dev-perl/AppConfig-1.560.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.010.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=018d10c4381919d92d39cc1f52b40314
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 9f5c6bf1c038..572480ed4279 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/cffi-1.15.1 b/metadata/md5-cache/dev-python/cffi-1.15.1
index 52335c0b399b..b40966ec3d1f 100644
--- a/metadata/md5-cache/dev-python/cffi-1.15.1
+++ b/metadata/md5-cache/dev-python/cffi-1.15.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_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
+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
 LICENSE=MIT
 RDEPEND=dev-libs/libffi:= dev-python/pycparser[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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.15.1
 SRC_URI=mirror://pypi/c/cffi/cffi-1.15.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6d1340594efef19b92f25b1f233da932
+_md5_=92ccf15f88929694ebc115b2b63a0f62
diff --git a/metadata/md5-cache/dev-python/furo-2022.6.21 b/metadata/md5-cache/dev-python/furo-2022.6.21
index 955cfdff32a7..fff171677ede 100644
--- a/metadata/md5-cache/dev-python/furo-2022.6.21
+++ b/metadata/md5-cache/dev-python/furo-2022.6.21
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/furo/ https://github.com/pradyunsg/furo/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-basic-ng[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/py3/f/furo/furo-2022.6.21-py3-none-any.whl
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9620507b6b9e1370205e20d234e5383a
+_md5_=063978fdfc521f381d71c23f1c249e79
diff --git a/metadata/md5-cache/dev-python/pymilter-1.0.4-r3 b/metadata/md5-cache/dev-python/pymilter-1.0.4-r3
new file mode 100644
index 000000000000..a53aeaf95bc8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymilter-1.0.4-r3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) ) test? ( mail-filter/libmilter:= dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=mail-filter/libmilter:=
+DESCRIPTION=Python interface to sendmail milter API
+EAPI=8
+HOMEPAGE=https://github.com/sdgathman/pymilter
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64
+LICENSE=GPL-2
+RDEPEND=mail-filter/libmilter:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sdgathman/pymilter/archive/pymilter-1.0.4.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1798dffceb04fbded219bcd312fe37c6
diff --git a/metadata/md5-cache/dev-python/pysvn-1.9.15-r1 b/metadata/md5-cache/dev-python/pysvn-1.9.15-r1
index 5ffda5644842..f1e4d480ac9d 100644
--- a/metadata/md5-cache/dev-python/pysvn-1.9.15-r1
+++ b/metadata/md5-cache/dev-python/pysvn-1.9.15-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pysvn.sourceforge.io/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=doc examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=Apache-1.1
 RDEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/subversion-1.9 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/pysvn/pysvn/V1.9.15/pysvn-1.9.15.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=25d9fe78280aa1c85453c4a129a7b900
+_md5_=54d9cb6ca5260105a0e0863811067222
diff --git a/metadata/md5-cache/dev-python/sphinx-basic-ng-0.0.1_alpha11 b/metadata/md5-cache/dev-python/sphinx-basic-ng-0.0.1_alpha11
index 34674dcafd47..b6240cff986d 100644
--- a/metadata/md5-cache/dev-python/sphinx-basic-ng-0.0.1_alpha11
+++ b/metadata/md5-cache/dev-python/sphinx-basic-ng-0.0.1_alpha11
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pradyunsg/sphinx-basic-ng/ https://pypi.org/project/sphinx-basic-ng/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=<dev-python/sphinx-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 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/pradyunsg/sphinx-basic-ng/archive/0.0.1.a11.tar.gz -> sphinx-basic-ng-0.0.1.a11.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1e036f52d275c30aed0b9556ad8ae65c
+_md5_=88f491fb69ff65a64cf5eed7877a02eb
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.7-r2 b/metadata/md5-cache/dev-python/wxpython-4.0.7-r2
index 4a0835b5bdef..500d77b5466c 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.7-r2
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.7-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.wxpython.org/
 INHERIT=distutils-r1 multiprocessing virtualx wxwidgets
 IUSE=test webkit python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=wxWinLL-3
 RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 media-libs/libjpeg-turbo:0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=4.0
 SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.7.post2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
-_md5_=14cf5e1027870e98454e0ad0d0e07883
+_md5_=367094cdf1daa8ad6eda69554f05f082
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 83a035fa829e..b080c586896b 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/gitlab-runner-15.2.1 b/metadata/md5-cache/dev-util/gitlab-runner-15.2.1
new file mode 100644
index 000000000000..97fe60599c9b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gitlab-runner-15.2.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=acct-group/gitlab-runner acct-user/gitlab-runner
+DESCRIPTION=The official GitLab Runner, written in Go
+EAPI=8
+HOMEPAGE=https://gitlab.com/gitlab-org/gitlab-runner
+INHERIT=go-module systemd tmpfiles
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=acct-group/gitlab-runner acct-user/gitlab-runner virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v15.2.1/gitlab-runner-v15.2.1.tar.gz -> gitlab-runner-15.2.1.tar.gz https://dev.gentoo.org/~williamh/dist/gitlab-runner-15.2.1-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=06538187e7ce464c4e4ec822e4c81112
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index d15f4608957d..95516bd1f013 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/libwpe-1.12.2 b/metadata/md5-cache/gui-libs/libwpe-1.12.2
new file mode 100644
index 000000000000..815a1ca7ed31
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/libwpe-1.12.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/mesa[egl(+)] x11-libs/libxkbcommon
+DESCRIPTION=Platform-agnostic interfaces for WPE WebKit
+EAPI=8
+HOMEPAGE=https://wpewebkit.org/
+INHERIT=meson
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=media-libs/mesa[egl(+)] x11-libs/libxkbcommon
+SLOT=1.0
+SRC_URI=https://wpewebkit.org/releases/libwpe-1.12.2.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=80bde2b376f68ee641c83b96f3303b97
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 3d5b11dfc29a..18d243f17d29 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/amavisd-milter-1.7.2-r1 b/metadata/md5-cache/mail-filter/amavisd-milter-1.7.2-r1
new file mode 100644
index 000000000000..3ff9e102feb7
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/amavisd-milter-1.7.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=mail-filter/libmilter:=
+DESCRIPTION=sendmail milter for amavisd-new
+EAPI=8
+HOMEPAGE=https://github.com/prehor/amavisd-milter/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=mail-filter/libmilter:= mail-filter/amavisd-new
+SLOT=0
+SRC_URI=https://github.com/prehor/amavisd-milter/releases/download/1.7.2/amavisd-milter-1.7.2.tar.gz
+_md5_=879b7b33e116c3f0201d586bf581b13c
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.158-r2 b/metadata/md5-cache/mail-filter/dcc-1.3.158-r2
new file mode 100644
index 000000000000..7872b402cdb6
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.158-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-lang/perl || ( net-ftp/ftp net-misc/curl net-misc/wget www-client/fetch ) milter? ( mail-filter/libmilter:= ) rrdtool? ( net-analyzer/rrdtool )
+DESCRIPTION=Distributed Checksum Clearinghouse
+EAPI=7
+HOMEPAGE=https://www.rhyolite.com/dcc/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=cgi ipv6 rrdtool milter
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+LICENSE=DCC GPL-2
+RDEPEND=dev-lang/perl || ( net-ftp/ftp net-misc/curl net-misc/wget www-client/fetch ) milter? ( mail-filter/libmilter:= ) rrdtool? ( net-analyzer/rrdtool )
+SLOT=0
+SRC_URI=https://www.rhyolite.com/dcc/source/old/dcc-1.3.158.tar.Z
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=f50fe93056943b8d21949820ac59729f
diff --git a/metadata/md5-cache/mail-filter/milter-regex-2.7-r1 b/metadata/md5-cache/mail-filter/milter-regex-2.7-r1
new file mode 100644
index 000000000000..b01d82f8c9fd
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/milter-regex-2.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/milter-regex >=mail-filter/libmilter-1.0.2_p2:= virtual/yacc
+DESCRIPTION=A milter-based regular expression filter
+EAPI=7
+HOMEPAGE=https://www.benzedrine.ch/milter-regex.html
+INHERIT=toolchain-funcs
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=acct-user/milter-regex >=mail-filter/libmilter-1.0.2_p2:=
+SLOT=0
+SRC_URI=https://www.benzedrine.ch/milter-regex-2.7.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=cf946dcd8cb454dfa3b80db58313b4a7
diff --git a/metadata/md5-cache/mail-filter/mimedefang-2.84-r2 b/metadata/md5-cache/mail-filter/mimedefang-2.84-r2
new file mode 100644
index 000000000000..64b22afaf352
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/mimedefang-2.84-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/defang acct-user/defang dev-perl/Digest-SHA1 dev-perl/IO-stringy dev-perl/MailTools dev-perl/MIME-tools dev-perl/Unix-Syslog mail-filter/libmilter:= virtual/perl-MIME-Base64 clamav? ( app-antivirus/clamav ) test? ( dev-perl/Test-Class dev-perl/Test-Most )
+DESCRIPTION=Antispam, antivirus and other customizable filters for MTAs with Milter support
+EAPI=7
+HOMEPAGE=http://www.mimedefang.org/
+IUSE=clamav +poll test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=acct-group/defang acct-user/defang dev-perl/Digest-SHA1 dev-perl/IO-stringy dev-perl/MailTools dev-perl/MIME-tools dev-perl/Unix-Syslog mail-filter/libmilter:= virtual/perl-MIME-Base64 clamav? ( app-antivirus/clamav )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://www.mimedefang.org/static/mimedefang-2.84.tar.gz
+_md5_=1a019c31fb811a5f820c42d7379169e3
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.4.1.1-r5 b/metadata/md5-cache/mail-filter/opendmarc-1.4.1.1-r5
new file mode 100644
index 000000000000..592bfb572859
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/opendmarc-1.4.1.1-r5
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=mail-filter/libmilter:= reports? ( dev-perl/DBI )
+DESCRIPTION=Open source DMARC implementation
+EAPI=7
+HOMEPAGE=http://www.trusteddomain.org/opendmarc/
+INHERIT=autotools systemd
+IUSE=spf +reports
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=mail-filter/libmilter:= reports? ( dev-perl/DBI ) acct-user/opendmarc reports? ( dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/Switch ) spf? ( mail-filter/libspf2 )
+SLOT=0/3
+SRC_URI=https://github.com/trusteddomainproject/OpenDMARC/archive/rel-opendmarc-1-4-1-1.tar.gz -> opendmarc-1.4.1.1.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b1fcc06b6db5aae592e266e6044c4c17
diff --git a/metadata/md5-cache/mail-filter/sigh-1607.1.6-r1 b/metadata/md5-cache/mail-filter/sigh-1607.1.6-r2
index 5766c70d2dfe..821bbb01071d 100644
--- a/metadata/md5-cache/mail-filter/sigh-1607.1.6-r1
+++ b/metadata/md5-cache/mail-filter/sigh-1607.1.6-r2
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=acct-group/sigh acct-user/sigh dev-libs/boost dev-libs/openssl:0= mail-filter/libmilter
+DEPEND=acct-group/sigh acct-user/sigh dev-libs/boost dev-libs/openssl:0= mail-filter/libmilter:=
 DESCRIPTION=S/MIME signing milter
 EAPI=7
 HOMEPAGE=https://signing-milter.org/
 INHERIT=cmake
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=acct-group/sigh acct-user/sigh dev-libs/boost dev-libs/openssl:0= mail-filter/libmilter
+RDEPEND=acct-group/sigh acct-user/sigh dev-libs/boost dev-libs/openssl:0= mail-filter/libmilter:=
 SLOT=0
 SRC_URI=https://github.com/croessner/sigh/archive/v1607.1.6.tar.gz -> sigh-1607.1.6.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=41f53f7f1354531aa95905adef9c2c45
+_md5_=75ff2494edeefcca2338f9b1125b01c1
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 822ba192e4ff..d3c3592046ce 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/fotoxx-22.20 b/metadata/md5-cache/media-gfx/fotoxx-22.20
index 57f3d61be03b..61d59c005be2 100644
--- a/metadata/md5-cache/media-gfx/fotoxx-22.20
+++ b/metadata/md5-cache/media-gfx/fotoxx-22.20
@@ -4,10 +4,10 @@ DESCRIPTION=Program for improving image files made with a digital camera
 EAPI=7
 HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
 INHERIT=optfeature xdg-utils
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+
 RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-22.20.tar.gz
 _eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=034c4a4552030315f27245bc4c8d8634
+_md5_=fda0c522287cd8c34b4072dc0bf9ef0b
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a7fa1356828e..ab4874586679 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.46 b/metadata/md5-cache/media-sound/ncmpc-0.46
deleted file mode 100644
index ab00a047baa4..000000000000
--- a/metadata/md5-cache/media-sound/ncmpc-0.46
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:=[unicode(+)] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre2 )
-DESCRIPTION=Ncurses client for the Music Player Daemon (MPD)
-EAPI=8
-HOMEPAGE=https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc
-INHERIT=meson
-IUSE=async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen
-KEYWORDS=amd64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:=[unicode(+)] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre2 )
-SLOT=0
-SRC_URI=https://www.musicpd.org/download/ncmpc/0/ncmpc-0.46.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=543837db7a5f370b0b92e41938ff792d
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.47 b/metadata/md5-cache/media-sound/ncmpc-0.47
index 829871020b19..62ff5f21517d 100644
--- a/metadata/md5-cache/media-sound/ncmpc-0.47
+++ b/metadata/md5-cache/media-sound/ncmpc-0.47
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc
 INHERIT=meson
 IUSE=async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen
-KEYWORDS=amd64 ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libmpdclient sys-libs/ncurses:=[unicode(+)] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/ncmpc/0/ncmpc-0.47.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=06c921f02b351608e97788855e9aaa48
+_md5_=836f8d222f221b588f660be7ae784917
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 2bb9897306d7..704dc4258f4c 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/mosh-1.4.0_rc1-r1 b/metadata/md5-cache/net-misc/mosh-1.4.0_rc1-r1
new file mode 100644
index 000000000000..5ebf3ce9f857
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mosh-1.4.0_rc1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/protobuf:= sys-libs/ncurses:= sys-libs/zlib virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) !nettle? ( dev-libs/openssl:= ) nettle? ( dev-libs/nettle:= ) utempter? ( sys-libs/libutempter )
+DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
+EAPI=8
+HOMEPAGE=https://mosh.org
+INHERIT=autotools bash-completion-r1
+IUSE=+client examples +hardened nettle +server syslog ufw +utempter
+LICENSE=GPL-3
+RDEPEND=dev-libs/protobuf:= sys-libs/ncurses:= sys-libs/zlib virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) !nettle? ( dev-libs/openssl:= ) nettle? ( dev-libs/nettle:= ) utempter? ( sys-libs/libutempter )
+REQUIRED_USE=|| ( client server ) examples? ( client )
+SLOT=0
+SRC_URI=https://github.com/mobile-shell/mosh/releases/download/mosh-1.4.0-rc1/mosh-1.4.0-rc1.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=42b5ff85858f168c66399aea62f1e345
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.12.0-r7 b/metadata/md5-cache/net-misc/tigervnc-1.12.0-r7
index 14a42e4f2179..dd6dd71663c9 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.12.0-r7
+++ b/metadata/md5-cache/net-misc/tigervnc-1.12.0-r7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://tigervnc.org
 INHERIT=autotools cmake eapi8-dosym flag-o-matic java-pkg-opt-2 optfeature systemd xdg
 IUSE=dri3 +drm gnutls java nls +opengl +server xinerama java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) ) java? ( virtual/jre:1.8 ) server? ( dev-lang/perl sys-process/psmisc ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=dri3? ( drm ) opengl? ( server )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.12.0.tar.gz -> tigervnc-1.12.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.1.tar.xz https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> tigervnc-1.12.0-xserver-21.patch )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f43f62bb3969781d810e4ed705d35f49
+_md5_=288595452ce84ae2cac5563d1fb12cc4
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 5167b3ff0c78..087a3af4be7c 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.16
new file mode 100644
index 000000000000..2cc34a19fc20
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.16
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.18.16
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.18.16 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.18.16
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-20.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-20.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g2.tar.gz -> gentoo-kernel-config-g2.tar.gz amd64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.18.9-gentoo ) arm64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.18.9-gentoo ) ppc64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.18.9-gentoo ) x86? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.18.9-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=50aef4bd0d1740bc0e9c620e3838d700
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.16
new file mode 100644
index 000000000000..f144d02fddbd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.16
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.18.16
+RDEPEND=!sys-kernel/gentoo-kernel:5.18.16 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.18.16
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-20.extras.tar.xz amd64? ( https://dev.gentoo.org/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.16-1.xpak -> gentoo-kernel-5.18.16-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.16-1.xpak -> gentoo-kernel-5.18.16-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.16-1.xpak -> gentoo-kernel-5.18.16-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~sam/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.16-1.xpak -> gentoo-kernel-5.18.16-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=db95108c1f06a3264ac81856238d5f6a
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.16 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.16
new file mode 100644
index 000000000000..b6a4f0ed4851
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.16
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.18.16
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.18.16
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.16.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.16.tar.sign ) amd64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.18.9-gentoo ) arm64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.18.9-gentoo ) ppc64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.18.9-gentoo ) x86? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.9-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.18.9-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=de013274f72045e42cad875fe2bd507b
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 2b0b221296bd..fff67d68ea04 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.18.16 b/metadata/md5-cache/virtual/dist-kernel-5.18.16
new file mode 100644
index 000000000000..876574fe6379
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.18.16
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.18.16 ~sys-kernel/gentoo-kernel-bin-5.18.16 ~sys-kernel/vanilla-kernel-5.18.16 )
+SLOT=0/5.18.16
+_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 38674791d5b1..5e76a8a14fa0 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/google-chrome-103.0.5060.134 b/metadata/md5-cache/www-client/google-chrome-104.0.5112.79
index 82ddfe5c837e..b141947bbf33 100644
--- a/metadata/md5-cache/www-client/google-chrome-103.0.5060.134
+++ b/metadata/md5-cache/www-client/google-chrome-104.0.5112.79
@@ -6,9 +6,9 @@ INHERIT=chromium-2 desktop pax-utils unpacker xdg
 IUSE=selinux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* amd64
 LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_103.0.5060.134-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_104.0.5112.79-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=64c6f976207c71ee82412bd7fa5d276b
+_md5_=f54ebfc7ec61e07d3a5f568bc5cc23e3
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-104.0.5112.57 b/metadata/md5-cache/www-client/google-chrome-beta-104.0.5112.79
index 1adb1b5381d8..5bfaec97498c 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-104.0.5112.57
+++ b/metadata/md5-cache/www-client/google-chrome-beta-104.0.5112.79
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_104.0.5112.57-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_104.0.5112.79-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d48be4d1b0cae1d9bf1bbfa4dc2a45c7
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-105.0.5176.3 b/metadata/md5-cache/www-client/google-chrome-unstable-105.0.5195.19
index a3821077b76f..82c2c33ef3ba 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-105.0.5176.3
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-105.0.5195.19
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_105.0.5176.3-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_105.0.5195.19-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d48be4d1b0cae1d9bf1bbfa4dc2a45c7
diff --git a/metadata/md5-cache/www-client/microsoft-edge-103.0.1264.62 b/metadata/md5-cache/www-client/microsoft-edge-103.0.1264.77
index c1e5f65b680b..9c512f36bcc7 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-103.0.1264.62
+++ b/metadata/md5-cache/www-client/microsoft-edge-103.0.1264.77
@@ -9,6 +9,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_103.0.1264.62-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_103.0.1264.77-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3301d61577802771b104ca2c26903a47
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.21 b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.35
index a5b005856e17..9df1b231a235 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.21
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.35
@@ -9,6 +9,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_104.0.1293.21-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_104.0.1293.35-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.25 b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.41
index 384765ca8ccb..ab8b4091923e 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.25
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.41
@@ -9,6 +9,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_104.0.1293.25-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_104.0.1293.41-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.14 b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.44
index 33fb5efac411..b3a28611add7 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.14
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-104.0.1293.44
@@ -9,6 +9,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_104.0.1293.14-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_104.0.1293.44-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1300.1 b/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1329.1
index 11c02e6dc79f..64364090ae41 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1300.1
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1329.1
@@ -9,6 +9,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_105.0.1300.1-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_105.0.1329.1-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-104.0.1293.5 b/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1336.2
index 466288a967f1..904cb9de3d97 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-104.0.1293.5
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-105.0.1336.2
@@ -9,6 +9,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_104.0.1293.5-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_105.0.1336.2-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/opera-89.0.4447.51 b/metadata/md5-cache/www-client/opera-89.0.4447.83
index f428410c8018..8b773b470c99 100644
--- a/metadata/md5-cache/www-client/opera-89.0.4447.51
+++ b/metadata/md5-cache/www-client/opera-89.0.4447.83
@@ -9,6 +9,6 @@ LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/89.0.4447.51/linux/opera-stable_89.0.4447.51_amd64.deb https://download2.operacdn.com/pub/opera/desktop/89.0.4447.51/linux/opera-stable_89.0.4447.51_amd64.deb https://download3.operacdn.com/pub/opera/desktop/89.0.4447.51/linux/opera-stable_89.0.4447.51_amd64.deb https://download4.operacdn.com/pub/opera/desktop/89.0.4447.51/linux/opera-stable_89.0.4447.51_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-102.0.5005.61.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/89.0.4447.83/linux/opera-stable_89.0.4447.83_amd64.deb https://download2.operacdn.com/pub/opera/desktop/89.0.4447.83/linux/opera-stable_89.0.4447.83_amd64.deb https://download3.operacdn.com/pub/opera/desktop/89.0.4447.83/linux/opera-stable_89.0.4447.83_amd64.deb https://download4.operacdn.com/pub/opera/desktop/89.0.4447.83/linux/opera-stable_89.0.4447.83_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-102.0.5005.61.tar.xz )
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d926edef9a5598685c8c74a4685e8966
diff --git a/metadata/md5-cache/www-client/opera-beta-89.0.4447.33 b/metadata/md5-cache/www-client/opera-beta-90.0.4480.30
index 943adaacb820..23c64ce38761 100644
--- a/metadata/md5-cache/www-client/opera-beta-89.0.4447.33
+++ b/metadata/md5-cache/www-client/opera-beta-90.0.4480.30
@@ -9,6 +9,6 @@ LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/89.0.4447.33/linux/opera-beta_89.0.4447.33_amd64.deb https://download2.operacdn.com/pub/opera-beta/89.0.4447.33/linux/opera-beta_89.0.4447.33_amd64.deb https://download3.operacdn.com/pub/opera-beta/89.0.4447.33/linux/opera-beta_89.0.4447.33_amd64.deb https://download4.operacdn.com/pub/opera-beta/89.0.4447.33/linux/opera-beta_89.0.4447.33_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-102.0.5005.61.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/90.0.4480.30/linux/opera-beta_90.0.4480.30_amd64.deb https://download2.operacdn.com/pub/opera-beta/90.0.4480.30/linux/opera-beta_90.0.4480.30_amd64.deb https://download3.operacdn.com/pub/opera-beta/90.0.4480.30/linux/opera-beta_90.0.4480.30_amd64.deb https://download4.operacdn.com/pub/opera-beta/90.0.4480.30/linux/opera-beta_90.0.4480.30_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-104.0.5083.0.tar.xz )
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3d354106d856a8fc7d7958ea47439b09
+_md5_=ca6e138e4454ef1c5a06bb9e51e523f7
diff --git a/metadata/md5-cache/www-client/opera-developer-90.0.4470.0 b/metadata/md5-cache/www-client/opera-developer-91.0.4491.0
index c50757cf24ed..1d0082d45c71 100644
--- a/metadata/md5-cache/www-client/opera-developer-90.0.4470.0
+++ b/metadata/md5-cache/www-client/opera-developer-91.0.4491.0
@@ -9,6 +9,6 @@ LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-developer/90.0.4470.0/linux/opera-developer_90.0.4470.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/90.0.4470.0/linux/opera-developer_90.0.4470.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/90.0.4470.0/linux/opera-developer_90.0.4470.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/90.0.4470.0/linux/opera-developer_90.0.4470.0_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-104.0.5083.0.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-developer/91.0.4491.0/linux/opera-developer_91.0.4491.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/91.0.4491.0/linux/opera-developer_91.0.4491.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/91.0.4491.0/linux/opera-developer_91.0.4491.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/91.0.4491.0/linux/opera-developer_91.0.4491.0_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-104.0.5083.0.tar.xz )
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ca6e138e4454ef1c5a06bb9e51e523f7
diff --git a/metadata/md5-cache/www-client/opera-developer-90.0.4477.0 b/metadata/md5-cache/www-client/opera-developer-91.0.4498.0
index 00f23eb1503f..4030ffcbda69 100644
--- a/metadata/md5-cache/www-client/opera-developer-90.0.4477.0
+++ b/metadata/md5-cache/www-client/opera-developer-91.0.4498.0
@@ -9,6 +9,6 @@ LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-developer/90.0.4477.0/linux/opera-developer_90.0.4477.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/90.0.4477.0/linux/opera-developer_90.0.4477.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/90.0.4477.0/linux/opera-developer_90.0.4477.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/90.0.4477.0/linux/opera-developer_90.0.4477.0_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-104.0.5083.0.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-developer/91.0.4498.0/linux/opera-developer_91.0.4498.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/91.0.4498.0/linux/opera-developer_91.0.4498.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/91.0.4498.0/linux/opera-developer_91.0.4498.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/91.0.4498.0/linux/opera-developer_91.0.4498.0_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-104.0.5083.0.tar.xz )
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ca6e138e4454ef1c5a06bb9e51e523f7
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index c4e51436d4a2..9fa30c031944 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-103.0.5060.134 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-104.0.5112.79
index 8a63e3c50472..3f925361baef 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-103.0.5060.134
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-104.0.5112.79
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_103.0.5060.134-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_104.0.5112.79-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285
 _md5_=63079fa95734c111159210df04e4b0cb
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-104.0.5112.57_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-104.0.5112.79_beta
index 13f512b594e2..ca9a2f1d596b 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-104.0.5112.57_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-104.0.5112.79_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_104.0.5112.57-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_104.0.5112.79-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285
 _md5_=280d4365f7d545b5db4b59005ac2ef69
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-105.0.5176.3_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-105.0.5195.19_alpha
index 8c567b21b0c6..9a94183ae7cb 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-105.0.5176.3_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-105.0.5195.19_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_105.0.5176.3-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_105.0.5195.19-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285
 _md5_=280d4365f7d545b5db4b59005ac2ef69
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 6f66596d6d68..2e3ebfdb00cb 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14051 BLAKE2B d460feca8bc7b4b0010f7ac7463f4648f0179be7700fc4f9141b971da3afd32867e4c57f7cc8b362bd97297526d49c086c2e727585677c6d001cb79f9ad21b12 SHA512 36e0a69e355d9df65eb4e07b145e6ac9baa2486cc796754e7a282c04a51eb949476215df45047dc77cbfbded75ae5fa94866b42dcd31f97fb13dd70c78334c0f
-TIMESTAMP 2022-08-04T00:09:46Z
+TIMESTAMP 2022-08-04T06:09:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLrDkpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLrYq9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB5dRAAkRe6485Rjzldbkb7hzoH8DRtmLTbebVrtt+cYUEOozMOwE4DtZYphyrR
-CxurWlwwmRhjvEPXKfXx3KRNVqBfIH+ExGnu5TjdXZYBS0fu/pfxegrMS9XdWOk7
-4tBgGRnSnZ3AZJ3Mr/yrhMg4DVANvUhgwLC1SiXNwiKtPj0x57PrYl0wDVw8qsN3
-2wFwPKYyA6g+HmXCtuGD+mJu5kNxcERhwNAtJVfDdDoqH0k3hfBB9jfrHuVAs8kM
-1s/R+QzSjx4OO5vsDGNTmKLvprZKQ5JQd/C1SSb7t8HH89Bs05euSuQzr36MrOnm
-qzLzVtINH/Jl3BDdslsRRL2agx9OQ/DXYbOTC3OzM5qD/hWrbTbmsimNFIF0I/sD
-7HWPSL6QhvpkmkrIOoBd4DoxefUBahJaSRQXI4re1oIBxvAS1F7/CNwCs6pybTfO
-xfPOUnMqEM/AiN6ch7CmW9unH2hUqrub61FDD92f2uCryuDUIYEDZ/Zftpw48wwT
-0e1X6uanojwSWbdhSVcDd8FE1Hg4iPFZYkA4B83qxWKd04Ysj135W64NOib2bNE2
-GgIGwcA47jt2GKeZ2wD1ZLKVthMvGfIVBXGnHSENlI4eIVKoJs529uYHx5F+IuoY
-zJ9c3Ao2XbodpNRN643/POnI7y7/Jy8mxC0mGNd1VUVHF3893ZY=
-=bt8r
+klBCCA//ROoMZ3KqgLLEQdY5AIn1TG79xoap7H65JRDFchD9cjzJLrqov6hFXj9h
+yczJQ6JEqEApZSCnT5lRiVcPoCzRhhr93q8JeramJRE2i8GYMgoK5tJQ8q3kh6gZ
+nFu6BV+nafBNwF/Ku6xCSsKYOOa7moZjjv4X2xIMnE800KkzNfYbT9xyYLvnrJ2o
+LI+7Y69vMNJOEFPNVE9QTpRZWhgxyEnnpDbiic4kSBK3E7MWedUVTIWIlX/vP/+S
+EaGzuvq+yCffGEED654izqJkmjPvAsQrYgU9G72GUwSqPqSzJGSgFjVO9Io3qhIM
+Eu9fJJvrYUSL0q3ATLD7URts1dChMU+6+RA0T0fZZOHGnQ+zaRYKKPCYaSZDqwqg
+8aeHvsJ9BXx43aC7URVFn/TiF4fmhOQsFlBS2+hOyzfhaA10dv6QS/WGR5X3XQRD
+CcQSteyUrOZHMNOpnA7suojcalS1DnoFk/xPxeLkRdUupNFZ6j9x9XleRc0p6yxd
+dYlJj1L5AS+/mQCx+MrMoCUr2qNuA8DLe3rWyhxaqtVHE/gup6oUZZtE9VjMIMy3
+NIQUaYWLmXMKS18c57vfmyc1JtcQfkwYtA7fDWcI2ayEDrkcK2M6ROlKFs3JnVHo
+mVelfO+2KwFCqBKfmU4/lUFgCPJ5bS/Ggu/WfflO9MSv123Qilc=
+=fzIk
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 271a13285575..e4936cc501e3 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 04 Aug 2022 00:09:43 +0000
+Thu, 04 Aug 2022 06:09:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7dbedd462cc3..485230a19075 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Aug  4 12:09:42 AM UTC 2022
+Thu Aug  4 06:09:48 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index dd9dee354132..e7a125a32ba5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 04 Aug 2022 00:15:01 +0000
+Thu, 04 Aug 2022 06:15:02 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 77a91c8a9f05..b8c022d099f7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0ff59588bcd61765035baa8b1e06b8bdfa9fa97f 1659570564 2022-08-03T23:49:24+00:00
+2a8ae50dc473e5355c4dada46674ab98e82097de 1659590489 2022-08-04T05:21:29+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5642cdeaeca9..a0ab2c34e4ab 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1659571801 Thu 04 Aug 2022 12:10:01 AM UTC
+1659593401 Thu 04 Aug 2022 06:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 271a13285575..e4936cc501e3 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 04 Aug 2022 00:09:43 +0000
+Thu, 04 Aug 2022 06:09:48 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a4c293967525..d810adbcabac 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 96fbe655277c..806b5178a5ab 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1,5 +1,7 @@
 AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d
 AUX mosh-1.3.2-bind-misinterpret.patch 432 BLAKE2B 81bda9f9a2d63ed2f5298b399ec92435db12b1e2c57906a6a38267df2dc525d209ec8cb72591627dd58d0c0c79e5c878345d52976df7b3b8d7893447f34574a5 SHA512 d9068c169f5ecc7c64d424490bbe9c03bdd5ecf184ad4a28fe106c68cbf228641ad39e3cf4da061b1693318e5bb3b4f91365203693537021ed75b67fc494b7f8
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
+DIST mosh-1.4.0-rc1.tar.gz 386364 BLAKE2B e9dee52f0a0d934c85efbcfd7c6b857ad1b6e3d5a7ed13730e1a79ef286331ef1828292ebc71731572af94c03bae37b7227ff569669c01b6885984b15220693e SHA512 82affca6a596a0475f32a944e23c879f625215ea8311cd29cef56f5af57d88a377420ba7addeb53c9bd30d1583654897baf939618e706d1928d57e83cc87ce9c
 EBUILD mosh-1.3.2-r2.ebuild 1495 BLAKE2B 37b69dd27d145709d283351072318f9c121d9d0b291138c8e65deb75af2f30956bbb1172497fa6e109511d19829e1e589fceacf0d9d25e3448aae416e5d3cfe0 SHA512 5ab027e930195649efbfeda59f32ab06513880fec2e54b85d8104c31b3620a2b49d81eff887bd79319a413b688230748493e4f7f3530ea09c9281c66e6b3ed0a
-MISC metadata.xml 1104 BLAKE2B 9da21afbf989104205fd3c8d8b9b0f597496efe9e175f1577c6c5e1866ca6dbfa9353ef03bfd72c850cd21fa2067be9146a82a261d2bd68ebe64cd49deff8e94 SHA512 4fd1d994fb0ca6bacc07a6c3a970edffc3a2e70bcca7cd6ecc74687794ba7ec6212994cb5997712946c555b3e66063caa36c8656ae737ac193031bf997ec7e13
+EBUILD mosh-1.4.0_rc1-r1.ebuild 1948 BLAKE2B e3f6f6023572ddeedf50183a9c5afd42ee37ebbc8db08f0c59ba680296e0eb0e18e83268fb7dfcde83777b9c8d8dccb691af667d773c6a223ed97d6f7390762d SHA512 7e3bc45e8c1fd255eb4b961fa53fc5abbe4923bf340bf56f0e6f75f4a862facc43bbb69b520d59156333d792f7383c27de092b11cfb0ad6012cbc6d0dd0635cd
+MISC metadata.xml 1291 BLAKE2B b31514cebb1e3737374756887ffad688e469dbd3135eee366987abf327252bbc1aa53eb6d4315fa246a6f7c71efb8d2baf32d97125463581e058c85b3aa0673c SHA512 ca82bbf4b4b57ad3af3cffcd048644e5e7d57463d651ffd8df5da747b67c0701608908bfb9892155eac70e3477cfdc4a0f7d95110e897e73c78dfdd81236ef55
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 065a0d495315..a93f5b0b0cb1 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="client">Build network client</flag>
 		<flag name="examples">Include example scripts</flag>
 		<flag name="mosh-hardening">Enable compiler and linker options to frustrate memory corruption exploits</flag>
+		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for some cryptographic functions instead of <pkg>dev-libs/openssl</pkg>. With Nettle, some of mosh's own code is used for OCB.</flag>
 		<flag name="server">Build network server</flag>
 		<flag name="ufw">Install net-firewall/ufw rule set</flag>
 		<flag name="utempter">Include libutempter support</flag>
diff --git a/net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild b/net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..849159872ea4
--- /dev/null
+++ b/net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
+HOMEPAGE="https://mosh.org"
+#SRC_URI="https://mosh.org/${P}.tar.gz"
+SRC_URI="https://github.com/mobile-shell/mosh/releases/download/${MY_P}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+IUSE="+client examples +hardened nettle +server syslog ufw +utempter"
+
+REQUIRED_USE="
+	|| ( client server )
+	examples? ( client )"
+
+RDEPEND="
+	dev-libs/protobuf:=
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/ssh
+	client? (
+		dev-lang/perl
+		dev-perl/IO-Tty
+	)
+	!nettle? ( dev-libs/openssl:= )
+	nettle? ( dev-libs/nettle:= )
+	utempter? (
+		sys-libs/libutempter
+	)"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+# [0] - avoid sandbox-violation calling git describe in Makefile.
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.5-git-version.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	MAKEOPTS+=" V=1"
+
+	local myeconfargs=(
+		# We install it ourselves in src_install
+		--disable-completion
+
+		$(use_enable client)
+		$(use_enable server)
+		$(use_enable examples)
+		$(use_enable hardened hardening)
+		$(use_enable ufw)
+		$(use_enable syslog)
+		$(use_with utempter)
+
+		# We default to OpenSSL as upstream do
+		--with-crypto-library=$(usex nettle nettle openssl-with-openssl-ocb)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	for myprog in $(find src/examples -type f -perm /0111) ; do
+		newbin ${myprog} ${PN}-$(basename ${myprog})
+		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
+	done
+
+	# bug #477384
+	dobashcomp conf/bash-completion/completions/mosh
+}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index b5babad1adb2..6c2cbfdead0e 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -9,6 +9,6 @@ DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f8
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 EBUILD tigervnc-1.12.0-r6.ebuild 4882 BLAKE2B fd5d58d7dd02d4b423dccf057d9e36e4292a441a9251b417305fac0a7d17d54fbac9d07a3ae0bc28ca889e59ad8cd8ebd31840da9075f4382744f444c9e1daa6 SHA512 c277bc658ae9c3449a81981c7265bab9926a36a4d9620de7da808800a7cfa840c97af6b8fe2370db38f8778b17f773fd09e9f4759b46bf95a7a01b746ddda285
-EBUILD tigervnc-1.12.0-r7.ebuild 4720 BLAKE2B 9a628baca4950ae89df4d82f83698b4d0bc40ae89bc4f62c78caf9ecde0f178c5e32e2b214e8b23ec5345f80665b0af38733546702d347345f0df5421d5eb962 SHA512 b9f1800320cd9c3a8cb36361b519518733cc30d8fdf6e9d1fe2052760d154c8168e589b4eb54382135ba303b1ada2aa1e0f46e88052da6ed42896e6fc7148632
+EBUILD tigervnc-1.12.0-r7.ebuild 4718 BLAKE2B 14fa86d2c0179bd54b77cf00b0c4628c5efbe1d4129fbd94fc15fc5349bfa276676d1d994daccae333d7718d5727989d7fb8a4165b16f1e1a232af80d4437e2d SHA512 80f8a667c86ff49a66efccc1ebd744ed098bcc28a106f09c98185674d4049d164e56fb78aa408446c4e5603d96db2aea4afe711bd07ad2af4c345a03f2793a0b
 EBUILD tigervnc-9999.ebuild 4618 BLAKE2B 972a802c205587855cfe3e70a421ab83984a3175dc75cfb71dc9d3127508fe5261eb4ce284c7593ff8056fd5ab9574e9a60a5d969b9ffcb64ce15b04d11f52f1 SHA512 6db6240797c92bcd49d82c8217120406b90de1dc7fd3aa8a7f3bc94014fb32d75f1796e400873d3d58fdd33b8b6b004158ba1769bbca6edf052daf1b5996b8ef
 MISC metadata.xml 651 BLAKE2B a2729d5a950c4bcc38bdf9b80da2563b1f140c6f3311f8a8b817199d3efae7a4fe1f2b6ac8bba87d3b858e6c5d98176ab6873ae0273ea1d416dafcb7e9c7703b SHA512 e0a9a4f66f75df32532c1bb055db8e8ae9fe2aff5503a3f1806531806c596f812403a92d6a9c717872321ddac2043e41da7376048bf89bca52d8746acd5f1b15
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
index 93ca0f1495e4..8a87e2df69b6 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
 	dri3? ( drm )
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 49955a5d7ad3..494c215cea2a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b76ea0a2924c..dd9a41aed21c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6519,6 +6519,7 @@ net-misc/modemmanager:qrtr - Enable support for the QMI over IPC Router bus (QRT
 net-misc/mosh:client - Build network client
 net-misc/mosh:examples - Include example scripts
 net-misc/mosh:mosh-hardening - Enable compiler and linker options to frustrate memory corruption exploits
+net-misc/mosh:nettle - Use dev-libs/nettle for some cryptographic functions instead of dev-libs/openssl. With Nettle, some of mosh's own code is used for OCB.
 net-misc/mosh:server - Build network server
 net-misc/mosh:ufw - Install net-firewall/ufw rule set
 net-misc/mosh:utempter - Include libutempter support
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f6d4d88bceb3..8a6c0d6cb746 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index fd1a77ee5c83..416da60e01c5 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -44,6 +44,8 @@ DIST genpatches-5.18-18.base.tar.xz 701140 BLAKE2B ee91222d6f6ce56d30cfe02b5546f
 DIST genpatches-5.18-18.extras.tar.xz 3924 BLAKE2B f01ece5d1568a0a760b58108571cfcad343a37be3d344ea728ff89d3fa5c972d7d1c6808ec41ec699ece98a2049ea2c5cc036bae5f44e93cf23528a71e3aa922 SHA512 e810217c00867d3836c4606586e35cc26e8c934382d5927ca188249610b613605437013ca0015217d650e89bede32d67f4daa443bd445dec382832a4e43937ab
 DIST genpatches-5.18-19.base.tar.xz 754304 BLAKE2B 4827ddbf25d32b89c8635f7cbb16bf2ebe3533450d86e358f0f47084a240bcc5faece567f3d8ca943ad980463b324eac184e04c2fee80229f38db8cddf7d25ad SHA512 157d3093573091224d151c930d309fef2160b2d8130ac4d28155d56cde993b6d17ede10fd33d436fa820da5c029bd45021ff393045250e260f7469660305338f
 DIST genpatches-5.18-19.extras.tar.xz 3920 BLAKE2B ba251facf88903832ba28ea4a7619b2ebfdac8b3d507201cad624763523283936c2d8251a715a7e0bd8c72569b55468e2d5c43dc48e6b504cf5d3c024dc840b7 SHA512 40113011145749e3aab4d0ad23ecf2bdaec2eacbe8def70201f13c0208cb0aa142a4e7be8d484e3db3b31142defdea125fbd8f54f4e3220e15a10b4b4f67bbe0
+DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
+DIST genpatches-5.18-20.extras.tar.xz 3924 BLAKE2B ddea420397d5b64ac5e964db6b2d863cca0a4fd46a3969af7f24b7803b0f07278b54363c1b43fbc4f305ac4b44e5880d5af0bb10cd2a0a08bc0e4fbd51c9e35e SHA512 51203e404cc8084974725f78dd521f5d7864f40380bc1f45596b8754a57f30535e32c3984c01a4d12b38b6118eb1448126f96042d8a2b5007167428e09761726
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-209.base.tar.xz 4887256 BLAKE2B 56d7ea7975b228df055d1bd4cfc41b49890d815409a159772230c6e9d081061a9b438b525b5e8542eb03feb0bdfc1841e5bc5e14dd1570aff8f964862b192b00 SHA512 5ea69d50d836dad1f68f000c6c1f5bd8459dcbc4d50a4fbd4ba3241c4c87638850215c0207dfea6fe06cc596957e3cfa61a3dfc00f0b60513596da43d286615f
@@ -146,6 +148,10 @@ DIST gentoo-kernel-5.18.15-1.amd64.xpak 72935393 BLAKE2B 05eef3933a4d3d6c061b79e
 DIST gentoo-kernel-5.18.15-1.arm64.xpak 65247697 BLAKE2B 545902d4d44e4e2ec7fd7040ae155c6bc4123fa099f447703102ffba00f4c39a94c41215e207c58a211a497b00b4b03eee495d53679d1e17aa363cfe2665e706 SHA512 1b8576829432a400cc418dd45041229b377713caccb96012fd2fbad9c898bb95d1fa70bb3a9994821612286cb39c2fe8d405cb16a95737fb81ace80e59976887
 DIST gentoo-kernel-5.18.15-1.ppc64le.xpak 59363169 BLAKE2B ea5af950dfe764441a740337d651cc2551590ceef754162b8985073d0eb813b7f4fb37b104da9b5e43b791493466bd9c2f1c69f46292b31420a1d43ff3e5cc94 SHA512 c8ee366fd027e4577cc9793e4c23da0834ff129faef2e8fc031dde66cac1864ac5ff202076c592823faa9187ba9e7671d80373ade457657fbac500c4014b9ec6
 DIST gentoo-kernel-5.18.15-1.x86.xpak 62832725 BLAKE2B fc315f531e839c90b1ac691e418ef0dd0fda73f217d512fba39e962a7843782a74c07de9425d11d395b18b347496559b58c3b7d61f67db002dba311a05ec8583 SHA512 1fca66ae3322b598dcd58fcac6926769dbefcdd6b412091a4ba9e02cfce058f09502cd5ceddda93711406b123e93d7b2e9568c19077735a4e7dd63224049a666
+DIST gentoo-kernel-5.18.16-1.amd64.xpak 72884888 BLAKE2B 1af89a98a01ac244b4b49f669f739a5040d35e1357c41e6477159a7bb538b8b4ed844a28d512bf1513e2234c20cad663555ef028b2d5378b364eca95d3cbbc47 SHA512 b654a185147259c5100a1ea162c9f945190e472014edeae6704ece63e9486b95c9dfa31e955f9576611d461095f2e309b58c1abc9ecb0dafa5bc1fe92ea0654f
+DIST gentoo-kernel-5.18.16-1.arm64.xpak 65231934 BLAKE2B 0ca27c34a9dcde9ec1bec606ba86489f780e31e3b4357135d10292db04028cd346246d71e10a7c09103bad99a4fa7a2a19610e94890af06baf617ff52bc973b3 SHA512 c75d1c72db2f74d52ced1c46caa12cf25c81834aeed42a038dc049a54aa4f9e45ca51a419f55e021a065159f81c3e8303d5e03967dbed7de2102bd7ca68b3d2e
+DIST gentoo-kernel-5.18.16-1.ppc64le.xpak 59491902 BLAKE2B 805bcb11a93fcdd8fa7e264025c662f46e555aa640838c25578084a3995dbfab2292e7056d5c52352a0060a8114a3d4ae8068f6f3896b46e61c563a6080053fd SHA512 83b37cb57fea22468398a40a04d222dfa2f784e2819bc5e4850d7223b78a72ce41cc2ff6f66f6e7d2fd495c1e7555a287bc143417d28271de0904f50cc22901f
+DIST gentoo-kernel-5.18.16-1.x86.xpak 62813706 BLAKE2B 90ff8f512ea3d9b3d5ac8492294191cfeb438a499ff76c25ab57f18214fb802edc9f90c91939f9446c9f6180c5796b394c24d4d430625337f976179cc55ce33a SHA512 994d78d292dcf1ed35f4167ed871fdbb4a3caca68182fca21398d9794283f9a12f1fe4495fda26e5e43676621ad7bf153ca252e0d6fd0ee94f0c05b8eb8e4530
 DIST gentoo-kernel-5.18.9-1.amd64.xpak 71596284 BLAKE2B e9eb499b587770b85cd230bfd5219c246f184addc2e4ff72be07ff8d8899a5532f35d67fd6d6c73289161b5ef5e83d62de8d7e6360a74f7989b16b74ab6122bf SHA512 1ac6bc3f97a9ee754fd9aa6c7360a725d2fc298cecdc28583db3ae8bb80c72d0d593a5c8a85dc868587285541437e1c62deac7baffdbf81aa9dd7f796df71c3c
 DIST gentoo-kernel-5.18.9-1.arm64.xpak 65216795 BLAKE2B 1947791701b9ad904633d8e65d97f098be88029a2d716e0e60d91cc02aff9c03eef429a90c8e85a8f1c0f82eaf49a2a03ea342a2b4537da044544523bc6ac2c7 SHA512 6557d0ec1b3072b51bac84dd99adf16cae9eee745a824ab5d39b227298a14ae5f2050aa1079b529593b583bdde0613dfa1fb099dd718d05aa2b3bb4828fc4a8b
 DIST gentoo-kernel-5.18.9-1.ppc64le.xpak 59391467 BLAKE2B 3d7aaf36df9ac13388101e16e90304ce4b0756a39f84dca004e0bccf054f34dfec4133e216ce68c640272047ba21a39f7d44761f2ea9e6985c92a6300c0bea61 SHA512 e6ccb620c255c5ba9e28919152fd0174f527a30906e3b0f30925ebfd37b189013a6d41343103eee57dec5f4afa29f9560bfb0e501d183496d2412214e11c919f
@@ -204,6 +210,7 @@ EBUILD gentoo-kernel-bin-5.18.12.ebuild 3179 BLAKE2B d787a408e8c9582f64476f84236
 EBUILD gentoo-kernel-bin-5.18.13.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.18.14.ebuild 3179 BLAKE2B 01eb5f420ac3cd98a4dcce1bff2e2fa20e7459c686aef304fc2750242c2db114817e2b981d7ebf426437c953df1e67f1a64af2affa693a5b8c55d81747688d9c SHA512 7e8559b147d4f3215a738b5ab501c5df18da96cef237b4996e554aa8ad1603fbbfb409f4c4cc21b8e9e769d3ab0d7cd3bbc0649a866da6223aa065b20bf385dd
 EBUILD gentoo-kernel-bin-5.18.15.ebuild 3169 BLAKE2B beea92a4d71574afbe65e94b0c65f2b66bfb7962cbb44b2867eaa97963281d99606240fe5aaa8393312df5ec5223404dcf631bc13f1404389b050de78f766016 SHA512 3874f69f775a6b88aa04e75b1157ce49e343af9df9a487ccfdeed01fcaf7fc9c9c84f29274470c362fa6fde6c2a13ebb2d87a3cb5bb1f4906f006c13dbfd89e5
+EBUILD gentoo-kernel-bin-5.18.16.ebuild 3169 BLAKE2B beea92a4d71574afbe65e94b0c65f2b66bfb7962cbb44b2867eaa97963281d99606240fe5aaa8393312df5ec5223404dcf631bc13f1404389b050de78f766016 SHA512 3874f69f775a6b88aa04e75b1157ce49e343af9df9a487ccfdeed01fcaf7fc9c9c84f29274470c362fa6fde6c2a13ebb2d87a3cb5bb1f4906f006c13dbfd89e5
 EBUILD gentoo-kernel-bin-5.18.9.ebuild 3181 BLAKE2B 3d96b3ef0bb3f97f101823690955371ffb3f27246651b9faee643ea972b930e53706bf164d4560d3f5e485e060a40c2bdad46f59c0192076c5737f7851c93ec6 SHA512 2e245d442bb5baf2c731bb328aa1c089d4d4480066b38b198b8ac15dd11f73fc99ad85e9745f4fafcbf3d1c304e76f6209bb931c57fdb02c15a54cb7cc53624e
 EBUILD gentoo-kernel-bin-5.4.203.ebuild 3177 BLAKE2B b9df1ff36a996b688640bca679f8342d7cfd016e9305d8b967f5b5895b417ad0aff4e5b07023bef65c3aa7c2f895d3a21c019ddcb48a0dea5844bf16a35a9602 SHA512 46ec6d4b5f3b818ae84d60e7dc1a8abd69f5221d609c5d176a8160cd1bfbcbaf41da3b374369747c98143d5db532bb8e4969d84fa3164d7a2b1e9819b8131ddd
 EBUILD gentoo-kernel-bin-5.4.204.ebuild 3181 BLAKE2B 852c1e5dced74978b88730b17ec3a1bf8461ef9ab922b07b1b2e40dd1aa6cb32b9452e0fd96e63369bec9e235c3a99a7d0f2215e0e3ac331aaa161232cbd613b SHA512 e0b994133da4ad035094bde587951a4a41f161fe067b58076a759fba38fdd724ad127e25a912260b26db9fbf2bec3cef5488d87735400fae46d89cc68650a867
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.16.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.16.ebuild
new file mode 100644
index 000000000000..cc187009eb97
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.16.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~sam/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index d5b5e9a8f573..866efca25959 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -44,6 +44,8 @@ DIST genpatches-5.18-18.base.tar.xz 701140 BLAKE2B ee91222d6f6ce56d30cfe02b5546f
 DIST genpatches-5.18-18.extras.tar.xz 3924 BLAKE2B f01ece5d1568a0a760b58108571cfcad343a37be3d344ea728ff89d3fa5c972d7d1c6808ec41ec699ece98a2049ea2c5cc036bae5f44e93cf23528a71e3aa922 SHA512 e810217c00867d3836c4606586e35cc26e8c934382d5927ca188249610b613605437013ca0015217d650e89bede32d67f4daa443bd445dec382832a4e43937ab
 DIST genpatches-5.18-19.base.tar.xz 754304 BLAKE2B 4827ddbf25d32b89c8635f7cbb16bf2ebe3533450d86e358f0f47084a240bcc5faece567f3d8ca943ad980463b324eac184e04c2fee80229f38db8cddf7d25ad SHA512 157d3093573091224d151c930d309fef2160b2d8130ac4d28155d56cde993b6d17ede10fd33d436fa820da5c029bd45021ff393045250e260f7469660305338f
 DIST genpatches-5.18-19.extras.tar.xz 3920 BLAKE2B ba251facf88903832ba28ea4a7619b2ebfdac8b3d507201cad624763523283936c2d8251a715a7e0bd8c72569b55468e2d5c43dc48e6b504cf5d3c024dc840b7 SHA512 40113011145749e3aab4d0ad23ecf2bdaec2eacbe8def70201f13c0208cb0aa142a4e7be8d484e3db3b31142defdea125fbd8f54f4e3220e15a10b4b4f67bbe0
+DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
+DIST genpatches-5.18-20.extras.tar.xz 3924 BLAKE2B ddea420397d5b64ac5e964db6b2d863cca0a4fd46a3969af7f24b7803b0f07278b54363c1b43fbc4f305ac4b44e5880d5af0bb10cd2a0a08bc0e4fbd51c9e35e SHA512 51203e404cc8084974725f78dd521f5d7864f40380bc1f45596b8754a57f30535e32c3984c01a4d12b38b6118eb1448126f96042d8a2b5007167428e09761726
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-209.base.tar.xz 4887256 BLAKE2B 56d7ea7975b228df055d1bd4cfc41b49890d815409a159772230c6e9d081061a9b438b525b5e8542eb03feb0bdfc1841e5bc5e14dd1570aff8f964862b192b00 SHA512 5ea69d50d836dad1f68f000c6c1f5bd8459dcbc4d50a4fbd4ba3241c4c87638850215c0207dfea6fe06cc596957e3cfa61a3dfc00f0b60513596da43d286615f
@@ -102,6 +104,7 @@ EBUILD gentoo-kernel-5.18.12.ebuild 3857 BLAKE2B 0dee6d23887d04b56e4f6228ca833ee
 EBUILD gentoo-kernel-5.18.13.ebuild 3859 BLAKE2B 7d5e5654d596002eec8478b6f72c3e2b8896acdf1f691f3d329e030b031fc8d2fb46434ec039dea09f1def77086663df6710e5690c0318bc15d8028321d21271 SHA512 3af374c1492526da624dd26511c01d401750fa59a8184f978b8ae28c564644faeb91ce8652f2baffe40a8c8f7d9c59b2a269b8c36ee3636f61f8a9d70093f2da
 EBUILD gentoo-kernel-5.18.14.ebuild 3857 BLAKE2B 81b04a8e1a805ba912e4ad3993f5d2915d77f3318e37e39ac95dbed503b965e064be55fd2d8ed6685836eeebb9a50a9aae5f787577cf058098cd002cf8ff9a40 SHA512 b917d360876b37c99d6c43f5884b86910d933e44b095651acef5167e6ef46826004f8f25befe001a6bf42149065a0a3d23a6aff0911d4d17c4bc034be0f89d6c
 EBUILD gentoo-kernel-5.18.15.ebuild 3859 BLAKE2B 7d5e5654d596002eec8478b6f72c3e2b8896acdf1f691f3d329e030b031fc8d2fb46434ec039dea09f1def77086663df6710e5690c0318bc15d8028321d21271 SHA512 3af374c1492526da624dd26511c01d401750fa59a8184f978b8ae28c564644faeb91ce8652f2baffe40a8c8f7d9c59b2a269b8c36ee3636f61f8a9d70093f2da
+EBUILD gentoo-kernel-5.18.16.ebuild 3857 BLAKE2B 81b04a8e1a805ba912e4ad3993f5d2915d77f3318e37e39ac95dbed503b965e064be55fd2d8ed6685836eeebb9a50a9aae5f787577cf058098cd002cf8ff9a40 SHA512 b917d360876b37c99d6c43f5884b86910d933e44b095651acef5167e6ef46826004f8f25befe001a6bf42149065a0a3d23a6aff0911d4d17c4bc034be0f89d6c
 EBUILD gentoo-kernel-5.18.9.ebuild 3859 BLAKE2B 39a5bf5ba05e8966d0c154ca944547d1d0fcaa320c278de676259385b59da46c41dad6cfb5a4d384e70283668a6bb8c89e297b55117ac479a307f02ddeff351c SHA512 98446575d30ca3131c36c2642cd14ce6a8e0b4053ad94da0e6cec93c82f92add00ef0c34fc18800643347c9ecbc9830ba6103485f43e991cbd4460ad37f9caa9
 EBUILD gentoo-kernel-5.4.203.ebuild 2799 BLAKE2B faf615c3252cf128099b4b7359422d78b19be5b647e89e4524b519e75e1fe9a8e778398cce27093e6be22c7977f18a996a6f7e72afa813d6a8369fa9f2395e05 SHA512 70a94b7bcb72a3adb27fd4707a7a4b53d952d37857dc22a3523846faa8f77c7309017264e8601f22c4ab01c3b2726a1dbe1b0f5dd2d81c7ea28c5b486265f8d6
 EBUILD gentoo-kernel-5.4.204.ebuild 2803 BLAKE2B 8aac73c55ef615de26496e74eb22f0c578f333f2d211535c9a0613f9e2b19f181245a1dcf394ffec75bec308855792ee8edf21c77a9d6c42f3249789cb15bfa6 SHA512 465a4c4f2df9f2332ac7eee6f8e5dc140e02e55ff9fac94bf465604f33d51f3b1cfcad1160bc071233e1a6e40fb15c984a26f1b2377fcdf5d7aa3a9b6536816b
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.16.ebuild
new file mode 100644
index 000000000000..b0f35a014fbd
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.16.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.9-gentoo
+GENTOO_CONFIG_VER=g2
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d03c0aa15b3c..745a6dd314d0 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -59,6 +59,8 @@ DIST linux-5.18.14.tar.sign 991 BLAKE2B 64bed04a35908e72950298e37ed4d200acafbd04
 DIST linux-5.18.14.tar.xz 129850900 BLAKE2B faeadb397c61f3adc70fb03d5ba10c203764d8a43b70cb70838d17780922bf05cd8389c19ba8d323f322d81169d11cf744d86103011c4a17606a2081e18a906f SHA512 270c27efc9557c001314dd80508d533e00c1f5dc6be496e1c4581144e2386550efd42048293f178816a01be1c18dc70ee99eeca5d0deed5dd64f4f8baf90a146
 DIST linux-5.18.15.tar.sign 991 BLAKE2B 9a66fb09918dda77b25b995cb10e6681c1a6c589c19afcce1a3b39d10ad922d728fa9174235c90e29462e34ade9394d4c28f3c485a89af688ee969ffe4fe9058 SHA512 815685c8b0aad3ecff7a1b781ce7d79bfb05e466195c08c39b6aa0c012e23da465537091ee416ce98ba09d928a566061ae43c5d6a748e92b1618b3cb3685072d
 DIST linux-5.18.15.tar.xz 129847068 BLAKE2B a99064b7725f84c6a99819a2356d40edb9117ee4a91c5243a7f8f0611200e7f54d300f48c79b86ea6f23d145b50fd180d33e664b305bcc07917c2162e9f193ae SHA512 9436831b84727bd751741d1f569dc8bc314c33daf02d2405d4ef612ae6797dc4b3b96e13b46088db65e518052780f1bc30c0d1a4c528373d3509039dc055f835
+DIST linux-5.18.16.tar.sign 991 BLAKE2B 5309ae0d80fbec35f4fcdfb82e3f1fd99c96ad53b82efe4ef95f0f7ee5f04be1e97f69bfe664080ff92fe21b327dc72e723515c0fe43fa52f6a43d1894454a34 SHA512 01edeffc25b4221907f0b57aca694361ff5cf5fd6235750422b23d95241b2a1b2cd3ba0fa4b8a895e1996df49d577654a16cb302c798e8c7365ec536088f6660
+DIST linux-5.18.16.tar.xz 129844784 BLAKE2B 60e9cc780af70242eaf3b41374acd8c11bb388a9aa17341aa98674e31a72cbd1c6ecf80158476fd762ed8955c6ded9a3ce8cd782ce0c956ddc3031c7487da686 SHA512 cc6813dc2c2bf8125159368e7b0b2812be220fd23cea98ec12ca727f3e032d313c80fc103abc55aa879c70105629dc54f14eed8e6fdfe00b9246bb850f86f5bf
 DIST linux-5.18.9.tar.sign 989 BLAKE2B f763fcc33c0cdc17835596b89f3589aa23c2e42f9569a31ce359595c45f558fdd79b04a29a3165a18271d23b2f7bd2388b589ae147c9395b46bc18271844d5d9 SHA512 c9928fb16009c3c61c19a9d0d3821496bc642c521bfbe942e9769a5f7b85eac1546f7db1878741f4e47875ace99732342ac75e39985003301fd405757f820abd
 DIST linux-5.18.9.tar.xz 129826700 BLAKE2B 9daa0be3f6f528aa4d761db357448c007f2647530940a12688b7b8b769a605d64b5ccacf0215759fff3383e8a9a179658e4e272bd4747c51663e120e0e12287d SHA512 8db3c73c91cc3cabcf24224bed97a790c562d28cd6a6562b924e7c07cc671d3721d7210defd5c9cc4bddfc16afee0086dacc40397823ca3ccb890f2f938f5814
 DIST linux-5.4.203.tar.sign 991 BLAKE2B 4e13305b908e1e158c61ae0667186cfd42e7dac237624cc871f584efc68c53d5de3a90379e801f5e26655293c584ab84e16c5f87d503c1e5381b6b9e8634d8d4 SHA512 867b1ac576df3db177f8c684291aed7a2094405a8c9f18c49c2f5f1e4c68b6fe4dbd211d65cdeb07db3522a6f485c03ce4993c687c0d93d85dd8af31b60fdb4f
@@ -97,6 +99,7 @@ EBUILD vanilla-kernel-5.18.12.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c
 EBUILD vanilla-kernel-5.18.13.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.14.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.15.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
+EBUILD vanilla-kernel-5.18.16.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.9.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.4.203.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 EBUILD vanilla-kernel-5.4.204.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.16.ebuild
new file mode 100644
index 000000000000..facbe03b0e1b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.16.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.9-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 0873e1f73411..c7375c9de061 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 2c23d4546cbc..7fd91a7b1f5a 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -20,6 +20,7 @@ EBUILD dist-kernel-5.18.12.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460
 EBUILD dist-kernel-5.18.13.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.18.14.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.18.15.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
+EBUILD dist-kernel-5.18.16.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.18.9.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.4.203.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 EBUILD dist-kernel-5.4.204.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
diff --git a/virtual/dist-kernel/dist-kernel-5.18.16.ebuild b/virtual/dist-kernel/dist-kernel-5.18.16.ebuild
new file mode 100644
index 000000000000..c2caefd6cfca
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.18.16.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 8dd5875d7cfa..507d84a33d36 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 668741ee5cad..c757187a349e 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_104.0.5112.57-1_amd64.deb 89829944 BLAKE2B 7939b8e75ba57ff88ce96b3d16f3b5ccb075dae7512b3e33f2fccc9b46935fbe53db09b79f42a871628b44abc8ea30f733d5a433ee8304d1f4673bde5765c3b5 SHA512 2de00a5465ae3ebd1503db47b3bf17cf8d2884258d5d4c6aca603bed0cc92af19bf8356e904f7b81c5571dc2c4bd8b478576b2169d8f75179b0f99d8fc6e7f72
-EBUILD google-chrome-beta-104.0.5112.57.ebuild 2761 BLAKE2B 0c68c9fa06f1076a6c8830d09678ae60d1f3f8fe433f3a39d5ab4c095d6bd3cdd0dec71936db31b3b0d44c5276587b5299122a38e2e43961e5b6aff52fea9940 SHA512 657593a1bc0d7f3ad5225c2372e3f3587a7d34ce7c4933030de7b1c240188968f4fbdb5921437b759d052109f0c6db8f473578b0be9d374af0a22249dafbeb19
+DIST google-chrome-beta_104.0.5112.79-1_amd64.deb 89612296 BLAKE2B 0a201e82af1cecd50ce14cd7cad656c8161d3e9ac10c935e1bebd28b2d7488c8b9ebf5946febdc0f7ef8806fabb4706c75f416768c48e12a36ce5ff5b6d57c58 SHA512 09781af28b672f0d22310e1d7598aaa2c2367d92dcdaec3fa31e8ea5a96ad6ce83e859106109eeb7c7491da649422193d40d900d05093c03f01b7de5a3b16882
+EBUILD google-chrome-beta-104.0.5112.79.ebuild 2761 BLAKE2B 0c68c9fa06f1076a6c8830d09678ae60d1f3f8fe433f3a39d5ab4c095d6bd3cdd0dec71936db31b3b0d44c5276587b5299122a38e2e43961e5b6aff52fea9940 SHA512 657593a1bc0d7f3ad5225c2372e3f3587a7d34ce7c4933030de7b1c240188968f4fbdb5921437b759d052109f0c6db8f473578b0be9d374af0a22249dafbeb19
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-104.0.5112.57.ebuild b/www-client/google-chrome-beta/google-chrome-beta-104.0.5112.79.ebuild
index e2d9ee01fea3..e2d9ee01fea3 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-104.0.5112.57.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-104.0.5112.79.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 890a8a6abc9c..32ad5ce10812 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_105.0.5176.3-1_amd64.deb 90277740 BLAKE2B 03093be18477358f18efd5c30cfbfda4176730887db720f01ef14465b19d5f245465d7f2715b0032e0ec70070b76b67142cecf473567f1f2ab40c55b905a0d9d SHA512 93f1d0140683e620eea4b079a75678e4b45cdc8ab1122368e08fa7216b7a49b062d54a704344630fff0309b6e93040fc365e027dc8501d10da93214019a8ed80
-EBUILD google-chrome-unstable-105.0.5176.3.ebuild 2761 BLAKE2B 0c68c9fa06f1076a6c8830d09678ae60d1f3f8fe433f3a39d5ab4c095d6bd3cdd0dec71936db31b3b0d44c5276587b5299122a38e2e43961e5b6aff52fea9940 SHA512 657593a1bc0d7f3ad5225c2372e3f3587a7d34ce7c4933030de7b1c240188968f4fbdb5921437b759d052109f0c6db8f473578b0be9d374af0a22249dafbeb19
+DIST google-chrome-unstable_105.0.5195.19-1_amd64.deb 91153904 BLAKE2B 1ebfbffc33cd14ba3a643adbf594a584c77c87c960e0ac6fef929f1ca51852a968e909c61d45054fba2034cd8161990b5e4422092f28f4a0f383eae24749358f SHA512 ccf8692dbd364c86d2f27db52d7bffa408ccdd128eea1a5e9865abe1abdf2c00386d627a113fcf31a34c8c28b0f75df2bd5223d9532b0432aa7b2941ea68d0b3
+EBUILD google-chrome-unstable-105.0.5195.19.ebuild 2761 BLAKE2B 0c68c9fa06f1076a6c8830d09678ae60d1f3f8fe433f3a39d5ab4c095d6bd3cdd0dec71936db31b3b0d44c5276587b5299122a38e2e43961e5b6aff52fea9940 SHA512 657593a1bc0d7f3ad5225c2372e3f3587a7d34ce7c4933030de7b1c240188968f4fbdb5921437b759d052109f0c6db8f473578b0be9d374af0a22249dafbeb19
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-105.0.5176.3.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-105.0.5195.19.ebuild
index e2d9ee01fea3..e2d9ee01fea3 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-105.0.5176.3.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-105.0.5195.19.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 55e406124f8f..779e42f978f5 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_103.0.5060.134-1_amd64.deb 85810808 BLAKE2B 97465396f2d1a39c99716de66523f650395dd6cbeb297e8a75262c43e428ab4828ca621e2b8cdace9f87dc6c1363b687dd5f827e60bff4f9a885e0e666e6b518 SHA512 fe3b26288e8428813ca029b1843c0dc83cb94afc88017edd2f429fd31057c6ae9832e5df16e25dff49c1adac352f924be95cff918d9e1217a5c0b4469dffa9a3
-EBUILD google-chrome-103.0.5060.134.ebuild 2778 BLAKE2B afa8da25aef23a8d2ef84d2745da8388b401361589145e63b386907f3dd50ee145ca21f2d90d5a8898e15929d4ee9f037d3f53cf15029bd45e8b7e4c54df5eea SHA512 20c7383df6b0d7fb8ec183e9edcef23edb7ce6e854300c8c3806a89e99e3e00b005d9e87ac796b3b90fb3331355789a901de7abf1c6806770a0d9da7a718154c
+DIST google-chrome-stable_104.0.5112.79-1_amd64.deb 89563160 BLAKE2B fcfa2a827a47401a057d55ddf41a00b47c62fdd84ccabfe835540830a12ec629e7333fc92a0da199c2a6eb52a18633c407cec6dc868c1dbbb11d0e50a637fee3 SHA512 7fb1041b3c314c0efa5ea559228907eb9bba4891ddbd377755753c77fb15d24c78409937c240ed024863e2e8347f44d0801817c6523cb9dc540dc76c3dc2dc85
+EBUILD google-chrome-104.0.5112.79.ebuild 2760 BLAKE2B 42c5c3a7dab81c7c6175ee92aa150cdd87eabd416e4bb878cdcc680ba8a0cecff77c9e467761d4abc853c5e0a9b4918a91bb678209f3b49cfc322b1c526b8fc5 SHA512 fb268f31fc93488c59beb7430456a7c90a18cc3b5dfa772582d6e8ae2d8c0973611759aaaa141c63ddb2c16b5902dbfc9234c3e4942ea4e927db4ff034f98b73
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-103.0.5060.134.ebuild b/www-client/google-chrome/google-chrome-104.0.5112.79.ebuild
index fd4d8c87bedb..3af8d9e0922d 100644
--- a/www-client/google-chrome/google-chrome-103.0.5060.134.ebuild
+++ b/www-client/google-chrome/google-chrome-104.0.5112.79.ebuild
@@ -38,7 +38,6 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/nspr
 	>=dev-libs/nss-3.26
-	dev-libs/wayland
 	media-fonts/liberation-fonts
 	media-libs/alsa-lib
 	media-libs/mesa[gbm(+)]
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 86d7f47fcfa5..83cfa9f61e6a 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_104.0.1293.14-1_amd64.deb 130810540 BLAKE2B 9adf3b414f621cfce2a335cc69bb4d2f3d8bbe0b5f0db384c8dba41ecfba933b56f7553ccdddb9d1df77d5d89877f005e36234a48988b3c3468de2bd909eea01 SHA512 a6e57c7a648607ff3fc942875795a069c89bf72c677ed610f0202978f3d77a920a10223cd9cb54e180bada259b07a117e93e37dc65d0e21c4729f569fc40e825
-DIST microsoft-edge-beta_104.0.1293.21-1_amd64.deb 130937280 BLAKE2B b267d8dea8c7acb4d543f4a5e3bf85b945e06e5246df6c3bf8d7c5df301a8bf1b299cef2f3dc791749af2e61db4357210e3d2a84cead6ebd7c5bc2aaca7a3ab3 SHA512 0bdf06efb473d38b3b2cdebef2bf9b2746df1d7fb50a34655c6cdf8b4a35bfb9a1429a73f274ad0613037132b7a8ef11742647642632fb1aed2a351826e42a7f
-DIST microsoft-edge-beta_104.0.1293.25-1_amd64.deb 130941692 BLAKE2B 8679ef903452617b70d2c792b4be251cb99507c361ee9e9c4289f6864cd4dabe33432ce7c09d35f91ba5f2f65384aac12ce8f22f8f813e7f109c446451c8eb8c SHA512 baea25f7fe12563c842249ef96af4570ff223a78dfba75e180f10f21a1a7e1c9b59f47a4cddb97a2fb8cc96bb98d70664c79603deb4172fa9b9747bd2c389d19
-EBUILD microsoft-edge-beta-104.0.1293.14.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
-EBUILD microsoft-edge-beta-104.0.1293.21.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
-EBUILD microsoft-edge-beta-104.0.1293.25.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
+DIST microsoft-edge-beta_104.0.1293.35-1_amd64.deb 130951156 BLAKE2B 8b41399b85592f318ab142a2d0f54740504cbdc6baa379ccef8a3dd923733d2cfff54ae1bde10e2e62685fe6d14e56354ded778963f85b082eb476c38c9a69b3 SHA512 3e5b58c72f774931ecaad45518307065658f3a37cec00b727f2575996f3c8caca99c151202c4fe1fa8d492beb65f930e7e5890937ed7c6890e982f921e0a3ed9
+DIST microsoft-edge-beta_104.0.1293.41-1_amd64.deb 131308560 BLAKE2B 19d390accfd6b7933959433912b816be03da874f0226c05930b78d870e26f863add223fe97b86218079c25ae53ec24f41c21271dad668e7a7f22352885d6b209 SHA512 9d9f7886d3961245bb9770b27a1ce618c9fa67f7fe05905236d944b830da061d461e29c99cae93fa78d8a29dc48dc7964c1690e48cbbe5950fd29a57e4ad323f
+DIST microsoft-edge-beta_104.0.1293.44-1_amd64.deb 131317504 BLAKE2B 0460e851470f575e222d4e6f401b0cc22d1c511b96a1ba97cfee78cd9533c6a79c6f6c88065bce59a7447adb53c09427558ddf09311d504b64d5c34cb00477f2 SHA512 d42595a5e55ceae0017b1fc7b826b89846869ef6a13f37b6c7928791496ea67c4a4c04cd894c52705dc75cd13f3303fffee3a212004871559e4b60f284e311e3
+EBUILD microsoft-edge-beta-104.0.1293.35.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
+EBUILD microsoft-edge-beta-104.0.1293.41.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
+EBUILD microsoft-edge-beta-104.0.1293.44.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.14.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.35.ebuild
index a8cc7e730ebf..a8cc7e730ebf 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.14.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.35.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.21.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.41.ebuild
index a8cc7e730ebf..a8cc7e730ebf 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.21.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.41.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.25.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.44.ebuild
index a8cc7e730ebf..a8cc7e730ebf 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.25.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-104.0.1293.44.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 9ec721066d32..97ec76767a39 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_104.0.1293.5-1_amd64.deb 130750276 BLAKE2B 9fb4a7d77811511369ef31ce4ea3b1fd0b1ff3857727319e02ddfd7ad77d58cafa5c725d8e3f7e1d69a5e6bcc8b74357563aa9edadceaea6ccb185567a28202a SHA512 9c51f8345a551ffba88af25ed2971753680382e76c9d260c5baca5a1312dc4b5bb0746f415dbd7c8c24e532bf22a0c0072289a35fded6956b50755e11508188c
-DIST microsoft-edge-dev_105.0.1300.1-1_amd64.deb 130784672 BLAKE2B 2f32aa8c1dd33a2115e5a6ae7cd7787caeb65ed3c001affc156412f50371466c7b59fedb0d5bbf1edb8a0cb210942e4efcd0ebe57c045b8fceb0648ccdcbb0e2 SHA512 eacd91a5f93629e255aade6d030372539f09b8cb19ead8c48e0f7aaebba58b5e1000dbc50b78aa295811c5868f433e874799b58796d6ee1566d951c313bf4d1d
 DIST microsoft-edge-dev_105.0.1321.0-1_amd64.deb 131542472 BLAKE2B 2b46014b97b710dcecc63a0a61d4d3b15bcedbd416e07907af8a35ce5857a55d9b1da2fdd61fccdb885d76470f7a04e302b914933e52ef1051cc33d410459601 SHA512 e3f7ba2def3ad76598c68ffdd1e6a6eaf32a38dedf7d40ce1d9411db3cb28281b45cd3ce0b1f354f43b5b8d89416ae4f9241f222afc679a88c560fa25f106460
-EBUILD microsoft-edge-dev-104.0.1293.5.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
-EBUILD microsoft-edge-dev-105.0.1300.1.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
+DIST microsoft-edge-dev_105.0.1329.1-1_amd64.deb 131224604 BLAKE2B 5d33a50dc43cceb6b754691445606db8a17f197f9ede37e3097fda382f35eb83c4feb261c24a4b89d058f194babf7c9c267a4d867f2fc1ea0f2e81ada24b20de SHA512 6a4fa77ca9e5ddadbc29f26d07a8ff48265e2a3b66acbb0bf17e643fa22b9ff52daca7dafc3468f275336d505ac83e16fec69f6b04ad45b68e837c1267442385
+DIST microsoft-edge-dev_105.0.1336.2-1_amd64.deb 131567160 BLAKE2B e176c7a04dbda390bd08eb8be63e1328d4d2a95682acf9ce815e69997ec016a108c9d2898a6eb45aca817cdd92cddc5b53fa2f32afd40ced4a8c05c0c25f7312 SHA512 430901a96d42f9742ded46ada8e5141b0fb52c3f03e51042ece7669c230a23f334c97d7bea2a3ec5edba7098e8970c89495a685d8eb81438a69c2159a662af7a
 EBUILD microsoft-edge-dev-105.0.1321.0.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
+EBUILD microsoft-edge-dev-105.0.1329.1.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
+EBUILD microsoft-edge-dev-105.0.1336.2.ebuild 2504 BLAKE2B 7814aa517dea7ae2621aaa7a78ed8382b1df55b42089441547d17c37c7eb9d0bb0a1db6cc427ace91f2a08e340c5667893604841fb59952806f916442df0ee97 SHA512 928fd020e419bde93a3fb8493e02d4c73db393913dd9189cf08bba8071c7a8f097e7150a9aedd741d8341dff44a8e8501c3c9be6bf6b8613c18f4ac1e3425ade
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-104.0.1293.5.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-105.0.1329.1.ebuild
index a8cc7e730ebf..a8cc7e730ebf 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-104.0.1293.5.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-105.0.1329.1.ebuild
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-105.0.1300.1.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-105.0.1336.2.ebuild
index a8cc7e730ebf..a8cc7e730ebf 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-105.0.1300.1.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-105.0.1336.2.ebuild
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index c95d8ab812b2..903b78ae6c2f 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-stable_103.0.1264.62-1_amd64.deb 120908516 BLAKE2B 015121a28800c52c7f27a3e1776610bb21c3a58769d33fc4173232bec37bde2fccc54892df9d650f456cfe0068872f67406e012a29592df84b4993ff9e57282a SHA512 8c87f9248b00a1039c31adf576ae63238497a39d7058ed1731f54a89c4babc3f7c5a77fe288d353bcd5eb511aa245421641ea1ee26009e98c9ac622bd386e581
-EBUILD microsoft-edge-103.0.1264.62.ebuild 2503 BLAKE2B 6e9465b67cd5fc35097dd61a95c915a4f3b58ac44e82efc9bfa351baf6f1581f4e68c02287881d7aafa8ce7a5d1643f6d209cc38bd64f94957f60cccde175fa5 SHA512 1f95dbc80e9b207396d6a73a7ffe21d9d44af40c15aa4b7a795c893df0720bef079dc2956ad6d34718e58100e6806a1ccaebdd5f9c71f6363ee05ec69c1893f6
+DIST microsoft-edge-stable_103.0.1264.77-1_amd64.deb 120967200 BLAKE2B b7efc8da293cfbb88f3e3d97e5aeaf96172fad77882a7bdc53b9bb2e7cf880f630690f90ee790596448a0b55908a3f68738e7278d2f46a126cd62f81cea39d47 SHA512 034a60292464395eb9f8aa75869ddb034ff1286dcdbc0c389afe1d7a06ac6d71a6e40d1577a9c9a2e5e23af30b807ec04dd77596521c5a55dec059543cdb07e2
+EBUILD microsoft-edge-103.0.1264.77.ebuild 2503 BLAKE2B 6e9465b67cd5fc35097dd61a95c915a4f3b58ac44e82efc9bfa351baf6f1581f4e68c02287881d7aafa8ce7a5d1643f6d209cc38bd64f94957f60cccde175fa5 SHA512 1f95dbc80e9b207396d6a73a7ffe21d9d44af40c15aa4b7a795c893df0720bef079dc2956ad6d34718e58100e6806a1ccaebdd5f9c71f6363ee05ec69c1893f6
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge/microsoft-edge-103.0.1264.62.ebuild b/www-client/microsoft-edge/microsoft-edge-103.0.1264.77.ebuild
index 3db12034b572..3db12034b572 100644
--- a/www-client/microsoft-edge/microsoft-edge-103.0.1264.62.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-103.0.1264.77.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 98e5fc81d5df..814fdc68f869 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,9 +1,9 @@
-DIST opera-beta_89.0.4447.33_amd64.deb 86881152 BLAKE2B 34000f2db58eb2b989b286258a0ae0fd034e6144e9baaffbb6cc853af69d5ccd7cd0fa447a7293ac4281506654b2ea665964d39703128c18e478fc0d9e8e8896 SHA512 2af8fc44d43214ab9c716795dc4577cff2914389bb9fb74b8446c040f57978a83ea7f385fe8d4aa279ba95fcfba7803d3dc5b4dbf2637ffbbca3456272594f2c
 DIST opera-beta_89.0.4447.37_amd64.deb 86976092 BLAKE2B e6a094370fe58946b6217588ab45d135938d1540db5d51caca89c6d7dc40c5f13f19d453ad2fe57a731ec799e2996b10bc62c9efd4a99b034643288447e58e43 SHA512 d4c0622919043bcac442063323e8f46c91860b785e4d36007a88386bcbfa36bd87df8f4467a59014df1f04b94a8f5bc737b42194a132fdea5c2e6f4ca5b03f96
 DIST opera-beta_90.0.4480.25_amd64.deb 87712392 BLAKE2B 939b94c36a380913f944378f10026f726f154e5a0f359b6d233ea4cca51c1ee7cd86008c6599add44bc6e9f258aa8c2196cf942bb7a86da25ab4f6c5c4c9a7dc SHA512 40f1fbf146da283f31924e31edfd6ffbd70596f273191a7b9ae68a438db50e02b3fdbe9d809e875ad0148c04983778a1c06077af696ff7803796b76558e0fb90
+DIST opera-beta_90.0.4480.30_amd64.deb 87759060 BLAKE2B d3f07fbf6e4b53ae70da344586f963f8259cc081fca7bc9642f424b76b5da97e7e68f59ce685ed68d962a648982e34e1f829f3f9a91287b003802c81c1c412dc SHA512 3e9a5156825b3ce39f85df5f9ab06df9f5836fc216ba7890b87b4db532784f1529797763296fac9ba0f8f28d4cbe904857f967dc074c4f5ef5e4e6b375a2e879
 DIST opera-ffmpeg-codecs-102.0.5005.61.tar.xz 1429920 BLAKE2B a4cb07805650c3cd7f7e1127e475775c95d74b8cd17af5ad736a6d4f256176586b1608c2a617961cf2f3f7980879bc8f1a84cd9faa4838eafbc7b1b4e2edfe1a SHA512 af20383a0b77da89bf2ef52b412d9cce0a1f12bcfe2612ebd5110f1e8008cfff874da36e00b980609ac29346c545f2326bbe5f1b42473530f2886d67a00f52ca
 DIST opera-ffmpeg-codecs-104.0.5083.0.tar.xz 1431840 BLAKE2B 172ba55d6f390eaea644803ddae8c3cee4ee2d585de873db438d43b9e7f6d07f5b0e9b659f06c126f65148148d889948cc3287ee21da00eec08f2e665be47dbc SHA512 9ca7fe8a244b634d65a28602f9e1173694faaab6de95cd0a44aeedc29dffb75b14adf842c69d5ba5631fb40e51f021fce190dc8307148d8e9218230b7cde29b8
-EBUILD opera-beta-89.0.4447.33.ebuild 3584 BLAKE2B a747320ddd65e8eae0103d0f06308e66898d32f147106143b2e2269ec41f91fddb1fde363e41efbb103442ecac05a6b1611fcd59a95d3280d696ef25d68b0c2e SHA512 c72d3e2de99617299bac78478b89ce23b8f368dd3fecbc57dc0555220030b6573090659069b48021db8856cb14e2884d1f0b9380864f47fd00227abe0e274d20
 EBUILD opera-beta-89.0.4447.37.ebuild 3584 BLAKE2B a747320ddd65e8eae0103d0f06308e66898d32f147106143b2e2269ec41f91fddb1fde363e41efbb103442ecac05a6b1611fcd59a95d3280d696ef25d68b0c2e SHA512 c72d3e2de99617299bac78478b89ce23b8f368dd3fecbc57dc0555220030b6573090659069b48021db8856cb14e2884d1f0b9380864f47fd00227abe0e274d20
 EBUILD opera-beta-90.0.4480.25.ebuild 3583 BLAKE2B 9b15327b611d24210f9cfe62ff709cc70df96b97ea6203b7f6e0f15fc24b5e848aa653bb05ebaa323bde4d6084d574241d45145df7b56f32d99f9b7cb05b66a2 SHA512 20f9ee145bc5c162fddec4be280ad0bcd86dcb3a4e3dccb03d2bdde5e07361493ed6b103dd26a531e28faa534e6a5e92d4b35d9463a2a178c1dc6fc66ef55d47
+EBUILD opera-beta-90.0.4480.30.ebuild 3583 BLAKE2B 9b15327b611d24210f9cfe62ff709cc70df96b97ea6203b7f6e0f15fc24b5e848aa653bb05ebaa323bde4d6084d574241d45145df7b56f32d99f9b7cb05b66a2 SHA512 20f9ee145bc5c162fddec4be280ad0bcd86dcb3a4e3dccb03d2bdde5e07361493ed6b103dd26a531e28faa534e6a5e92d4b35d9463a2a178c1dc6fc66ef55d47
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-developer/opera-developer-90.0.4470.0.ebuild b/www-client/opera-beta/opera-beta-90.0.4480.30.ebuild
index bf2f16f337f7..bf2f16f337f7 100644
--- a/www-client/opera-developer/opera-developer-90.0.4470.0.ebuild
+++ b/www-client/opera-beta/opera-beta-90.0.4480.30.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 7c96a7a41c0b..fcbeb97cff40 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,8 +1,8 @@
-DIST opera-developer_90.0.4470.0_amd64.deb 87647176 BLAKE2B 86f8b4ae3d346a314078429aeb1070ecf31d007b46c890e5c013d697dceabe5dbf7e4e312f22e54da8215c87da6c8e2524ffdb6bec9a826514c018117c4c6b51 SHA512 9bd48def6804a6cf173e738e2297619401748339971ca031c3af1d6dc820e25777972c6691c560d506b97c3af0c1f98b4da44d52b0fe9de1c2d0982f1c0556b8
-DIST opera-developer_90.0.4477.0_amd64.deb 87534288 BLAKE2B e2670fc26d8ff72966e0dbae7f80801499f80e5a85874dda603a7617d3e2c11b6cb5f715916fd2037c280b261f41675c5401e0eeab85902a3af382c843a33f00 SHA512 20e545c9f5bd826c9529d8a2545de30e4e8123566429811b64df435b3e441ee88741a800bed889491a073b4431e45159d9893069193413ccc7116ca5f5098073
 DIST opera-developer_91.0.4484.0_amd64.deb 87605720 BLAKE2B 4b7b8f17a0bba21667f1bfe64c05bcf15c0fe20b1bdf928ad806f71f9ce6c8a7d3a8b2318b8b8cc2801a76c7d83172ce20c46514ba26ddd5a401915122dd4e79 SHA512 4056ea6b064867b558e132e70e8ee7c151424a7e8129e2996d8abed12806ee97a56bde613db8c8eff80331e7565bc4b0db10d7e758d24180eda9075d59260fcc
+DIST opera-developer_91.0.4491.0_amd64.deb 87721736 BLAKE2B 602d9525b1e69bb6ece6a1f9336964bdd62d0785bca4f2180628e53dd3356056d1066ddfb7b308b1bdae05512d99319da5f9b68c4735c0aff5e285e1c7d9d7ec SHA512 6853ae5d703ff9e0af5d9b0d15d45da1288b584d63aed94b761fd4926de169bcece2dda73dd0311aaaa823b2ae0892e2c852c24efa2fe1734d5faca5c31ad9a4
+DIST opera-developer_91.0.4498.0_amd64.deb 87205640 BLAKE2B 97d3516f597468930d8d523a0a90fa008d518fe6285cf786fe339c16e267d3a4cac1045fa1e50044ff099c37f14b2475e6fdc8ad2f8c7a4ea158092df61aefcf SHA512 d0841e500e05d5575719be4e4f5027f1bd9709734ca49f25cffaf6ba3cbe5508f333ca2594a621d5f338f389e1442c62aef3433f3e7fb5398c1801ebd1ba6c65
 DIST opera-ffmpeg-codecs-104.0.5083.0.tar.xz 1431840 BLAKE2B 172ba55d6f390eaea644803ddae8c3cee4ee2d585de873db438d43b9e7f6d07f5b0e9b659f06c126f65148148d889948cc3287ee21da00eec08f2e665be47dbc SHA512 9ca7fe8a244b634d65a28602f9e1173694faaab6de95cd0a44aeedc29dffb75b14adf842c69d5ba5631fb40e51f021fce190dc8307148d8e9218230b7cde29b8
-EBUILD opera-developer-90.0.4470.0.ebuild 3583 BLAKE2B 9b15327b611d24210f9cfe62ff709cc70df96b97ea6203b7f6e0f15fc24b5e848aa653bb05ebaa323bde4d6084d574241d45145df7b56f32d99f9b7cb05b66a2 SHA512 20f9ee145bc5c162fddec4be280ad0bcd86dcb3a4e3dccb03d2bdde5e07361493ed6b103dd26a531e28faa534e6a5e92d4b35d9463a2a178c1dc6fc66ef55d47
-EBUILD opera-developer-90.0.4477.0.ebuild 3583 BLAKE2B 9b15327b611d24210f9cfe62ff709cc70df96b97ea6203b7f6e0f15fc24b5e848aa653bb05ebaa323bde4d6084d574241d45145df7b56f32d99f9b7cb05b66a2 SHA512 20f9ee145bc5c162fddec4be280ad0bcd86dcb3a4e3dccb03d2bdde5e07361493ed6b103dd26a531e28faa534e6a5e92d4b35d9463a2a178c1dc6fc66ef55d47
 EBUILD opera-developer-91.0.4484.0.ebuild 3583 BLAKE2B 9b15327b611d24210f9cfe62ff709cc70df96b97ea6203b7f6e0f15fc24b5e848aa653bb05ebaa323bde4d6084d574241d45145df7b56f32d99f9b7cb05b66a2 SHA512 20f9ee145bc5c162fddec4be280ad0bcd86dcb3a4e3dccb03d2bdde5e07361493ed6b103dd26a531e28faa534e6a5e92d4b35d9463a2a178c1dc6fc66ef55d47
+EBUILD opera-developer-91.0.4491.0.ebuild 3583 BLAKE2B 9b15327b611d24210f9cfe62ff709cc70df96b97ea6203b7f6e0f15fc24b5e848aa653bb05ebaa323bde4d6084d574241d45145df7b56f32d99f9b7cb05b66a2 SHA512 20f9ee145bc5c162fddec4be280ad0bcd86dcb3a4e3dccb03d2bdde5e07361493ed6b103dd26a531e28faa534e6a5e92d4b35d9463a2a178c1dc6fc66ef55d47
+EBUILD opera-developer-91.0.4498.0.ebuild 3583 BLAKE2B 9b15327b611d24210f9cfe62ff709cc70df96b97ea6203b7f6e0f15fc24b5e848aa653bb05ebaa323bde4d6084d574241d45145df7b56f32d99f9b7cb05b66a2 SHA512 20f9ee145bc5c162fddec4be280ad0bcd86dcb3a4e3dccb03d2bdde5e07361493ed6b103dd26a531e28faa534e6a5e92d4b35d9463a2a178c1dc6fc66ef55d47
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-developer/opera-developer-90.0.4477.0.ebuild b/www-client/opera-developer/opera-developer-91.0.4491.0.ebuild
index bf2f16f337f7..bf2f16f337f7 100644
--- a/www-client/opera-developer/opera-developer-90.0.4477.0.ebuild
+++ b/www-client/opera-developer/opera-developer-91.0.4491.0.ebuild
diff --git a/www-client/opera-beta/opera-beta-89.0.4447.33.ebuild b/www-client/opera-developer/opera-developer-91.0.4498.0.ebuild
index d9356701daff..bf2f16f337f7 100644
--- a/www-client/opera-beta/opera-beta-89.0.4447.33.ebuild
+++ b/www-client/opera-developer/opera-developer-91.0.4498.0.ebuild
@@ -42,7 +42,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="102.0.5005.61"
+FFMPEG_VERSION="104.0.5083.0"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index f4720a0acad8..aa495ad905b2 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-102.0.5005.61.tar.xz 1429920 BLAKE2B a4cb07805650c3cd7f7e1127e475775c95d74b8cd17af5ad736a6d4f256176586b1608c2a617961cf2f3f7980879bc8f1a84cd9faa4838eafbc7b1b4e2edfe1a SHA512 af20383a0b77da89bf2ef52b412d9cce0a1f12bcfe2612ebd5110f1e8008cfff874da36e00b980609ac29346c545f2326bbe5f1b42473530f2886d67a00f52ca
-DIST opera-stable_89.0.4447.51_amd64.deb 86650976 BLAKE2B 5a80121f290ea857116cd463c6b5eb4b9be805d6fd75237618961481418ca9707fe0cecdf8594ec446ff66d84922764ad22bf29f7d619da99b0b0851d0a32de1 SHA512 b8bbfd659850830df13205c1d80d7610d0d7681c11b08cc4030a518b18dfcd6f4cc13a2502d05cb2dd152070deeb8bde027651cf6aa24fef2708c776fdbca235
-EBUILD opera-89.0.4447.51.ebuild 3583 BLAKE2B 13854d02b15144eb83990b5e7b32de07f5c3ad7e791b7e1d44a8066402de2abae0fbb5556de088ad09f641187038c17a8c00d2050774d890d2e26c29d69a4c78 SHA512 c7089c91e81623b69d121e5badfdb5676d223b37a88c103db31faf25821e957228e2e58f66cdffb1eb85e83e85de59e3aac399723ee53ce9a689972046813d96
+DIST opera-stable_89.0.4447.83_amd64.deb 86714216 BLAKE2B fad6220116819a352bca38b378c6164314fe82df230d8c6d024fb3188eed45a515151ba47c8646b7ce0d87e27761790add4fa404a2ce75db3a21b469d814c536 SHA512 e9ca106059848bbfd8b3778a8c2b26d6eb253137bfb451085df239e001ea3cd35a701acf10d770ac37a71eb70910f88dff6337d3cf79ad448dcdba2771b6d0ca
+EBUILD opera-89.0.4447.83.ebuild 3583 BLAKE2B 13854d02b15144eb83990b5e7b32de07f5c3ad7e791b7e1d44a8066402de2abae0fbb5556de088ad09f641187038c17a8c00d2050774d890d2e26c29d69a4c78 SHA512 c7089c91e81623b69d121e5badfdb5676d223b37a88c103db31faf25821e957228e2e58f66cdffb1eb85e83e85de59e3aac399723ee53ce9a689972046813d96
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera/opera-89.0.4447.51.ebuild b/www-client/opera/opera-89.0.4447.83.ebuild
index fdfecdad5600..fdfecdad5600 100644
--- a/www-client/opera/opera-89.0.4447.51.ebuild
+++ b/www-client/opera/opera-89.0.4447.83.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index d42f145f3096..275c5432565f 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index cb3b911045e0..bb45b4f60b1b 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_104.0.5112.57-1_amd64.deb 89829944 BLAKE2B 7939b8e75ba57ff88ce96b3d16f3b5ccb075dae7512b3e33f2fccc9b46935fbe53db09b79f42a871628b44abc8ea30f733d5a433ee8304d1f4673bde5765c3b5 SHA512 2de00a5465ae3ebd1503db47b3bf17cf8d2884258d5d4c6aca603bed0cc92af19bf8356e904f7b81c5571dc2c4bd8b478576b2169d8f75179b0f99d8fc6e7f72
-DIST google-chrome-stable_103.0.5060.134-1_amd64.deb 85810808 BLAKE2B 97465396f2d1a39c99716de66523f650395dd6cbeb297e8a75262c43e428ab4828ca621e2b8cdace9f87dc6c1363b687dd5f827e60bff4f9a885e0e666e6b518 SHA512 fe3b26288e8428813ca029b1843c0dc83cb94afc88017edd2f429fd31057c6ae9832e5df16e25dff49c1adac352f924be95cff918d9e1217a5c0b4469dffa9a3
-DIST google-chrome-unstable_105.0.5176.3-1_amd64.deb 90277740 BLAKE2B 03093be18477358f18efd5c30cfbfda4176730887db720f01ef14465b19d5f245465d7f2715b0032e0ec70070b76b67142cecf473567f1f2ab40c55b905a0d9d SHA512 93f1d0140683e620eea4b079a75678e4b45cdc8ab1122368e08fa7216b7a49b062d54a704344630fff0309b6e93040fc365e027dc8501d10da93214019a8ed80
-EBUILD chrome-binary-plugins-103.0.5060.134.ebuild 1178 BLAKE2B 7e2302efe34d64e47dc50e2030eca39e319040087a38f8ae74c1c6bdfb7caec7cf198c53d83b6134ada98292c79c55a3b19ab88ae74d34023310f921652fefdc SHA512 55691ac6f5b345ad9ba9b3d531f8612d9f062bb531057c95e719fca4f447cd872ad74c575251d31331b6176c3165dbf367f5a7711dd21623663093e056aa9411
-EBUILD chrome-binary-plugins-104.0.5112.57_beta.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
-EBUILD chrome-binary-plugins-105.0.5176.3_alpha.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
+DIST google-chrome-beta_104.0.5112.79-1_amd64.deb 89612296 BLAKE2B 0a201e82af1cecd50ce14cd7cad656c8161d3e9ac10c935e1bebd28b2d7488c8b9ebf5946febdc0f7ef8806fabb4706c75f416768c48e12a36ce5ff5b6d57c58 SHA512 09781af28b672f0d22310e1d7598aaa2c2367d92dcdaec3fa31e8ea5a96ad6ce83e859106109eeb7c7491da649422193d40d900d05093c03f01b7de5a3b16882
+DIST google-chrome-stable_104.0.5112.79-1_amd64.deb 89563160 BLAKE2B fcfa2a827a47401a057d55ddf41a00b47c62fdd84ccabfe835540830a12ec629e7333fc92a0da199c2a6eb52a18633c407cec6dc868c1dbbb11d0e50a637fee3 SHA512 7fb1041b3c314c0efa5ea559228907eb9bba4891ddbd377755753c77fb15d24c78409937c240ed024863e2e8347f44d0801817c6523cb9dc540dc76c3dc2dc85
+DIST google-chrome-unstable_105.0.5195.19-1_amd64.deb 91153904 BLAKE2B 1ebfbffc33cd14ba3a643adbf594a584c77c87c960e0ac6fef929f1ca51852a968e909c61d45054fba2034cd8161990b5e4422092f28f4a0f383eae24749358f SHA512 ccf8692dbd364c86d2f27db52d7bffa408ccdd128eea1a5e9865abe1abdf2c00386d627a113fcf31a34c8c28b0f75df2bd5223d9532b0432aa7b2941ea68d0b3
+EBUILD chrome-binary-plugins-104.0.5112.79.ebuild 1178 BLAKE2B 7e2302efe34d64e47dc50e2030eca39e319040087a38f8ae74c1c6bdfb7caec7cf198c53d83b6134ada98292c79c55a3b19ab88ae74d34023310f921652fefdc SHA512 55691ac6f5b345ad9ba9b3d531f8612d9f062bb531057c95e719fca4f447cd872ad74c575251d31331b6176c3165dbf367f5a7711dd21623663093e056aa9411
+EBUILD chrome-binary-plugins-104.0.5112.79_beta.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
+EBUILD chrome-binary-plugins-105.0.5195.19_alpha.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-103.0.5060.134.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-104.0.5112.79.ebuild
index a8c4f73dffbd..a8c4f73dffbd 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-103.0.5060.134.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-104.0.5112.79.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-104.0.5112.57_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-104.0.5112.79_beta.ebuild
index 48788b628112..48788b628112 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-104.0.5112.57_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-104.0.5112.79_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-105.0.5176.3_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-105.0.5195.19_alpha.ebuild
index 48788b628112..48788b628112 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-105.0.5176.3_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-105.0.5195.19_alpha.ebuild