gentoo auto-resync : 23:04:2023 - 12:07:24

229 files changed, 3890 insertions, 1215 deletions

diff --git a/Manifest b/Manifest
index 8cec8bd29ba5..b8f3ba2b37b5 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29464 BLAKE2B 2c82ffc8095ac343f637a6a28e32d0516b33373cdcec067a697df9e5752294c8926a0d934cb873f7b60aa88b32d80119e89515d013ed5bf5645f5271b5b6307a SHA512 90515c32b1ce3c6436e58fedd93a762a010ea529b2a3c9800a092e3664c8e924ff1c5ae27cf6da2a413017df8f048f665263a447ebaf64498267560c5f06043c
-TIMESTAMP 2023-04-23T04:39:38Z
+MANIFEST Manifest.files.gz 29465 BLAKE2B 10eb4cd390ad4ef3848c1d1b40cdba4fff0ed121664dfa677a0dab22ff2db24a2e0bda835148f93fc7bdfd2b0ffd7f931e5b7012b161e7fe42553e667c4f0995 SHA512 5e2e8f9e176f08d621c54b1c24d0d55566e2dcc8fa16188d6a025f8f2c52ddf9dd12985eca2192437c6543c71ef3931fa5c0574f35a55c0215de460203dcc5b3
+TIMESTAMP 2023-04-23T10:39:36Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmREtopfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRFCuhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klArzBAAiSa1pSrXYfMJOTuYrTdi0dCrSf1wUd0sKR/XaLXfiowwd9NzATBxKccE
-EONKc/tgjgU6+COrOjCia27mpAm0EbzFkGQrhdCWHTApp/d68ANswuYapfWMBn2X
-a0VNZsMsNXUAcrI+Waq0tAIZ/ATybDOCkeDalxmu/sDbJtWqDjxXESRcKWTx0L4D
-LS77du1e4zQKSLtzwOIXJKZqrk8aE9Bxfi8kmPm3CsJWn3mRDRxYRIoZE5YSmF1l
-yXmVJsWZF8o8DXj2Vm5cxPxpG+CVYWFAFWT+MVJvy6UF1zt5TG4gn7DxEqjWKClZ
-EwV6U7bOTM4fB0sKGeVw02iYpM/DJhPtPeS4EFK8IHNySbOYSS3NYaZ5l6RKs6Jk
-TEPcBA5aLWRHQckOe8y1VHTD76hO+8VmaP/9q8XCvf5tZkgmExgsEWXE+bNO7rNE
-g1/eC1oYtkQIgv93tWFfCXwV/WvplSZ86huZfJ/9gmJ0R+9X01CCQ8n31YqYLyY4
-Mad9OVcbJTy7DApIL9YZ/2PbXsgpilXgD5Uhwm8Ob1MqsTX7WtKy2nnD4yIGjaHo
-fMJRmhLJZNpzrby83IpWf7d5+y6DCGq2uFMLxffDUO8gG0Z6jxiUW8go/Rh9Voaa
-WZY84X3jYfYkLqHh69K3XUjpFGbc6HLY/FSgj6hvJDsDM68ObRk=
-=JBD8
+klDBdRAAsUvXUiX/UKs0XXVCTxhD2f/1M7VfaIkJeLEFyVLfPlXUmFSBS2PqtB9A
+4l2DvVG1muj2O1L4D9mu8HQR6GWtGoTZ+5wUKTa+AGZ+IauXM8awK1DvH/ajanY/
+KFNnY1QRN262vLFkcs6KS8+mgyAaBa21HtK9XD0SqqEm2ZuIlFgt5Nsb0lALR6/t
+Rzm65XDk7A1z+r3xWmSREVYyZDzEFdKyxzh7lK6Jb/WK6tZDi3Hl7l4HhHer2WdM
+bwJ1MET1Zw9EOdTjp4HeAHEZlDY0pPp+sfBxJ02m+VlN443kAX1SSfaO5r4pjFwr
+/UnYkhS/uRkDMklki8A74KxlcDPkZZLsNmjI883PW/A90a9E9b8MGZYNsxvPvxo7
+FANIIk/nwAqUFGdGHjgrcCNyvIRQD57TG/K+FnvpXAsTbsvs67sWsFTc7JQyZkYJ
+qnBMtxubkgAfk6s56+0gcvoPE82BWu221+nBTxHlG6KKlLvq4GBvs89n8MSN8ZqB
+rVaO4M+BkEex8Ln02zBSH7M/6KyJVULI7fzsACSULUDaQJcJ0tr7yJ1FzuknJLtR
+OT9PKWwQKMSbWHpGVTDdR7krT2qTOL0Dihi9M/HlzsxZmhFmA9WMOARmrRgcSOpI
+PV0McO10zH1F08bDT4kVW0z7DcRSvPMomV7ulZEMkOaGLuVYGDk=
+=Jjnt
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 45dcc2cf8780..967b72f55e02 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 7cd0ebbe924b..d674686e38d0 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 4ef7e825b903..64fa7cdd8600 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,7 +1,9 @@
 DIST scite-5.1.3.tgz 3427245 BLAKE2B ca765b61cb1fa96934c1e28d76a97cd7086a6c692ae33bb57591dfbc8637ffc94c4a3f20f9c6b55d11da8a76664f1d521f7e393bf6f31db55cbe02e0bf5052ba SHA512 ef86a18f739062598d3c7bf19bcd2f38ca012e890b9b4685c1f1b809e928762ab60d24c33a1f45ca33133ce5007e3a22a76e80222b121c9a4089d3c57aa0bc4c
 DIST scite-5.2.4.tgz 3440615 BLAKE2B a98028774837f7c19a73d3ceef0e7cf945674b0b0d21eec7af4874a1fab1dcbfdad9255adcfb9d458dfc6549baeb27dee3fab207f0145b6c722794a9a96ec284 SHA512 ac3f25fbfe654f4b249c55b2bf97d5ea57483a484feeb30c3663e13366d1a569d9faa22c83b4eb5201154d00713fcd550478573db987084eba0a2e8ea22c57e9
 DIST scite-5.3.0.tgz 3499449 BLAKE2B b54a4eb5c9d669f840efa782d0b02e1b087b386aabbf58dcd37bdc314f42ff6597bf674329c64bbf40befecbc3d3d00aaf13bd03d0f18a28ab6a050049b25336 SHA512 3401ea04019f4fbbd15118a6b2aeffaaeff91382e742cff4df2dcd83ea59e4d43600b288869db9dbe44609fcfad979d29659edbd200b6b0edfa56eac5a9f577d
+DIST scite-5.3.5.tgz 3535798 BLAKE2B 16bd6331b8ab5ef2d700a121d8d85078f6eea2f8c45cfd62c5b27c7c9622f853a871e98402ee3833c09652d869271ed05a61374ee1f55d58dbdcc0f5fcbd681c SHA512 18ed3e802f6f5e66573f72c4ad42d592ea3f79e191e828a32d2d55aaf285a2cb9961e206c9e99f82c77f0975494e9105ac925394d7cf48223b954e253f1dee9c
 EBUILD scite-5.1.3.ebuild 2399 BLAKE2B aa552326db18257573410f3759bec58c93fa6b331997c0475f459c698f41f685cde2d05e5c9ba88e70998566a45b6a18a52a128dc5d3ad00b429d9f7e9043221 SHA512 777e8ec73b35e14962728cbfa6ca7dbe1170ccab75c2abe0cb184580a9fffb2192df27fe853fd0f65018c9991dd33dfca059b086a64f85be4f2a7044fc024bd8
 EBUILD scite-5.2.4.ebuild 2406 BLAKE2B 6792a9a78a9fd9968dacd4360bcecb0b3570950d46767bb03a6ed69ebe24ae1de1f9963e1cf4f0f8adafc255d7f372fbbffece45db92799b54a85d68b874514e SHA512 f73769262346f62af1962d2e97e1f5a81d22901ee1adb92eaee774d1572fb6c46b8147ea9bcbae3829bc9ebd278d8ab0557c8b154b2b277bb56583e50be08e29
 EBUILD scite-5.3.0.ebuild 2406 BLAKE2B 6792a9a78a9fd9968dacd4360bcecb0b3570950d46767bb03a6ed69ebe24ae1de1f9963e1cf4f0f8adafc255d7f372fbbffece45db92799b54a85d68b874514e SHA512 f73769262346f62af1962d2e97e1f5a81d22901ee1adb92eaee774d1572fb6c46b8147ea9bcbae3829bc9ebd278d8ab0557c8b154b2b277bb56583e50be08e29
-MISC metadata.xml 477 BLAKE2B 6b4ee233530c91bd81cb7aaec6533f9d4f917765d372e8e84bed225da07b0db5e94f00d34644d9496a3d7321c8a16dc6e65b993263901ab8e58b65664f50458c SHA512 b7329399a31e6e514cebc509b048943a4cce7fca1affc7ac9f401420e885d51a7af6f60d61bc5405326c54a2d1207583f066e3b77ab4b08d00333b6ec43cdc0d
+EBUILD scite-5.3.5.ebuild 2435 BLAKE2B 39e7bacb12cbb36ea56559d2e6418bded0ddb906c850b18ffa19a92a42ca4c8a93ccb78138ced7a8b462166f8c233a58b00f16e483f14c2ec542fe19c181e7b9 SHA512 840c98d88021e4514039af0e068de11ca445fa6b75fcbfd10fac54f322caa1b73c009c93edbd9fa7d633df3dcc09e7a84735063b8e501c038d0c39d9b2628e4b
+MISC metadata.xml 247 BLAKE2B 48a241bd34b1820e804bb495b923696deea0e8d8fb710efd928c6b04aea362cdde3c15c81b9edc82868e39047e00210be8ca4f1b7b550e812375277dad47a803 SHA512 a083104fd79c7979f84234a82f419dee039d3d63cbd28d44b251f4a3f7183d333f920193e055c967fed03e7d755013365b867283f28d88751af52a6574f46a3c
diff --git a/app-editors/scite/metadata.xml b/app-editors/scite/metadata.xml
index 7694337e8744..ae6d6c4b2c1f 100644
--- a/app-editors/scite/metadata.xml
+++ b/app-editors/scite/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>ervin.peters@ervnet.de</email>
-		<name>Ervin Peters</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">scintilla</remote-id>
 	</upstream>
diff --git a/app-editors/scite/scite-5.3.5.ebuild b/app-editors/scite/scite-5.3.5.ebuild
new file mode 100644
index 000000000000..0eab49a0696b
--- /dev/null
+++ b/app-editors/scite/scite-5.3.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit lua-single toolchain-funcs xdg
+
+DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
+HOMEPAGE="https://www.scintilla.org/SciTE.html"
+SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
+
+LICENSE="HPND lua? ( MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="lua"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "../README" )
+
+S="${WORKDIR}/${PN}/gtk"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	tc-export AR CC CXX RANLIB
+
+	# remove hardcoded CC, Optimizations and clang unknown flags
+	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
+	-e "s#^CC = gcc#CC = ${CC}#" \
+	-e "s#^CC = clang#CC = ${CC}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
+	-e "s#-Os##" \
+	-e "s#-Wno-misleading-indentation##" \
+	|| die "error patching /scintilla/gtk/makefile"
+
+	sed -i "${S}/makefile" \
+	-e "s#^CC = clang#CC = ${CC}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
+	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
+	-e "s#-Os##" \
+	|| die "error patching gtk/makefile"
+
+	# repair and enhance the .desktop file
+	sed -i "${S}/SciTE.desktop" \
+	-e "s#text/plain#text/\*;application/xhtml+xml#" \
+	-e "s#^Categories=\(.*\)#Categories=Development;#" \
+	|| die "error patching /scite/gtk/SciTe.desktop"
+
+	#  add the ebuild suffix as shell type for working with ebuilds
+	sed -i "${WORKDIR}/scite/src/perl.properties" \
+	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
+	|| die "error patching /scite/src/perl.properties"
+
+	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
+	# Bug #576162
+
+	cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
+	eapply_user
+}
+
+src_compile() {
+	# prepare make options
+	local emake_pars=("GTK3=1")
+
+	tc-is-clang && emake_pars+=("CLANG=1")
+	use !lua    && emake_pars+=("NO_LUA=1")
+
+	emake -C "${WORKDIR}/lexilla/src" "${emake_pars[@]}"
+	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}"
+	emake "${emake_pars[@]}"
+}
+
+# want to use the base src_install() as base_src_install()
+
+src_install() {
+	GTK3=1 default
+	dosym SciTE /usr/bin/scite
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 376b8fd84a23..3272528b038d 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/gnuplot-mode/Manifest b/app-emacs/gnuplot-mode/Manifest
index e979482150bd..faed5c45306e 100644
--- a/app-emacs/gnuplot-mode/Manifest
+++ b/app-emacs/gnuplot-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50gnuplot-mode-gentoo.el 347 BLAKE2B 6a72d3ac75c8ef7629b8c018f9652b924137f56feb7c1578d7d5b572846bb22b248ae569412e7d9f6969ce6daca4aa21debccac7b7d5b63c4c66b04959d72836 SHA512 eb342c60bee1a9e45a50373093207545b8b37888432b082afb7c4f0911eed08481379094ee5a73888a03a12898c3c41016c2d9161f92a1a7cf7be7f2010c1c83
 DIST gnuplot-mode-0.8.0.tar.gz 352106 BLAKE2B 5408cc682b205ee712d2e0ff94b57a585d4040a62d1c61b3248cac63c16c76899b4ebe9b8e6ff091216beac3c9c79ea1425e018b275145d8ed5aff3b64e524bf SHA512 d1f93f0a28036ed66869ce228ff7c7007cdd463006d29930f01a6c5fa31c0487f603f0394f423fb8831b054e8d465f669f11ec2c3f8115ef1c84d828f77056cf
+DIST gnuplot-mode-0.8.1.tar.gz 88458 BLAKE2B 99355ec86b6a74294b72976efdaf88402ee9240c9a89432af52eca22b93af18a930e4f7cd07a0c4e25b235aeef0dc3a32498f57b8e74992f5cfb95cef471de55 SHA512 77bb70bde28007d7d42570c9649f18aec13426746acd97f0f94df1bc34ef0698ed5c4a69f5eac7dca4d9d000a527e1da70656692a7ecb2e1dccf61d0e0fc35b5
 EBUILD gnuplot-mode-0.8.0.ebuild 930 BLAKE2B c5bf242170780970d9a894590e42737bd7afc54967d5940fa0292e850580a8009c5bdedc71f05beadaed7cc1feea8d92f46eaaabd5cd01e15435335bb3326765 SHA512 b548de934051d60346f2b7452a72d6c3168b1d1bebfaf204d53a4380ad7ffb375375ffeae07567dde24def86767dee035fb0039bb4e6de58dbe8acb69631ee62
+EBUILD gnuplot-mode-0.8.1.ebuild 892 BLAKE2B fe07eb6f3c584a5eab54ea5f170afd953e93939bbf6c2033e12452c7389500660889eeae536ad261de4ec66918d90f8ed946aed6fdf2ec2d6e461f673d89c145 SHA512 cd182cd1addcc19d7a70537bcf0c4cbe42f2ad6085d7520f2f728e9580668637458b7f0734a96c2a2b4e742360a5ac2bf638f2d3e4a85dcfa7dd2711f1cc2a26
 MISC metadata.xml 369 BLAKE2B 139d2654a602c21239140953a8c9786a51e3236ebc5988e100f87d79aac42c76584c78cd29694edea85157025ce17f520003b77a5f0e67437db41960fe87e04b SHA512 9850f7e3592e7dceb70332a4a54083f8bed23f011e5ad9b373e630d71b93ecb417ab44dc8acb83111200c1aec000ddf37d9d1016534a64d6c917a2cb4907f467
diff --git a/app-emacs/gnuplot-mode/gnuplot-mode-0.8.1.ebuild b/app-emacs/gnuplot-mode/gnuplot-mode-0.8.1.ebuild
new file mode 100644
index 000000000000..4384d2723260
--- /dev/null
+++ b/app-emacs/gnuplot-mode/gnuplot-mode-0.8.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Gnuplot mode for Emacs"
+HOMEPAGE="https://github.com/emacs-gnuplot/gnuplot"
+SRC_URI="https://github.com/emacs-gnuplot/${PN%-mode}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN%-mode}-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc"
+
+BDEPEND="doc? ( virtual/latex-base )"
+RDEPEND="sci-visualization/gnuplot"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS=(CHANGELOG.org README.org)
+DOC_CONTENTS="Please see ${SITELISP}/${PN}/gnuplot.el for the complete
+	documentation."
+
+src_compile() {
+	elisp_src_compile
+	use doc && { pdflatex gpelcard || die; }
+}
+
+src_install() {
+	elisp_src_install
+	use doc && dodoc gpelcard.pdf
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2092b51505de..9dae98e7b05d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apache-arrow/Manifest b/dev-libs/apache-arrow/Manifest
index d86e6f32e1a2..37217f2d8395 100644
--- a/dev-libs/apache-arrow/Manifest
+++ b/dev-libs/apache-arrow/Manifest
@@ -2,5 +2,5 @@ AUX apache-arrow-11.0.0-shared-lz4.patch 456 BLAKE2B b6c8263ac0cf52e49004836ebd1
 DIST apache-arrow-11.0.0.tar.gz 19956186 BLAKE2B dff0faecbde9e2d19f092fd0c48a7ac7a401da6dbfd17f30af1b35c9e3fd3e1ba5611311f5bcb08383368de195cff783a178a9397a63a1c4f740a81349f8b8d3 SHA512 46df4fb5a703d38d0a74fde9838e9f9702b24b442cb225517516c335a5ab18955699000bf0b2fc7d1698ada6d2e890ba3860933b6280f5160b0fce8a07484d0e
 DIST apache-arrow-arrow-data-11.0.0.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82
 DIST apache-arrow-parquet-data-11.0.0.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61
-EBUILD apache-arrow-11.0.0.ebuild 2258 BLAKE2B b8cc1e4d4a8da6e05272f60e48932aea007f750c47d1a59db923e733df2dba264d75c8de8edc92075f2dced03630ede9bda9c7602c48facf9cce0ef31bbc66b0 SHA512 d391805e18a4d32d33120e856ca530f7e0bfd78eeb12e12f361236746e3d153528c698ff04ac5b1e7d9646c0c3fd96318c26fd17da7fcce7264f60a241a1e405
-MISC metadata.xml 543 BLAKE2B b5daf8e9028b74697416b7f29c9e1894e70faa985b62d1f6ff4bc92ce090fe5208666193f92662621732cd1b4024c092b92b18820452e8bd1cec832383063fe6 SHA512 710ce1906d4b90b37db8728dc614146cbc264c3a955830023f18e8edcbe3499a1668ea97bce7790c660364ec26558f8eab5998410296b17e7c0d684b1a5e1b5e
+EBUILD apache-arrow-11.0.0-r1.ebuild 2542 BLAKE2B 6c315dbedf283a22de4d01c27cba8f339c0b14031128f6a19c9885754860b404d3042100f4c3909967c1715a478bb4972a5293ada841eb0052b37e1279afe246 SHA512 fadc17aabb71426866f66b4909c7e1113777f135cf767697ab41c145063614279f6cb050253b1c77da2a2e46a50914cddcd2f7269dbd0aa1a326f0cc2bc962ba
+MISC metadata.xml 866 BLAKE2B 26d1c8b485480dcaf144d9149a4f012dd2cdc84910e0417b66c59c09491a2658663d4849f01939f19092cc348688fc6214722dd6bae22aefe581d1cd7ba4b1e5 SHA512 1dce3c5b471ca44b3617ece860700f1cfd91cb27e52e9f47ff4a4055fdd05e702f4bda0d65e7d94105a99c4eb4bf6e1515bbd7d2dd5a41e4dd56e34ad3aaf7b9
diff --git a/dev-libs/apache-arrow/apache-arrow-11.0.0.ebuild b/dev-libs/apache-arrow/apache-arrow-11.0.0-r1.ebuild
index 6d70b765d4d9..12dd7ecedf80 100644
--- a/dev-libs/apache-arrow/apache-arrow-11.0.0.ebuild
+++ b/dev-libs/apache-arrow/apache-arrow-11.0.0-r1.ebuild
@@ -23,11 +23,13 @@ SRC_URI="
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bzip2 dataset json lz4 parquet re2 snappy test zlib zstd"
+IUSE="brotli bzip2 compute dataset json lz4 parquet re2 snappy ssl test zlib zstd"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	brotli? ( app-arch/brotli )
 	bzip2? ( app-arch/bzip2 )
+	compute? ( dev-libs/libutf8proc )
 	dataset? (
 		dev-libs/libutf8proc
 		re2? ( dev-libs/re2 )
@@ -36,6 +38,7 @@ RDEPEND="
 	parquet? (
 		dev-libs/libutf8proc
 		dev-libs/thrift
+		ssl? ( dev-libs/openssl )
 	)
 	snappy? ( app-arch/snappy )
 	zlib? ( sys-libs/zlib )
@@ -45,6 +48,7 @@ DEPEND="${RDEPEND}
 	dev-cpp/xsimd
 	json? ( dev-libs/rapidjson )
 	test? (
+		dev-cpp/gflags
 		dev-cpp/gtest
 	)
 "
@@ -72,15 +76,20 @@ src_configure() {
 	local mycmakeargs=(
 		-DARROW_BUILD_STATIC=OFF
 		-DARROW_BUILD_TESTS=$(usex test)
+		-DARROW_COMPUTE=$(usex compute)
 		-DARROW_CSV=ON
 		-DARROW_DATASET=$(usex dataset)
 		-DARROW_DEPENDENCY_SOURCE=SYSTEM
 		-DARROW_DOC_DIR=share/doc/${PF}
+		-DARROW_FILESYSTEM=ON
+		-DARROW_HDFS=ON
 		-DARROW_JEMALLOC=OFF
 		-DARROW_JSON=$(usex json)
 		-DARROW_PARQUET=$(usex parquet)
+		-DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl)
 		-DARROW_USE_CCACHE=OFF
 		-DARROW_USE_SCCACHE=OFF
+		-DARROW_WITH_BROTLI=$(usex brotli)
 		-DARROW_WITH_BZ2=$(usex bzip2)
 		-DARROW_WITH_LZ4=$(usex lz4)
 		-DARROW_WITH_RE2=$(usex re2)
diff --git a/dev-libs/apache-arrow/metadata.xml b/dev-libs/apache-arrow/metadata.xml
index 78102c94fc52..67bc36926748 100644
--- a/dev-libs/apache-arrow/metadata.xml
+++ b/dev-libs/apache-arrow/metadata.xml
@@ -6,9 +6,16 @@
 		<name>Tupone Alfredo</name>
 	</maintainer>
 	<use>
+		<flag name="brotli">Enable brotli compression suppor</flag>
+		<flag name="compute">Build the Arrow Compute Modules</flag>
 		<flag name="dataset">Build the Arrow Dataset Modules</flag>
-		<flag name='json'>Enables read/write json format</flag>
-		<flag name='parquet'>Enables read/write parquet data format</flag>
+		<flag name="json">Enables read/write json format</flag>
+		<flag name="parquet">Enables read/write parquet data format</flag>
 		<flag name="re2">Build with support for regular expressions using the re2 library</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">apache/arrow</remote-id>
+		<remote-id type="github">apache/parquet-testing</remote-id>
+		<remote-id type="github">apache/arrow-testing</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/cutlass/Manifest b/dev-libs/cutlass/Manifest
index ad2b36d557d6..7df573f71562 100644
--- a/dev-libs/cutlass/Manifest
+++ b/dev-libs/cutlass/Manifest
@@ -1,3 +1,3 @@
 DIST cutlass-2.10.0.tar.gz 15241458 BLAKE2B 66779759ac1c7ebcb860bb9b925a236b45959f5ee3bf4e1f95ffd05a98200dcf2eb4fe2907c02e44143d3f51eca1e2a4ebd890e0edab7fd5378684819123f197 SHA512 4310f8da2931815a63a5e9a69c6c073f95148efecbea7026afcd90965dbd2e1921db52b0ac2a06cda64e20bbaa44112ae1fb7c3b557c41416d99dac33d000aa7
-EBUILD cutlass-2.10.0-r1.ebuild 757 BLAKE2B ab7fac892b0019e6c572289a19f5be8bbbb5da04bbf7d494b33c3a48dae3ab1259dd334a927bf598a6243d3f7b96a901bfa6aff1714cfeb812dc22c1dcef6bf6 SHA512 3f546d02ea51a8d3197c587a0f2a4555389d67eebf03b3416adc8a3da70c7a0a627d88f5b46420b3660b0654a22d283914792a2a62a723791aa424aa34c50c5c
+EBUILD cutlass-2.10.0-r1.ebuild 779 BLAKE2B 7c90175cde496fa74d5e6163dd414114553c40ab0acfc5c6e339fa3068228e09e0e309cff6f20098918c5d4f226a0cec463fde9102809d02649698906bfc3630 SHA512 9eefe7c67275c2cf1b597fc69a0adb09f3c05266c0340532da7eae73ee47a9f076f008544cd5dd5353f1931700f5e749ac2a012e3cffcfe4d0ec291e251dedf7
 MISC metadata.xml 382 BLAKE2B 008169851d66b1d1d20635e60d3afc08dd94dc94f660f93ebcb95ffaf06b2e23ef23caa8d6546b051acd7f2e1c19418b89a445921d60f3a09ef787be5047e148 SHA512 2bcf3aae1701f437eb8acf62ab9d977999ca675e20fca597097f127d0131a79982d56fe24281b59e1e85a450193d4ebd4f90aa7b317370a4b99db17636dcff5e
diff --git a/dev-libs/cutlass/cutlass-2.10.0-r1.ebuild b/dev-libs/cutlass/cutlass-2.10.0-r1.ebuild
index 4ce3100f8132..0a0c63b2dd1c 100644
--- a/dev-libs/cutlass/cutlass-2.10.0-r1.ebuild
+++ b/dev-libs/cutlass/cutlass-2.10.0-r1.ebuild
@@ -30,6 +30,7 @@ src_configure() {
 		-DCUTLASS_ENABLE_TESTS=no
 	)
 	cuda_add_sandbox -w
+	addpredict /dev/char
 	cmake_src_configure
 }
 
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 1372e8343c1a..956d2c6f246c 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Math-Int64/Manifest b/dev-perl/Math-Int64/Manifest
index e54a5c916868..adcc2d8774d4 100644
--- a/dev-perl/Math-Int64/Manifest
+++ b/dev-perl/Math-Int64/Manifest
@@ -1,3 +1,3 @@
 DIST Math-Int64-0.54.tar.gz 119664 BLAKE2B cf12dd1f156c92cbbd2f87913737cd1a4b48ef3d879e340506241bea6debcdc2313f8c1503597f54a0d80e6e50f16cbdba5be112e4e6df71e1f2c38575c423c3 SHA512 03677df499ebc3924fabefbc6fb863adc2f765341a9697305b03bb24477b391029e65cc492c831a24e282e26e850082abbd0e52dda198aa041f3f4f41cc4f995
-EBUILD Math-Int64-0.540.0.ebuild 813 BLAKE2B e44c6f903f864bdf7ab849f5aec8427fe6588e72908a8cdb8a94d548c67beeafc2a93dcb4d0f437c62ce83b3faafd2fbae7fb624704ba375473e24e1a8308604 SHA512 4cdc4fba3978eedff0d0c4e809cec92a841589d6ce1af35e95fa105d39a149e445da3255f6a19e709f60bc464e93bed9874fec71838ee4ec33921396817f637c
+EBUILD Math-Int64-0.540.0.ebuild 818 BLAKE2B 1ab7398e64e438e42cee989c13238747a781381ca3c177efd31e2ed919b33e681c7c8506457d33f20af81329575523da694bfeac7a7ea0b15d8f7805f73f57d2 SHA512 8be66a0397c3345439b9a180f4f32e91f4d623e3f98539a3d0eeb3a13c8b2927de012f526309a87d227abbe7ff922cd97abacca8c0bf57fb7332892ef1588a35
 MISC metadata.xml 737 BLAKE2B 31045d778dafb42fcc28d2d8828fad9787283bdd26b80718d3ca84e1206130d8ef9df2afb32c2e94d0cb66f122abac0971500c7b4bcb5ba1c824ba65820f8ef7 SHA512 652f2bf5c87dffd39909152144ec20c38e9ea1d2b1fdc9a6606c886157ba9b2825c4fc755786dfec8b8f17e9f0c1d019c8ec268bb7eae3e048f9398c57299901
diff --git a/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild b/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild
index a4b06b19d904..f194658058f2 100644
--- a/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild
+++ b/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Manipulate 64 bits integers in Perl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 72cff56809d0..d0cbec8228fd 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 1fb812ffd591..98cfac9ea161 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5-5.15.7.tar.gz 3238978 BLAKE2B 8e810444d9e4fe0c5af702161bc834848eefb6fdf04b282bbf42a9057d564aa778a01a5d40c249c10eecafb0dce8d160f032668f0d1fc87714fd874f002ec88a SHA512 815065f88454f767525fdd2caf97b0192eaf6095133c9c708ee4efa3d222742720a169856be65c84400a6e8d42d69ae65697d7f9dd17b9b4a347d75db93c5129
 DIST PyQt5-5.15.9.tar.gz 3241160 BLAKE2B 37d7227e09c48576a51030729217d2c0771b2f833cfac76ff05dd0c9315889548934ceb459e590a5a9bc3a9ea2b26200791e470788f7d5b28a80fbc21539aa2f SHA512 1c07d93aefe1c24e80851eb4631b80a99e7ba06e823181325456edb90285d3d22417a9f7d4c3ff9c6195bd801e7dc2bbabf0587af844a5e4b0a410c4611d119e
 EBUILD PyQt5-5.15.7.ebuild 5261 BLAKE2B d2e474ab79602bce66ec107092ff81736c847b3b1f28b140d018b0171bb569a0a4bc04aeb728ada782f067d26689350f7dadbc9ab2d274243265941939943212 SHA512 d1757ec5ee655fe92b1e9112ad2c6aa8c4e980b348afed88c4151da0b6b64fdf18781717b4de1a3ddcf95307cc6eaebf28d4264f53de4777a7e1705922572fce
-EBUILD PyQt5-5.15.9.ebuild 5234 BLAKE2B 4328154bbfcfc879dd19f177a1cb91c1c530fd5733297b3e7346e77e412f109da927f496fe2391aad98e29e4df383ded5a0d17fafc7feac7ec3d65bceb2d25c3 SHA512 e1c0c8cc4861bf8f0698d97af8c40309293c5722e80c094259dbf46c217794de40278b7368afcaf0daa79698e4ae703bbced2509227d53bd29f26290e129d9f0
+EBUILD PyQt5-5.15.9.ebuild 5233 BLAKE2B b5b58feb7cb265366453c4499d8e4d7b18ae686ed0dac09a704479020d1c9ad2775bcbdc0c3647dbd66f94115f94fbb4a159991c677514055fede053a58c46fd SHA512 036d22b8a31cbff64137050ec7e2cd2613c19d012e0694b27f75747b8a92f4d33927f05f6970797e9d9cced1a033a5c4bfa0cc6eb9198c655052dc407d9642f4
 MISC metadata.xml 2287 BLAKE2B b4090aa2c55d05554a152bc3adfa76c68dc78175d26bb4ea6d25858ce2db922c168cc4ded6c7fa9114cf651417e0a6e435baebe460c8efbbd94be17adafd6f43 SHA512 12e3559ff04c32ebce2a382bf3b01730b0b69829c77cdf75f0061143cc19000e126daebbf9014beeae8bd1fba2675ef2ecfe7943296a8dc66000439c104c1351
diff --git a/dev-python/PyQt5/PyQt5-5.15.9.ebuild b/dev-python/PyQt5/PyQt5-5.15.9.ebuild
index 936b389127ca..b8021b29afcf 100644
--- a/dev-python/PyQt5/PyQt5-5.15.9.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.9.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 5cf5f91afccb..ee166bf81253 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -4,5 +4,5 @@ DIST cairocffi-1.5.0.tar.gz 86811 BLAKE2B c8f6a39608f0db6d0b7730302437a8856a3dd7
 DIST cairocffi-1.5.1.tar.gz 86924 BLAKE2B 51bbd85ed486d8a324255d7b328fc44490097f0eeb0568d0e9436350e627ee2da7770323d0cfa547da2f007dc097327962d80d0a9a96a2f119bac0bb4aa4d7f4 SHA512 58b33e921866a3db7dfa464514f935f7c615ae3463b852d888e9d221256e91efaa7639001781999bdf68619a725a90de06300973f9e635c7974e8c48729705dc
 EBUILD cairocffi-1.4.0.ebuild 927 BLAKE2B d8ee16540e8495e36c2ea53fc0a02ebec035d52e9e96ae7434aeef28827bd86b69253b989cda30980289c1412c214c436eb16f5ea6d69ab1762cf4cf6424d0fd SHA512 b57881771ca23d12bd5b8f6076991f07c9bd4898b7b7655f8f0ce629dfb9c9fb2afba0a0e4686a4566f7372b4d9b09a471d32d8618bb39a89aa88fd52d19857b
 EBUILD cairocffi-1.5.0.ebuild 1099 BLAKE2B 043b8fde20638038041ea9e9c6f6ddf31a13f015ee70c9ce3cc376daf4ebca0214f9550d373b5f590407a84ea7d2e02f7c1a22dd7eaf64fe373e0c489cfeb798 SHA512 d86293285e4bd8913bad4ed39bf7314578ae18dd6bd35c1add2c8a1a39dcd1de668de32a94b44ac7ed6005a3e602f009fd5c898b362d5adfbe9bf90f0d87e4f9
-EBUILD cairocffi-1.5.1.ebuild 1095 BLAKE2B bf8e0897e8a48bf4b40112e24b5c41798c4564ea03c3a6143754672a2252a83018980729087206596c7e4075cecd5deceb5839b6655c4e13a20f17b7345a5686 SHA512 d1c715a796f8985240cd9eeabe1d8febefc6f8bbf707f4cc7cde8b32a712cc4e0d249fc7e0189482458e59d00724dccba18b4df01611d4623ffefc8f1fa30abe
+EBUILD cairocffi-1.5.1.ebuild 1094 BLAKE2B 20adc8d5d03167ee026fd617c9ac19e6ad5a019e9701a466e994adfde1652783687706a9b6781ebb1475468d820008ea97b41ae6a0617a45d2e024f4b93be4bd SHA512 ac6748b2e2aa8ae5252d3f02bb8b275f8e8618a46ade799045512a8a34da143a28a8c656ecd0c8f0f8e32c8f71d3a5e20301676ce271e658baca1d4149fcf8bb
 MISC metadata.xml 380 BLAKE2B e489f8f463877335d35d1ccd7b04247ff92e5bddeffd36d42a4d8d45f3d48962d704c4a2701b8df91bb38182ada14e19ec6f97c58250f7a9881728cfa319ee15 SHA512 d64dde8aa97fa923c5b13f23539774ebcf02d5ea14b50e01e98c6a3e2f63316ab08a235613fe4bedfc496dd7ffacc2f6e41ea5a2fad310b341ad3ac254b2a522
diff --git a/dev-python/cairocffi/cairocffi-1.5.1.ebuild b/dev-python/cairocffi/cairocffi-1.5.1.ebuild
index 853dde8fdc76..779fd685200c 100644
--- a/dev-python/cairocffi/cairocffi-1.5.1.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.5.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server_mathjax/Manifest b/dev-python/jupyter_server_mathjax/Manifest
index 0de83674b37d..1ca9429526fb 100644
--- a/dev-python/jupyter_server_mathjax/Manifest
+++ b/dev-python/jupyter_server_mathjax/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_mathjax-0.2.6.tar.gz 2648665 BLAKE2B 079108842d1c62b58c12e5466736508a4002fcc977acdbb1ea0c35205f685f53b985038af7df1d58ab188eadf6be85c59cc3eed4012a92d4353d5b77424935ea SHA512 a87a73471c470a60fae67d3a2dc7e163c39fc2ce62b357fd6eaa030ffcf63b44106ef35377795e58c5f89a847648c7fedfcace68ad9aef8efa45e71a2fd1a79c
-EBUILD jupyter_server_mathjax-0.2.6.ebuild 1085 BLAKE2B 148c2ca17b07df2fcdfb9256e45c91c8b80cbca793ac3e3a5b566560a77c7b7419622f208d2c67ca244aa4b13926d1ce5f266e4f66f0d3df5eca654712da70b0 SHA512 bbf26b46383cbb75df436b50f3e86df9ed132b8efa240ffbe42162cf14de68fa5b8eaf7b6f68dd938837a27ad3e29e8dcd566f0bc7d02aeca6154817db2e7904
+EBUILD jupyter_server_mathjax-0.2.6.ebuild 1083 BLAKE2B 50ef4b57eb5fefb48ae4d560649d030f6a099a995ff68121ea2047b5ea45bf83fb9b4368a26a3f2f0dc8496da0aefc1c0b4f3220c970bfbb22a0038938609ab8 SHA512 8a732a4c8a86ce51404308b5ad0c46524ac5eb76d821f950926d1ceedb1209fc4c1beb83731de50294c10fa1c03acbaf42cb4ee36f673f31e017ee6cef58adb7
 MISC metadata.xml 453 BLAKE2B 7a4ebaf263ff85d75f9ceac762692040bac146e147e7d01f5464132f3c518f2141c884cc0c447388e863651929727fe1524971925bcee7fad92aa5d33febf90e SHA512 399c94bc19b4144701f44638ea0fde80c366750131c8952a9c8c5f8554275e8ff0be72c3ad08335facb3719c0f8b9c9027ab2f60b3897e5e9791eb3ab95daa17
diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
index 733e4dd1792a..9618fb790a14 100644
--- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
+++ b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index e2bf4e77a72d..a09df8ab7d5d 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,5 +1,5 @@
 DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 767f7c848a5d840c1ac26d42f4074888163fd0bf63b774e9f79c5b7738f7f43453e35c93bdbad9cb10bb52315d67e1de6207b3463bbb885a6d095ada2bfae7ef SHA512 306764a2dd8770ee5041f5ebe076c3de5da9444166de3b77c7a6c37ef1a13c57f1adecf11e99a6f812930b133ae4ec7229de61f8a789804de77abd518f2e08b4
 DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd SHA512 e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
-EBUILD nbdime-3.1.1-r2.ebuild 2946 BLAKE2B 7d00b3862d80fabe1328a2707282c13d8cb762aa32858f4d60218fa204e746a60069a5e0ef27bd59603e0a26c728e83602525de2dbf965d1a1f4d76fc0ec6ab2 SHA512 d99b834a93f9594c6e2b39ea2965c472523fed801c696675f68d506b690ea84981167b361634d85076151781da6926d1694e625d13df739e5263444e8fe7357e
+EBUILD nbdime-3.1.1-r2.ebuild 2944 BLAKE2B ba0755d0ee980ec60ef1d1e67457da37289dfc3e41e3dd9b7f6b0590e85e25a058df457832fe7c83c3d4d5c25193b28309fadae11fa2a1aeb3af48433b41bb1c SHA512 9eb88a2335b414b3c8f610fbb320c7489a938f1458a505d9f34583f4739019e10f5de5edaf18e465deef942f68678682704d61030503ae48ab9b764a21109788
 MISC metadata.xml 414 BLAKE2B 9951da7227d2b6628d68aeef19d236a17e9011c62f6318ff274f7979b0db4e7e84be7dfcaecb32c82069a761a743efe6c8b27cfbac421274c39e417cdcaaebf7 SHA512 7fe4193e5844adc4d403c8673acf55bd9c7322c484374072239dbb266e0312bdd9e7b18e0f338e45e602003c89f1cbf50090ae9fca2e38833e17d41dfe4e131e
diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 5f0b124c03e6..a75dfbf6a8c1 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index 904dccc79d67..fdd436907f6d 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,6 +1,6 @@
 DIST nbval-0.10.0.tar.gz 62727 BLAKE2B 5b8d2815ec38481da1c0b3b5b62f809a231c4d136499b73ef13dba6a5214c87a5d4f77db1d81488e1bf13bd3ff365414e75760763a56a3cc28e752dd316ac009 SHA512 3e0e495db40aa4969e03ed1359f0c509b7470a54b3d8b6a85731601af5da0407bd44b3f069178f1a6b3aca7bf243747aaeaca4cb2332912e917e360f705eae61
 DIST nbval-0.9.6.tar.gz 60932 BLAKE2B 77f283279e16e03ec87f250b2012aabd8f580e24b222efcb0b21d9b0dadc381cea3c4a3f96a85df0104da86911de66e6c21bfd3985801fa9c3d8764b2fb26183 SHA512 d4261fc30e197e7350c07504649f0230751b5ed746fe4626b92c5920032dc15abe47ad421c93f4762e93a8b6afcbca440ca006bfd1cdbcba37d131c4e6decaa7
-EBUILD nbval-0.10.0-r1.ebuild 1045 BLAKE2B 10dee943e91252cbff38f445bb843c78c98c899f0cce83282b1e690462b87d7aaa8fae856bfc0125a0e572f8b6b6b7744e409d6e69ca31cce4f7fbf06d878388 SHA512 79162c945bdd2bdcb7becd579ce86cc5b72365ecd30d9ef0c3413326acd4680263824ca49fe9c96f1bb0c85054fdea31d5dc9038b93d1076d72d8244835cedc2
+EBUILD nbval-0.10.0-r1.ebuild 1043 BLAKE2B 5a50c224cfcf8cb27cc83493d3b62c8dcccc09c308d9c1a2f9f01370bd3bed341f63c5e41abc880f10f64b78b66161341f6847da4a31f2256f1d9864f97eb719 SHA512 b250c772e95d090cd642856c23e50f8264e74ccf6a3e481ed356855f63b30028fc0b0d2dbdc5ebeafa665444c9b998a6741017376aaa5a3750dcf63afffb4b65
 EBUILD nbval-0.10.0.ebuild 982 BLAKE2B 2cdf4e4513111076ec62decaf10b4931445239e29528c35ccd4a672087f4c59c9e04e5c8af21db81fa5fb46bdd50d2fc00188c56be830797cd9b872660890798 SHA512 0115387da679b9d11f378e9c8a59c4af78ca8d2ce3b35f57bd5a834e6678cc3b99a01eb77a663c70e21fbf84606e167f7b2dee2380dbc294fb9bef0db38e5108
 EBUILD nbval-0.9.6.ebuild 978 BLAKE2B 2ff41fe3f14119a897ba2a31959b17ba1537d3528c4ea18c9f5865dbb23ab671082d49665dd00439a79500ead951f5ad738998851ecbf87493fbe2703e88c832 SHA512 18b47f5a8a56d5df04b5243412a394c51feaa19c510675bd103bf4dde4167a805afde61081ef07e47f3eaf6c42d12cf65a87d26b33f8271f7ba3a92c98260e7d
 MISC metadata.xml 984 BLAKE2B 1f5a69806d70ed9aa5c0cf2a7f3466afc76e8b5078923142d10aa8ac5a68ab41dc54cd2345cef061236b7b68fc13fc76ff7a072b9fec8697eae259272a32aefc SHA512 13284c08e700976e1da78dbfe0038c2cca1d1e3f286726c4096ad53ded3b6ebbaabd51e105f70781be57293a46d8e2de3116e406cee4ac35d2dc80f1a165a7f8
diff --git a/dev-python/nbval/nbval-0.10.0-r1.ebuild b/dev-python/nbval/nbval-0.10.0-r1.ebuild
index 1f68800e7c97..58a160e645ab 100644
--- a/dev-python/nbval/nbval-0.10.0-r1.ebuild
+++ b/dev-python/nbval/nbval-0.10.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/computationalmodelling/nbval"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index a83185483541..94ad1e631343 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,5 @@
 DIST watchdog-2.3.1.tar.gz 123140 BLAKE2B a49307b890b9f69eda760c6285d325fddc7281347740b36d7c840a5e28ef496498420c21424f1553bf1dc0d47a928194720ef1ae542e7c0f6f58085760c2e8f5 SHA512 a492c818fcc8b21ca4052fecafdf6b4d00f441034d73b10464fc9c09a89d539acd8304e591ded96e5d992e2c9455be018373ba4f06a33b047e606c083f9061e8
 DIST watchdog-3.0.0.tar.gz 124593 BLAKE2B bc8135dcbe9b1000fb7befc85ebf62518222b0470676cf94aabbe8f871bb05064a46ae4d11ce34f8030d35268c073fe82757b911e3983a8b683ffbd09227395c SHA512 fa1421b01af99d7fa676c9077b2330ead17c004d9bb9e9edd78d4bbf87cf41624ecd669ca48613d99be2109373bbab4e004b69665d2ca42e082573e4740c13d0
 EBUILD watchdog-2.3.1.ebuild 1058 BLAKE2B f8b3604c4702ecd9da7f6eb8ad3c26430939f27c052da39cae3dacac7c2f71fa11cd8e8d1cb7a706e61b940ed4fcd295ed5ed293acebce7d630d1bae8442c804 SHA512 56ceb3e077685b271b245c7634f69311fe0b55c2bddb51f4999f9c2a3f9b312f897c3763dcb4aa5deec5fccf8101b03be5e31f087486182ec91cede25e018293
-EBUILD watchdog-3.0.0.ebuild 1060 BLAKE2B f411d20ce268c176ee88f811a781e8398e83cd7d9af46776663c7d3de77a87b181d9824866cf71f3e678a866f5cc163819806322f7237a9e698efba0c6c20c9b SHA512 5bbfb3b2b7670f0d75d025940931b078d7c3bf9be030632eacf6056502b454b08371f50012c7d08c2dfca2898118c0d417d5ed3de713716a1359f15fb507b274
+EBUILD watchdog-3.0.0.ebuild 1059 BLAKE2B 4b02ccd97b49333631c7479fccda70aefca6c6e82bc981062ef6678c09d7943569d00ed0e80b0874d9f3fd63d2ca095e8b8c64dd8c26d882ddd6609b5346a5ae SHA512 81347aae3dcde9999b29517cdcb9412dd26538bc4199bda3cbd63b25de0d91952072cbd4c817ea87be8762dd975f7c301f9b088c6d2fe758c56cd8a53376c9dc
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-3.0.0.ebuild b/dev-python/watchdog/watchdog-3.0.0.ebuild
index 8db51699de47..419a43feeeda 100644
--- a/dev-python/watchdog/watchdog-3.0.0.ebuild
+++ b/dev-python/watchdog/watchdog-3.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 329f5da5c0a2..a44652bff8ce 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/xgalaga/Manifest b/games-arcade/xgalaga/Manifest
index 3953cd8c3208..66c3d5b5313f 100644
--- a/games-arcade/xgalaga/Manifest
+++ b/games-arcade/xgalaga/Manifest
@@ -1,4 +1,5 @@
+AUX xgalaga-2.1.1.0-function-and-ints.patch 465 BLAKE2B bbd03f209ce6b3dd04cb3bc75b0c80dac84db658f2c275fc4eb62a20fe3326a4db1e6f9c2401c7e590a2d1b2cdcd2d882cb6c1d93a67c2f8560fcbe3281d0ceb SHA512 25a599c251251bf670f7a4d40f10ce0ac0bba239f12dcc2b298881b1efcd58ec69d17e3c26df210cead5b696aedfeb774ca39ae77a67107c27de787dca30f4af
 AUX xgalaga-2.1.1.0-respect-AR.patch 633 BLAKE2B 9bfcf18f6bfc8deaa39427269539c0f07ffff02dcec7cbdebdfd432bb07138ca85464d4bc4db96bf49ce8cbecaeb544074a22ba3a424526c4b2b6af4bd5f9668 SHA512 e094a8158bae4ac25573ce99f12e070eb444bb14e15f80c7d5380b0b9697ccc696797fb575e82ac9f5b214ef1a6561f71f8a84d42576bacae6d9c14718cb0367
 DIST xgalaga-2.1.1.0.tar.gz 331621 BLAKE2B 290881eb89cacc7a2be469af8da2c11d710dea45f165daa43d4a10a310e681c9f6ffb012e057e266f1e50c5629122ca38cfd97e31a788104e7710f02d756f59d SHA512 087db9e0501cedb042bb673a217f9de32640d3e4f4f529a29fd25ed682a1aece9ae1beacdc2ee77fc93ac931411a1051e2cd19873578ccffe5f03a083bffe513
-EBUILD xgalaga-2.1.1.0-r1.ebuild 1481 BLAKE2B 9273b52aeb3c9b746a1cbb9e550cd6051d692789354c13d4cb4d8ab9a9bf3fde78ffe90209e3139373832db0764f2740a948e5b4952bf56d27d1faf45d250c02 SHA512 12ab6b11e2f92f18d0840437ca3d3d91370e1daecac6ae1db6dd8c30371f180a0acba0669caa4e2c6b3efbfc2c26fd0de3fcab5bbb8574d95b0e4e2738cd3d45
+EBUILD xgalaga-2.1.1.0-r2.ebuild 1534 BLAKE2B 096431696e9dc0816904f07a414782f981e1dfe10abddca4deda05940f2d3748741a213885dc6438e53b6e1be47bce1445dc2f0b0a9779f490d5f5e7557f5414 SHA512 b38b22833e068e75eec42358b8bb858dd907060a14a05395710866b6071f6faf6c01d21bebca2b3e5f7668b8891031bbd8006a74d2e6ad6d246b4543b3e77816
 MISC metadata.xml 331 BLAKE2B 70295bd201289c95fd4810fe6ac4c72feb4b3bea584fa469bc0747844f0bc0649d6e68f6b757f79ff8304e8e9fa2332434d92bf0c83e7f0b632e1b0ceb7e6ee4 SHA512 a0ccb0b7c07bfe08ddb36d65f86c8d56355d7f0f8eba06424a47ca18137d4feb1d02d9223d3241e2dff5041af3566ebc6d8aaa68edd236a231b9aff451f021de
diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch
new file mode 100644
index 000000000000..349f01216f35
--- /dev/null
+++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-function-and-ints.patch
@@ -0,0 +1,24 @@
+Bug: https://bugs.gentoo.org/877287
+--- a/title.c
++++ b/title.c
+@@ -5,6 +5,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #ifdef HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
+@@ -17,9 +18,9 @@
+ #include "proto.h"
+ 
+ /* for scrolling credits */
+-const LINESIZE= 70;
+-const VISIBLELINES=7;
+-const SPEEDFACTOR=5;
++const int LINESIZE=70;
++const int VISIBLELINES=7;
++const int SPEEDFACTOR=5;
+ char *gchLBuf;
+ int giCreditLines=0, giActCreditLine=0;
+ 
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild
index 1b87b13d58d9..a8367332b7e3 100644
--- a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
+++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,7 @@ RDEPEND+=" acct-group/gamestat"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.1.0-respect-AR.patch
+	"${FILESDIR}"/${PN}-2.1.1.0-function-and-ints.patch
 )
 
 src_prepare() {
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 4c0fa22ef9ad..9dbf8de62a45 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/tetzle/Manifest b/games-board/tetzle/Manifest
index 1faa746eedfe..b47009e1162d 100644
--- a/games-board/tetzle/Manifest
+++ b/games-board/tetzle/Manifest
@@ -1,4 +1,6 @@
 AUX tetzle-2.1.3-gentoo.patch 267 BLAKE2B 7432663ff3ae333e4dcef46193da107436a30395f236e2aebe11c5b3c0efe2264303f50c6eabc92167b5ba36a2e8d64d9cd27e78dc1a3aa3ddebbb29d8d567f3 SHA512 92e4a48b88df690f75890cb969863006b6b7cb1476970d87c0fa7ae59bc5aaa591004e6e962bdf7d84bb1e9668eeed0bc7131269247d79e613b7cb252bbf194c
 DIST tetzle-2.1.3-src.tar.bz2 1022680 BLAKE2B 197e2a221a779734d3cd76d5600460df42014a31a032fca2f5c181d54c004f56e6beb9803c60fd53edf5b0d4a614b3d0709fd8913d561e49a938a2f6f1943001 SHA512 6f4541ad2f67ac8a98bd0e1683d4cb6131a85a4e9d31a9dae0a97177a721038750f4276fb3a592b97804daceb1b99f0117e14c6221a6a6ce74b852b00ed5c607
-EBUILD tetzle-2.1.3.ebuild 640 BLAKE2B ac6712dc232d4c563dd0bbece0d1b42df8eccf0cd76f8205f92b3c9140dc6b11876d16ae783a8f2d398e2771af1de23b261ba04123fa0610f8647c77bee3da7c SHA512 c24fddd08a55b24421f169d03a48d87500f6ae3fb1fe69103a56e78ad1ee5ffa797241c2fc3fce70d08c036771635d426e50b1c1f0b9786299ef4ea03daa22e3
+DIST tetzle-2.2.2.tar.bz2 1094634 BLAKE2B 9fa50b6d691226f1b3526361e141f7ef566d9eea7db72b9d825afd52ae312cbb3b794e427014f427518da2a6fac0adf32bc0a557246042079fc0a2693ee68e34 SHA512 1aee8b110acd496cd885a207a4d229840f9c3f6960ed16b2f6a2c1f452f6234e4d88429c0276affb7e8c486d18b64ab36ada9cddcb006c4c56284216b5351891
+EBUILD tetzle-2.1.3-r1.ebuild 653 BLAKE2B aa18d5e72b3d3d224615ab9d1e09a67ca4fe790b9d0456259002c9085fc006df9e315c289bfafc5a604ff35d07101c99faf1bb0c5d939aed14fb3ef1461d7c0a SHA512 c69648f57a99a1da93c5ac2c8b8e6e3f464671c36b81ddc2d5950e52a51197314076def572906ef5f17a15a0b71d72ba612c5292d550db22af285de7ff60799d
+EBUILD tetzle-2.2.2.ebuild 449 BLAKE2B a9264df8f620cab02c04eaf435fac9a358eae97a9229f3e6c0d9f88fc3e43dcfd4ec7aa126145f738e6bd6924c792ecf414e01300a21439b06b78ccc7936b16e SHA512 5f1264629cb81e862a7873d0897940952c898b14bf00062b3784e8dd9c680087f7ff4c79c11eaeb32808386d19bfbf3fd70de594826703f742bb60363959f2d4
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-board/tetzle/tetzle-2.1.3.ebuild b/games-board/tetzle/tetzle-2.1.3-r1.ebuild
index dbce5456d1c7..b47e7036d289 100644
--- a/games-board/tetzle/tetzle-2.1.3.ebuild
+++ b/games-board/tetzle/tetzle-2.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ BDEPEND="
 "
 DEPEND="
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[-gles2-only]
 	dev-qt/qtwidgets:5
 "
 RDEPEND="${DEPEND}"
diff --git a/games-board/tetzle/tetzle-2.2.2.ebuild b/games-board/tetzle/tetzle-2.2.2.ebuild
new file mode 100644
index 000000000000..a3bd63f75c46
--- /dev/null
+++ b/games-board/tetzle/tetzle-2.2.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Jigsaw puzzle game that uses tetrominoes for the pieces"
+HOMEPAGE="https://gottcode.org/tetzle/"
+SRC_URI="https://gottcode.org/tetzle/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index eb91353cef39..6fe78d0dbb73 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index ec0af111d381..2f7b84d5339e 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -15,7 +15,7 @@ DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
 DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
-EBUILD pcsx2-1.7.3738.ebuild 6993 BLAKE2B 2bd343f6a8dfc20d0a2758eda004fb7f9e0f6b3bd62091d6f67cdb8a0fa9d61e02a7087a14bc659d188a9c2069ab6e8917fe98e9214cd615584b97e5b08cad2a SHA512 2c88b36f9191e5a3360d9dcc8167680df48f409acd1e13c40fa22721e6e0f4068541b6984924c8f1671dc7f3a6a33d1d436f6f4518ebbc4e7538db0d23a92a91
-EBUILD pcsx2-1.7.4280.ebuild 7377 BLAKE2B a55490c259a9690da44889ae601b27293788bf3f69ad5e4eef4eba9046eda6c337e7e976be2b51292988250748c77cecea211289e5db1300f2803afabbd4beb7 SHA512 674d6714a39aa8a3ba4c28ec1d96b6fcfa63d3f885bd9457336e9f628dae2d535b9293366000d5920e0a3ff2c138c94047c3d71049ba9d53ab712c61785ccf01
-EBUILD pcsx2-9999.ebuild 7377 BLAKE2B a55490c259a9690da44889ae601b27293788bf3f69ad5e4eef4eba9046eda6c337e7e976be2b51292988250748c77cecea211289e5db1300f2803afabbd4beb7 SHA512 674d6714a39aa8a3ba4c28ec1d96b6fcfa63d3f885bd9457336e9f628dae2d535b9293366000d5920e0a3ff2c138c94047c3d71049ba9d53ab712c61785ccf01
+EBUILD pcsx2-1.7.3738.ebuild 6995 BLAKE2B 32a94ee14dcb0028b2280ddbc7fcafdc0f13476349d6ed22e946edd0ecc08e4d2a294b1e75b9ee36335a6b5960209d13983bf0b5f5beb16764f4c1b8c9831ba8 SHA512 bd11c8952966d956cda822e5a4ac880bdf164dee72cc0f6664bf8d314f87ada5e364a7559ef554fbe41166adc294559223517d937274482bdcdeacca519684ac
+EBUILD pcsx2-1.7.4280.ebuild 7379 BLAKE2B 0deae8293fa56918fb12059817bdc6f44cad94368922eaba70b45f18417a9ce981404155e0ae62237070007ac0bb009b6e7068029cb9aa7ec74964f0847e1558 SHA512 6e20ee1d1175dd57834027de19e17789a9f61d4d15401308ad27d678039e431a404e8304f974ac79cd954901bb0cc709e73a660b49801408944a743ec98bfd45
+EBUILD pcsx2-9999.ebuild 7379 BLAKE2B 0deae8293fa56918fb12059817bdc6f44cad94368922eaba70b45f18417a9ce981404155e0ae62237070007ac0bb009b6e7068029cb9aa7ec74964f0847e1558 SHA512 6e20ee1d1175dd57834027de19e17789a9f61d4d15401308ad27d678039e431a404e8304f974ac79cd954901bb0cc709e73a660b49801408944a743ec98bfd45
 MISC metadata.xml 905 BLAKE2B 704b0ab594db3d23761b25d1d18b0a7121a989f967cfeb533f06ffa2d688fbaaa426c61d9f7c8068410129784924c26684de9919994a9580f2db531f5e34aea3 SHA512 f65374e9062406f81607514193b362a11e7e682aca7e40995679a7d7597ab13304c0f57f6b4c9eebb4ebee60cb4cdaff06ad9801ba6ce75c3698e3a926d5bf1d
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
index 951c4e4fe7c8..87648ee26e9d 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
@@ -81,7 +81,7 @@ DEPEND="
 	test? ( dev-cpp/gtest )"
 BDEPEND="
 	dev-lang/perl
-	qt6? ( dev-qt/qttools[linguist] )
+	qt6? ( dev-qt/qttools:6[linguist] )
 	!qt6? ( sys-devel/gettext )"
 
 FILECAPS=(
diff --git a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
index a0683b3c3d85..ae1c9c594c50 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
@@ -71,7 +71,7 @@ DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 	test? ( dev-cpp/gtest )"
-BDEPEND="dev-qt/qttools[linguist]"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 FILECAPS=(
 	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index a0683b3c3d85..ae1c9c594c50 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -71,7 +71,7 @@ DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 	test? ( dev-cpp/gtest )"
-BDEPEND="dev-qt/qttools[linguist]"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 FILECAPS=(
 	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8dd4f3c222f8..982175debf56 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index a7c8e28f3bd6..16e199c079f5 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,5 +1,7 @@
 AUX libmtp-1.1.19-fix-docdir.patch 462 BLAKE2B 5c23a2b98a138fb6bc51d49c07d556cff17357ce604cc7e11bf652e180d560cfc1befb2957629a5bb9e46876721fa62d186dd7e0a4dc0e95b74f41a3d5620f9c SHA512 50e15c26fe110d551c350ec11e9fc2309f8dfb26039e824e7d59aa1e5b5250e012397ed30278578524eb579132b0206fae8d5c40f387dd71b93ac7fc261ac2e7
 DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018
+DIST libmtp-1.1.21.tar.gz 862703 BLAKE2B c6067d0e9c7e2410b950715d1f02243c835afacfb3eef2f250361d4075d378b2754dceadf5120c9a646413ea826f42291c530590861420f56140458558dccc8e SHA512 510f01f75de37a07c8ce54957a8fb74724538a7cfbdf1a86c201fda68573ef23fa578ff7baf2d9df938703b5776ded4ab1057c617125f3539e594bb5a1f3146f
 EBUILD libmtp-1.1.20.ebuild 1919 BLAKE2B 987f14665aeed026a6b06a4e59f39327b6dab5ff47122281d5c6cf7c4d03e24874b54154612c0b86727553441605a78ad1c392baadaa96c9423b4dc23350ece9 SHA512 6befe7987890738fb24b8c0846bb5243e73ef3159f5446765cd08216186fe1fa7ec00fed18c2dc1679a8eb0ab2905ba74694cf64d020e81a13ff4817d2975204
+EBUILD libmtp-1.1.21.ebuild 1924 BLAKE2B d81e67b2ac602b2fde3a4ae655adf4bdbece70340c2338ab27cb69d074f3cb8a839eb42c4ad12bc65e3146f02b8fb82e3ce9be216616edf4cc3961256a7a9df3 SHA512 823748c580d3eaacc0e254718fa6962b99bacf0815654b97c0f7f8da21400403221cbfcf6238d49287013710452f6c81ea15838e2b91717460b0b86aded08139
 EBUILD libmtp-9999.ebuild 1859 BLAKE2B d6c4d0516b3028951494178b3823090a56e03b1777871134a3b6152709ebf6c00e0e6caee12d38a00453245402ce5499ee7b568880195f6cf45256bd76255e3c SHA512 f102aba2ae7d1b10997dd3dc2676f1463b5dd14890fe74796c4490524acd6d706a2cb3709f876c2ffb3e035a9599a027ca2b76519c61663185bef663f00a6f0f
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/libmtp-1.1.21.ebuild b/media-libs/libmtp/libmtp-1.1.21.ebuild
new file mode 100644
index 000000000000..8e8453ea4c9a
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.21.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit udev
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
+	inherit autotools git-r3
+else
+	inherit libtool
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
+HOMEPAGE="http://libmtp.sourceforge.net/"
+
+LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
+SLOT="0/9" # Based on SONAME of libmtp shared library
+IUSE="+crypt doc examples static-libs"
+
+RDEPEND="
+	acct-group/plugdev
+	virtual/libiconv
+	virtual/libusb:1
+	crypt? ( dev-libs/libgcrypt:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS README TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.19-fix-docdir.patch"
+)
+
+src_prepare() {
+	default
+
+	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
+	rm ChangeLog || die
+
+	if [[ ${PV} == 9999* ]]; then
+		if [[ -e /usr/share/gettext/config.rpath ]]; then
+			cp /usr/share/gettext/config.rpath . || die
+		else
+			touch config.rpath || die # This is from upstream autogen.sh
+		fi
+		eautoreconf
+	else
+		# Needed to fix -fuse-ld=* filtering (e.g. lld)
+		# Can drop this once copyright year in libtool file included
+		# says >= 2021 (was 2014 at time of writing).
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable crypt mtpz)
+		$(use_enable doc doxygen)
+		$(use_enable static-libs static)
+		--with-udev="$(get_udevdir)"
+		--with-udev-group=plugdev
+		--with-udev-mode=0660
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,sh}
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 18b1696d6fb3..cd96b9988497 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -3,5 +3,5 @@ AUX opus-1.3.1-macro-wstrict-prototypes.patch 469 BLAKE2B a68a9506ee1d3c08f0106f
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
 DIST opus-1.4.tar.gz 1063408 BLAKE2B 21f11df745cb868f4da1586d678901045fd9bd0c0590628015f3adc2522c88b0660df88096abe975051fec3188b76b93762c4a01907c2ab2b23c40fde79cf6ad SHA512 1ecd39e0add24de12823bf7c936bb67441228721e2cdae0edbfcf3cee0894bcc6edf2a1d0ca5cdfdad1565803bf39cc4c985ad32710c2a9582f850adeb5ca631
 EBUILD opus-1.3.1-r4.ebuild 1396 BLAKE2B 61734d61d0f4a2cc973821e3ebfcda2ed0d9ac96a4550512b71408472408eddbbbe5fd0027434a151388d06b14845270d102dbf72c1116b928b400e6bbc1d099 SHA512 31e110ab734cfbd63d364f3891421ff44188be244b7f5a29f3c941259bb945032b1a9617290b9b7eaec142118cf77d34443258eaae05bec09afc441c2f630ed3
-EBUILD opus-1.4.ebuild 1496 BLAKE2B fcf6ac170a88f7d02dc6b61fafa7ff692ee98ffc80255dc8021d16a85e48e3f5dc1264cd098761c25f16fe8370713760f9ec0695e3ee12a96734a5811d61f633 SHA512 5c966ea9007d37eff2f1747f950ed50a51ed1b639a7108757ca504d69976d41f79cabfc4c1fc64aa1ff0a1dc55e25d2ec39bab5dfb291266ce40d196854344d2
+EBUILD opus-1.4.ebuild 1560 BLAKE2B fad714c58e67a8fa5d20dd1d50d47ab2df4ab71d7ed00bbaf301ec20722602583b6cd12fb927264f0f5ca363192cb4586d0f6211aa08a8bac9d43ab11e2de113 SHA512 ffcdf5e13977a06bedf1dd01aae2105e2015a6559f1e6a2e1d1d85ec70a6034893ce012c36c8f6504d9fe7a4f74ca6aaf645d8bf37c2d01a277602a9ceed8882
 MISC metadata.xml 538 BLAKE2B d65f695f3bf53cb827c9fbfc621cb58f3465e77f74f3bb3c436fc8741161798b6f7dc3381a07e21f7f1e5310104ed89179c64d9ab30f2102c76ef6ee73ad9ebc SHA512 0e84eba3a3711486a9569e7d38b0fe7cd11aa0d68c123f3304b6b698394dff4e48f4270624793cdc17a16a3ac8c9f921ae50bcbb30b920916b4bad9ae60c7117
diff --git a/media-libs/opus/opus-1.4.ebuild b/media-libs/opus/opus-1.4.ebuild
index eee6a69ff2cf..5c116f4d9edc 100644
--- a/media-libs/opus/opus-1.4.ebuild
+++ b/media-libs/opus/opus-1.4.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit flag-o-matic meson-multilib
+PYTHON_COMPAT=( python3_{9..11} )
+inherit flag-o-matic meson-multilib python-any-r1
 
 DESCRIPTION="Open codec for interactive speech and music transmission over the Internet"
 HOMEPAGE="https://opus-codec.org/"
@@ -17,6 +18,7 @@ IUSE="custom-modes debug doc hardened static-libs test ${INTRINSIC_FLAGS}"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
+	${PYTHON_DEPS}
 	doc? (
 		app-doc/doxygen
 		media-gfx/graphviz
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 57d7ef9d08cb..51a17538501b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 5f0a39406dac..56ff4a304d27 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -2,7 +2,7 @@ AUX qjackctl-0.9.1-disable-git.patch 468 BLAKE2B 84b9ec507f3e5c7d3524c6ee916eb77
 DIST qjackctl-0.9.10.tar.gz 1279033 BLAKE2B 923310e8f6541ae8c0c463a2f256c3f960a45c1025608a9b5712873983243498178541dda4ca08dc0558b35765ec0abab48fef9ee727963bea57cae82285f146 SHA512 e209b1814ac2ea0b2d885d7f265b515f95f8f94acb19c6475a0cc37073ca099d7c6ac4949c646b49ffcf0e38a188ea5587dfae54b350d0df5eae9600615b7645
 DIST qjackctl-0.9.8.tar.gz 1274469 BLAKE2B 6ed3b594b501c89603c48d382736e13d9ab16f25eeb11e47b9619e0cb33d6749de2ed2aabf8e252f0a146713fafe65810c45fd25c7f288c4c6c6977db9de7961 SHA512 270b14865ed12456dc30f6d9c7d6b9a03753f087f4317e4aed2e524bff742c1ca0cfcd11be08983117117e2301da16eae3cf572075152f3cc9f993c73ef76ece
 DIST qjackctl-0.9.9.tar.gz 1278700 BLAKE2B 9db5ed933534f1364fcd7c7c81abeee6fee426efd4b9625954f1756bdc8b05628e730d428c88283b8c0d5bca6c21b6dd018b660a4b8069d3cb7c2a4f0edd2ea6 SHA512 184745bd24e52ee82d25ed410525751ba3f9a1c832c78c93a2e6457b0e930ea8d501efd5474c2e37812a264821d007c721b98a1774ce39c4ad58be331f2a2eb3
-EBUILD qjackctl-0.9.10.ebuild 978 BLAKE2B 9beae34d3dbf27b8d124cd9818bcb9db6f8941d3eeeb97e2cc4dbd3063416d5195877f8495c91d75da274452b073e43595bc7b92ee04f241610958d638a19abb SHA512 e5f207b83899ce58ea2bb94b77f9c0db0270347e354af15770fe185939a38019ec5f564fe5774bf8f331a202258330202dc3a9d2a6b5e915f28484d31143ed53
+EBUILD qjackctl-0.9.10.ebuild 976 BLAKE2B f742ae39cc3114440f13a020401ff08f9aee3fd930591d65470626eddd4fa024314ce5dbb5b74f902581f38b35c4c9ddef4def8bf3efe3c61f9e4f9296806b8f SHA512 5e9958873520878568f875c661b5f792e45c33b9e6e8ebddb9ea21df58c16b7e7beeb258b280e4c5c32b2cdd2389cdae90eba80ae69ba4910e147db4f0be4ec0
 EBUILD qjackctl-0.9.8.ebuild 976 BLAKE2B a6a05372bde75dd58333c396065004ac4a1dcca0740602b66607c2034102c222e78e0df210a3232c9c1fe4889e0dadd1184453c5f6f851c7081b741398303589 SHA512 36e100173b637c3b4bea81f7f4134dbd6cd65a285be5ce93ee0b60cbb06551e7fb41f901fb4f9bf0c2aa27cd38b5cfe5c68c8cbcaa612c9e8f8aad7717838eab
 EBUILD qjackctl-0.9.9.ebuild 978 BLAKE2B 1cd97fba1596268e1b574e7712d53a4632c05f3e8dff249baf579ececaebb2e72fa03b3e7a24f6dd8843241ab13e6a5e0d19ab43607102955b4b074b609e5f30 SHA512 e14fba2be8e4de5a4781ea3806a8f60ff3ab430fb9f57860ed502efd83d5efb6d53cf983a34c3b3bcec218d39cf21b585561fdcf952d2dcb88cb84e760118339
 EBUILD qjackctl-9999.ebuild 920 BLAKE2B 1d966d83ed7d06090b7117259727d872cfcc78963b9fdd61324d321694fdb85d8f9592ff2b428feb13259dc276189ef032fc34bdba258e72d8dc5de699709c16 SHA512 b581805aff62535801ced064ed7ee16f72884ca4b7442062e6961dedd20d58abba68cc7ee292e759e52bbfe2868f442c8dba84ddfb4e1bed1f18535aded1f1b7
diff --git a/media-sound/qjackctl/qjackctl-0.9.10.ebuild b/media-sound/qjackctl/qjackctl-0.9.10.ebuild
index 6ede25347be0..a19336e1aa98 100644
--- a/media-sound/qjackctl/qjackctl-0.9.10.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.9.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 368311e8c095..9e3ecbaa24c1 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 33334c010d07..e0eae0dcff61 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -3,6 +3,7 @@ AUX chromium-r1.patch 1582 BLAKE2B 48547a7d53fd1f0f44b682c7e2306e79f007f8e96b362
 AUX ffmpeg-4.2.7-libsdl2-new-version-scheme.patch 1132 BLAKE2B 59d40a3edcb19909a34000fc5e5fe2cb0565031fcb653d4ba3099b310e66ab1f3cf6ce11906d61657e472025bb9135342c7207b7c0536f850156e78e6a0e9cb7 SHA512 bc46370ffb830b32bc5c92ce31b2a2d51f2db1cb8a53bf6f03cc73f184a70448a0e744b5eb3d19990b58bb018e52d16a419ca030f42be4175c577a1d0ddf9f5e
 AUX ffmpeg-4.4.3-clang-14-ff_seek_frame_binary-crash.patch 1813 BLAKE2B 3fdb56fade5c723fcf387dfe5e31aefbd88e8256fb2ae24a3a90b91902ff18f9ffa9b1e464c0b0b40fad04c7230be7bec78f043b7ce52d70ee94f2a2313dc2b2 SHA512 fb11cb1047d8f44ab9f9f66e52af136b7fea27589929e45afb770e53837954fb03854ea9d839ecee80d3c3d5a493f32bbdbc74e8efc9600d5b53a7d91136abca
 AUX ffmpeg-4.4.3-get_cabac_inline_x86-32-bit.patch 1068 BLAKE2B b547cd925bfd506e08d44395c67916fe20b30f397a36adf53fcf277660c45aef9d3d8c014b2bbfcf038539618affb9dd8ff5d93f2fe622e4282c61c4d1b26861 SHA512 779e921e783b800e6bf9bc95af73d44a170287676d17bc22f2b7cd91e393f410ec3f6c7bfa173497443a65496047f39f37cac1d56507271411893c5bdcb37d8b
+AUX ffmpeg-4.4.4-wint-conversion-vulkan.patch 1066 BLAKE2B 1409c97a31ae59500df944ced7efc064486e325e1658ac8f30d74ac926c63de51b610eebb5be9951adcd8ad02c8c143429c6eff57ce789a1c187e0b24221aa6d SHA512 58e33b2f0e94e75ef7acebb221332dc4d618846f8a968011da370743ce80a4ab688112411d3f2a5320d144c25db567780c870a0eb4045152b73957e2d7fe747e
 AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb
 AUX ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch 999 BLAKE2B 736a85e60d3ee9b48346e1d7795bd8e075e8bcc2556695ec9db0a48a8d7356d20795ed31e1d6dcda7615e5ad3ff9faf7edf7563ba6e1f822a99d3cd442bd8a72 SHA512 f16c7185a3265710b6638e35322895590b58dffaffcb8fb436b08f945e19c44a1b66a17902b73e89fd53cf5e4cd9e7f2256bef4df4c82be16a807eb6bf663f5a
 AUX ffmpeg-5.1.2-vulkan.patch 1725 BLAKE2B e8be249e7aa6f87eb1653dc6aec19e32e98efde6903cff6d1a32736dc343d7c12da249490853214c87cb95019d677e214dd0a065cf0dc9bbd44f2754c8d9cded SHA512 9fec574848c9ac90f51f6bca18120f40a22f6f737677a57d21bd07867f9e6619c146d8aa1cdac8d11ec53de87e7119316369874d3492b256f295b98b1b5df762
@@ -12,6 +13,7 @@ DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418
 DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275
 DIST ffmpeg-4.2.7.tar.bz2 10966448 BLAKE2B 91151a3ece19700fbc04f304ebad9f34ffce2de19416992ceccf3a347ab58195f746a0ace0a331cc1f34dafd87e4e8c6467268546b417d3f58a1cbbe41662807 SHA512 ab57fc370005d8f33eed2e0f18ac4f418372f47f03d43566c52f9ffc70de27e6ec1ba49faf6e3356fd8a495cff40a8073f8d85a625f6ee21bd7018e19b31734f
 DIST ffmpeg-4.2.8.tar.xz 9118672 BLAKE2B 7631bac87db7ce046a93c45422f0ffdc2929d9bb71798125dc403872b27f758015a5b0856e2b73edd47cbea2f3b3f6d94787f7d99846c9783826bd42b58b227a SHA512 40c3c0a2b9853220ad48ea7d9b6e6238238d8f914b1a845aa2be0961d88f5602daab79ca38dd21215077649bbd6967c9e9d9a993831a6735f3a00ae6b798c65f
+DIST ffmpeg-4.2.9.tar.xz 9117288 BLAKE2B 6fbebfc71a24fb876fc60fd6611346f4aded84b6d573441b2ee910ac1a831ba2e4ad1790592a0173e545c19416db1909344d48160a2dbf64fd4c2adf6c5f4d48 SHA512 db3e4489b0aee65195ca3f0e8ce32e749d5b4cbcdc7d5b8e4504ba3d52b0b40e84a2d8cfa8f599c6e722af0b8c5d969c908d6e2fe15d9d3ff2bd60002b59fe6e
 DIST ffmpeg-4.4.3.tar.xz 9566020 BLAKE2B a8b62a37151173f90821b876cf51e6819eb5519d7fb1f47b55b5f3003cb0e3d18d43c9482d70e32ef2bb6f5c6310260ec2c04ee997aad5ef687d598d838e9bc9 SHA512 0b232b66555237ed1a061807f88dbc5e6cd156e604c5d611bb6ac0c32b9006414cc4f30d632b482d9cb95f526df98b36efa3af9c863c52e7b7aa1a183545d915
 DIST ffmpeg-4.4.3.tar.xz.asc 520 BLAKE2B 999785516beb913d246d5f9de6e189ee644d0dba07f64ac90cbec91961ca181e5d6b95d9e097c362a76b543e3498672b1458edd68c23a86c3123ffc8e6c5ff2b SHA512 347abc8d75f4447296d8f6105b188a187daac158fbd972dc157b8a3597919519c20b8f649b7460df4e9aea249d74c6287e35bc389cc99ae5629490a36b345557
 DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d634b1c56240619a4b6924dae4ec7adb445932bf4455f409dbc03fdc6d52b4fc270da55393e329ccd3d129f5770 SHA512 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf
@@ -24,8 +26,9 @@ DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5ab
 DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed
 EBUILD ffmpeg-4.2.7.ebuild 17929 BLAKE2B 94d2d6a0c1bcda9ac5831893b5844eb62ac1fa7c9518c654aec5acee4b011f157741ebf30125f8550964a86639d9ad3433df15137e5a55196c9167adbf448d4e SHA512 adcc1802e3ac4296cbeee519d331231324d344a28c8d6fdafb4c91fad9f98966c4e6aa8b81e91351d226b8220360b491783eaa3fe452bffce45f5a9c03844390
 EBUILD ffmpeg-4.2.8.ebuild 17867 BLAKE2B d594efba4a185920f93bcbe74ca253940e61df3d195cd8530560248f58e3a73428d2d46b8350a34f3b334485727990ca5783b79eb006ccea45d287cc2daeb365 SHA512 7086fba3b0a8b71d0bc0eaf19ae48883c5b4d003b5d2638d9c73a6cafe237250954f2869692cbb67ecb92d3a0ea8e49d438f298e1dbbedf43dd78fb4e13e3e97
+EBUILD ffmpeg-4.2.9.ebuild 17874 BLAKE2B 7228a2011c40712683b8b1a9062a55657b85b12bc809f34108dbc6b0253fe3f7d4de3d5d1a9683f7df44806136b5da0e9c99ab9b40cf3a461f58541a6d8f9815 SHA512 33bc633ec35e26e4b69e9be9dd228c09bcc68791810b288dec0c2db03ecd8d14630e6959ca94116587e17f8491fbc95e0904f326cf710a448c08fb7cef210fe8
 EBUILD ffmpeg-4.4.3.ebuild 19576 BLAKE2B 178e86e08063a361b69dde9ce36dc9fa65171983f41916476eff6feef56c895dcab63f64d5dbd145e7fca3322da52e868012eec791d91fdf75355e25b01e83ba SHA512 bec07436f4659d34d6e2a1776d4b8b371381ff1c5dd269b933cc3374f6abec642d33d3dead6632ca5d840f7a8c4dad2c0cb2d3458329a5471a1ea89d392df5fa
-EBUILD ffmpeg-4.4.4-r1.ebuild 19657 BLAKE2B dee9198f24391f876fba832cf43a44b3376bf0cf02fbbf936ad518997f546724c5e3539770920ba0d2d1136900dc0c118cc545c544c7e84ffe55746a483dd5bd SHA512 62dbd23618a0b3a5ce2db564228764bd11731e1d7376938a40667ef6ac79afc5f450cf8fbcab8406c3e8b82c34f4ddb0da07164db7b145de0218139544ae5fdc
+EBUILD ffmpeg-4.4.4-r2.ebuild 19713 BLAKE2B 818cc6ea7253c53c4d1cec7bba8f3fa49b4c270a6504179b29e40bb7ffe1938274122b1efd9ff650baf167d304ada1dcb48191165434de0be73e163ae97e9d42 SHA512 1041f333c472b533cd07b37059c0b83a99c8ff1e2ed16052fd15688add3fa0268b857823f3feefaaa88e3a3a4bb9c2b39e660f98e0406dcf5ddfd0dbfa332585
 EBUILD ffmpeg-5.1.2-r2.ebuild 19754 BLAKE2B 8890723f07bd3fca6468e2ca4a20bb19cf4c67af8008b766b3e2a82c950310240e150efbecc3c62b63b39cbb209b803811e5c1688661ad91ee58105265514d9e SHA512 d3dac5ded3d55582b34727b7aa8b686a9bf0430e06f096b1793824592e2fc94b98e6375a5c1743717e411f57be8c207bd9b024f3feb2f640f7cf24131c490d7f
 EBUILD ffmpeg-5.1.3.ebuild 19721 BLAKE2B e6ffe28b512b7a335af927b0c6d54a90c3cbd6ed79d4c0965a947d4acafa7ec34ef851df9efbefe83280853dee1769c291d17e8a70368dd79d066c1100527fd6 SHA512 1a5e8e788173a87168ca2d893dd54e0c867dd2a191be654b676598ba2904fea4d5230f14475e3188ab0974b56afd9460e01e857757acfac04077aea0cebcf7a3
 EBUILD ffmpeg-6.0-r1.ebuild 19755 BLAKE2B aba1d0613f168525613cacd628956976427d4d25dd0d65cf3f0ea3bad083f4dac6b4ed73a9a63b22412511917bee8902bd0fd775db75f1b39dd87935fbdd355f SHA512 ea05dcc994e5dc483652dbd77441d3d8140bff4465d51696c917db30a3e2f263f6238160b95953f1ca5eb5fb379cbb6b4cb67201a7c19cffad541e3fa80f734c
diff --git a/media-video/ffmpeg/ffmpeg-4.2.9.ebuild b/media-video/ffmpeg/ffmpeg-4.2.9.ebuild
new file mode 100644
index 000000000000..ee624ec3a2cc
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-4.2.9.ebuild
@@ -0,0 +1,555 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=56.58.58
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_MIN_CLONE_TYPE="single"
+	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
+HOMEPAGE="https://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+else # Release
+	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz
+		https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-altivec.patch.gz
+		https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-gcc.patch.gz
+	"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	libaribb24? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl hardcoded-tables +iconv libxml2 lzma +network opencl
+		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
+		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 dav1d:libdav1d fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
+		libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
+		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
+		# libavfilter options
+		appkit
+		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
+		rubberband:librubberband zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar libaom
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 )
+PPC_CPU_REQUIRED_USE="
+	cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec )
+	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx )
+"
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${MIPS_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${PPC_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
+	dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
+	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
+	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
+	nvenc? ( >=media-libs/nv-codec-headers-9.0.18.0 )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}]
+	)
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	postproc? ( !media-libs/libpostproc )
+"
+
+RDEPEND="${RDEPEND}
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+"
+
+DEPEND="${RDEPEND}
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	>=sys-devel/make-3.81
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
+	doc? ( sys-apps/texinfo )
+	test? ( net-misc/wget sys-devel/bc )
+"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	rubberband? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+	)
+"
+REQUIRED_USE="
+	cuda? ( nvenc )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	!test? ( test )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/chromium-r1.patch
+	"${WORKDIR}"/${PN}-4.2.2-ppc64-gcc.patch     # both ppc patches from
+	"${WORKDIR}"/${PN}-4.2.2-ppc64-altivec.patch # https://trac.ffmpeg.org/ticket/7861
+	"${FILESDIR}"/${PN}-5.0-backport-ranlib-build-fix.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+build_separate_libffmpeg() {
+	use opencl
+}
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	# bug 842201
+	use ia64 && tc-is-gcc && append-flags \
+		-fno-tree-ccp \
+		-fno-tree-dominator-opts \
+		-fno-tree-fre \
+		-fno-code-hoisting \
+		-fno-tree-pre \
+		-fno-tree-vrp
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use libaribb24 && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	if use openssl ; then
+		myconf+=( --disable-gnutls )
+	fi
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
+		--disable-libcelt # bug #664158
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--strip="$(tc-getSTRIP)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--disable-opencl
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+
+				# When not built separately, libffmpeg has no code of
+				# its own so this QA check raises a false positive.
+				QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*"
+			fi
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild
index 66c06c476313..d98da4233b78 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild
@@ -335,6 +335,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.0-backport-ranlib-build-fix.patch
 	"${FILESDIR}"/${PN}-4.4.3-clang-14-ff_seek_frame_binary-crash.patch
 	"${FILESDIR}"/${PN}-4.4.3-get_cabac_inline_x86-32-bit.patch
+	"${FILESDIR}"/${PN}-4.4.4-wint-conversion-vulkan.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.4-wint-conversion-vulkan.patch b/media-video/ffmpeg/files/ffmpeg-4.4.4-wint-conversion-vulkan.patch
new file mode 100644
index 000000000000..f3766bb69f50
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.4.4-wint-conversion-vulkan.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/903752
+https://git.videolan.org/?p=ffmpeg.git;a=commit;h=cc76e8340d28438c1ac56ee7dfd774d25e944264
+
+(Dropped second bit for vulkan.h as has changed significantly in >4.4.)
+
+From cc76e8340d28438c1ac56ee7dfd774d25e944264 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
+Date: Thu, 2 Mar 2023 17:27:30 +0100
+Subject: [PATCH] lavu/vulkan: fix handle type for 32-bit targets
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fixes compilation with clang which errors out on Wint-conversion.
+
+Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
+Signed-off-by: Martin Storsjö <martin@martin.st>
+--- a/libavutil/hwcontext_vulkan.c
++++ b/libavutil/hwcontext_vulkan.c
+@@ -1149,7 +1149,7 @@ static void free_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)
+ 
+     av_freep(&cmd->queues);
+     av_freep(&cmd->bufs);
+-    cmd->pool = NULL;
++    cmd->pool = VK_NULL_HANDLE;
+ }
+ 
+ static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)
+
+
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a0ae2e3c30e2..a0639435c42f 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e4f9817c99b6..3e24164861f7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Apr 2023 04:39:35 +0000
+Sun, 23 Apr 2023 10:39:31 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 43ca65009b9c..ab1ca6e08264 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-04-23T04:39:38Z
+TIMESTAMP 2023-04-23T10:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmREtopfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRFCudfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBD9w/9EO5GwtE1XkoMbUuJHypZFWr9LyKUip5Xw/9VayLIvbu0MuPDHssPYFHc
-vqKQDvAI4S/lLhEAWD2Le4NEnGlkyhUVq7elByQ9GVLJGyEv36uydE/AALCbk4r4
-fKEBqZZvIrC+mlzleWaJ15awNFgNyvGi41YtfFZbpu7fSxEddXrSpBgm/bfqw1Wh
-GAqP3bA0MifCJa56iQG3NsE/85kJyr56gDgOPM0bt2+QOcggCVTGzPXvi0ZCOIZw
-4jMnwnhysB1yb6zL7m7yuQ7KJBPWdF50uCdvBV0alC70t0qfx8a0njiVWDsIlWa0
-otv846t37X238RhgGYBnayXi0Z9PVd4iWUCDSzOIm69TWPpwdcmxcniFBwrxZEUg
-pzDFSGn7sD1em7s6DhnMm52W0lO3SJEnZmzpgnn2LXowd10yyKuQkWqJ5VJ55qjS
-VCUUVDdKsSXYjMjAvIYnkzl2TilKs13tRE6LakjcHXwmBpfPeKEOIyMbneFIrn6E
-I2ZUma0NoLPGPLrhbzLMgRK5Fg6cfAhCmL/+zWNgDm1Io9Ti569W5NM4UciXk6vQ
-jt1zBp4g1Oc/gGjt/T/iQv61JjdaG5len59up98Knex7t2jlhOmE453+ANXc88xW
-zeU0XV/qoTjm9xz8IXergxUgFhPnaeuI1oJgUy7DRhHnNBVO5rc=
-=ylAz
+klCQIRAAhut56HiJD7W/cObK6VDlTvdMqKRrZbwpf7ZdkYEEwPWod2OJ737Ue1jp
+cxuEYCSo6pPhQsEM4auEcpG+IUV86AESn4VnLulvCE3ub0bPpH1CECJngfABY+8e
+otzrOw2oTpauuPFfSdg0NABwRGfN6b7/1sTnX6OOe0Hd3KzOMY5/VBpEUv7kvGKB
+ry5xR4mDa5hbtVGLth1aJyAp1olcxjIc53aoNyB/VNJGR5t5apoI1OAf+qgr9QpN
+JsccSqyQ1QVo8Hy3R2ls/DVnGjnhIsPf4Mm+Z8xPYh7KlTcwSFFfFjCF9K+7LGJn
+DWM28gBo7un8VHPiie8RtSb8W6cASyTInQ7hGJ/retvmXYb+FAYK19q03/vPc7sA
+4/tLdJy/7ZB1Y3CYRkEmkljwpOMPAmuclhdr+kpNKGKOVjJkxAw/ukx6apQ911eo
+tewOwhcuKcKPItcwt4KFACBrscmbkdpH9+0G2a/bCijl6Mwf0lXQX9+B4Ukc3OvH
+drxsRSaKETYQ17ezcDJRUeeBgjjMXHl9ZPmEiaXPzWoIfirgr2hWKFFCGl28ee6g
+6wsV7FAy7Ii4EOiOv0qu7DlRgZFL7tQFuKTROVuRuYh48ZfTT1RLn0rr3BGAu83d
+iaSA6zll8pOhKXQE66ePLYeXz3esgw00FjE/ilHsg84eAHbSqKs=
+=WMpz
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e4f9817c99b6..3e24164861f7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Apr 2023 04:39:35 +0000
+Sun, 23 Apr 2023 10:39:31 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0293cc66dd7f..640a590897e4 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index a32132d920d7..95ac5ebefdf1 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/scite-5.3.5 b/metadata/md5-cache/app-editors/scite-5.3.5
new file mode 100644
index 000000000000..275a8821ee63
--- /dev/null
+++ b/metadata/md5-cache/app-editors/scite-5.3.5
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=>=app-accessibility/at-spi2-core-2.46.0 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango lua? ( lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) )
+DESCRIPTION=A very powerful, highly configurable, small editor with syntax coloring
+EAPI=8
+HOMEPAGE=https://www.scintilla.org/SciTE.html
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=lua-single toolchain-funcs xdg
+IUSE=lua +lua_single_target_lua5-4
+KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=HPND lua? ( MIT )
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango lua? ( lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-4 ) )
+SLOT=0
+SRC_URI=https://www.scintilla.org/scite535.tgz -> scite-5.3.5.tgz
+_eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6d98639cfafee64b36a36e50a0cc8d8f
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 0392c7359b2e..342f3857c0c9 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/gnuplot-mode-0.8.1 b/metadata/md5-cache/app-emacs/gnuplot-mode-0.8.1
new file mode 100644
index 000000000000..838d5593b021
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/gnuplot-mode-0.8.1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( virtual/latex-base ) >=app-editors/emacs-25.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Gnuplot mode for Emacs
+EAPI=8
+HOMEPAGE=https://github.com/emacs-gnuplot/gnuplot
+INHERIT=elisp readme.gentoo-r1
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=sci-visualization/gnuplot >=app-editors/emacs-25.3:*
+SLOT=0
+SRC_URI=https://github.com/emacs-gnuplot/gnuplot/archive/refs/tags/0.8.1.tar.gz -> gnuplot-mode-0.8.1.tar.gz
+_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
+_md5_=d2c8659b3a61d7a5725a40529d9bcb80
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index c5597b93561a..270ff7e75b5e 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/apache-arrow-11.0.0 b/metadata/md5-cache/dev-libs/apache-arrow-11.0.0-r1
index 2955b0cf6fb6..203a3f77fe86 100644
--- a/metadata/md5-cache/dev-libs/apache-arrow-11.0.0
+++ b/metadata/md5-cache/dev-libs/apache-arrow-11.0.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=bzip2? ( app-arch/bzip2 ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-cpp/xsimd json? ( dev-libs/rapidjson ) test? ( dev-cpp/gtest )
+DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) compute? ( dev-libs/libutf8proc ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ssl? ( dev-libs/openssl ) ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-cpp/xsimd json? ( dev-libs/rapidjson ) test? ( dev-cpp/gflags dev-cpp/gtest )
 DESCRIPTION=A cross-language development platform for in-memory data.
 EAPI=8
 HOMEPAGE=https://arrow.apache.org/
 INHERIT=cmake
-IUSE=bzip2 dataset json lz4 parquet re2 snappy test zlib zstd
+IUSE=brotli bzip2 compute dataset json lz4 parquet re2 snappy ssl test zlib zstd
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=bzip2? ( app-arch/bzip2 ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
+RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) compute? ( dev-libs/libutf8proc ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ssl? ( dev-libs/openssl ) ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
 REQUIRED_USE=test? ( json parquet? ( zstd ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/arrow/arrow-11.0.0/apache-arrow-11.0.0.tar.gz test? ( https://github.com/apache/parquet-testing/archive/b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz -> apache-arrow-parquet-data-11.0.0.tar.gz https://github.com/apache/arrow-testing/archive/d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz -> apache-arrow-arrow-data-11.0.0.tar.gz )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=69b73e1245c62b9cdbdb3190fa0226f2
+_md5_=aadcbd81316073c453835940c21ac48b
diff --git a/metadata/md5-cache/dev-libs/cutlass-2.10.0-r1 b/metadata/md5-cache/dev-libs/cutlass-2.10.0-r1
index 06198b0fc8de..09ef6ae170cc 100644
--- a/metadata/md5-cache/dev-libs/cutlass-2.10.0-r1
+++ b/metadata/md5-cache/dev-libs/cutlass-2.10.0-r1
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/NVIDIA/cutlass/archive/refs/tags/v2.10.0.tar.gz -> cutlass-2.10.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cuda	13d76baf0dc95e560610c6b7dfa79db4	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=367e64b2b56639e2d84dd738d530c02e
+_md5_=bcdc05b68c59bca2b955e983e12ced03
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index ceb644b39eb9..d52c9ca96d3e 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/Math-Int64-0.540.0 b/metadata/md5-cache/dev-perl/Math-Int64-0.540.0
index 478107ff9b4c..0cbd5cf030bb 100644
--- a/metadata/md5-cache/dev-perl/Math-Int64-0.540.0
+++ b/metadata/md5-cache/dev-perl/Math-Int64-0.540.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Math-Int64
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Math-Int64-0.54.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b61e6221c8747fdf089f651127ce408d
+_md5_=ea06d00855f4de416e5c862764065068
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index dd0b074e8713..759f4f145f7b 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/PyQt5-5.15.9 b/metadata/md5-cache/dev-python/PyQt5-5.15.9
index 8fa602545987..4ebe1dfd393b 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.15.9
+++ b/metadata/md5-cache/dev-python/PyQt5-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/ https://pypi.org/project/PyQt5/
 INHERIT=pypi python-r1 qmake-utils
 IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network opengl positioning printsupport sensors serialport speech sql +ssl svg testlib webchannel websockets widgets x11extras xmlpatterns python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-qt/qtcore-5.15:5 >=dev-qt/qtxml-5.15:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtdbus-5.15:5 ) declarative? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5[ssl=] ) opengl? ( >=dev-qt/qtopengl-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5 ) serialport? ( >=dev-qt/qtserialport-5.15:5 ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5 ) websockets? ( >=dev-qt/qtwebsockets-5.15:5 ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5 ) >=dev-python/PyQt5-sip-12.11:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt5/PyQt5-5.15.9.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ade69429279cbc825f9f04d92a0559a1
+_md5_=534ba302b8526b6b5adc07956fd695e2
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.5.1 b/metadata/md5-cache/dev-python/cairocffi-1.5.1
index 930577d57f3e..4fb517a865fa 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.5.1
+++ b/metadata/md5-cache/dev-python/cairocffi-1.5.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Kozea/cairocffi/ https://pypi.org/project/cairocffi/
 INHERIT=distutils-r1 pypi virtualx
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/xcffib-0.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-1.5.1.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=24d7fceb5b8c7ab9340e7184ec253c10
+_md5_=1aff931e71858896c58403e9aa0e56c9
diff --git a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6 b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
index 962df50d95c6..12c47e28a761 100644
--- a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
+++ b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server_mathjax/ https://pypi.org/project/jupyter-server-mathjax/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jupyter-server-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b9762cc4ba638c34458aa3b8fb3a2796
+_md5_=e216a7c2f74e0c618a3bfab651647950
diff --git a/metadata/md5-cache/dev-python/nbdime-3.1.1-r2 b/metadata/md5-cache/dev-python/nbdime-3.1.1-r2
index d87aed8466f7..70de9058f139 100644
--- a/metadata/md5-cache/dev-python/nbdime-3.1.1-r2
+++ b/metadata/md5-cache/dev-python/nbdime-3.1.1-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbdime/ https://pypi.org/project/nbdime/
 INHERIT=distutils-r1 pypi edos2unix
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/GitPython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_server_mathjax[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tornado[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nbdime/nbdime-3.1.1.tar.gz https://github.com/jupyter/nbdime/commit/0e1cdaa77f57aa7f609d5ef7da26a52814c7ff74.patch -> nbdime-3.1.1-jupyter_server2.patch https://github.com/jupyter/nbdime/commit/f67a809262b45ed0eaedc840b0e5d979eaa6965d.patch -> nbdime-3.1.1-py3.11.patch
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	edos2unix	33e347e171066657f91f8b0c72ec8773	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b562c8ff59f2c2c645b9913252f6c9ad
+_md5_=037e6019b870a5da5f612e2866426a43
diff --git a/metadata/md5-cache/dev-python/nbval-0.10.0-r1 b/metadata/md5-cache/dev-python/nbval-0.10.0-r1
index 530ad0c3c881..b3b7aeefc125 100644
--- a/metadata/md5-cache/dev-python/nbval-0.10.0-r1
+++ b/metadata/md5-cache/dev-python/nbval-0.10.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/computationalmodelling/nbval
 INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/coverage[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nbval/nbval-0.10.0.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=665a3bc8c145cbb8582227ad997a1d9e
+_md5_=a1259265e19c9f223cefb2b22b83279c
diff --git a/metadata/md5-cache/dev-python/watchdog-3.0.0 b/metadata/md5-cache/dev-python/watchdog-3.0.0
index 784f7f440246..11d53c9f1b92 100644
--- a/metadata/md5-cache/dev-python/watchdog-3.0.0
+++ b/metadata/md5-cache/dev-python/watchdog-3.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gorakhargosh/watchdog/ https://pypi.org/project/watchdog/
 INHERIT=distutils-r1 optfeature pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/w/watchdog/watchdog-3.0.0.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9c9f63d3250344e9beecedb4b857dc18
+_md5_=1a0fa86c0b066cee289f01488b037f83
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 0d3f929d9bab..2c199814366c 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r1 b/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r2
index 5ca9df886b59..5c2df52730bc 100644
--- a/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r1
+++ b/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r2
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXext x11-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/xgalaga/xgalaga-2.1.1.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	desktop	021728fdc1b03b36357dbc89489e0f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=31209a9861cd6de7c00cf4d99df68beb
+_md5_=dfc68d75731e165deedeb0bc31e43f39
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 60050ffefc6c..3b8c11a8ec09 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/tetzle-2.1.3 b/metadata/md5-cache/games-board/tetzle-2.1.3-r1
index 923afd14510e..db1873e9cc16 100644
--- a/metadata/md5-cache/games-board/tetzle-2.1.3
+++ b/metadata/md5-cache/games-board/tetzle-2.1.3-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-qt/linguist-tools:5
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtwidgets:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Jigsaw puzzle game that uses tetrominoes for the pieces
 EAPI=7
 HOMEPAGE=https://gottcode.org/tetzle/
 INHERIT=qmake-utils xdg
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/tetzle/tetzle-2.1.3-src.tar.bz2
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1d5df8470c08bdbe5a44922ab0aaf014
+_md5_=e274fafc3854ba61b5b3392867e1f548
diff --git a/metadata/md5-cache/games-board/tetzle-2.2.2 b/metadata/md5-cache/games-board/tetzle-2.2.2
new file mode 100644
index 000000000000..fc78637c7aa5
--- /dev/null
+++ b/metadata/md5-cache/games-board/tetzle-2.2.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/qttools:6[linguist] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only]
+DESCRIPTION=Jigsaw puzzle game that uses tetrominoes for the pieces
+EAPI=8
+HOMEPAGE=https://gottcode.org/tetzle/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake xdg
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only]
+SLOT=0
+SRC_URI=https://gottcode.org/tetzle/tetzle-2.2.2.tar.bz2
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=df3573f64a62fd87e876a6f010115e3e
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 6f786d04405b..1c22a53f660a 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.7.3738 b/metadata/md5-cache/games-emulation/pcsx2-1.7.3738
index 4211e2eab8ae..c2e1400d7af2 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-1.7.3738
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.7.3738
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl qt6? ( dev-qt/qttools[linguist] ) !qt6? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=dev-lang/perl qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=app-arch/xz-utils app-arch/zstd:= >=dev-cpp/rapidyaml-0.5:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] ) sndio? ( media-sound/sndio:= ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) x11-base/xorg-proto test? ( dev-cpp/gtest )
 DESCRIPTION=PlayStation 2 emulator
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PCSX2/pcsx2/archive/refs/tags/v1.7.3738.tar.gz -> pcsx2-1.7.3738.tar.gz https://github.com/fastfloat/fast_float/archive/32d21dcecb404514f94fb58660b8029a4673c2c1.tar.gz -> pcsx2-fast_float-32d21dcecb.tar.gz https://github.com/RetroAchievements/rcheevos/archive/31f8788fe0e694e99db7ce138d45a655c556fa96.tar.gz -> pcsx2-rcheevos-31f8788fe0.tar.gz vulkan? ( https://github.com/KhronosGroup/glslang/archive/c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5.tar.gz -> pcsx2-glslang-c9706bdda0.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/9f4c61a31435a7a90a314fc68aeb386c92a09c0f.tar.gz -> pcsx2-vulkan-headers-9f4c61a314.tar.gz )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=37d0b4499ea6ff35b802a611e16991bb
+_md5_=ce316f3785f1a30fd36b6cc3225fc022
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.7.4280 b/metadata/md5-cache/games-emulation/pcsx2-1.7.4280
index f87a15909daf..b280859df465 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-1.7.4280
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.7.4280
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/qttools[linguist] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=dev-qt/qttools:6[linguist] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr dev-libs/libfmt:= dev-libs/libzip:=[zstd] dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= media-video/ffmpeg:= net-libs/libpcap net-misc/curl sys-libs/zlib:= virtual/libudev:= x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) backtrace? ( sys-libs/libbacktrace ) jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) sndio? ( media-sound/sndio:= ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) x11-base/xorg-proto test? ( dev-cpp/gtest )
 DESCRIPTION=PlayStation 2 emulator
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PCSX2/pcsx2/archive/refs/tags/v1.7.4280.tar.gz -> pcsx2-1.7.4280.tar.gz https://github.com/fastfloat/fast_float/archive/32d21dcecb404514f94fb58660b8029a4673c2c1.tar.gz -> pcsx2-fast_float-32d21dcecb.tar.gz https://github.com/RetroAchievements/rcheevos/archive/31f8788fe0e694e99db7ce138d45a655c556fa96.tar.gz -> pcsx2-rcheevos-31f8788fe0.tar.gz vulkan? ( https://github.com/KhronosGroup/glslang/archive/c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5.tar.gz -> pcsx2-glslang-c9706bdda0.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/9f4c61a31435a7a90a314fc68aeb386c92a09c0f.tar.gz -> pcsx2-vulkan-headers-9f4c61a314.tar.gz )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b26a5a9f4a9a926118e5fb9c2d287bf3
+_md5_=e58fe3a4d6dbc320781440fd74166ddb
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index d9999bf929cd..452b0157c8b9 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/qttools[linguist] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-qt/qttools:6[linguist] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr dev-libs/libfmt:= dev-libs/libzip:=[zstd] dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= media-video/ffmpeg:= net-libs/libpcap net-misc/curl sys-libs/zlib:= virtual/libudev:= x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) backtrace? ( sys-libs/libbacktrace ) jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) sndio? ( media-sound/sndio:= ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) x11-base/xorg-proto test? ( dev-cpp/gtest )
 DESCRIPTION=PlayStation 2 emulator
@@ -14,4 +14,4 @@ REQUIRED_USE=cpu_flags_x86_sse4_1
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b26a5a9f4a9a926118e5fb9c2d287bf3
+_md5_=e58fe3a4d6dbc320781440fd74166ddb
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 4de6bae58260..ed9e8638f866 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.21 b/metadata/md5-cache/media-libs/libmtp-1.1.21
new file mode 100644
index 000000000000..cc034430fae5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.21
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( dev-libs/libgcrypt:0= )
+DESCRIPTION=Implementation of Microsoft's Media Transfer Protocol (MTP)
+EAPI=8
+HOMEPAGE=http://libmtp.sourceforge.net/
+INHERIT=udev libtool
+IUSE=+crypt doc examples static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( dev-libs/libgcrypt:0= )
+SLOT=0/9
+SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.21.tar.gz
+_eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=b4f5c1e2cfd1a2823272dcba50ff2760
diff --git a/metadata/md5-cache/media-libs/opus-1.4 b/metadata/md5-cache/media-libs/opus-1.4
index 57c640ca7df5..d54fbcd72b83 100644
--- a/metadata/md5-cache/media-libs/opus-1.4
+++ b/metadata/md5-cache/media-libs/opus-1.4
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=Open codec for interactive speech and music transmission over the Internet
 EAPI=8
 HOMEPAGE=https://opus-codec.org/
-INHERIT=flag-o-matic meson-multilib
+INHERIT=flag-o-matic meson-multilib python-any-r1
 IUSE=custom-modes debug doc hardened static-libs test cpu_flags_x86_sse cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xiph/opus/releases/download/v1.4/opus-1.4.tar.gz
-_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=82e504b45a7d172cac534ed65ca0f9d4
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f70f1c2d3216d72ec5159c33dac9b5e0
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 2c7805c0af83..c1141426214e 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/qjackctl-0.9.10 b/metadata/md5-cache/media-sound/qjackctl-0.9.10
index 258e045365a2..e4d6c446f279 100644
--- a/metadata/md5-cache/media-sound/qjackctl-0.9.10
+++ b/metadata/md5-cache/media-sound/qjackctl-0.9.10
@@ -7,10 +7,10 @@ HOMEPAGE=https://qjackctl.sourceforge.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg cmake
 IUSE=alsa dbus debug portaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio ) dev-qt/qtsvg:5
 SLOT=0
 SRC_URI=mirror://sourceforge/qjackctl/qjackctl-0.9.10.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f0ab8fd14156293934fb1331879ea9d9
+_md5_=cc875ec7e51729528ef775df803b3dce
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 1bd357e138e4..cb99eca5bdf8 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.2.9 b/metadata/md5-cache/media-video/ffmpeg-4.2.9
new file mode 100644
index 000000000000..7f95be101cbe
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpeg-4.2.9
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/make-3.81 virtual/pkgconfig cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) test? ( net-misc/wget sys-devel/bc )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( >=media-libs/nv-codec-headers-9.0.18.0 ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
+DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes libavcodec
+EAPI=7
+HOMEPAGE=https://ffmpeg.org/
+INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs
+IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl hardcoded-tables +iconv libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg nvenc vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( >=media-libs/nv-codec-headers-9.0.18.0 ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+REQUIRED_USE=cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+SLOT=0/56.58.58
+SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.2.9.tar.xz https://dev.gentoo.org/~gyakovlev/distfiles/ffmpeg-4.2.2-ppc64-altivec.patch.gz https://dev.gentoo.org/~gyakovlev/distfiles/ffmpeg-4.2.2-ppc64-gcc.patch.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=fc16aef439e5a4e6c2426426d8834262
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.4.4-r1 b/metadata/md5-cache/media-video/ffmpeg-4.4.4-r2
index 4934060ed0c9..4f9ed58721f1 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.4.4-r1
+++ b/metadata/md5-cache/media-video/ffmpeg-4.4.4-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.4.4.tar.xz verify-sig? ( https://ffmpeg.org/releases/ffmpeg-4.4.4.tar.xz.asc )
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=3cd1feeb0d5388bbf537bce23b00ff0e
+_md5_=ae056d1544d70037398af69fb3bf8c2f
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 86f0c8553bcd..23b34584ace1 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/ntopng-5.6-r1 b/metadata/md5-cache/net-analyzer/ntopng-5.6-r2
index 20dcd6415e51..c26fb9da5629 100644
--- a/metadata/md5-cache/net-analyzer/ntopng-5.6-r1
+++ b/metadata/md5-cache/net-analyzer/ntopng-5.6-r2
@@ -11,4 +11,4 @@ RDEPEND=dev-db/mysql-connector-c:= dev-db/sqlite:3 dev-libs/hiredis:= dev-libs/j
 SLOT=0
 SRC_URI=https://github.com/ntop/ntopng/archive/5.6.tar.gz -> ntopng-5.6.tar.gz https://github.com/ntop/ntopng-dist/archive/90d81ad0281eb6eb582a683ac321a3959abb1269.tar.gz -> ntopng-5.6-web-90d81ad0281eb6eb582a683ac321a3959abb1269.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=85ff70b7c951b71caaee67491545086d
+_md5_=f8f78a92a672c277b06fdcdfd4fa82ad
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.31 b/metadata/md5-cache/net-analyzer/zabbix-5.0.31
deleted file mode 100644
index 0df1a87d6660..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.31
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/5.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.31.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.31-go-deps.tar.xz )
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=298122298ca64ce54e030cd444d5a26d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.13 b/metadata/md5-cache/net-analyzer/zabbix-6.0.13
deleted file mode 100644
index 5b9fce5cd136..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.13
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/6.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.13.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.13-go-deps.tar.xz )
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=db11d917da5f7f812530bd5a6ad31dd6
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 4827618a04d1..f0542ebbac1c 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.15-r2 b/metadata/md5-cache/net-dialup/rp-pppoe-3.15-r2
index 0df0e13099d4..6f2e7258efb0 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.15-r2
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.15-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup
 DEPEND=>=sys-kernel/linux-headers-2.6.25 elibc_musl? ( net-libs/ppp-defs ) net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
 DESCRIPTION=A user-mode PPPoE client and server suite for Linux
 EAPI=7
-HOMEPAGE=https://dianne.skoll.ca/projects/rp-pppoe/
+HOMEPAGE=https://dianne.skoll.ca/projects/rp-pppoe/ https://salsa.debian.org/dskoll/rp-pppoe
 INHERIT=autotools readme.gentoo-r1 toolchain-funcs
 IUSE=tk
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
@@ -12,4 +12,4 @@ RDEPEND=net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
 SLOT=0
 SRC_URI=https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-3.15.tar.gz https://dev.gentoo.org/~polynomial-c/dist/rp-pppoe-3.14-patches-01.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=28b69f918d267ad98c1f73dc0f53e41f
+_md5_=be6ac95ec4cfbcac631710f3eb83140c
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-9999 b/metadata/md5-cache/net-dialup/rp-pppoe-9999
index 96e297c7a05b..9cd0bf4e9e49 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-9999
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install setup unpack
 DEPEND=>=sys-kernel/linux-headers-2.6.25 elibc_musl? ( net-libs/ppp-defs ) net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
 DESCRIPTION=A user-mode PPPoE client and server suite for Linux
 EAPI=8
-HOMEPAGE=https://dianne.skoll.ca/projects/rp-pppoe/
+HOMEPAGE=https://dianne.skoll.ca/projects/rp-pppoe/ https://salsa.debian.org/dskoll/rp-pppoe
 INHERIT=readme.gentoo-r1 git-r3
 IUSE=tk
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
 SLOT=0
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
-_md5_=8677aa52cdab7bf8667e5d25cc109469
+_md5_=4c90d1720fc7d2420702b7f85477f525
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index e6419fba06bc..7d1d318aaf29 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/firewalld-1.3.2 b/metadata/md5-cache/net-firewall/firewalld-1.3.2
new file mode 100644
index 000000000000..c45c3a8ecab8
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/firewalld-1.3.2
@@ -0,0 +1,17 @@
+BDEPEND=app-text/docbook-xml-dtd >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) iptables? ( net-firewall/iptables[ipv6(+)] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_11(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) dev-libs/glib:2
+DESCRIPTION=A firewall daemon with D-Bus interface providing a dynamic firewall
+EAPI=8
+HOMEPAGE=https://firewalld.org/
+INHERIT=bash-completion-r1 gnome2-utils linux-info optfeature plocale python-single-r1 systemd xdg-utils
+IUSE=gui +nftables +iptables test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm arm64 ~loong ppc64 ~riscv x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) iptables? ( net-firewall/iptables[ipv6(+)] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_11(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://github.com/firewalld/firewalld/releases/download/v1.3.2/firewalld-1.3.2.tar.bz2
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6cd6696779faf8665dcf86d3603178f6
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index c27e4182ee6a..4a52d1c54499 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/networkmanager-1.42.2 b/metadata/md5-cache/net-misc/networkmanager-1.42.2
index 4ff490ad8638..6c8d82048f17 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.42.2
+++ b/metadata/md5-cache/net-misc/networkmanager-1.42.2
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.56 ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
+DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
 DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
@@ -8,10 +8,10 @@ INHERIT=gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 syste
 IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
 REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.42/NetworkManager-1.42.2.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	vala	1343f639cc74d2aa8b36fc08677da58d	virtualx	817571665ee28575da44ee08135089e5
-_md5_=74e19a76423d734f3ab2360846fd8e63
+_md5_=8fa391e22ef2482932bc3b85d366961f
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.42.4 b/metadata/md5-cache/net-misc/networkmanager-1.42.4
index 714ec4ae6317..01403f6c266b 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.42.4
+++ b/metadata/md5-cache/net-misc/networkmanager-1.42.4
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.56 ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
+DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
 DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
@@ -8,10 +8,10 @@ INHERIT=gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 syste
 IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
 REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.42/NetworkManager-1.42.4.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	vala	1343f639cc74d2aa8b36fc08677da58d	virtualx	817571665ee28575da44ee08135089e5
-_md5_=5567c9d93ee235bec3d77c43abac6ba3
+_md5_=181fcc262dfb572495c71f5e70cb879c
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.42.6-r1 b/metadata/md5-cache/net-misc/networkmanager-1.42.6-r1
new file mode 100644
index 000000000000..b94ca532461a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.42.6-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.56 ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+INHERIT=gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
+IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nss-3.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.42/NetworkManager-1.42.6.tar.xz https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/5df19f5b26c5921a401e63fb329e844a02d6b1f2.patch -> networkmanager-ppp-2.5.0.patch
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	vala	1343f639cc74d2aa8b36fc08677da58d	virtualx	817571665ee28575da44ee08135089e5
+_md5_=e523afb6b7054a4c643f649982a2e17b
diff --git a/metadata/md5-cache/net-misc/sstp-client-1.0.18-r2 b/metadata/md5-cache/net-misc/sstp-client-1.0.18-r2
new file mode 100644
index 000000000000..cb785502a3c0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sstp-client-1.0.18-r2
@@ -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-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/libevent:= dev-libs/openssl:= net-dialup/ppp:=
+DESCRIPTION=Client implementation of Secure Socket Tunneling Protocol (SSTP)
+EAPI=8
+HOMEPAGE=https://sstp-client.sourceforge.net/
+INHERIT=autotools linux-info
+IUSE=static
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=dev-libs/libevent:= dev-libs/openssl:= net-dialup/ppp:= acct-group/sstpc acct-user/sstpc
+SLOT=0
+SRC_URI=mirror://sourceforge/sstp-client/sstp-client-1.0.18.tar.gz https://dev.gentoo.org/~sam/distfiles/net-misc/sstp-client/sstp-client-1.0.18-ppp-2.5.0-patches.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=95c2cfe790961d898ae9acf2ca548322
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index cdd40deb5ecf..5df2722d9f77 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.4.0-r2 b/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.4.0-r2
new file mode 100644
index 000000000000..e2f3ef631f06
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.4.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen >=sys-devel/gettext-0.19 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.2:= gtk? ( >=app-crypt/libsecret-0.18 gui-libs/gtk:4 media-libs/harfbuzz >=net-libs/libnma-1.2.0 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager Fortinet SSLVPN compatible plugin
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+INHERIT=gnome2
+IUSE=gtk
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager-fortisslvpn/1.4/NetworkManager-fortisslvpn-1.4.0.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b432bdc37b9d6946af773dbc3ebcc4d7
diff --git a/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.20.8 b/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.20.8
index 84750fd9ad61..0cb9231cecc4 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.20.8
+++ b/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.20.8
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig app-arch/xz-utils
 DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/openssl:= net-dialup/ppp:=[eap-tls] net-dialup/xl2tpd >=net-misc/networkmanager-1.20[ppp] || ( net-vpn/strongswan net-vpn/libreswan ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet media-libs/harfbuzz:= net-libs/libnma x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) x11-base/xorg-proto
+DEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/openssl:= net-dialup/ppp:=[eap-tls(+)] net-dialup/xl2tpd >=net-misc/networkmanager-1.20[ppp] || ( net-vpn/strongswan net-vpn/libreswan ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet media-libs/harfbuzz:= net-libs/libnma x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) x11-base/xorg-proto
 DESCRIPTION=NetworkManager L2TP plugin
 EAPI=8
 HOMEPAGE=https://github.com/nm-l2tp/NetworkManager-l2tp
@@ -8,8 +8,8 @@ INHERIT=gnome.org
 IUSE=gtk
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/openssl:= net-dialup/ppp:=[eap-tls] net-dialup/xl2tpd >=net-misc/networkmanager-1.20[ppp] || ( net-vpn/strongswan net-vpn/libreswan ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet media-libs/harfbuzz:= net-libs/libnma x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) dev-libs/dbus-glib
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/openssl:= net-dialup/ppp:=[eap-tls(+)] net-dialup/xl2tpd >=net-misc/networkmanager-1.20[ppp] || ( net-vpn/strongswan net-vpn/libreswan ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet media-libs/harfbuzz:= net-libs/libnma x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) dev-libs/dbus-glib
 SLOT=0
 SRC_URI=https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/1.20.8/NetworkManager-l2tp-1.20.8.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe
-_md5_=58a0d66fb7422cbb9f9f2ab109c6d5a9
+_md5_=a5c092fbef01f1dad1c06b4410115210
diff --git a/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.20.8-r3 b/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.20.8-r3
new file mode 100644
index 000000000000..9a35b5d5be00
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.20.8-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/openssl:= net-dialup/ppp:=[eap-tls(+)] net-dialup/xl2tpd >=net-misc/networkmanager-1.20[ppp] || ( net-vpn/strongswan net-vpn/libreswan ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet media-libs/harfbuzz:= net-libs/libnma x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) x11-base/xorg-proto
+DESCRIPTION=NetworkManager L2TP plugin
+EAPI=8
+HOMEPAGE=https://github.com/nm-l2tp/NetworkManager-l2tp
+INHERIT=autotools gnome.org
+IUSE=gtk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/openssl:= net-dialup/ppp:=[eap-tls(+)] net-dialup/xl2tpd >=net-misc/networkmanager-1.20[ppp] || ( net-vpn/strongswan net-vpn/libreswan ) gtk? ( app-crypt/libsecret gnome-extra/nm-applet media-libs/harfbuzz:= net-libs/libnma x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) dev-libs/dbus-glib
+SLOT=0
+SRC_URI=https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/1.20.8/NetworkManager-l2tp-1.20.8.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=8eec0176c69cdad2b2f1c745fade64bd
diff --git a/metadata/md5-cache/net-vpn/networkmanager-sstp-1.3.1-r1 b/metadata/md5-cache/net-vpn/networkmanager-sstp-1.3.1-r1
new file mode 100644
index 000000000000..bb6cfb7373e8
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/networkmanager-sstp-1.3.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen sys-apps/file sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.32:2 net-misc/sstp-client >=net-misc/networkmanager-1.1.0 net-dialup/ppp:= net-libs/gnutls:= gui? ( >=net-libs/libnma-1.2.0 >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 gtk4? ( >=app-accessibility/at-spi2-core-2.46.0 media-libs/graphene media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango gui-libs/gtk:4 ) )
+DESCRIPTION=Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/network-manager-sstp https://sourceforge.net/projects/sstp-client/
+INHERIT=autotools
+IUSE=gui gtk4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 net-misc/sstp-client >=net-misc/networkmanager-1.1.0 net-dialup/ppp:= net-libs/gnutls:= gui? ( >=net-libs/libnma-1.2.0 >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 gtk4? ( >=app-accessibility/at-spi2-core-2.46.0 media-libs/graphene media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango gui-libs/gtk:4 ) )
+SLOT=0
+SRC_URI=https://gitlab.gnome.org/GNOME/network-manager-sstp/-/releases/release-1.3.1/downloads/dist/NetworkManager-sstp-1.3.1.tar.xz https://dev.gentoo.org/~sam/distfiles/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-ppp-2.5.0-patches.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=a0cd928f4c796a1a8ac7f91f848ebba6
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 7f411b629061..e96c829ca18e 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/ngspice-40 b/metadata/md5-cache/sci-electronics/ngspice-40
new file mode 100644
index 000000000000..f2241e500aa0
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/ngspice-40
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=sys-libs/ncurses:= X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 ) fftw? ( sci-libs/fftw:3.0= ) readline? ( sys-libs/readline:= ) tcl? ( dev-lang/tcl:= dev-tcltk/blt )
+DESCRIPTION=The Next Generation Spice (Electronic Circuit Simulator)
+EAPI=8
+HOMEPAGE=http://ngspice.sourceforge.net
+INHERIT=autotools multibuild toolchain-funcs virtualx
+IUSE=X debug deprecated doc examples fftw openmp +readline +shared tcl test
+KEYWORDS=~amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD GPL-2 MPL-2.0
+RDEPEND=sys-libs/ncurses:= X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 ) fftw? ( sci-libs/fftw:3.0= ) readline? ( sys-libs/readline:= ) tcl? ( dev-lang/tcl:= dev-tcltk/blt )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/ngspice/ngspice-40.tar.gz doc? ( mirror://sourceforge/ngspice/ngspice-40-manual.pdf )
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
+_md5_=630724e0fcaa1f0627a6b12810713020
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 278f6fb7cb79..0eadcebd7942 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/gdal-3.6.4 b/metadata/md5-cache/sci-libs/gdal-3.6.4
new file mode 100644
index 000000000000..1df3d6442170
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/gdal-3.6.4
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) java? ( dev-java/ant-core dev-lang/swig:0 >=virtual/jdk-1.8:* ) python? ( dev-lang/swig:0 python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
+EAPI=8
+HOMEPAGE=https://gdal.org/
+INHERIT=cmake java-pkg-opt-2 python-single-r1
+IUSE=armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd java python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD Info-ZIP MIT
+RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) spatialite? ( sqlite )
+RESTRICT=!test? ( test )
+SLOT=0/32
+SRC_URI=https://download.osgeo.org/gdal/3.6.4/gdal-3.6.4.tar.xz test? ( https://download.osgeo.org/gdal/3.6.4/gdalautotest-3.6.4.tar.gz )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=dd493555e1feb8d0517e950fc809f5d1
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 1cb1c591652c..2c31c396e360 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1 b/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1
index 538a8320cd66..493a22477495 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://maxima.sourceforge.net/
 INHERIT=autotools elisp-common flag-o-matic python-single-r1 xdg-utils
 IUSE=clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test l10n_de l10n_es l10n_pt l10n_pt-BR python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-2+
 RDEPEND=clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( <dev-lisp/gcl-2.6.14[ansi,readline] ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) virtual/libcrypt:= emacs? ( >=app-editors/emacs-26:* ) gui? ( dev-lang/tk:0 ) X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] vtk? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sci-libs/vtk[python,rendering,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) ) emacs? ( virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended )
 REQUIRED_USE=vtk? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) || ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl ) gui? ( X )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.46.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	dcd21c5d379fc2217e95f529504c5fe0	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6c8e458eaab9b79adac7dcee2a863f19
+_md5_=0fa109a876541ad7486b89bd1e4b9c08
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 000cfaa85d52..61da4f061ff6 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-auth-20230329 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-auth-20230329
index f6849fac2354..83d51c85cba7 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-auth-20230329
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-auth-20230329
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Gentoo Authority Keys (GLEP 79)
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/downloads/signatures/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-auth.asc.20230329.gz
-_md5_=deee3ec41464d356ad413fc62a72d30b
+_md5_=343d44f098ebb36341e82cf5da45af55
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403
index dae93041da1a..c1ec178ce862 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.gentoo.org/downloads/signatures/
 INHERIT=edo python-any-r1
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=public-domain
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230403.gpg -> openpgp-keys-gentoo-developers-20230403-active-devs.gpg
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6926976edac2e064f13865d97bb24617
+_md5_=f7dbeb210ea9d9dc2fa07d2dd6d8af9b
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230417 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230417
new file mode 100644
index 000000000000..bbf6075eb6eb
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230417
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/python-gnupg[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-gnupg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/python-gnupg[python_targets_python3_9(-)] ) ) sec-keys/openpgp-keys-gentoo-auth test? ( app-crypt/gnupg sys-apps/grep[pcre] )
+DEFINED_PHASES=compile install setup test unpack
+DESCRIPTION=Gentoo Authority Keys (GLEP 79)
+EAPI=8
+HOMEPAGE=https://www.gentoo.org/downloads/signatures/
+INHERIT=edo python-any-r1
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=public-domain
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230417.gpg -> openpgp-keys-gentoo-developers-20230417-active-devs.gpg
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6926976edac2e064f13865d97bb24617
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-release-20230329 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-release-20230329
index 77ce45576e4f..0d57e0074498 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-release-20230329
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-release-20230329
@@ -4,9 +4,9 @@ DESCRIPTION=OpenPGP keys used for Gentoo releases (snapshots, stages)
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/downloads/signatures/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.20230329.gz test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20190224.tar.gz )
-_md5_=512d2dc2ab3442c96827019fb9693592
+_md5_=b73c38f2e4d176752b952a043c717d5e
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index d03de85a5afe..c272a24c9c80 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-2.3 b/metadata/md5-cache/sys-apps/nvme-cli-2.3
index 9545b2d6a663..5194a5779871 100644
--- a/metadata/md5-cache/sys-apps/nvme-cli-2.3
+++ b/metadata/md5-cache/sys-apps/nvme-cli-2.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/linux-nvme/nvme-cli
 INHERIT=meson systemd udev
 IUSE=hugepages
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~loong ppc64 ~riscv ~x86
 LICENSE=GPL-2 GPL-2+
 RDEPEND=>=sys-libs/libnvme-1.3:= hugepages? ( sys-libs/libhugetlbfs:= ) dev-libs/json-c:= sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v2.3.tar.gz -> nvme-cli-2.3.gh.tar.gz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=ee63961fd4927f184798dd05961e7212
+_md5_=74b08fb52dadb2482da2aeed067478eb
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 3ce607c4898d..7b7c8febb94d 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/parallel-20230422 b/metadata/md5-cache/sys-process/parallel-20230422
new file mode 100644
index 000000000000..e84430e317d3
--- /dev/null
+++ b/metadata/md5-cache/sys-process/parallel-20230422
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure unpack
+DEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
+INHERIT=verify-sig
+IUSE=verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+SLOT=0
+SRC_URI=mirror://gnu/parallel/parallel-20230422.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20230422.tar.bz2.sig )
+_eclasses_=verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=ed8555aa36d127edfda3bb09bcd6bbb4
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 77b73dd674a3..2d43dd4c4eba 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/chromium-112.0.5615.165 b/metadata/md5-cache/www-client/chromium-112.0.5615.165
index 9f3353dcb92e..48daec0b9970 100644
--- a/metadata/md5-cache/www-client/chromium-112.0.5615.165
+++ b/metadata/md5-cache/www-client/chromium-112.0.5615.165
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://chromium.org/
 INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
 IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +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_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=BSD
 RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-112.0.5615.165.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_112.0.5615.49-2raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=57d6942f139a6ab92cb47fe2c4fad188
+_md5_=84afb57d76763421165dbf420c572ca4
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index ee2d59ca34b0..a7d9ed865209 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/monitorix-3.15.0 b/metadata/md5-cache/www-misc/monitorix-3.15.0
index 9d7a1ea710c3..9c4a3b6747da 100644
--- a/metadata/md5-cache/www-misc/monitorix-3.15.0
+++ b/metadata/md5-cache/www-misc/monitorix-3.15.0
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight system monitoring tool
 EAPI=8
 HOMEPAGE=https://www.monitorix.org/
 INHERIT=systemd optfeature
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/monitorix acct-user/monitorix dev-perl/CGI dev-perl/Config-General dev-perl/DBI dev-perl/HTTP-Server-Simple dev-perl/IO-Socket-SSL dev-perl/MIME-Lite dev-perl/XML-Simple dev-perl/libwww-perl net-analyzer/rrdtool[graph,perl]
 SLOT=0
 SRC_URI=https://www.monitorix.org/monitorix-3.15.0.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ee6f8e547748ec671da4e3bc3832ae24
+_md5_=df07fb9e9c01de5e5a453667db0f8a11
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 045a1de30f3f..3ac4a5e84bf8 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/puma-5.6.4 b/metadata/md5-cache/www-servers/puma-5.6.4
deleted file mode 100644
index 874b712c5c48..000000000000
--- a/metadata/md5-cache/www-servers/puma-5.6.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/localhost[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] test? ( dev-ruby/localhost[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby30(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] test? ( dev-ruby/localhost[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby31(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby31(-)] ) ) test? ( ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/nio4r:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
-EAPI=8
-HOMEPAGE=https://puma.io/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:0= ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/nio4r:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/puma/puma/archive/v5.6.4.tar.gz -> puma-5.6.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3b122c2ae98fe936c2fa259afc59a85e
diff --git a/metadata/md5-cache/www-servers/puma-6.0.0 b/metadata/md5-cache/www-servers/puma-6.0.0
deleted file mode 100644
index f5ce863ef448..000000000000
--- a/metadata/md5-cache/www-servers/puma-6.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/localhost[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] test? ( dev-ruby/localhost[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby30(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] test? ( dev-ruby/localhost[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby31(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby31(-)] ) ) test? ( ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/nio4r:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
-EAPI=8
-HOMEPAGE=https://puma.io/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:0= ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/nio4r:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/puma/puma/archive/v6.0.0.tar.gz -> puma-6.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=75d77df7eba9b6ded44abdecdbd565fa
diff --git a/metadata/md5-cache/www-servers/puma-6.0.1 b/metadata/md5-cache/www-servers/puma-6.0.1
deleted file mode 100644
index 3170e73ccdf8..000000000000
--- a/metadata/md5-cache/www-servers/puma-6.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/localhost[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] test? ( dev-ruby/localhost[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby30(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] test? ( dev-ruby/localhost[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby31(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby31(-)] ) ) test? ( ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/nio4r:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
-EAPI=8
-HOMEPAGE=https://puma.io/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:0= ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/nio4r:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/puma/puma/archive/v6.0.1.tar.gz -> puma-6.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=75d77df7eba9b6ded44abdecdbd565fa
diff --git a/metadata/md5-cache/www-servers/puma-6.2.2 b/metadata/md5-cache/www-servers/puma-6.2.2
new file mode 100644
index 000000000000..ff0f92d97eac
--- /dev/null
+++ b/metadata/md5-cache/www-servers/puma-6.2.2
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] test? ( dev-ruby/localhost[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby30(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] test? ( dev-ruby/localhost[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby31(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( virtual/ruby-ssl[ruby_targets_ruby32(-)] test? ( dev-ruby/localhost[ruby_targets_ruby32(-)] dev-ruby/rack:2.2[ruby_targets_ruby32(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby32(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby32(-)] ) ) test? ( ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/nio4r:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/nio4r:2[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
+EAPI=8
+HOMEPAGE=https://puma.io/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:0= ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/nio4r:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/nio4r:2[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/puma/puma/archive/v6.2.2.tar.gz -> puma-6.2.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=feb335bee3c75a6512d88955f73aa797
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index b9132a561733..03f446fdf221 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/zim-0.75.1 b/metadata/md5-cache/x11-misc/zim-0.75.1
index f39064935119..b946983a76ce 100644
--- a/metadata/md5-cache/x11-misc/zim-0.75.1
+++ b/metadata/md5-cache/x11-misc/zim-0.75.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-w
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 optfeature virtualx xdg
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD GPL-2+
 RDEPEND=python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.75.1.tar.gz -> zim-0.75.1.tar.gz
 _eclasses_=distutils-r1	f12c3dec394316618cba1e403667cdd8	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c79627f1fa758a8110aecf10d41f7130
+_md5_=eee7016168658d53b38d23a053cde208
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e08d4417c73b..0e3d2d989d5b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-04-23T04:39:38Z
+TIMESTAMP 2023-04-23T10:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmREtopfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRFCudfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klArGA/9ERbf6xx2VbIenArpUhx+Z4CBFrl16U5zVZzBPN/ayJG+s8pF76WLRSLy
-8flfizncUXkbYHsXvfypTLmclOfam094bwZ6tDhPLhsrG9qUEQdrpZv/sxqtiatT
-xXAk2/3V3vclO7YN5/MwsuKE31hztf49J0z/sOWaT7tLk8gpw1HKVm2CMvvanyP/
-rLKm/jb361qsH2KkI31u4bHvH/KeEEPHxJw+R/ZpnjVm8oouoWDNSBTtko+dLReF
-DBbolD+or475WXDO85uM7iRtIHjxVuJYiWdVDxsv5C67warrtdoQN7qzcIF7cYr4
-kKIlme/0m0tOUUp9NKp3tXEHFSFWwn5N2018DW0Qzl/JeqybzRO2d0YxdnUdyYWH
-bbHJC5SvsvBpeVWtWsEwGdhtHyIH3hVs/sB+0XtSm4k5QQ/dONXbDMtmQiNknMFw
-2h/KEZPwu41ycFBZgMz8+KDLjEPFVMqzn/Xs6ZjZPyX1THhUJK3D9MlzDENTkg7x
-OHrlSemYwU8BhSLrJqPrMmihrnvZnkCKqgZsr1Le1xf2Bn7szjMRbktjrvVg8poy
-LQ+ZGYb8BZollg5y/TktfZKraS+WRCGIaCKLagyJtvwmGTCReMd5/MkQbxC0zdGf
-whSy2lfFRndWmYaClDvm9aGaycuP9jBSA+jqdPXn/jgRHEhm5dY=
-=S81i
+klBSExAAhhuabhVMLDoQjur3GoT5MK0z2ZBK+YGC7EIrHjt9PprZidOV6CzbKvUL
+Zq1jYJph4jEuGF6QGwWMrrTJxUPu3+8PDlbrpvAkmr+aeNsrWzKM/lsd1WC33gEU
+/+muNnT7HO0Pfi33HI5hTy9ZSe3X8Gnh71Eu9/gDL+Hse8Y7znM2pulTqU1Fo3cI
+447TcQ+o17Khc9SSNKdEzCxNss3dRrH+r2r0ydEql+v50BfC5khcK22b0TNtYQYa
+O/7Qwh7S7pKHFNpP6elX38Ktt9OJPW1p9UuZoYeloV0pePcfm9tQz1USv0x0Y70t
+aZpMI9RClhn5BbtLxUVn/KZuFQxLWVVDHJe1KkBqSCRuHXeB5c6hneV3AmnwEeTG
+HO1uL7KEMTy8xEdZveYzwXf3cT0Sf1XrlIRyG8BxAGK0EdCS1l/bE3rusNOZ7kSr
+j7ItC75ZC1p/9Kr88r6nOUr+iEGLR6eqeCz9kDK6EJBGH0gYMDDB7ZtftpZHgt+o
+4GxrsdtvL8WIKuQAbuFqgcsqkP7cjHkbHicvS7IdqTWt0LgwxUrf3EBQ6LrCWof1
+J1Y41ewcHXWH5UjOC7I50N9+gPet1ENuVZneoXhMY4u2dMAi2UgK3iJTbQWzQ9ou
+bNhfhU3atGyKxOWCPJ83t08Yir6JfVLAhu4/iIGeXXfafVtagpU=
+=Hjt5
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e4f9817c99b6..3e24164861f7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Apr 2023 04:39:35 +0000
+Sun, 23 Apr 2023 10:39:31 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a9959f6a9057..2b5571e38fb0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Apr 23 04:39:35 AM UTC 2023
+Sun Apr 23 10:39:31 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2d3d08b87404..fbf78577c1c1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Apr 2023 04:45:01 +0000
+Sun, 23 Apr 2023 10:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 41130964ee13..cd18158ef133 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9a48abe10c8e886860998506c2c207d6d97c4f57 1682224333 2023-04-23T04:32:13+00:00
+6346874114214aa520a51887487af76a8c42e846 1682243047 2023-04-23T09:44:07+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 173744299b14..8991e4d9f1da 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1682224801 Sun 23 Apr 2023 04:40:01 AM UTC
+1682246401 Sun 23 Apr 2023 10:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e4f9817c99b6..3e24164861f7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Apr 2023 04:39:35 +0000
+Sun, 23 Apr 2023 10:39:31 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index b871c768da2d..650ef8f986fb 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index a8773c751ec9..ef636ebdddcb 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -10,5 +10,5 @@ DIST ntopng-5.6-web-90d81ad0281eb6eb582a683ac321a3959abb1269.tar.gz 2525957 BLAK
 DIST ntopng-5.6.tar.gz 46318113 BLAKE2B 48702b55c239edca46d6cdecb846ac358c9a829a261eee128444bd994b967c962577a419466f139a2aefdd3a51485d2bb17bf39b8f35a9a31322c40c07203a5d SHA512 c4ab79f98b2dc99218cd0c7ac0ed7275d23e7a161de742632f3ec7a538ea4948ba906d40e7fd2ba36fb4bd9be86ecc69f5df65e7f81607e6da489863947b2da5
 EBUILD ntopng-5.2.1-r1.ebuild 2232 BLAKE2B b1a55a7eff04c3e6fcdabfff960846e10353bc7899c4221cad0f0c482b33eebcd59ab9b18f66c06bb654b4335fb90d6344545a15ccd8050631c6f8aed74f8c01 SHA512 f2badf2841ba9920b955c39c766bd7a7bad59bea7905befd2a5ab4dfe362669d1f18cdcc0138cf0bbd1538ed481e976dd95e79da100c9937360d9e2af7eec352
 EBUILD ntopng-5.4.ebuild 2236 BLAKE2B dba0614126d673b4ee92662c80746bf2d4d971ad6b6c78f121dc8000556b17c7c8e9288e091d55ba907533efffa64d11924c342182a3b75987396af41e4296c6 SHA512 84aba7423e8ef582ae9251db3cc87f748b5372de146caa36e9953a1883c3d22d40e409acb880f27cc0638e87851eb9ef73d8e2c0138541117bd550417f8c880b
-EBUILD ntopng-5.6-r1.ebuild 2673 BLAKE2B 86572d83f5558316a93b3d59e48365b37cfc565a5cd8e5ee563d52b68b647cf7e620476a479b1b565ef04465b10a6499a31d7f54a7a8194644a2b293821e608b SHA512 326d1ba1e05973c52955247444b76c15c2912af8b8b00df89b0ca3bf18cf5aa35779bf452fab4a423286c0e80dc462447b33806ab2d91972a79412b1e2cb4fb1
+EBUILD ntopng-5.6-r2.ebuild 2678 BLAKE2B 977136893448e4acca79f4ada05909de7b011b8a8feea0ea185588078a5aa02ad70c09e9756c64a11cf35ad06063223e75eb4211a323dd9fe3ae97ab73c2b12b SHA512 3028809586a4f729c4fd06e4a9c19afd8b2f72a3fb23d3581cce82c1393c652652c0cfe1574f40b7ce09f95482890d9e31e42e46149c1631f6cb7615813ed646
 MISC metadata.xml 295 BLAKE2B 2b7f20f08d1cef4e5cfa80981f282a4907a8496b565a1a146f27a3d8736653d35c6b03e07299b0b4bbbb32100d01c873c683b90ca96bed98e85cfd71a6175ddf SHA512 4d5b0f4892ca44c672c5f9b1291a91fb3333b36830df22432df5cfed48e3c6c93ca88a0675a50fd33013d7f01805df99d474e8c98b9c94f3c878366b32d5bc6f
diff --git a/net-analyzer/ntopng/ntopng-5.6-r1.ebuild b/net-analyzer/ntopng/ntopng-5.6-r2.ebuild
index 765764836c15..9dca5e2d0a9e 100644
--- a/net-analyzer/ntopng/ntopng-5.6-r1.ebuild
+++ b/net-analyzer/ntopng/ntopng-5.6-r2.ebuild
@@ -81,7 +81,7 @@ src_install() {
 	doins -r httpdocs
 	doins -r scripts
 
-	insinto "${SHARE_NTOPNG_DIR}"/httpdocs
+	insinto "${SHARE_NTOPNG_DIR}"/httpdocs/dist
 	doins -r "${WORKDIR}"/ntopng-dist-${NTOPNG_DIST_COMMIT}/.
 
 	insinto "${SHARE_NTOPNG_DIR}/third-party"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index b001c4387784..dd165cc76666 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -18,14 +18,10 @@ AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-4.0.44.tar.gz 17713321 BLAKE2B 1f75f99430846cfc029d5e541ede7ef8c019a42af0ab6d70be3170052b723877ca54f6554cd9a29f7f436fb6e9d5ffd02913a1b12ad45a2a8ed00432738e5660 SHA512 223d6fdd352e5731487797d839c1741209eae79af78a058d3ba29e5a9eaab5cbf91072ad827bdd676696d3ea518c638d7fd515bff2a257aef3a7ad38f41b3cb6
 DIST zabbix-4.0.45.tar.gz 17906669 BLAKE2B b90ebcfc05e7232257a0cdbde82dba5d96407bb569e3b6f31edb834012bea90b8583cc313444fd9d606bd6fe76bfca21a2e9bb395a36c36c89b2dbc52517f14b SHA512 b5b9b41b50be071f43b38f431d408fd51809745bde5573a33f7c12d0789a905d74fb66c27c196d685a48a555b7bfd13db63638de3f9b8094fdb1692d3d5405c0
-DIST zabbix-5.0.31-go-deps.tar.xz 34443128 BLAKE2B 38bf33002e6dbae95b39579383f8bb6998b0408434f140b1bb31e7cadf07a0363ac6234a820ec306cc12f764fc43d250a45ffd159a315dc494d0871ae6167660 SHA512 4d54ff09ccb356b3080240065598cc93d11a11c8faef0c6a22ec923face789cf2bee95ddaf62d0ecd74bd0807060fb4fcbcfa71b1ffcb8723096b1164d7c25ae
-DIST zabbix-5.0.31.tar.gz 21567566 BLAKE2B 076090e07856df0dc2603d75fb7cc9862e40b9e6bda89094cf687aa00719a0df7cf7fd93bc973cb38cbbb31b6b723efd3dc5aa6dde00b4f4a5b118331795bfeb SHA512 7409e23313a6c5f6f4f1e1c0ba0ccfec88aa2687caa25673709bf05b9e287a535ea417551dee0f9d2fbd571adfe843a700ee45ee3dc72752cdeab12ec4c54644
 DIST zabbix-5.0.32-go-deps.tar.xz 34470664 BLAKE2B aedd50682e9e71686852f5d69c1645c16d52a5c16a0628692452b6fbb1577a775473daad8ab687d23302966aa989dd0257ab38143f3db8ce4fdcf386d94b9689 SHA512 2ca7f5cf5e11eb0770bc16008a9e52436510bcee9e222b17ac58ea47acffd455a1278a9cdee9df9a6e045bfb7deb1df9950fb9ea19e767b8733b8036d9dc1d81
 DIST zabbix-5.0.32.tar.gz 21664895 BLAKE2B d70e68727eec0181398c7624c56aa2ef721a738a7549fa075a66cd94b6225243b7e73ff1b4d2ed96482ca5ac79ac8bcb230e9736f63a5dbe66cc4d0b10a88e24 SHA512 f58ecac976cc3b9e81f738e19ac23185747c005a73060f35137b5964d4144b96263b7dcba7db6d895f39908217aae9ba260ce5a772a4c53d4b24ccd41083f524
 DIST zabbix-5.0.33-go-deps.tar.xz 34386484 BLAKE2B 43228e628666ad841054c11d7031991903b9cd0ebd521350f33a94485d834be4d8ab30660e375bb0bf769f15b57f8125f9bb5239a65b7415ead07d2cf652c2b6 SHA512 19884c90024065839f38456b66e85e4fd228099f3746c8a63010686bcfffa0a1224b889ff4b7774efba838753cc97ae8a741d92beeebef1e0f154256a7381bfb
 DIST zabbix-5.0.33.tar.gz 21791284 BLAKE2B 920adfe2d078a58bc658ab8d815bc426ab654fe6356ed46950b572e4fc480d5986adf03e05ab780cae61166178e60e0eaee6be6a02f4d1d33744c84ce04f1ea1 SHA512 c5c6046d53a8341270cd0642e41df77f61ae0d472c1c3ee6fe86f7c3a4433ab30ced0b25ade3291f67872cf0b38e60eaffec8b16bb89e6d9729c7e277de321a7
-DIST zabbix-6.0.13-go-deps.tar.xz 17974536 BLAKE2B 296ae034ccf0f6cd1d83379c46ad87d80faf3d897d807d948312989e044dc4d159aabab27999730ed255be3c7d5aa6b70927bcfb888f9969b36994c68246c14b SHA512 279aeed128e00dab8f1824ed7186ddc914615f7756a96c049bff0321997c9e412007c56701a036a1a25029aa7c4f878ad4566e95abbf766ee353666a6a588370
-DIST zabbix-6.0.13.tar.gz 41075557 BLAKE2B 41db999c52d3ca596861d8850d594e639159b8c7090b47dd824be5b2695a6f1ebc0399643de8fb25af4081ab294c6fefe7ec9c0025ba4e4d17d44aa16d8b233a SHA512 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
 DIST zabbix-6.0.14-go-deps.tar.xz 17976336 BLAKE2B e4e29c6730f10e95c84d4f517130e79b44f82ddcfbe1465f7c419356158eba0354b0b3c18b45c8813be218337e354bb4f0be45633716b36a2272dabfa86a025f SHA512 2ae41852f7a84916b27e92e2661c9ff0beb56b3f54f83314a0ccddb55293c5c2a5bbbd090efba3c99f93a1722e0dedd94e4051d63d4dd9c8ff4cd9e084a4b39e
 DIST zabbix-6.0.14.tar.gz 41242602 BLAKE2B 2639e9b210df72f51de1ef2e610e5e1e936a147c8fb892dc15b7dc44008e3535c6df867d314c153283588e8a1a3b63dad65604877ea7471bb2d207a4dbc913c8 SHA512 9750dc6bfdc3966a6be098297744fed507272776212ce2143c70b035c2a0662e6c1fb1a1f423babbd9b69ad6231e6cbe397d5def069192a0c21189ca96670c89
 DIST zabbix-6.0.15-go-deps.tar.xz 18724120 BLAKE2B bba750a6edf0ee9fa2f0696332f5d0e1281a9bda62116202161f1a2c3d16aa3d9eae79bc1a45e1533ac3d65d28a009971c647835816ae32699b7525e641a2fea SHA512 5354ff78df69db23ee0c20cf92fbce7af4496297328dc2988a6e1948ff242afdd04f3d9b1584d92c8d67cdb9da5daa57dc068a2a8ad618b2c4739823ae9739c9
@@ -38,10 +34,8 @@ DIST zabbix-6.4.1-go-deps.tar.xz 21571696 BLAKE2B e312fdfdc5687b94c6b2368a42d918
 DIST zabbix-6.4.1.tar.gz 43014634 BLAKE2B 498358bf2a5de028b1bb0c8a5ebbe45451ec9be8fe2b08726f5c853b750a504f1dd7fe1b7c68d7f05fe65382077b65716dcd554d225019433d61ecd4dd6656c9 SHA512 4f82cdbf527b34e3689b280e8a0405faa1d9066a6288b273ac50f3b3008c0a6b8fcc325b760de4204dbf52a1301d7e59eadbe74a3f7a5fc3e26d6eb2f7a5c17f
 EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
 EBUILD zabbix-4.0.45.ebuild 9427 BLAKE2B 55a59585793b3217720c9a2c44b6371feb9e465fd8ad31adf040b0f8e21c883cee98b1fd26518a7c72e24ad8d42bf2523b575e94af6d80bc7ad739c8372811e6 SHA512 988468624b1f2825a14b9626ad4d53684144078fb97a225b52f8db5aba240a01d13de581a61943b3cb58f7316676c04211d51e4e043a9b487735934d9163accc
-EBUILD zabbix-5.0.31.ebuild 10142 BLAKE2B ffd5ab5a402b325ba940def36626cb3c8e6484ae8648010dde643921a793a07850b29c57c5f0b73f74d0fdd0c68c758327906696e4813f5c032cbbc761843bbc SHA512 50a9cfeb2756b2ec52f072566cc906a1bf15b0b9c96c0842dfd8d56e0e1ec26dcc0c170c0d304b8113e086545041aaa6e7acd83d2bba172e280d75f59933c619
 EBUILD zabbix-5.0.32.ebuild 10142 BLAKE2B ffd5ab5a402b325ba940def36626cb3c8e6484ae8648010dde643921a793a07850b29c57c5f0b73f74d0fdd0c68c758327906696e4813f5c032cbbc761843bbc SHA512 50a9cfeb2756b2ec52f072566cc906a1bf15b0b9c96c0842dfd8d56e0e1ec26dcc0c170c0d304b8113e086545041aaa6e7acd83d2bba172e280d75f59933c619
 EBUILD zabbix-5.0.33.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
-EBUILD zabbix-6.0.13.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
 EBUILD zabbix-6.0.14.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
 EBUILD zabbix-6.0.15.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.0.16.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
diff --git a/net-analyzer/zabbix/zabbix-5.0.31.ebuild b/net-analyzer/zabbix/zabbix-5.0.31.ebuild
deleted file mode 100644
index c5d4ab2db7d0..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.31.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable agent2) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with gnutls) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with openssl) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-6.0.13.ebuild b/net-analyzer/zabbix/zabbix-6.0.13.ebuild
deleted file mode 100644
index 21333f63c79d..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.13.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre2:=
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-	local econf_args=(
-		--with-libpcre2
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 4770f3b9a328..442960ee2a2c 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index b24638ceb6a3..7b1aeded570e 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -3,6 +3,6 @@ AUX pppoe-server.initd 456 BLAKE2B 1dd9e1dbfe7e18c4f20d9e7a6eb99f942742516273053
 AUX rp-pppoe-3.15-no_max_interfaces.patch 2821 BLAKE2B 3ad091bb9fbab181a223c92c143ff860e0541856cc2e4296700eff08db81f42562f365da9bb836d8180f8ce8c08042e5fa4fc2466a0864678e46f14df619e324 SHA512 16567d42c4691fa0bee04bcca5dc200385c8749c97e147c4134f4290064ab00fad4e1ad8847aaa0be975d7bc2dea024307adcc91f47d54ae20bb42ae0e8dc18c
 DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea
 DIST rp-pppoe-3.15.tar.gz 224966 BLAKE2B 85eda606677b71e35ed3b9389db0d01ac1f16c7b40cc31b3adf31946b18454b77867a5e8822386e9fb08455399733242c4c074c2fee6f1c4d62fe23b44e82707 SHA512 a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9
-EBUILD rp-pppoe-3.15-r2.ebuild 2230 BLAKE2B be315b4922acb03eec11ec8890fb01af537f23ed72e8cbc88a298a58bce00b2b14aaebf8a9f122a5bb9b93579b1458335259014518a8ab758c00b50a0974bf3f SHA512 0d5e7fc65c624b91601b5e7d011b49cd4245c87fcec2955f52e3969be4e0b628b786622c1618b34d63b689378e648c2066f32818c13e4e2075e202a3144a7b39
-EBUILD rp-pppoe-9999.ebuild 1905 BLAKE2B 0a518b94bcad23a390e917ddde470a3d8ebe09adb3b28bd8a5d36241389d5379829e2f19491cc82ddd3057f666fe0603828623ec55d0c6a3080a1efadee05793 SHA512 07d06673b3f1f4c22ad75e0b00312b1e07afa194a6c8cae8fb843bb6157558579ad35d5ef0dc13b520468f624ff16e9e6c15c6878e90efbe39e75ce65bbcdbfe
+EBUILD rp-pppoe-3.15-r2.ebuild 2271 BLAKE2B 8ae2cb7083e21200c1746333768fe85c07c116aafba342c549a8fd069d85476f8412258cab4f101c6512554dfdbd7a1c3e8807ab7f442ae70e795074b969dfde SHA512 77b37dadf0401ca9da4faf7409209229b37172c019eb5f9018df3ceaf9941b83cb27dab7f0847f585cd3df8bdf4649caa523bd36275f190ac9e4e74fb420a3f5
+EBUILD rp-pppoe-9999.ebuild 1946 BLAKE2B 046221ff976fc71e8c7ff90465eb51d33cafefbdfc7114ce37d114845b8bbe7391b0b19dcf00e05d37375e820c20d0202268bd09f657a74fa7387d8b2d08a8d3 SHA512 915b4aa6d223eff27088fcbfc30b3d5e53150f3926738f1618069b8338a3335b3cc164ae08645895ae4f720da1bdadf196e045062a54a9e4decf5526d7e3106b
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild
index 5d913cfb1c03..79f536d951d8 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ PATCHES=(
 )
 
 DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
-HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/"
+HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/ https://salsa.debian.org/dskoll/rp-pppoe"
 SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
 	https://dev.gentoo.org/~polynomial-c/dist/${PATCHSET}.tar.xz"
 
diff --git a/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild b/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
index f296b23837e1..b7e763a73d83 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit readme.gentoo-r1
 
 DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
-HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/"
+HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/ https://salsa.debian.org/dskoll/rp-pppoe"
 if [[ $PV = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI=https://github.com/dfskoll/rp-pppoe.git
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index fff1c69914ee..24c80a0e19b3 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 36dc825eb4c0..1fa4c9fc676f 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -2,6 +2,8 @@ AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d
 AUX firewalld.service 581 BLAKE2B b4eb7549305da68bc53f913d5d0a3ff2595e8e482ed2a474ede645f33b8192e142cd1aa964c5c1dcf8a7c336c68d494ee13421ec7566312a4f89330c236cab9c SHA512 b81fb8414619b3661985cbac001a47c76d76b13eebe421919a838fa0396e6470a3109e0d20d88f423ff43b6e48c0537467125a85bf8939ef0ab6ded4d4829b03
 DIST firewalld-1.3.0.tar.gz 2146120 BLAKE2B ea023278099e095ab46ea46f78f2e75c33ebadfc253cbc74beb56cf6176b98a3104f3d048c4b5379ce1ee0cca05010f9a90d019602233d869b563dd92de0cf7c SHA512 e20605c8f12c12a2a692eaa38d7833b0c258092a6742c1adc359928fb4fb1872667e3a3bf0bad0b139dfc132a5507a8745789745fd9408324f7d171ad2cd5d68
 DIST firewalld-1.3.1.tar.bz2 1229285 BLAKE2B cd3c42f90700ab9076b2bcf51f4a863adf6909072bd3c6a0439e1a37af4cfca7b4bcf323e0609ec22bb98f5669145636d70b394e37bf8e4641590f431d0167eb SHA512 98fb8a3fed2fa02aef2fe4940e044839693daa7a040d38e6ad5ff636e6cb60647917b80340858b28a9f3e3a4a736d7e4e6fdfe00356c072308d0c22277015574
+DIST firewalld-1.3.2.tar.bz2 1225416 BLAKE2B 108302dab4a1a156bc12df4ec82a2f6fc7ad3e17ca56f68ac9cbd4f85db4cd06abc1a39275ec6d11fc41e820d9fc01f3cd59a73f44332cd3b9662d50d2eeb22a SHA512 06658d279c5ec8eadfb14f9f7053882fc2872a4e27055e9c3aac81cf93167773d592fc29bd749cb6447116419c663fac79d6df725422394409b9a2e1c4708695
 EBUILD firewalld-1.3.0.ebuild 5283 BLAKE2B 93926f1bab6849b2326b9cfead9cb5880449a23a8b950824d09a17016e8839f7092628d07f7222f821327377300a2ec9eb71fc383f3d30261277f12aaecf73d0 SHA512 b40b862dab7a873c5fe83b869321cc282e4c2b5e6e69bfbf683421b1ab2d32c4b4105cb41f365cd8311cd8dc3c11254d2d4918fe38c47c9e8800238bf99bf727
 EBUILD firewalld-1.3.1.ebuild 5289 BLAKE2B 3df9cb79323616799761733fe0d41434b30a40e4f577b2485235296b97ffbbb00246fd17292c3b33dcb3513e736dac94622382021852230a8180af2db2b8986a SHA512 af2f3c80e0eb2b029b38131ae278d0808342d5095539a78a395b417e3496ffdc13a58f7bf7252542c181dd4c9c3539bf10a6273a3a833d2b6cb09781fc5e3e33
+EBUILD firewalld-1.3.2.ebuild 5286 BLAKE2B 79019a778ed3cc6bbcd786ccf16f546d380874018fe5d0e6e80e12f60a13f3fd72756d51e031a1861f165c152131692bdd9dfe3ceab10cb8ad3de776c608daa7 SHA512 f7aef367c920e9aaa12e04b9f9fac7c13edfd27002908b303b1fcb13f822a6c80acdcf5179775b732ec08e99de986dcc328b49083c52f771df72f1b3c0a0635c
 MISC metadata.xml 671 BLAKE2B 69c4bda7cc74a243aa1738bed90d16a3bc2c2085f6c0718becc7797a68da63035ef4d4f5e59c0583987d54032c163df6052d012fb7ca49026ca7259088793d33 SHA512 dd2d482251a4e33cb12ba324e1a21b4758f82de83c0cf83d5fa6259444c272360b47c5666e596103eba4703183fc9864a6bbb07a254aba67146b89d9870e9bbe
diff --git a/net-firewall/firewalld/firewalld-1.3.2.ebuild b/net-firewall/firewalld/firewalld-1.3.2.ebuild
new file mode 100644
index 000000000000..8b87c6bc94c2
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.3.2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit bash-completion-r1 gnome2-utils linux-info optfeature plocale python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
+HOMEPAGE="https://firewalld.org/"
+SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="gui +nftables +iptables test"
+# Tests are too unreliable in sandbox environment
+RESTRICT="!test? ( test ) test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	iptables? (
+		net-firewall/iptables[ipv6(+)]
+		net-firewall/ebtables
+		net-firewall/ipset
+		nftables? ( net-firewall/nftables[xtables(+)] )
+	)
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		gui? (
+			x11-libs/gtk+:3
+			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		)
+		nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
+	')"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2"
+BDEPEND="app-text/docbook-xml-dtd
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
+
+PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS_NS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	# bug #831259
+	if kernel_is -le 5 4 ; then
+		CONFIG_CHECK+=" ~NF_TABLES_SET"
+	fi
+
+	# bug #853055
+	if kernel_is -lt 5 18 ; then
+		CONFIG_CHECK+=" ~NFT_COUNTER"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	plocale_find_changes "po" "" ".po" || die
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local myeconfargs=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+
+	# Our version drops the/an obsolete 'conflicts' line with old iptables services
+	# bug #833506
+	systemd_dounit "${FILESDIR}"/firewalld.service
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+
+	# bug #833569
+	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 89529ed15dff..e1cc19a628ca 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index b28951633f65..d0a158e57e84 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -13,4 +13,4 @@ AUX lftp-4.9.2-configure-clang16.patch 617 BLAKE2B c8e2f3476011b6fa154de4021644b
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
 EBUILD lftp-4.9.2-r1.ebuild 2708 BLAKE2B b0613d9932f8010911d0877f8a6b74423324191b8747f5e381dccacb2b917bef31fc2606ecc5c28339c2b4768f25f6df3129b73019ac304c4994191543979f99 SHA512 279248619815058833a5d7f538267cb8a637edc91a6696c708c15141636ae6be3dfd0f5673faddfecb41c942401125f88595459a2cbd92bfe5b549d657e12205
 EBUILD lftp-9999.ebuild 2445 BLAKE2B 3a39352024188a959e6d2d6cadab400acdb7f0e2977e58d4e97be6e52cc9d9dc7733baace2fe77b754f317b59ecddd58dda6da2d03c4ab0923861f1091c6d857 SHA512 0bb8e954d106b9e14899bd1375cc0e22fa2511f83e361903a0b21969e3b3f2158368ff61efed4306fb7dd43f23cc63675e4914ff5fa2734ebcd18693d6b5b96c
-MISC metadata.xml 480 BLAKE2B 931c7e6b08cd167d3c1b9c68a342b06b4f1c1c740561644463066311ae6ec145ed262867f02452432494de522d0542d67b2a24f084a716e29c2a55986b7f0db7 SHA512 f0e2170af26c5218e609a615a6312b9d28e8a1113dcb9c3a34b833c879be6af37537a520c8d242771b70a96e054afef70244f6caf937debd3c70f896824b8944
+MISC metadata.xml 556 BLAKE2B d7469c2b0a5fd85a1a102b587d9cb992bee74a41df956bb91c6b944d6ab5f3bdbf003c8e2a4e89f8326e1c0290dde88efdc2689d212e284b7394383f2e4ded99 SHA512 84c61561f72df1c9daaa60b493877be495e35f306d65aeff607c356484492cecd40e1e4a1f6a5143e3cf5b2fed665489a50af8f5ed5afe38c614674692de0ca8
diff --git a/net-ftp/lftp/metadata.xml b/net-ftp/lftp/metadata.xml
index 31c778d46d76..5ff4b9eab5d8 100644
--- a/net-ftp/lftp/metadata.xml
+++ b/net-ftp/lftp/metadata.xml
@@ -9,4 +9,7 @@
 		<flag name="convert-mozilla-cookies">Install the convert-mozilla-cookies script and its run-time dependencies</flag>
 		<flag name="verify-file">Install the verify-file script and its run-time dependencies</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">lavv17/lftp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 711c4a9464cb..b167ec286e1c 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -9,4 +9,4 @@ AUX pure-uploadscript.initd-r1 776 BLAKE2B 1e382300a92fabb5308aa2636de2f427418d8
 DIST pure-ftpd-1.0.51.tar.bz2 520648 BLAKE2B 0b82fee114986140eb74d2669b7d91582a48f1b366936895acda913afb7d3bca1578295a930f7857f8674e593bd1bf8094c36f2ae8db6cf1a62cacfd4234cf13 SHA512 3615ac1ec42813855f3328dde200f60025e1f2ca7d1e17ea042967fd4164079260d058f3e2586acd778334660f387a280b35850a9e2091dd913fb84ef929bdca
 EBUILD pure-ftpd-1.0.51-r1.ebuild 4450 BLAKE2B a74926b5714227b97d6e7732985b5302e9f8d95f2ee5d722ad6c9b5aedd1a9d89b28405c9bd35e5dd460d328725cfd0f9187c09782fe77ad9314081dcf9429e9 SHA512 4130b154979dc8954da66d053bbd295e661684eac51b42aff1a5a36ab9c540e896f3a126eff63f95c8b3a595aa056edfbe893eb71f50caf2da9e3e5127e391da
 EBUILD pure-ftpd-9999.ebuild 4459 BLAKE2B c9b9a0eb103ba66c0c31e71ca61377829d40dfaef4f81528936b395b2a04d7ca39d4689e5d78dfe0432c376bb63269169cc8f9ddb1a9bdbaf07a1b1f6d222f8b SHA512 acb68506a8a4df2c33b75830fe0ff965892bbaf7b63dc0dc6f51ac0e10ec8f4a2865dd1c671e084de3ad7c06e6fced96b93036cc18c8ff4bb1ce03cff8e70bf0
-MISC metadata.xml 1206 BLAKE2B d63b00ba878cf0c264df68458ad167e3d2fff42220b1fb2a620da61bfeec258f19d7a516541bc745c74b1bc86951b974c9d4e65e9ee35aff1aed5942291e71a8 SHA512 34eea80ef0ff27b2bfefcec60275846fe49f0ef0bc6395d74e42ce66db8ae2592f5db79ab4563293d65ec3ab6907a6a671758ebf24868f198ed6610a583cbd9c
+MISC metadata.xml 1289 BLAKE2B bf0e11d7e99724a817cdd10c7d38898d60725e455b4cf438a5d0e63cdaddaa6f4f3b231eb51231ff55226850f084dde65d885785aae0f5b7e3ccede8df366952 SHA512 ab0cfea202b128a04fb269f9332e9a1267d7e5194b3f34e2d34aefca07323304cacf8cbd97cf4db2e990632c1be781f97334a220aa5cb9815f7ca7eef4ad0ac1
diff --git a/net-ftp/pure-ftpd/metadata.xml b/net-ftp/pure-ftpd/metadata.xml
index 34d05732be28..58d488700236 100644
--- a/net-ftp/pure-ftpd/metadata.xml
+++ b/net-ftp/pure-ftpd/metadata.xml
@@ -22,4 +22,7 @@
 		<flag name="sysquota">Enables system quota support (needs <pkg>sys-fs/quota</pkg>)</flag>
 		<flag name="vchroot">Enable support for virtual chroot (possible security risk)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jedisct1/pure-ftpd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 27e68fb4eda0..86bac7545f13 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 8f215a2732a4..d863e418aa6f 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,7 +5,9 @@ AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31e
 DIST NetworkManager-1.42.2.tar.xz 6749184 BLAKE2B cf94f79bad373d1271f406392af595941c78d567cb28a6116b351093858bbce68acf4d115950582087687ea3b3fafad7a977361f6c7f5ce8565bc2eed0e6ab60 SHA512 6142aaa7da2ae0dc3c8c75dbf51619ff969ace61c8a2d4a72aa83c4eff69e8389b262941e1667d71cbb55fb0653b14798a3c169b39dfcfa084109ef9fb3a335a
 DIST NetworkManager-1.42.4.tar.xz 6659860 BLAKE2B 5f98dba82d2bf932d61dc44b263a0c3263a299cc06bb506a98ec822126edf8dd6dde1618f75943caaf49f85864cadcf1eaf2c12864cde5f7521a7dff9053571d SHA512 af51ce481b8a6c3ee6e8856400a19f3e94c1fb0d5b2750ccf48785374b59110b49aa2a90aae675d322d902ad0e3f6eef6188bb247067448de84272dc6b114acb
 DIST NetworkManager-1.42.6.tar.xz 6749088 BLAKE2B 9d583c163908ee4fe145cdbdaa657cbc682d9f6270efc7d7525acd86912a0da50f2ccf14810fdfe2998c6ce701dcabc2b5b39fa58ff9d3fe4f5630205b15f4c8 SHA512 606a996043d8fbc7972329b94bc9854557950f665790381611eddfc632850b31584a4ba2d773fa9d12127db4c37ea2076c657521b78cedb012144df6f41d3748
-EBUILD networkmanager-1.42.2.ebuild 11730 BLAKE2B 3fab705271b084282fb7324521717531504b6b877dde88dae7e41ae2d3a49272108a1793f0d9dc9603af0f4a9999e2a1386eb634936567166fcd3c547a16e73b SHA512 dee0d56a794d5497d8a6ba6a31dab4ce0ff2afeb87d01c1b8d3499e9e3dee2673c8dbcfe865cbd79beeac26a94da958d9cca2d60dcd76f2a8ac8d6f2d83c672b
-EBUILD networkmanager-1.42.4.ebuild 11736 BLAKE2B 815367546ba3cf57caa26f58708f6530e4dd9b4c7c704b0fe7fa52a81a9cc96f4712332470b6a380c96335a7c38e0a8b20e79d1b4fa07045ef0fd04d20b6d505 SHA512 a0bf9b646bc4f9bb802924a2169b13d047849e87eb648542a9f34d01ebd4b14f982d2e56470b7eab49a5c3b349d06d1fe26c66875e4aecf3b1d26292b2d970b5
+DIST networkmanager-ppp-2.5.0.patch 45845 BLAKE2B afcf1410f89db950a7e7c2c0af3aaed174a43fae127c8a139431093a3ae9802542c40cf69faabd1d057563438b48f0a0b0d4c7fc188c13e9320d127e0034f181 SHA512 34fe7780ac1780efa156429166344548058a9079ad61238a33d89a57e52ab79765ebfaf39bd9c246d0b74549ca7156e9df1a472920485cbe23ed81de4f8cf243
+EBUILD networkmanager-1.42.2.ebuild 11733 BLAKE2B 65255082fb790a8ce291187476e256aed72ae1a3fe7637abf00915380804f927b55720bdc39b6f2e88e90ad81a87b7e7b530c7205d5eadceb1c93b3f0c013213 SHA512 e1e8b2cff582bb7838e126e7469da98f3245e001ce36da8014ed726fcec901626a98e2b2d8ef4c51e44593754b9fc59432d646cb50bd6afe7ab2f83fb8b98641
+EBUILD networkmanager-1.42.4.ebuild 11739 BLAKE2B 9b4323473c5ae5ce583f8690b9d2163f9e36a2f1f9067f1d6b2e81e19e03c33f2a0aabfd493ac501df4677476440e6d64fc4e9f3d465ef178db07d7c48773f70 SHA512 75df38efe6158626c98de4d08f984626771360573053b86c3c3ed1154f4e5e0a5486915ebb50cec25a39c23b97e7651e26e170799d8a0df98e9943a206b43d78
+EBUILD networkmanager-1.42.6-r1.ebuild 12041 BLAKE2B fef3286a96cf609c8fc2d4836a4185fade12daaa5d32dfca0cf62f4b609cbe2253f1229e8021ae5e82ce1a1a2c6c8ef9acb5234b791cd5bda801d1cce3f67810 SHA512 1eee0ab46638d19b6764100a0e94e28593793e0feff18bd6517b59515ee3dd53ccf687388fb7611a23f23c707a7f1f6f69424b34a54704c3e8eb9f65323ef32f
 EBUILD networkmanager-1.42.6.ebuild 11739 BLAKE2B 9b4323473c5ae5ce583f8690b9d2163f9e36a2f1f9067f1d6b2e81e19e03c33f2a0aabfd493ac501df4677476440e6d64fc4e9f3d465ef178db07d7c48773f70 SHA512 75df38efe6158626c98de4d08f984626771360573053b86c3c3ed1154f4e5e0a5486915ebb50cec25a39c23b97e7651e26e170799d8a0df98e9943a206b43d78
 MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2
diff --git a/net-misc/networkmanager/networkmanager-1.42.2.ebuild b/net-misc/networkmanager/networkmanager-1.42.2.ebuild
index 3a1f0cb95b0d..e19e6ce11264 100644
--- a/net-misc/networkmanager/networkmanager-1.42.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.42.2.ebuild
@@ -57,7 +57,7 @@ COMMON_DEPEND="
 	gnutls? (
 		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
 	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] )
 	modemmanager? (
 		net-misc/mobile-broadband-provider-info
 		>=net-misc/modemmanager-0.7.991:0=
diff --git a/net-misc/networkmanager/networkmanager-1.42.4.ebuild b/net-misc/networkmanager/networkmanager-1.42.4.ebuild
index ea8c15c407b0..fb476d87dcba 100644
--- a/net-misc/networkmanager/networkmanager-1.42.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.42.4.ebuild
@@ -57,7 +57,7 @@ COMMON_DEPEND="
 	gnutls? (
 		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
 	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] )
 	modemmanager? (
 		net-misc/mobile-broadband-provider-info
 		>=net-misc/modemmanager-0.7.991:0=
diff --git a/net-misc/networkmanager/networkmanager-1.42.6-r1.ebuild b/net-misc/networkmanager/networkmanager-1.42.6-r1.ebuild
new file mode 100644
index 000000000000..478acfbd2687
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.42.6-r1.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="NetworkManager"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+# bug #904840
+# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1607
+SRC_URI+=" https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/5df19f5b26c5921a401e63fb329e844a02d6b1f2.patch -> ${PN}-ppp-2.5.0.patch"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	gtk-doc? ( introspection )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( gnutls nss )
+	?? ( elogind systemd )
+	?? ( dhclient dhcpcd )
+	?? ( syslog systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	elogind? ( >=sys-auth/elogind-219 )
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	sys-apps/dbus
+	net-libs/libndp
+	systemd? ( >=sys-apps/systemd-209:0= )
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	selinux? (
+		sec-policy/selinux-networkmanager
+		sys-libs/libselinux
+	)
+	audit? ( sys-process/audit )
+	teamd? (
+		>=dev-libs/jansson-2.7:=
+		>=net-misc/libteam-1.9
+	)
+	policykit? ( >=sys-auth/polkit-0.106 )
+	nss? (
+		dev-libs/nspr[${MULTILIB_USEDEP}]
+		>=dev-libs/nss-3.11[${MULTILIB_USEDEP}]
+	)
+	gnutls? (
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
+	)
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] )
+	modemmanager? (
+		net-misc/mobile-broadband-provider-info
+		>=net-misc/modemmanager-0.7.991:0=
+	)
+	bluetooth? ( >=net-wireless/bluez-5:= )
+	ofono? ( net-misc/ofono )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	ovs? ( >=dev-libs/jansson-2.7:= )
+	resolvconf? ( virtual/resolvconf )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	psl? ( net-libs/libpsl )
+	concheck? ( net-misc/curl )
+	tools? (
+		>=dev-libs/newt-0.52.15
+		libedit? ( dev-libs/libedit )
+		!libedit? ( sys-libs/readline:= )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		>=dev-libs/jansson-2.7
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=(
+	"${DISTDIR}"/${PN}-ppp-2.5.0.patch
+)
+
+python_check_deps() {
+	if use introspection; then
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+
+	# bug 809695
+	if tc-is-clang && use lto; then
+		eerror "Clang does not support -flto-partition"
+		die "Please use gcc or turn off USE=lto flag when building with clang"
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	default
+	use vala && vala_setup
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+meson_nm_program() {
+	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
+}
+
+meson_nm_native_program() {
+	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+
+		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
+		-Dsystem_ca_path=/etc/ssl/certs
+		-Dudev_dir=$(get_udevdir)
+		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
+		-Dkernel_firmware_dir=/lib/firmware
+		-Diptables=/sbin/iptables
+		-Dnft=/sbin/nft
+		-Ddnsmasq=/usr/sbin/dnsmasq
+
+		-Ddist_version=${PVR}
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool policykit config_auth_polkit_default)
+		-Dmodify_system=true
+		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool systemd systemd_journal)
+		-Dhostname_persist=gentoo
+		-Dlibaudit=$(multilib_native_usex audit)
+
+		$(meson_native_use_bool wext)
+		$(meson_native_use_bool wifi)
+		$(meson_native_use_bool iwd)
+		$(meson_native_use_bool ppp)
+		-Dpppd=/usr/sbin/pppd
+		$(meson_native_use_bool modemmanager modem_manager)
+		$(meson_native_use_bool ofono)
+		$(meson_native_use_bool concheck)
+		$(meson_native_use_bool teamd teamdctl)
+		$(meson_native_use_bool ovs)
+		$(meson_native_use_bool tools nmcli)
+		$(meson_native_use_bool tools nmtui)
+		$(meson_native_use_bool tools nm_cloud_setup)
+		$(meson_native_use_bool bluetooth bluez5_dun)
+		-Debpf=true
+
+		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
+		-Dconfig_plugins_default=keyfile
+		-Difcfg_rh=false
+		-Difupdown=false
+
+		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
+		-Dnetconfig=no
+		-Dconfig_dns_rc_manager_default=auto
+
+		$(meson_nm_program dhclient "" /sbin/dhclient)
+		-Ddhcpcanon=no
+		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
+
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc docs)
+		-Dtests=$(multilib_native_usex test)
+		$(meson_native_true firewalld_zone)
+		-Dmore_asserts=0
+		$(meson_use debug more_logging)
+		-Dvalgrind=no
+		-Dvalgrind_suppressions=
+		-Dld_gc=false
+		$(meson_native_use_bool psl libpsl)
+		-Dqt=false
+
+		$(meson_use lto b_lto)
+	)
+
+	if multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=systemd )
+		emesonargs+=( -Dsuspend_resume=systemd )
+	elif multilib_is_native_abi && use elogind; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=elogind )
+		emesonargs+=( -Dsuspend_resume=elogind )
+	else
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=no )
+		emesonargs+=( -Dsuspend_resume=auto )
+	fi
+
+	if multilib_is_native_abi && use syslog; then
+		emesonargs+=( -Dconfig_logging_backend_default=syslog )
+	elif multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dconfig_logging_backend_default=journal )
+	else
+		emesonargs+=( -Dconfig_logging_backend_default=default )
+	fi
+
+	if multilib_is_native_abi && use dhclient; then
+		emesonargs+=( -Dconfig_dhcp_default=dhclient )
+	elif multilib_is_native_abi && use dhcpcd; then
+		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
+	else
+		emesonargs+=( -Dconfig_dhcp_default=internal )
+	fi
+
+	if use nss; then
+		emesonargs+=( -Dcrypto=nss )
+	else
+		emesonargs+=( -Dcrypto=gnutls )
+	fi
+
+	if use tools ; then
+		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
+	else
+		emesonargs+=( -Dreadline=none )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
+	if ! multilib_is_native_abi; then
+		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
+
+	insinto /usr/lib/NetworkManager/conf.d #702476
+	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
+	rmdir "${ED}"/usr/share/doc/NetworkManager || die
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	udev_reload
+
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index 95675f4d2769..aa9d0ec40950 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -3,7 +3,9 @@ AUX sstp-client-1.0.12-remove-network-test.patch 313 BLAKE2B 80857c01cfdb8a4b919
 AUX sstp-client-1.0.17-fix-bashism-configure.ac.patch 1054 BLAKE2B 6c73460707247ec49d639d993b45f9dc6fc96df9cf2c8946bd222a305f4e818016ccfaf3d13985eccd0020bebcf8a22f2fff22964d97aadd8018c5b9b5d234fa SHA512 8aa8417ef1ae6df46fcf7328a979d75983ecf6c279dd972651bd0faec372a3ee952e4c6b3dd3318ea463a2a080a17f60303d637cf2e5c7d8b31069051eef35c7
 AUX sstp-client-1.0.18-includes.patch 1286 BLAKE2B 51d8ba85abbef0ac8d3b9eb8e2b76db8111f3f57eaee1fbcec1c736e3f00717929c57c74ae99f911607b5cf929d129c38e283a4ea57df748a941ab36a65e7393 SHA512 782eff5caed5cdbd88c74d0ce53dae76f57726c0f9da5c09e446e3ac5669c60688b98d79d1884a57205af819528f0d5c6c7b13b73f8b9fec5c34d2574c7e1cea
 DIST sstp-client-1.0.17.tar.gz 482831 BLAKE2B d19c752b3f061401f89eb46bd52091e3ab0a3c931c6646a55c1ee0e6dd7e9c501fba14b7c870a2514cb72fb0fd1d8bc89538562d4d99b9d58a081e0917734f5d SHA512 eff18eb894b2c96d46315b5ac7530fe50e8dd6e6c29ea946cd0e7c05c56416e85088fc65650fb77c05e3a747cb0b4e3575af5457515d240161027910abae9775
+DIST sstp-client-1.0.18-ppp-2.5.0-patches.tar.xz 7244 BLAKE2B 4249787feb98d71f81d50ac4f02cf38f8cd21501bfffc0ec65ba262db5c5ccf3bc3ba728f676e7156e6105181c2706c5bfc242b66c6db63cc39e82a6e4add56a SHA512 ed99b6de0ea57ff80ca175b329b00334cad7ca535fd6465f318bf5db0994a1a9aec6f7026bebcf9087a1d21ecac8a8a3a027e346ca541582470b0570273d4cd7
 DIST sstp-client-1.0.18.tar.gz 477886 BLAKE2B 3a2929a5245a703c36b9bf6c17b7f65d911446a8a44b95894fd990ccf5ad01a98e4b5e843681e4643ff4b28a57de359a98ef42f9bb378d52c6829297970399b6 SHA512 e0dd0fe57b65c2001737222159e58b11177a8f1cb64564e520fad2199c0581d0550a00f49c921be74039dec59062233b4716f8b624a0e4cb48bdf8df9272f93c
 EBUILD sstp-client-1.0.17.ebuild 1398 BLAKE2B a848990445c2fd440856b77c92af0319c180de495635b0a372bf3298ef49b15b68c59070bbf9db1df2c1c1c18ba4f91ccd7b0e54eb99e2362df815918dc75b42 SHA512 1590b4788a05099d7d0193d8b86550acc41658ba6a7e95ad70a0b44206af25c82c087521dcbd9fe2f134665ca10e93467bb85d4ec0329a7a758a05fc18b5fa06
+EBUILD sstp-client-1.0.18-r2.ebuild 1519 BLAKE2B 5b1332ca8c8ad23e78663bcf2f79d0e90219fd7085bb65caf306655673bd16f71d213c6f89078553a7ea716bb3cde05cd585832903fc5fefe8aa7bac3d3a7653 SHA512 a4af80eb124e11e9362a994420c90d99d76ae52162b56be147e67603e39dd136d3f61ad1311401ae7f223fb7376c52c47161f55caeff46ba8b73b2d08c322f4c
 EBUILD sstp-client-1.0.18.ebuild 1384 BLAKE2B 83256b78ddd94528f435e3066ab2c800fbcb9d2ef61dd6df36d4fbe6146d79b7d9f39e26425fa4520d11f09aa68f8a69267321426528a8b8890a807c51066c25 SHA512 714b53ddfe3a55092c96fc7ba855b7088bf8bd021b65aa306721dcc021309f4d9cbbbae00479746659ad7ad8dc0819f1fd1d914fd290b24c43c14e54bdcdcc1f
-MISC metadata.xml 308 BLAKE2B 3a472844a5dc30193440521d7cba758d6c78b10528e9aee2d76491a526c94bc410376b9db50062de890819b553e5db25c6b596fa6e28432d1095153f3c498573 SHA512 75461a9b457611c5b72de5d80f75969cb63987c6b8e771d3c10b321c00c51fd1bbd06ad6e30c1d9e8a8867320191fd7213ee80cd5adbee35f44226e227a4109c
+MISC metadata.xml 313 BLAKE2B dd8f979f53d0aa9751a0a6b84f08925cb5ef75b0bdd6d886f92aca04bab3508ec3ba81dc5519e6dbcc5da6b8d76b58efeed4fc78d36dee1e31df19ece22735da SHA512 aaeb75acf8c8ac6e79e288da3ec75fda923b12cf0e1774d75aac63c4b24a1b581c7922fcfa9e5bb215518205084404be4aec9a2a4d9787ace432eca9c923374c
diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml
index c93fe2ce4d92..cc62457fcaa6 100644
--- a/net-misc/sstp-client/metadata.xml
+++ b/net-misc/sstp-client/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="gitlab">eivnaes/sstp-client</remote-id>
+		<remote-id type="gitlab">sstp-project/sstp-client</remote-id>
 		<remote-id type="sourceforge">sstp-client</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild b/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild
new file mode 100644
index 000000000000..d3fbceca2f8f
--- /dev/null
+++ b/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="Client implementation of Secure Socket Tunneling Protocol (SSTP)"
+HOMEPAGE="https://sstp-client.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ppp-2.5.0-patches.tar.xz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static"
+
+DEPEND="dev-libs/libevent:=
+	dev-libs/openssl:=
+	net-dialup/ppp:="
+RDEPEND="${DEPEND}
+	acct-group/sstpc
+	acct-user/sstpc"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~NETFILTER_NETLINK"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.12-remove-network-test.patch"
+	"${FILESDIR}/${PN}-1.0.12-fix-example.patch"
+
+	"${FILESDIR}/${PN}-1.0.18-includes.patch"
+	"${WORKDIR}/${P}-ppp-2.5.0-patches"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local PPPD_VER="$(best_version net-dialup/ppp)"
+	# Reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER#*/*-}
+	# Main version without beta/pre/patch/revision
+	PPPD_VER=${PPPD_VER%%[_-]*}
+
+	local myeconfargs=(
+		--enable-ppp-plugin
+		--enable-group=sstpc
+		--enable-user=sstpc
+		--with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}"
+		--with-runtime-dir="/run/sstpc"
+		$(use_enable static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 743864850f49..73257684417d 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-fortisslvpn/Manifest b/net-vpn/networkmanager-fortisslvpn/Manifest
index eef71a306ecd..a05277003e9a 100644
--- a/net-vpn/networkmanager-fortisslvpn/Manifest
+++ b/net-vpn/networkmanager-fortisslvpn/Manifest
@@ -1,5 +1,9 @@
+AUX networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch 8202 BLAKE2B 7d1468e7aa6afaba82e0c7b961fe8e60e9bbf831749f6b14125fc5efd7c88c6cd468080a1dd0fbd304717cfa6e17fac9ebb4a50ca98b6d5f65c87161d356214d SHA512 78a49ea9330fefdd85558820e8424ddb24cbf6d2f8052d46db31b06af140a7886ec998cdf4a76c1c7e0dfd9b79b2c5934a0696536b2ec91b3893cb425fb8f45a
+AUX networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch 865 BLAKE2B 1fc9035e3fba62b1db8af99bcef8dbe5ad722e2c816290e168dce37e7f826b7fb44a2ea70df04a492583640654f8de5af7fce33fe4b6174e427832ac215e25f7 SHA512 b497e0c83fba95a153c80a9655422d76cd5985e413b509166047edf482f5129385f30dbb167c07fc1658c11bee601f46fe44b7d9083b531f9e7ac124cd80af10
+AUX networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch 5362 BLAKE2B 486c6ab5ba11135a410e05abd55b8b6699fcbce24c7eafea596e9f01a8a353e7fb833062c8971be230fb01eb8c67ed9b9d4ba5195371f16356ed4a3fd8e5a1a0 SHA512 fbbabce7973e8129f51a2ee0ed152f458c0fd73eea361ef205e9cc6fd3164527f43f7ed2fcbc9d0a32d1c3fba5c06cc2a415276d34e68a220189854393ea93eb
 DIST NetworkManager-fortisslvpn-1.3.90.tar.xz 375416 BLAKE2B d2e07a2f79685cb600b6c0abca52a54911ff41534c152e9c5befe25d436757ba517d84cc474ff5c200ae62ca019296871fc29dc8342788295b3e59be55fa8198 SHA512 98b3e524cbb33c8dcdb325b10d227f88534948d98ca8009f770e48b87d42637762ba5343f081ac583b77c3387cb47f2660be0f60430ede237f812a2af8d9a7aa
 DIST NetworkManager-fortisslvpn-1.4.0.tar.xz 381964 BLAKE2B 11cbcd0077a6636feaf04fc191bb78b269f1fcb13ae5ebc3f2d1fe239570e9955406b5f2ff76f6ea0f297e3425e6dac816a0a79f2c2a0723bae51e9fe42fa34d SHA512 94e96f204262825f3d525c96b5f135b31d9a3bb382bd2baf3fafdceb08768321331d4bd4f6af8879a8818e3bad854cdf057c9915e0ac9aee09d17e83b9d12d54
 EBUILD networkmanager-fortisslvpn-1.3.90.ebuild 1071 BLAKE2B b4ba9a550c464b4b9f2e9e6468415b26645a002c2106346a48f2f6122a32bf44707956abfe0c8415ee3573325dfbb2b4a746a3d6c93b321da16ac9ac4a800e20 SHA512 ae8f948778c018a5ecda4e973935c3cba416a3596df01d9ebe59261e095115ccb78a7497c89b541a12ed9cc454a315e837da3cdd350a7d6af08f69e72942b916
+EBUILD networkmanager-fortisslvpn-1.4.0-r2.ebuild 1189 BLAKE2B 28b48ae8f25e86199c41bcd012de3d1d6ed77259be496cd1223fac05f05da57a4e8e1331a57d41dbd61d17d3a5c8891e87a92535f08607872021d8e093b54545 SHA512 d641c49a693c46f5b065590c0fd1c89e7d04cb2c72a7bf032e11a44a80a0ad02452c7324bb782653243ae9ffad6fc4bd709ccfad018243aa313bdd610b1c8bd6
 EBUILD networkmanager-fortisslvpn-1.4.0.ebuild 1122 BLAKE2B 1af8b38f7e4c6244ad8419529558147a769f32dd4223f832a2f4b9cddec738e0078982d2c54ae80477d86fa18f719d7d6495bbe74c45f9a72e3cc4d9e1f07436 SHA512 23c6b224cf9b67a4189314e4a3bb31545c5f0df83af9e3ac9f2ef44c671a5005a0b7121abfc38bf23ccfdfffc23e7c0a24454dff64cf64a21ce3e2e2d660d0b8
-MISC metadata.xml 411 BLAKE2B 2a68544a08639f4ee73732a7c1663614694c6aeabd6fb93e9a25f94b4667cfa3470bea7e40f3da181d985775362e7122dcc64f96b3ee96879b2137c3722f105c SHA512 e490c46a95e3ad932a325519831cdc74a356137a014d02f8e602821955ec81a0e523022a80d9e1f1412dcaa9b1ef17a8e2a0ec608e67c0ee58aa02f9165fa40c
+MISC metadata.xml 518 BLAKE2B ddeb630701cdb97695694b7f696481050bf67f59e9440c80b447e6ffe3a439011abdebeeff1ac47aa8c29ec95526772ac99b6be484e59ab2950414a7007171c1 SHA512 24738222e6aa68582b218274615ad1a4bcc235a98eba3ee95fa1beae259fe63ac34e4d4a1a08861e2835d34da9249bc2612f8c658ea12f152517e00e76d2663f
diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch
new file mode 100644
index 000000000000..71da31e3e435
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch
@@ -0,0 +1,284 @@
+https://bugs.gentoo.org/904842
+https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/commit/084ef529c5fb816927ca54866f66b340265aa9f6
+
+From 084ef529c5fb816927ca54866f66b340265aa9f6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
+Date: Sat, 4 Mar 2023 21:20:43 +0000
+Subject: [PATCH] Adding support for compiling against pppd-2.5.0 (or master
+ branch)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -81,7 +81,7 @@ libexec_PROGRAMS += src/nm-fortisslvpn-service
+ src_nm_fortisslvpn_service_SOURCES = \
+ 	shared/nm-utils/nm-shared-utils.c \
+ 	shared/nm-utils/nm-shared-utils.h \
+-	src/nm-ppp-status.h \
++	src/nm-fortisslvpn-pppd-status.h \
+ 	src/nm-fortisslvpn-service.h \
+ 	src/nm-fortisslvpn-service.c \
+ 	shared/nm-fortissl-properties.c \
+@@ -106,7 +106,8 @@ src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \
+ 	shared/nm-utils/nm-shared-utils.c \
+ 	shared/nm-utils/nm-shared-utils.h \
+ 	src/nm-fortisslvpn-pppd-plugin.c \
+-	src/nm-ppp-status.h
++	src/nm-fortisslvpn-pppd-compat.h \
++	src/nm-fortisslvpn-pppd-status.h
+ nodist_src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \
+ 	src/nm-fortisslvpn-pppd-service-dbus.h
+ src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags)
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,10 @@ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
++AC_PROG_CPP
++AC_PROG_EGREP
+ AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
++PKG_PROG_PKG_CONFIG()
+ 
+ AC_GNU_SOURCE
+ 
+@@ -37,20 +40,50 @@ dnl
+ dnl Required headers
+ dnl
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(fcntl.h paths.h sys/ioctl.h sys/time.h syslog.h unistd.h)
++AC_CHECK_HEADERS(fcntl.h paths.h stdarg.h stdbool.h sys/ioctl.h sys/time.h syslog.h unistd.h)
+ 
+ AC_CHECK_HEADERS(pppd/pppd.h,,
+   AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.))
+ 
++dnl
++dnl Check the presense of other pppd/*.h files
++AC_CHECK_HEADERS([
++    pppd/chap.h
++    pppd/chap-new.h
++    pppd/chap_ms.h
++    ])
++
++dnl
++dnl Versions >= 2.5.0 will have pkg-config support
++PKG_CHECK_EXISTS([pppd],
++    [AS_VAR_SET([pppd_pkgconfig_support],[yes])])
++
++dnl
++dnl Get the version of pppd using pkg-config, assume 2.4.9 if not present
++PPPD_VERSION=2.4.5
++if test x"$pppd_pkgconfig_support" = xyes; then
++    PPPD_VERSION=`$PKG_CONFIG --modversion pppd`
++fi
++
++
+ AC_ARG_WITH([pppd-plugin-dir], AS_HELP_STRING([--with-pppd-plugin-dir=DIR], [path to the pppd plugins directory]))
+ 
+ if test -n "$with_pppd_plugin_dir" ; then
+ 	PPPD_PLUGIN_DIR="$with_pppd_plugin_dir"
+ else
+-	PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.5"
++	PPPD_PLUGIN_DIR="${libdir}/pppd/$PPPD_VERSION"
+ fi
+ AC_SUBST(PPPD_PLUGIN_DIR)
+ 
++dnl The version of pppd dictates what code can be included, i.e. enable use of
++dnl   #if WITH_PPP_VERSION >= PPP_VERSION(2,5,0) in the code
++AC_DEFINE_UNQUOTED([PPP_VERSION(x,y,z)],
++    [((x & 0xFF) << 16 | (y & 0xFF) << 8 | (z & 0xFF) << 0)],
++    [Macro to help determine the particular version of pppd])
++PPP_VERSION=$(echo $PPPD_VERSION | sed -e "s/\./\,/g")
++AC_DEFINE_UNQUOTED(WITH_PPP_VERSION, PPP_VERSION($PPP_VERSION),
++    [The real version of pppd represented as an int])
++
+ dnl
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ dnl
+--- /dev/null
++++ b/src/nm-fortisslvpn-pppd-compat.h
+@@ -0,0 +1,93 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
++/* nm-sstp-service - sstp (and other pppd) integration with NetworkManager
++ *
++ * Copyright (C) Eivind Næss, eivnaes@yahoo.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ */
++
++#ifndef __NM_FORTISSLVPN_PPPD_COMPAT_H__
++#define __NM_FORTISSLVPN_PPPD_COMPAT_H__
++
++#define INET6      1
++
++// PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define.
++//   this silly macro magic is to work around that.
++
++#undef VERSION
++#include <pppd/pppd.h>
++
++#ifndef PPPD_VERSION
++#define PPPD_VERSION VERSION
++#endif
++
++#include <pppd/fsm.h>
++#include <pppd/ccp.h>
++#include <pppd/eui64.h>
++#include <pppd/ipcp.h>
++#include <pppd/ipv6cp.h>
++#include <pppd/eap.h>
++#include <pppd/upap.h>
++
++#ifdef HAVE_PPPD_CHAP_H
++ #include <pppd/chap.h>
++#endif
++
++#ifdef HAVE_PPPD_CHAP_NEW_H
++ #include <pppd/chap-new.h>
++#endif
++
++#ifdef HAVE_PPPD_CHAP_MS_H
++ #include <pppd/chap_ms.h>
++#endif
++
++#ifndef PPP_PROTO_CHAP
++#define PPP_PROTO_CHAP              0xc223
++#endif 
++
++#ifndef PPP_PROTO_EAP
++#define PPP_PROTO_EAP               0xc227
++#endif
++
++#if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
++
++static inline bool debug_on(void)
++{
++    return debug;
++}
++
++static inline const char *ppp_ipparam(void)
++{
++    return ipparam;
++}
++
++static inline int ppp_ifunit(void)
++{
++    return ifunit;
++}
++
++static inline const char *ppp_ifname(void)
++{
++    return ifname;
++}
++
++static inline int ppp_get_mtu(int idx)
++{
++    return netif_get_mtu(idx);
++}
++
++#endif // #if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
++#endif // #ifdef __NM_FORTISSLVPN_PPPD_COMPAT_H__
+--- a/src/nm-fortisslvpn-pppd-plugin.c
++++ b/src/nm-fortisslvpn-pppd-plugin.c
+@@ -23,12 +23,6 @@
+ #define ___CONFIG_H__
+ #include <config.h>
+ 
+-#include <pppd/pppd.h>
+-#include <pppd/fsm.h>
+-#include <pppd/ipcp.h>
+-
+-#include "nm-default.h"
+-
+ #include <sys/types.h>
+ #include <string.h>
+ #include <sys/socket.h>
+@@ -42,10 +36,12 @@
+ #include <grp.h>
+ #include <glib/gstdio.h>
+ 
++#include "nm-fortisslvpn-pppd-status.h"
++#include "nm-fortisslvpn-pppd-compat.h"
+ #include "nm-fortisslvpn-pppd-service-dbus.h"
+-#include "nm-fortisslvpn-service.h"
+-#include "nm-ppp-status.h"
+ 
++#include "nm-default.h"
++#include "nm-fortisslvpn-service.h"
+ #include "nm-utils/nm-shared-utils.h"
+ #include "nm-utils/nm-vpn-plugin-macros.h"
+ 
+@@ -80,7 +76,7 @@ static struct {
+ 
+ int plugin_init (void);
+ 
+-char pppd_version[] = VERSION;
++char pppd_version[] = PPPD_VERSION;
+ 
+ static void
+ chroot_sandbox (void)
+@@ -296,7 +292,7 @@ get_ip4_routes (in_addr_t ouraddr)
+ static void
+ nm_ip_up (void *data, int arg)
+ {
+-	guint32 pppd_made_up_address = htonl (0x0a404040 + ifunit);
++	guint32 pppd_made_up_address = htonl (0x0a404040 + ppp_ifunit());
+ 	ipcp_options opts = ipcp_gotoptions[0];
+ 	ipcp_options peer_opts = ipcp_hisoptions[0];
+ 	GVariantBuilder builder;
+@@ -317,7 +313,7 @@ nm_ip_up (void *data, int arg)
+ 
+ 	g_variant_builder_add (&builder, "{sv}",
+ 	                       NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV,
+-	                       g_variant_new_string (ifname));
++	                       g_variant_new_string (ppp_ifname()));
+ 
+ 	str = g_getenv ("VPN_GATEWAY");
+ 	if (str) {
+@@ -442,8 +438,14 @@ plugin_init (void)
+ 		return -1;
+ 	}
+ 
++#if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
+ 	add_notifier (&phasechange, nm_phasechange, NULL);
+ 	add_notifier (&ip_up_notifier, nm_ip_up, NULL);
+ 	add_notifier (&exitnotify, nm_exit_notify, NULL);
++#else
++	ppp_add_notify (NF_PHASE_CHANGE, nm_phasechange, NULL);
++	ppp_add_notify (NF_IP_UP, nm_ip_up, NULL);
++	ppp_add_notify (NF_EXIT, nm_exit_notify, NULL);
++#endif	
+ 	return 0;
+ }
+similarity index 100%
+rename from src/nm-ppp-status.h
+rename to src/nm-fortisslvpn-pppd-status.h
+--- a/src/nm-fortisslvpn-service.c
++++ b/src/nm-fortisslvpn-service.c
+@@ -40,7 +40,7 @@
+ #include <glib/gstdio.h>
+ 
+ #include "nm-fortissl-properties.h"
+-#include "nm-ppp-status.h"
++#include "nm-fortisslvpn-pppd-status.h"
+ #include "nm-fortisslvpn-pppd-service-dbus.h"
+ #include "nm-utils/nm-shared-utils.h"
+ #include "nm-utils/nm-vpn-plugin-macros.h"
+-- 
+GitLab
diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch
new file mode 100644
index 000000000000..a0b14d390e9f
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/904842
+https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/commit/8773f772d39f8eee6edc1fd2e5437c754ed41e1e
+
+From 8773f772d39f8eee6edc1fd2e5437c754ed41e1e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
+Date: Sat, 4 Mar 2023 21:29:54 +0000
+Subject: [PATCH] Fixing configure.ac from previous change
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,11 +47,7 @@ AC_CHECK_HEADERS(pppd/pppd.h,,
+ 
+ dnl
+ dnl Check the presense of other pppd/*.h files
+-AC_CHECK_HEADERS([
+-    pppd/chap.h
+-    pppd/chap-new.h
+-    pppd/chap_ms.h
+-    ])
++AC_CHECK_HEADERS(pppd/chap.h pppd/chap-new.h pppd/chap_ms.h)
+ 
+ dnl
+ dnl Versions >= 2.5.0 will have pkg-config support
+-- 
+GitLab
diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch
new file mode 100644
index 000000000000..30092c021bd3
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch
@@ -0,0 +1,191 @@
+https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/merge_requests/27
+https://bugs.gentoo.org/904842
+
+From d59819b5d26db44f51bfbb76be3b373c419e408d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
+Date: Wed, 8 Mar 2023 04:30:13 +0000
+Subject: [PATCH] Improve compatibility with pppd-2.5.0 release
+
+This allows compiling against the older pppd 2.4 series while still
+using the new API in the plugin code. It does so by adding a static
+inline function ppp_add_notify().
+
+Additional formatting changes to the nm-fortisslvpn-pppd-compat.h based
+on review from Lubomir.
+--- a/src/nm-fortisslvpn-pppd-compat.h
++++ b/src/nm-fortisslvpn-pppd-compat.h
+@@ -1,32 +1,15 @@
+-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+-/* nm-sstp-service - sstp (and other pppd) integration with NetworkManager
+- *
+- * Copyright (C) Eivind Næss, eivnaes@yahoo.com
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License along
+- * with this program; if not, write to the Free Software Foundation, Inc.,
+- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- */
++/* Copyright (C) 2023 Eivind Naess, eivnaes@yahoo.com */
++/* SPDX-License-Identifier: GPL-2.0-or-later */
+ 
+ #ifndef __NM_FORTISSLVPN_PPPD_COMPAT_H__
+ #define __NM_FORTISSLVPN_PPPD_COMPAT_H__
+ 
+-#define INET6      1
+-
+-// PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define.
+-//   this silly macro magic is to work around that.
++/* Define INET6 to compile with IPv6 support against older pppd headers,
++ *   pppd >= 2.5.0 use WITH_PPP_IPV6 and is defined in pppdconf.h */
++#define INET6 1
+ 
++/* PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define.
++ *   this silly macro magic is to work around that. */
+ #undef VERSION
+ #include <pppd/pppd.h>
+ 
+@@ -43,51 +26,98 @@
+ #include <pppd/upap.h>
+ 
+ #ifdef HAVE_PPPD_CHAP_H
+- #include <pppd/chap.h>
++#include <pppd/chap.h>
+ #endif
+ 
+ #ifdef HAVE_PPPD_CHAP_NEW_H
+- #include <pppd/chap-new.h>
++#include <pppd/chap-new.h>
+ #endif
+ 
+ #ifdef HAVE_PPPD_CHAP_MS_H
+- #include <pppd/chap_ms.h>
++#include <pppd/chap_ms.h>
+ #endif
+ 
+ #ifndef PPP_PROTO_CHAP
+-#define PPP_PROTO_CHAP              0xc223
++#define PPP_PROTO_CHAP 0xc223
+ #endif 
+ 
+ #ifndef PPP_PROTO_EAP
+-#define PPP_PROTO_EAP               0xc227
++#define PPP_PROTO_EAP  0xc227
+ #endif
+ 
++
+ #if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
+ 
+-static inline bool debug_on(void)
++static inline bool
++debug_on (void)
++{
++	return debug;
++}
++
++static inline const char
++*ppp_ipparam (void)
+ {
+-    return debug;
++	return ipparam;
+ }
+ 
+-static inline const char *ppp_ipparam(void)
++static inline int
++ppp_ifunit (void)
+ {
+-    return ipparam;
++	return ifunit;
+ }
+ 
+-static inline int ppp_ifunit(void)
++static inline const char *
++ppp_ifname (void)
+ {
+-    return ifunit;
++	return ifname;
+ }
+ 
+-static inline const char *ppp_ifname(void)
++static inline int
++ppp_get_mtu (int idx)
+ {
+-    return ifname;
++	return netif_get_mtu(idx);
+ }
+ 
+-static inline int ppp_get_mtu(int idx)
++typedef enum ppp_notify
++{
++    NF_PID_CHANGE,
++    NF_PHASE_CHANGE,
++    NF_EXIT,
++    NF_SIGNALED,
++    NF_IP_UP,
++    NF_IP_DOWN,
++    NF_IPV6_UP,
++    NF_IPV6_DOWN,
++    NF_AUTH_UP,
++    NF_LINK_DOWN,
++    NF_FORK,
++    NF_MAX_NOTIFY
++} ppp_notify_t;
++
++typedef void (ppp_notify_fn) (void *ctx, int arg);
++
++static inline void
++ppp_add_notify (ppp_notify_t type, ppp_notify_fn *func, void *ctx)
+ {
+-    return netif_get_mtu(idx);
++	struct notifier **list[NF_MAX_NOTIFY] = {
++		[NF_PID_CHANGE  ] = &pidchange,
++		[NF_PHASE_CHANGE] = &phasechange,
++		[NF_EXIT        ] = &exitnotify,
++		[NF_SIGNALED    ] = &sigreceived,
++		[NF_IP_UP       ] = &ip_up_notifier,
++		[NF_IP_DOWN     ] = &ip_down_notifier,
++		[NF_IPV6_UP     ] = &ipv6_up_notifier,
++		[NF_IPV6_DOWN   ] = &ipv6_down_notifier,
++		[NF_AUTH_UP     ] = &auth_up_notifier,
++		[NF_LINK_DOWN   ] = &link_down_notifier,
++		[NF_FORK        ] = &fork_notifier,
++	};
++
++	struct notifier **notify = list[type];
++	if (notify) {
++		add_notifier(notify, func, ctx);
++	}
+ }
+ 
+-#endif // #if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
+-#endif // #ifdef __NM_FORTISSLVPN_PPPD_COMPAT_H__
++#endif /* #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) */
++#endif /* #ifdef __NM_FORTISSLVPN_PPPD_COMPAT_H__ */
+--- a/src/nm-fortisslvpn-pppd-plugin.c
++++ b/src/nm-fortisslvpn-pppd-plugin.c
+@@ -438,14 +438,8 @@ plugin_init (void)
+ 		return -1;
+ 	}
+ 
+-#if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
+-	add_notifier (&phasechange, nm_phasechange, NULL);
+-	add_notifier (&ip_up_notifier, nm_ip_up, NULL);
+-	add_notifier (&exitnotify, nm_exit_notify, NULL);
+-#else
+ 	ppp_add_notify (NF_PHASE_CHANGE, nm_phasechange, NULL);
+ 	ppp_add_notify (NF_IP_UP, nm_ip_up, NULL);
+ 	ppp_add_notify (NF_EXIT, nm_exit_notify, NULL);
+-#endif	
+ 	return 0;
+ }
+-- 
+GitLab
diff --git a/net-vpn/networkmanager-fortisslvpn/metadata.xml b/net-vpn/networkmanager-fortisslvpn/metadata.xml
index 69d7525227bc..950b680bd95b 100644
--- a/net-vpn/networkmanager-fortisslvpn/metadata.xml
+++ b/net-vpn/networkmanager-fortisslvpn/metadata.xml
@@ -9,4 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/NetworkManager-fortisslvpn</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.4.0-r2.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..b04017413c2d
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.4.0-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.2:=
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		gui-libs/gtk:4
+		media-libs/harfbuzz
+		>=net-libs/libnma-1.2.0
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/pango
+	)
+"
+RDEPEND="${RDEPEND}
+	net-dialup/ppp:=
+	>=net-vpn/openfortivpn-1.2.0"
+BDEPEND="dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-ppp-2.5.0-{1,2,3}.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix deprecated location, #709450
+	sed -i 's|/appdata|/metainfo|g' Makefile.{in,am} || die
+}
+
+src_configure() {
+	CONFIG_SHELL="${BROOT}"/bin/bash gnome2_src_configure \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--localstatedir=/var \
+		$(use_with gtk gnome) \
+		$(use_with gtk gtk4) \
+		--without-libnm-glib
+}
diff --git a/net-vpn/networkmanager-l2tp/Manifest b/net-vpn/networkmanager-l2tp/Manifest
index 8d88bdb1cc8f..018cc439857e 100644
--- a/net-vpn/networkmanager-l2tp/Manifest
+++ b/net-vpn/networkmanager-l2tp/Manifest
@@ -1,3 +1,7 @@
+AUX networkmanager-l2tp-1.20.8-bashism-configure.patch 1232 BLAKE2B 49b51a8dccedd5c8e3bfb226f8f0c48cff3e5b4ed0a0e2725eb61ad9ae452e1545546c58d7ab601fdbb4359aaa2470aba45ce78c8584d47c62d99c5e2a5a5b92 SHA512 f92643f64a7299bda2c7923d1e25c449f5075976b333facd024fed44782ba87ab71351dc7cadf84e8dd31d5d68a5d01585f870e42ab213f5c281e7820c394730
+AUX networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch 4872 BLAKE2B 36fe5df3abd8413363fa859193d5d590f3d225ae809cfafe4a5bfa444c3cc9d0fce5750eae5469b086c831cffb08244778ca6b3bba8c4e5a7dfb8b419ec9ddf5 SHA512 871234b17ae3a44f7b10f833988118740c9fb23de5b2cfbe90ff3a7fda1ad8d71f5268ac8c873e7c48cff097f9afade91dc0a1cd6abe2b93eec2d5a531d84f5d
+AUX networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch 4591 BLAKE2B a568afc4e1c970ccbf253c3e1b140a2cf388c7ad49b057a5fcaa4cf43f160083aeb3faf54550cbcb0494d199702bd045b9445c579a68bd9de19b129e57225f35 SHA512 d67f608c2e40bcc39066ea28a685e04e1d53a97c8e1a47ae77c947a3df5712214f34b2994c4becef136923dab02c764345e3f9246a99f889f26ef590c74044b4
 DIST NetworkManager-l2tp-1.20.8.tar.xz 487316 BLAKE2B 97a0b13a56babee47c2fd57b4bb655b79b96206eb3a51dacef642812fdf9059483fb7176f2be6ba86fc286cb6d1efdbada2c3dc8564e89598670781786e76011 SHA512 6ed2ab401821878bf775a27d43e540acce0ea6504a1a4bac436164776ef9e0eacef7963f0362691ef4ad7304e30e2c3199ba4fb41e24918b83aab88b34f7bb6a
-EBUILD networkmanager-l2tp-1.20.8.ebuild 1454 BLAKE2B b77f093d35350492102d28af1c19bf62eabb4784b1eb5d0847c26d00fbb7de48cbe79873b81e93c37f0b0f1c493ff48bf85977c4a6e70b1330da7a6f940a2fc1 SHA512 055fc646525863ed33ce9d0c7a500430cf8a581966ff3b091d406172d35a7df98b0ad8104d0e2fe51a38a4495893164df1e16729c8481716bdaf68ed4abb7a7f
+EBUILD networkmanager-l2tp-1.20.8-r3.ebuild 1654 BLAKE2B a55b8c73ce7ce6d288115b3f5f204e6a9445ccc6e739634ffb55b0b60461ec2aefaf6d3a6b0af8fde961204ede1faa95b91a36ef80d633845c8dafd9ed0bf0b0 SHA512 e3344e1c3ee9d9849ca6c2ced1542897d337c8b90794628959deae650c754ede9cf58cf8d2d6cad7c081e6472b0a332836cdcf897d3ee2cc51cbff3d700fc551
+EBUILD networkmanager-l2tp-1.20.8.ebuild 1457 BLAKE2B 7e650be93b810d277587a85120fc4666417316187c85985a71554117ca8d61e908c7f6d016eb7d347287f35db4324f62b631a47c6cc5ef7b27ac5e0bfdb8e13c SHA512 684a0bd9aa7ecb66f848dc8ebf86e0bd7fab5bbbe7e84ef12929b415d9ea06b1b05ca748b3313302dae3d4bc352001626d32a53c856bcce6ee511a9e8e2cf68c
 MISC metadata.xml 265 BLAKE2B 39644ede9957536ee9d058b398c84eb25da50a448547726479d94943e32a2d688421bf9eb591864ff027f2f47b28f6bc0443f63c9f6c5ccdd0e76d6caa433015 SHA512 a8820c1f5c2c61b51328871182b50294c52f508140cb306556c11cce5301c5b3ae98cd5ddb4355393fa821db2564c5889a74d41553ae5ace27a6242a9906c3da
diff --git a/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-bashism-configure.patch b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-bashism-configure.patch
new file mode 100644
index 000000000000..d4a672815cd3
--- /dev/null
+++ b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-bashism-configure.patch
@@ -0,0 +1,35 @@
+https://github.com/nm-l2tp/NetworkManager-l2tp/pull/208
+
+From bf46aec299c58321703f5431ebafcce561a98cef Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 23 Apr 2023 09:16:24 +0100
+Subject: [PATCH] configure.ac: fix bashisms in configure.ac
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+--- a/configure.ac
++++ b/configure.ac
+@@ -197,7 +197,7 @@ fi
+ AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
+ 
+ AC_ARG_WITH(gtk4, AS_HELP_STRING([--with-gtk4], [Build NetworkManager-l2tp with libnma-gtk4 support]), [], [with_gtk4_specified=no])
+-if test "$with_gtk4_specified" == no; then
++if test "$with_gtk4_specified" = no; then
+ 	with_gtk4=no
+ fi
+ if test "$with_gtk4" != yes; then
+@@ -256,7 +256,7 @@ NM_LD_GC
+ 
+ NM_PLUGIN_DIR="$libdir/NetworkManager"
+ AC_SUBST(NM_PLUGIN_DIR)
+-if test x"$enable_absolute_paths" == x"yes"; then
++if test x"$enable_absolute_paths" = x"yes"; then
+ 	NM_PLUGIN_DIR_NAME_FILE="$NM_PLUGIN_DIR/"
+ else
+ 	enable_absolute_paths=no
+
diff --git a/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch
new file mode 100644
index 000000000000..4ff829048c20
--- /dev/null
+++ b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch
@@ -0,0 +1,161 @@
+https://bugs.gentoo.org/904843
+https://github.com/nm-l2tp/NetworkManager-l2tp/commit/e6860eb957208a932fb565dd7b5e79fe5a4df662
+
+From e6860eb957208a932fb565dd7b5e79fe5a4df662 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
+Date: Fri, 3 Mar 2023 05:22:13 +0000
+Subject: [PATCH] Adding support for compiling against pppd-2.5.0 (current
+ master)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,10 @@ dnl
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
++AC_PROG_CPP
++AC_PROG_EGREP
+ AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
++PKG_PROG_PKG_CONFIG()
+ 
+ AC_CHECK_PROG([has_file], file, yes, no)
+ if test x$has_file = xno ; then
+@@ -49,24 +52,63 @@ dnl
+ dnl Required headers
+ dnl
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(fcntl.h paths.h sys/ioctl.h sys/time.h syslog.h unistd.h)
++AC_CHECK_HEADERS([
++	fcntl.h
++	paths.h
++	stdarg.h
++	stdbool.h
++	sys/ioctl.h
++	sys/time.h
++	syslog.h
++	unistd.h
++	])
+ 
+ AC_CHECK_HEADERS(pppd/pppd.h,,
+   AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.))
+ 
++dnl
++dnl Check the presense of other pppd/*.h files
++AC_CHECK_HEADERS([
++    pppd/chap.h
++    pppd/chap-new.h
++    pppd/chap_ms.h
++    ])
++
++dnl
++dnl Versions >= 2.5.0 will have pkg-config support
++PKG_CHECK_EXISTS([pppd],
++    [AS_VAR_SET([pppd_pkgconfig_support],[yes])])
++
++dnl
++dnl Get the version of pppd using pkg-config, assume 2.4.9 if not present
++PPPD_VERSION=2.4.9
++if test x"$pppd_pkgconfig_support" = xyes; then
++    PPPD_VERSION=`$PKG_CONFIG --modversion pppd`
++fi
++
+ AC_ARG_WITH([pppd-plugin-dir], AS_HELP_STRING([--with-pppd-plugin-dir=DIR], [path to the pppd plugins directory]))
+ 
+ if test -n "$with_pppd_plugin_dir" ; then
+ 	PPPD_PLUGIN_DIR="$with_pppd_plugin_dir"
+ else
+-	PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.9"
++	PPPD_PLUGIN_DIR="${libdir}/pppd/$PPPD_VERSION"
+ fi
+ AC_SUBST(PPPD_PLUGIN_DIR)
+ 
++dnl The version of pppd dictates what code can be included, i.e. enable use of
++dnl   #if WITH_PPP_VERSION >= PPP_VERSION(2,5,0) in the code
++AC_DEFINE_UNQUOTED([PPP_VERSION(x,y,z)],
++    [((x & 0xFF) << 16 | (y & 0xFF) << 8 | (z & 0xFF) << 0)],
++    [Macro to help determine the particular version of pppd])
++PPP_VERSION=$(echo $PPPD_VERSION | sed -e "s/\./\,/g")
++AC_DEFINE_UNQUOTED(WITH_PPP_VERSION, PPP_VERSION($PPP_VERSION),
++    [The real version of pppd represented as an int])
++
+ AC_MSG_CHECKING(whether EAP-TLS patch has been applied to pppd)
+ AC_EGREP_CPP(eaptls_passwd_hook, [
+ #define USE_EAPTLS
+ #include <pppd/pppd.h>
++#include <pppd/eap.h>
+ ], [have_eap_tls=yes] , [have_eap_tls=no])
+ 
+ if test "x${have_eap_tls}" = "xno"; then
+--- a/src/nm-l2tp-pppd-plugin.c
++++ b/src/nm-l2tp-pppd-plugin.c
+@@ -9,11 +9,6 @@
+ #include <config.h>
+ #define ___CONFIG_H__
+ 
+-/* pppd headers *sigh* */
+-#include <pppd/pppd.h>
+-#include <pppd/fsm.h>
+-#include <pppd/ipcp.h>
+-
+ #include "nm-default.h"
+ 
+ #include <string.h>
+@@ -25,13 +20,14 @@
+ 
+ #include "nm-l2tp-service.h"
+ #include "nm-ppp-status.h"
++#include "nm-l2tp-pppd-compat.h"
+ 
+ #include "nm-utils/nm-shared-utils.h"
+ #include "nm-utils/nm-vpn-plugin-macros.h"
+ 
+ int plugin_init(void);
+ 
+-char pppd_version[] = VERSION;
++char pppd_version[] = PPPD_VERSION;
+ 
+ /*****************************************************************************/
+ 
+@@ -146,7 +142,7 @@ nm_phasechange(void *data, int arg)
+ static void
+ nm_ip_up(void *data, int arg)
+ {
+-    guint32         pppd_made_up_address = htonl (0x0a404040 + ifunit);
++    guint32         pppd_made_up_address = htonl (0x0a404040 + ppp_ifunit());
+     ipcp_options    opts                 = ipcp_gotoptions[0];
+     ipcp_options    peer_opts            = ipcp_hisoptions[0];
+     GVariantBuilder builder;
+@@ -166,7 +162,7 @@ nm_ip_up(void *data, int arg)
+     g_variant_builder_add(&builder,
+                           "{sv}",
+                           NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV,
+-                          g_variant_new_string(ifname));
++                          g_variant_new_string(ppp_ifname()));
+ 
+     g_variant_builder_add(&builder,
+                           "{sv}",
+@@ -343,12 +339,18 @@ plugin_init(void)
+     chap_check_hook  = get_chap_check;
+     pap_passwd_hook  = get_credentials;
+     pap_check_hook   = get_pap_check;
+-#ifdef USE_EAPTLS
++#if defined(USE_EAPTLS) || defined(PPP_WITH_EAPTLS)
+     eaptls_passwd_hook = get_credentials;
+ #endif
+ 
++#if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
+     add_notifier(&phasechange, nm_phasechange, NULL);
+     add_notifier(&ip_up_notifier, nm_ip_up, NULL);
+     add_notifier(&exitnotify, nm_exit_notify, NULL);
++#else
++    ppp_add_notify(NF_PHASE_CHANGE, nm_phasechange, NULL);
++    ppp_add_notify(NF_IP_UP, nm_ip_up, NULL);
++    ppp_add_notify(NF_EXIT, nm_exit_notify, NULL);
++#endif
+     return 0;
+ }
+
diff --git a/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch
new file mode 100644
index 000000000000..1625c57a4bc8
--- /dev/null
+++ b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch
@@ -0,0 +1,170 @@
+https://bugs.gentoo.org/904843
+https://github.com/nm-l2tp/NetworkManager-l2tp/commit/36a427c316a8ccd3168606f6e7fd6c8ae2b9bebf
+
+From 36a427c316a8ccd3168606f6e7fd6c8ae2b9bebf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
+Date: Fri, 3 Mar 2023 05:22:13 +0000
+Subject: [PATCH] Adding support for compiling against pppd-2.5.0 (current
+ master)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -99,7 +99,7 @@ src_nm_l2tp_service_SOURCES = \
+ 	shared/nm-l2tp-crypto-nss.c \
+ 	shared/utils.h \
+ 	shared/utils.c \
+-	src/nm-ppp-status.h \
++	src/nm-l2tp-pppd-status.h \
+ 	src/nm-l2tp-service.h \
+ 	src/nm-l2tp-service.c
+ src_nm_l2tp_service_CPPFLAGS = $(src_cppflags) $(NSS_CFLAGS) $(OPENSSL_CFLAGS)
+@@ -118,7 +118,8 @@ pppd_plugin_LTLIBRARIES = src/nm-l2tp-pppd-plugin.la
+ src_nm_l2tp_pppd_plugin_la_SOURCES = \
+ 	$(shared_sources) \
+ 	src/nm-l2tp-pppd-plugin.c \
+-	src/nm-ppp-status.h
++	src/nm-l2tp-pppd-compat.h \
++	src/nm-l2tp-pppd-status.h
+ src_nm_l2tp_pppd_plugin_la_CPPFLAGS = $(src_cppflags)
+ src_nm_l2tp_pppd_plugin_la_LDFLAGS = \
+ 	-module -avoid-version
+--- /dev/null
++++ b/src/nm-l2tp-pppd-compat.h
+@@ -0,0 +1,93 @@
++/* SPDX-License-Identifier: GPL-2.0-or-later */
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
++/* nm-sstp-service - sstp (and other pppd) integration with NetworkManager
++ *
++ * Copyright (C) 2023 Eivind Naess, eivnaes@yahoo.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ */
++
++#ifndef __NM_L2TP_PPPD_COMPAT_H__
++#define __NM_L2TP_PPPD_COMPAT_H__
++
++// PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define.
++//   this silly macro magic is to work around that.
++
++#define INET6	1
++
++#undef VERSION
++#include <pppd/pppd.h>
++#ifndef PPPD_VERSION
++#define PPPD_VERSION VERSION
++#endif
++
++#include <pppd/fsm.h>
++#include <pppd/ccp.h>
++#include <pppd/eui64.h>
++#include <pppd/ipcp.h>
++#include <pppd/ipv6cp.h>
++#include <pppd/eap.h>
++#include <pppd/upap.h>
++
++#ifdef HAVE_PPPD_CHAP_H
++ #include <pppd/chap.h>
++#endif
++
++#ifdef HAVE_PPPD_CHAP_NEW_H
++ #include <pppd/chap-new.h>
++#endif
++
++#ifdef HAVE_PPPD_CHAP_MS_H
++ #include <pppd/chap_ms.h>
++#endif
++
++#ifndef PPP_PROTO_CHAP
++#define PPP_PROTO_CHAP              0xc223
++#endif 
++
++#ifndef PPP_PROTO_EAP
++#define PPP_PROTO_EAP               0xc227
++#endif
++
++#if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
++
++static inline bool debug_on(void)
++{
++    return debug;
++}
++
++static inline const char *ppp_ipparam(void)
++{
++    return ipparam;
++}
++
++static inline int ppp_ifunit(void)
++{
++    return ifunit;
++}
++
++static inline const char *ppp_ifname(void)
++{
++    return ifname;
++}
++
++static inline int ppp_get_mtu(int idx)
++{
++    return netif_get_mtu(idx);
++}
++
++#endif // #if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
++#endif // #ifdef __NM_L2TP_PPPD_COMPAT_H__
+--- a/src/nm-l2tp-pppd-plugin.c
++++ b/src/nm-l2tp-pppd-plugin.c
+@@ -9,8 +9,6 @@
+ #include <config.h>
+ #define ___CONFIG_H__
+ 
+-#include "nm-default.h"
+-
+ #include <string.h>
+ #include <stdlib.h>
+ #include <sys/socket.h>
+@@ -18,10 +16,11 @@
+ #include <arpa/inet.h>
+ #include <dlfcn.h>
+ 
+-#include "nm-l2tp-service.h"
+-#include "nm-ppp-status.h"
++#include "nm-l2tp-pppd-status.h"
+ #include "nm-l2tp-pppd-compat.h"
+ 
++#include "nm-default.h"
++#include "nm-l2tp-service.h"
+ #include "nm-utils/nm-shared-utils.h"
+ #include "nm-utils/nm-vpn-plugin-macros.h"
+ 
+similarity index 100%
+rename from src/nm-ppp-status.h
+rename to src/nm-l2tp-pppd-status.h
+--- a/src/nm-l2tp-service.c
++++ b/src/nm-l2tp-service.c
+@@ -36,7 +36,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ 
+-#include "nm-ppp-status.h"
++#include "nm-l2tp-pppd-status.h"
+ #include "nm-l2tp-pppd-service-dbus.h"
+ #include "nm-utils/nm-shared-utils.h"
+ #include "nm-utils/nm-secret-utils.h"
+
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r3.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r3.ebuild
new file mode 100644
index 000000000000..a8dc957d7e74
--- /dev/null
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="NetworkManager-l2tp"
+MY_P="${MY_PN}-${PV}"
+inherit autotools gnome.org
+
+DESCRIPTION="NetworkManager L2TP plugin"
+HOMEPAGE="https://github.com/nm-l2tp/NetworkManager-l2tp"
+SRC_URI="https://github.com/nm-l2tp/${MY_PN}/releases/download/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+COMMON_DEPEND="dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/openssl:=
+	net-dialup/ppp:=[eap-tls(+)]
+	net-dialup/xl2tpd
+	>=net-misc/networkmanager-1.20[ppp]
+	|| (
+		net-vpn/strongswan
+		net-vpn/libreswan
+	)
+	gtk? (
+		app-crypt/libsecret
+		gnome-extra/nm-applet
+		media-libs/harfbuzz:=
+		net-libs/libnma
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto"
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/dbus-glib"
+BDEPEND="dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ppp-2.5.0-{1,2}.patch
+	"${FILESDIR}"/${PN}-1.20.8-bashism-configure.patch
+)
+
+src_prepare() {
+	default
+
+	# For ppp-2.5.0 patch & bashism patch
+	eautoreconf
+}
+
+src_configure() {
+	local PPPD_VER=$(best_version net-dialup/ppp)
+	PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+
+	local myeconfargs=(
+		--localstatedir=/var
+		--with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}
+		$(use_with gtk gnome)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8.ebuild
index cfc6b1c20e10..c4c3ee77c566 100644
--- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8.ebuild
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8.ebuild
@@ -21,7 +21,7 @@ COMMON_DEPEND="dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
 	dev-libs/openssl:=
-	net-dialup/ppp:=[eap-tls]
+	net-dialup/ppp:=[eap-tls(+)]
 	net-dialup/xl2tpd
 	>=net-misc/networkmanager-1.20[ppp]
 	|| (
diff --git a/net-vpn/networkmanager-sstp/Manifest b/net-vpn/networkmanager-sstp/Manifest
index 09a0c0198e48..63976daa9589 100644
--- a/net-vpn/networkmanager-sstp/Manifest
+++ b/net-vpn/networkmanager-sstp/Manifest
@@ -1,4 +1,7 @@
 AUX networkmanager-sstp-1.3.0-fix-configure.ac-bashisms.patch 5579 BLAKE2B f47cdac48099067340ae0723b011dca385711ed9f7651105e14541f2f799d96d8476604d20c747f43651ece043e11c857edf86acb5b99fd7a37db544020a953d SHA512 c9ef2c096d887f9a06c0bf64fe78d4dd2713997ecf5cf103c154f95465b40bf706b842483979df86ffa4efda208788bdfeb5015a39110568fd05ce951cca1672
 DIST NetworkManager-sstp-1.3.0.tar.bz2 548907 BLAKE2B 97248268a781033bc960f930c5a55102e9fa76efa4be6477ffd277fd334649625b6c88418f00d678afa4412fb088cd201ef6711ef6f48b516daaa38fac02caa9 SHA512 9a26c737601990b913d9506ecaac957c4f6d2a4c64a3a0eb8beaf93eaef797ed134b2ddfe2421006a7ffe0dbd18800d49501836f3671f798132a1df707da138a
+DIST NetworkManager-sstp-1.3.1.tar.xz 508392 BLAKE2B 1ead40fa9c8f5bb48b8f7d6d7f6593812849cc26778c531c17a247f60969dbb8d72f477057e4ec7ec838425c3bd21a922b1a65235b72da0bee813f75540a928b SHA512 10247931a2b951b1126a6d7b9bd396fe2eab58d575888c409430f311baeaab85468f23a6c5b6afb7bef90bf73d1e2dbc2f5750cfb126dd365db23b3f79dd7ca6
+DIST networkmanager-sstp-1.3.1-ppp-2.5.0-patches.tar.xz 6792 BLAKE2B 58470f9e04be67029ad57cb2bddb3c80dd503ac5bfc2916683e7d6b4a9332aedb58883bc364a2317c31a8d871888662dbf6431c92753b6fd20b6ae873e45d96e SHA512 ee41eb9aba27e457ba5a8cba9ba27a98991f33750b8202c42ce8be2227bd6c1491bf8861b9e05cc1b3f97ea1bf93d60f5b5f83db3eefbed82ef8aff104ecba95
 EBUILD networkmanager-sstp-1.3.0.ebuild 1908 BLAKE2B 65db01a396d8586734dae6633b2e08b5f57481b62edbb1491eeeaa5e8c9df77a4f66bc8cc531868696ff70b12de5828cb6333d7230dac05e101aa19f7b019e27 SHA512 3783edf78594d49a4f0765822929918bd12a2acde2dd6a317632bc4c7f5115e140b19c2f87d9c02e024949a49c99fb8d2a70645714dc6da140a338e82bc3e39e
+EBUILD networkmanager-sstp-1.3.1-r1.ebuild 2032 BLAKE2B d7bb1430dee554f14b922f38b111a977f1c38c59cfd73b240c5baab5915056729e1baeab900db70d4f876fa084a8c842fe2e0ab8fbd130f49d13ea5cbf0db508 SHA512 95f01abee2aeb4685e7059c55331b3e09c79943355910c9e6758cc682d3d0ae4b57c8cdef5ac39a78b78b56a0b28ed499e2654582fdfce0e91e25b9a0d39286d
 MISC metadata.xml 406 BLAKE2B 5d7fa7ddbe8eb683af682b5ba31218ef5d59a15257119c1974d36ccfd5c0dd7ea1447abe1a1a76ff4c2f52dcab413ceafd98ce9350b2b19acd51b5abb1ee6ed9 SHA512 7142217c702ff68273a22dd75b34bf3bf5292c3e09c40fb2f2a6d1292a7b8e7f5aed2c6e3e736992ff0e2c88066450c9c793108d7f40024c0ac687d52155ea33
diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r1.ebuild b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..378579b00d87
--- /dev/null
+++ b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="NetworkManager-sstp"
+MY_P="${MY_PN}-${PV}"
+
+inherit autotools
+
+DESCRIPTION="Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/network-manager-sstp https://sourceforge.net/projects/sstp-client/"
+SRC_URI="https://gitlab.gnome.org/GNOME/network-manager-sstp/-/releases/release-${PV}/downloads/dist/${MY_P}.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ppp-2.5.0-patches.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui gtk4"
+
+# As of 1.3.0, if want GUI support, GTK 3 is always needed, even with GTK 4.
+# atk/graphene/harfbuzz/cairo/gdk-pixbuf/pango are all standard "dragged in by gtk/glib"
+# deps.
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	net-misc/sstp-client
+	>=net-misc/networkmanager-1.1.0
+	net-dialup/ppp:=
+	net-libs/gnutls:=
+	gui? (
+		>=net-libs/libnma-1.2.0
+		>=app-crypt/libsecret-0.18
+		>=x11-libs/gtk+-3.4:3
+
+		gtk4? (
+			>=app-accessibility/at-spi2-core-2.46.0
+			media-libs/graphene
+			media-libs/harfbuzz:=
+			x11-libs/cairo
+			x11-libs/gdk-pixbuf:2
+			x11-libs/pango
+
+			gui-libs/gtk:4
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-apps/file
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-ppp-2.5.0-patches
+)
+
+src_prepare() {
+	default
+
+	# Bug #741108
+	sed -i 's|/appdata|/metainfo|g' Makefile.{in,am} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local PPPD_VER="$(best_version net-dialup/ppp)"
+	# Reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER#*/*-}
+	# Main version without beta/pre/patch/revision
+	PPPD_VER=${PPPD_VER%%[_-]*}
+
+	econf \
+		--disable-more-warnings \
+		--with-dist-version=Gentoo \
+		--with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VER}" \
+		$(use_with gui gnome) \
+		$(use_with gtk4) \
+		--without-libnm-glib
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 6d044c4e488c..d55a94da4a2d 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 82d4e4f10de3..02faf4cc7e38 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -541,6 +541,7 @@ dev-qt/qtwayland:6
 dev-qt/qtwebchannel:6
 dev-qt/qtwebengine:6
 dev-qt/qtwebsockets:6
+>=games-board/tetzle-2.2.2
 >=media-video/bino-2
 >=x11-misc/albert-0.20.13
 
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 1e9c9df97b5c..ee7f27f52685 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1831,6 +1831,8 @@ dev-lang/yap:R - Enable support for connecting R to Prolog
 dev-lang/yap:raptor - Enable support for Raptor RDF syntax libarary
 dev-libs/aml:examples - Build and install examples
 dev-libs/antlr-c:debugger - Compiles debug info into the library
+dev-libs/apache-arrow:brotli - Enable brotli compression suppor
+dev-libs/apache-arrow:compute - Build the Arrow Compute Modules
 dev-libs/apache-arrow:dataset - Build the Arrow Dataset Modules
 dev-libs/apache-arrow:json - Enables read/write json format
 dev-libs/apache-arrow:parquet - Enables read/write parquet data format
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index e150ba509cfb..2d06ca251dd5 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index afade407b1d2..e17d177ceb56 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -6,8 +6,11 @@ DIST ngspice-35-manual.pdf 2347261 BLAKE2B 617462615525e5335f5795e625578324d2b17
 DIST ngspice-35.tar.gz 8050668 BLAKE2B d67475b55e1e14974a78451175a08ec91be24708030e0da8fa6811b7df880c8082741ec08d92c314c53480271cc074e35ad0eca27a3b7601e33fb240c834e530 SHA512 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b
 DIST ngspice-36-manual.pdf 2397103 BLAKE2B 09dbfe4101b8e1752509caa37ba3a323da7d7391488c3245b3f614114d1666ee32ea1391ad4f39772ed950e270f028b7513115e0c13fde052bfdb5674f021b3b SHA512 bd31f99f7ec0acd2bdd24f008e22cb953bba98fd5cc1164ded0bdde3397bfffa0b0cae25dfeae6cf0e1dadd23c23faa5588010069b62392438296451347a5134
 DIST ngspice-36.tar.gz 8450071 BLAKE2B 51fa2c5998e96a05deb3764f56659ed0970d6362fcbec7367b04a5fbe76fc7dadb08e0d36b660b0e1f8e525079bedf71305877ab2de8e2ab2773c891808fb5a6 SHA512 d862097f465e92986e8d6644374d43249eebee0fb6d79b1404dbb7c11d14a058dfedd4bdb61baf5aa1ffd1d2e71167440db73eb417d4b1249a0a7b83bd39efc3
+DIST ngspice-40-manual.pdf 2462604 BLAKE2B a0d680cd76f8acb1be18e94953d70784aaf79e1bcc4bc3995a1221d81e27c13e577d182e7cbacb8430a068db7d86681f22ec4f3537b5704faacb8e982588617f SHA512 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5
+DIST ngspice-40.tar.gz 9431981 BLAKE2B e45d5d7a9e8d9d3fdae4eb076090a588680055a74cc24ba9ca3d93a7c42b95ee29073101d5791f8069cb27b3049aa1a451476f1df6460477fb156336602678fd SHA512 dab422cc8677e6f4bb92e06be0ce695a53d3e9abbe533c7bb91540d55d2a13514b0b166c8ccafcc17699799a846a35e260dddc400664c6e1137e1b18504e9954
 EBUILD ngspice-31-r1.ebuild 4510 BLAKE2B 88b9e231cf3a19bd83f554ba235c86e081df699b5fb0b9d481eb5ab60a5c421202fe56dc5a2bafd5e82ff54ab1b7e2ac77f06eafdfc7f12284165636afd794d5 SHA512 b8ef7664e175d802dc9ec284cd0f40e2ead1810c78cde01f5a9d7d793f488d5f686603e8817f4fea6be1476af5ba3dd73a00735a9b0fa89df7225615a7ea0a60
 EBUILD ngspice-34.ebuild 4620 BLAKE2B 781dd445ce1e14499d3f1fa2aaae4026520e6c8194f5e7a9525c61d067537cc59ba774b914c131553aad8d9e18e5b2904809a76c01a35bc7dc9d082dfda9f906 SHA512 79e036d956bf02f544f833a35ec229dacf37e851ba76c3e931fcb3edd52a8e79f3d2e9d3ca30fb05f103caf94954954a8412ef10b0ae1839979b0c1572c83836
 EBUILD ngspice-35.ebuild 4587 BLAKE2B 450987f87ab81dccd90bf79e3a470ac54fedd47dc9b4c1b78bef07cfc39b22ef088cc110e5303f399e9e0b2e83b7d2a5247dd8d98d040a82d2b751db6ac7dd3a SHA512 02c78a4f942ce452ce19e6a2773f8a790be8fcd9a035df9a43cabbc3ec6c1bc79bd3593b40935ec141423c61dc0d9f06344190bff437bfe2c6722c8a11cfa11f
 EBUILD ngspice-36.ebuild 4592 BLAKE2B 8b774b0cff6f3544f3b1ba5713c2ace05f9116ff07692a7b01a98abadba841fcff08ce9f6a44469259016b5b3356442acd58f177777d8ecd1edb39ef2c98e86f SHA512 0aec985436560bf6a5b606b1afa79ce66ea8ac09178ba7029f5a4eb0fbed8509cfbfec2003c109fe0b23519fff19d18db7df657a02e43caef9ec7f779db63d5d
+EBUILD ngspice-40.ebuild 4612 BLAKE2B b8d675588b1d40f17834143e769c2471dc2fab971d43cb39291c1a42ead3f24c34bd0dc003dfbb1572ad5ca6fa67462797e8c008ab5257d0c295288ac48ebe5f SHA512 3707608175b72e01d142bfd7b4790b2b5a750a386e7b94b08ff78659760ecd0d656e15445d8c1ed5e73c41aaa43e5b3ee184e216eb3964fbbcd017f225fd2756
 MISC metadata.xml 677 BLAKE2B 541ff3e8439b8e222916341bb9f973ea2189a5b2aceeb1bd83ca7a73af7161f38e272a93fdbab51aba4f14be53f556c10a5c10be2a807ef07bca9e39fa73b6ed SHA512 b439de3838f17c9c21e50cd80d74b733d0061f79a7e736c82295c3db433bb786cdab8dc73ca1b40f6a486288f29f82b677723ea1e13ca583b0456fcfa82de206
diff --git a/sci-electronics/ngspice/ngspice-40.ebuild b/sci-electronics/ngspice/ngspice-40.ebuild
new file mode 100644
index 000000000000..5e10132afd22
--- /dev/null
+++ b/sci-electronics/ngspice/ngspice-40.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multibuild toolchain-funcs virtualx
+
+DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)"
+HOMEPAGE="http://ngspice.sourceforge.net"
+SRC_URI="
+	mirror://sourceforge/ngspice/${P}.tar.gz
+	doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )
+"
+
+LICENSE="BSD GPL-2 MPL-2.0"
+SLOT="0"
+IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl"
+KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~x64-macos"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/ncurses:=
+	X? (
+		x11-libs/libXaw
+		x11-libs/libXt
+		x11-libs/libX11
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	readline? ( sys-libs/readline:= )
+	tcl? (
+		dev-lang/tcl:=
+		dev-tcltk/blt
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	ANALYSES
+	AUTHORS
+	BUGS
+	ChangeLog
+	DEVICES
+	FAQ
+	NEWS
+	README
+	README.vdmos
+	Stuarts_Poly_Notes
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	MULTIBUILD_VARIANTS=( "binaries" )
+	use shared && MULTIBUILD_VARIANTS+=( "shared" )
+	use tcl && MULTIBUILD_VARIANTS+=( "tcl" )
+}
+
+src_prepare() {
+	default
+
+	if use tcl; then
+		if use examples; then
+			find examples/tclspice -type f -iname \*tcl -or -iname \*.sh |
+			while read s
+			do
+				sed -i -e 's@../../../src/.libs/libspice.so@libspice.so@g' \
+					-e 's@package require BLT@package require Tk\npackage require BLT@g' \
+					-e "s@spice::codemodel \(.*\)/\(.*\).cm@spice::codemodel /usr/$(get_libdir)/ngspice/\2.cm@g" \
+					"${s}" || die "sed failed"
+			done
+		fi
+	fi
+
+	eautoreconf
+	multibuild_copy_sources
+}
+
+src_configure() {
+	multibuild_foreach_variant ngspice_configure
+}
+
+ngspice_configure() {
+	local myeconfargs
+
+	pushd "${BUILD_DIR}" &>/dev/null || die
+
+	if use debug; then
+		myeconfargs=(
+			--enable-debug
+			--enable-ftedebug
+			--enable-cpdebug
+			--enable-sensdebug
+			--enable-asdebug
+			--enable-stepdebug
+			--enable-pzdebug
+		)
+	else
+		myeconfargs=(
+			--disable-debug
+			--disable-ftedebug
+			--disable-cpdebug
+			--disable-sensdebug
+			--disable-asdebug
+			--disable-stepdebug
+			--disable-pzdebug
+		)
+	fi
+
+	# As of March 2021, these do not compile
+	myeconfargs+=(
+		--disable-blktmsdebug
+		--disable-smltmsdebug
+	)
+
+	myeconfargs+=(
+		--enable-xspice
+		--enable-cider
+		--disable-rpath
+		$(use_enable openmp)
+		$(use_with fftw fftw3)
+		$(use_with readline)
+	)
+
+	if [[ "${MULTIBUILD_VARIANT}" == "shared" ]]; then
+		myeconfargs+=( --with-ngshared )
+	elif [[ "${MULTIBUILD_VARIANT}" == "tcl" ]]; then
+		myeconfargs+=( --with-tcl="${EPREFIX}/usr/$(get_libdir)" )
+	else
+		myeconfargs+=(
+			$(use_enable deprecated oldapps)
+			$(use_with X x)
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	multibuild_foreach_variant ngspice_compile
+}
+
+ngspice_compile() {
+	pushd "${BUILD_DIR}" &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
+
+src_test() {
+	if ! use debug; then
+		# tests can be only executed for the binaries variant
+		pushd "${WORKDIR}/${P}-binaries" &>/dev/null || die
+		echo "set ngbehavior=mc" > "${HOME}"/.spiceinit || die "Failed to configure ${PN} for running the test suite"
+		virtx default
+		popd &>/dev/null || die
+	else
+		# https://sourceforge.net/p/ngspice/bugs/353/
+		ewarn
+		ewarn "Skipping tests because they are known to fail in debug mode"
+		ewarn
+	fi
+}
+
+src_install() {
+	multibuild_foreach_variant ngspice_install
+
+	# merge the installations of all variants
+	local v
+	for v in "${MULTIBUILD_VARIANTS[@]}" ; do
+		cp -a "${ED}/tmp/${v}"/* "${ED}" || die "Failed to combine multibuild installations"
+	done
+	rm -rf "${ED}/tmp" || die
+
+	use tcl && DOCS+=( README.tcl )
+	use shared && DOCS+=( README.shared-xspice )
+	use doc && DOCS+=( "${DISTDIR}"/${P}-manual.pdf )
+
+	default
+
+	if use examples; then
+		if ! use tcl; then
+			rm -rf examples/tclspice || die
+		fi
+
+		insinto /usr/share/${PN}
+		doins -r examples
+	fi
+}
+
+ngspice_install() {
+	pushd "${BUILD_DIR}" &>/dev/null || die
+
+	emake DESTDIR="${ED}/tmp/${MULTIBUILD_VARIANT}" install
+
+	# Strip shared-library and Tcl-module builds to the bare minimum;
+	# all the support files will have been handled by the 'binaries' build.
+	if [[ "${MULTIBUILD_VARIANT}" != "binaries" ]]; then
+		rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/bin{,.debug} || die
+		rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/share || die
+		rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la || die
+		rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug} || die
+	fi
+
+	popd &>/dev/null || die
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 0b5943d347c8..3bff9f406786 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 18998f87177f..88a90c197d8c 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,13 +1,17 @@
+AUX gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch 528 BLAKE2B c393c21cb29687a52fbbc2283021c60ee5d2accba1c558763a6f8ed6e102aef813f0e75650adb37bc1492d9f65d9125f8d0cb361666379dba9c5adf748413770 SHA512 3849e73d5871eb62a6cec2a14f1ad480a6fb1e75f8fbfe2b9574944c2f00c43eb3429e9183db4aa4ddd5388b18488a0e5381fd5142e9983e68c3e71e70c87d27
 DIST gdal-3.5.3.tar.xz 9504740 BLAKE2B 7054df4c7ea6d8d3e6e9cf2544fc5c7a9149dea94ed882723ec82c61268100c2f5330f28a8d9d44e1296511eb2a204c64dfe41f135fadb44db380aa331d9c731 SHA512 b7bac9dd568e9db49d1fa5be8cd48df37f37196b0cacce44f738a981f0c43a77b5750312cd0c3385fdd881a6b525a5ceac56bcd08284d76071bd508d01781f49
 DIST gdal-3.6.1.tar.xz 8685072 BLAKE2B 84f707085e77317f2e6577afe594eb01aae777d2863454bfc873ba170f1254094946f02301079d9cce66f8e64848b2b97f03651b114b283c7910d46da1507430 SHA512 07138bdd66a0259cffed3a1587904760b734fffa546f5cdf7ca9ee472c77676e5694f6c92d57f03f9cdb94cc3992a0404688f248b79e263eb0c1e3ab6025f6bb
 DIST gdal-3.6.2.tar.xz 8635724 BLAKE2B c90606b642c632dd5ec224d63aa80c158c9ee04c6ca0341815f7449b319bf9442d65c2f9b981aedd242713ef6909a30f620b448ba26baf6cd8a31e2a9ae0dd8a SHA512 d404335d37ef4916b6098fa8dc7a5e1579ecdd958b37ce73bb08855fa226d3a7b488eee52db17364ef1c0697d59805d495a734f21dad2ad2f0b27e7b1f253e50
 DIST gdal-3.6.3.tar.xz 8645148 BLAKE2B c9d6817e74d0ec377979a060db231ec989e676f9aa0c1c04a8bcd6913c271eaccbb43a59b8bd52f0e297844759a3925039b83c73c4e0773943eeec8af656bb8a SHA512 296901ea667b7d419638fafd9a3ef3cb8bfb1753223048660c463b18e510cb840ae99fdcdb860495782003376c9fb8c24ca3be3699dc31497bd324a09e2abec9
+DIST gdal-3.6.4.tar.xz 8648032 BLAKE2B d6abdbcc87029bf230dae5586f06cbd329e5e43be37d8f5e9a72c67c93a6769458cc9c693b498e3f697b1ee1b68c9f9dbf7545ff9819fceb8fdde81b8d4ac882 SHA512 a8f69158d44ea456c44cfcb8937892697a28d2e4a43333c28db8fb9e81c51436a6edcb7a392b8c7ef63cd7453be6350a938bc4ba910720d9d5d9a1f32c57c558
 DIST gdalautotest-3.5.3.tar.gz 12374523 BLAKE2B 3f8e2ba8b49d7bb870a49bde4ec95f807ff79cf23d36504cf7beeccff104364d8fc8e287184a0239cd2c4bf5e26c900cfb29bda3beb615504e588519385a322c SHA512 3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e
 DIST gdalautotest-3.6.1.tar.gz 12577286 BLAKE2B 5215db1c39ee1b6d923da9503a2220d8862cf262d3f92605902e6a8e7272fbae156c306a8172f7ef75ad110fc6a82a06873c8420d5d1f2a3a8d4600430932a79 SHA512 a91ba311840b98d16df1918752bb5a629bdbe68b98e3ca9f00e2a8ee49f9f68021081700eb39cce7cf5b09fc3fafed987ea067c8135ab2469b91c34338ba7ef2
 DIST gdalautotest-3.6.2.tar.gz 12586870 BLAKE2B 28b6ae04d68964705dfe370bf189343c76fa63e358ce1c7362604743c92130c8e93ec826170a7adfd95aad8a05a5ae7a006b35cf487a81eb0c6695353ab7ef20 SHA512 63dd6f185b766cea9a200190428f2791c99f2d4032e7503404199833fa63cd31bc3b56e198a7d145cd954aace767d16d1d75c602880e9bee962dea98e9cf1859
 DIST gdalautotest-3.6.3.tar.gz 12613287 BLAKE2B a4548ccf7bd4a8de9fd093514afbd3d6de453ca6a1bb0c4b6e50f6f37ac5ec321f7b80943f32fcf4164442d2d63b09458c1d0ebad76ee76a53b681e2b07ee388 SHA512 2967c07a0c5cb426048ead60b6428e8ebb5c5f4bd1ff7409991537575b5a1eabd1d4da2d65607894e16153fd4ce8a31a501788b938a155ddf8cec581fddac1d4
+DIST gdalautotest-3.6.4.tar.gz 12614090 BLAKE2B d2c33b56790c1cb030a102ff48bec33c3d187c5be6e13d56da8d6cb8e9393734c2144274cbe08cf82b2a023ffb75df9fd01bcfd9f3d73076c95c4b213823f64e SHA512 2a7704e57f8bc0687c759d047b5a8fb290b2959eb058e02b08edf12e9cca17d6a9121213ef48e8b616c94c8cbe321531612700c6db52cb47fbcc5893c1c1c1c1
 EBUILD gdal-3.5.3-r1.ebuild 6692 BLAKE2B 2648c9ba25041e36dbb482964b2b5cdabddee82170232f1372b1f3436c16041e6675234407d5fb38d85a17753216fb29e6f41bdee417312ba78d0ef7b3173cae SHA512 9af7d1da2dbbb461e400ffad40e94546e08e40aeb2ef89db367e6b4981798ec0321e9a17e655c2fa46aedc89ae0739f1ee04c15a77d382fec4b30802156d2491
 EBUILD gdal-3.6.1-r1.ebuild 6766 BLAKE2B 9dc9bdebdf831012495ade7983b5df18f7aae1c036bb4dec925d22bce39f4a218ccd2cdd6aaa32f8aa78652858a031c2ab98127ea8e05338844b57c546b7751d SHA512 5d9273750e6ab779bfd006650790c8741d3a5778440c9dd17761eda906fd36994d7ada2c8261d4e0ac13b6b7434446a363164952b4daabc8a97d0131fe4bb2e9
 EBUILD gdal-3.6.2.ebuild 6762 BLAKE2B 1adf8ab59134602a90e3797021a01bbb92e62496b1cbe1ba5b9da0fad4977e90c718f855eaf5981ae8d1a1ec81bc2b98c8f4f5825df77547b279eb76fce4ea54 SHA512 1ad6c2c44f02e69d8355494f0da37ad44a24cc70209858252cfbff91d5e6cb5d89a414edba6632a63d139769f1c9db64dc4fddc4755f3a8db4f2a3062e36696e
 EBUILD gdal-3.6.3.ebuild 6648 BLAKE2B ecc59e3aaebcaeb5ba0332f11e1e331be9e83153fe710da6c8c33a16459bf41080d5201249337cab917b8c52742fcdf6fc8a80c64f6f5e46a145fa6f38c371fd SHA512 c4ef0a2d7949c273c2563294e0a9dafdba2198ac9002f0cfee47f172c41419b6fafcc380965e382b4ecb0e55074019d3018ee6d6c0f6f030fac7d9d252d9a8ab
+EBUILD gdal-3.6.4.ebuild 6776 BLAKE2B 8856545ec242dba14c48acf40bd6e254b85701c4ba78a3d93925597cd20cbf8ea976f732e7a7c1c622fa765a453a46f6ac93a5dfe02eccd368935e69f4e25a4c SHA512 b34cbf95712bd9fb570fb142836c67f6067abd57c6724528ae035e8062dfed039b24f1c29af6de697e72d105640b6935ad61f39780214a24aa2d8e5893a1a900
 MISC metadata.xml 1348 BLAKE2B 6666f26bc5f48bbfe1971736c6737420fefa7949cd6e1b74c649ae53cb51b756ebba42bb934930af83de254bebc4e4268f60a04ed2fb1aa8835b9abbdb3968b2 SHA512 b5b90368a48679c780dbe89b73ddee9e2c74639bf1a2c9f39dd4a3cdbb005878cd2197271f2ddc23d9611feaf79c0239b32d655d8a29592ad6d87a402970b726
diff --git a/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch b/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch
new file mode 100644
index 000000000000..2ddc39db8b36
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/904534
+--- a/ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt
++++ b/ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt
+@@ -8,6 +8,7 @@
+           ogrflatgeobufeditablelayer.cpp
+           PLUGIN_CAPABLE
+           NO_DEPS)
++set_property(TARGET ogr_FlatGeobuf PROPERTY CXX_STANDARD 17)
+ gdal_standard_includes(ogr_FlatGeobuf)
+ target_include_directories(ogr_FlatGeobuf PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+                                                   $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)
+
diff --git a/sci-libs/gdal/gdal-3.6.4.ebuild b/sci-libs/gdal/gdal-3.6.4.ebuild
new file mode 100644
index 000000000000..bce013c8d745
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.6.4.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
+SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz )"
+
+LICENSE="BSD Info-ZIP MIT"
+SLOT="0/32" # subslot is libgdal.so.<SONAME>
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.8:*
+	)
+	python? (
+		dev-lang/swig:0
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+DEPEND="dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre2
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-3.8.0 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	heif? ( media-libs/libheif:= )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( >=sci-libs/ogdi-4.1.0-r1 )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	png? ( media-libs/libpng:= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	_wstat64 # Windows LFS
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use test ; then
+		mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_IPO=OFF
+		-DGDAL_USE_EXTERNAL_LIBS=ON
+		-DGDAL_USE_INTERNAL_LIBS=OFF
+
+		# bug #844874 and bug #845150
+		-DCMAKE_INSTALL_INCLUDEDIR="include/gdal"
+
+		# Options here are generally off because of one of:
+		# - Not yet packaged dependencies
+		#
+		# - Off for autotools build and didn't want more churn by
+		#   enabling during port to CMake. Feel free to request them
+		#   being turned on if useful for you.
+		-DGDAL_USE_ARMADILLO=$(usex armadillo)
+		-DGDAL_USE_ARROW=OFF
+		-DGDAL_USE_BLOSC=OFF
+		-DGDAL_USE_BRUNSLI=OFF
+		-DGDAL_USE_CRNLIB=OFF
+		-DGDAL_USE_CFITSIO=$(usex fits)
+		-DGDAL_USE_CURL=$(usex curl)
+		-DGDAL_USE_CRYPTOPP=OFF
+		-DGDAL_USE_DEFLATE=OFF
+		-DGDAL_USE_ECW=OFF
+		-DGDAL_USE_EXPAT=ON
+		-DGDAL_USE_FILEGDB=OFF
+		-DGDAL_USE_FREEXL=$(usex xls)
+		-DGDAL_USE_FYBA=OFF
+		-DGDAL_USE_GEOTIFF=ON
+		-DGDAL_USE_GEOS=$(usex geos)
+		-DGDAL_USE_GIF=$(usex gif)
+		-DGDAL_USE_GTA=OFF
+		-DGDAL_USE_HEIF=$(usex heif)
+		-DGDAL_USE_HDF4=OFF
+		-DGDAL_USE_HDF5=$(usex hdf5)
+		-DGDAL_USE_HDFS=OFF
+		-DGDAL_USE_ICONV=ON # TODO dep
+		-DGDAL_USE_IDB=OFF
+		-DGDAL_USE_JPEG=$(usex jpeg)
+
+		# https://gdal.org/build_hints.html#jpeg12
+		# Independent of whether using system libjpeg
+		-DGDAL_USE_JPEG12_INTERNAL=ON
+
+		-DGDAL_USE_JSONC=ON
+		-DGDAL_USE_JXL=OFF
+		-DGDAL_USE_KDU=OFF
+		-DGDAL_USE_KEA=OFF
+		-DGDAL_USE_LERC=OFF
+		-DGDAL_USE_LIBKML=OFF
+		-DGDAL_USE_LIBLZMA=$(usex lzma)
+		-DGDAL_USE_LIBXML2=ON
+		-DGDAL_USE_LURATECH=OFF
+		-DGDAL_USE_LZ4=OFF
+		-DGDAL_USE_MONGOCXX=OFF
+		-DGDAL_USE_MRSID=OFF
+		-DGDAL_USE_MSSQL_NCLI=OFF
+		-DGDAL_USE_MSSQL_ODBC=OFF
+		-DGDAL_USE_MYSQL=$(usex mysql)
+		-DGDAL_USE_NETCDF=$(usex netcdf)
+		-DGDAL_USE_ODBC=$(usex odbc)
+		-DGDAL_USE_ODBCCPP=OFF
+		-DGDAL_USE_OGDI=$(usex ogdi)
+		-DGDAL_USE_OPENCAD=OFF
+		-DGDAL_USE_OPENCL=$(usex opencl)
+		-DGDAL_USE_OPENEXR=OFF
+		-DGDAL_USE_OPENJPEG=$(usex jpeg2k)
+		-DGDAL_USE_OPENSSL=ON
+		-DGDAL_USE_ORACLE=$(usex oracle)
+		-DGDAL_USE_PARQUET=OFF
+		-DGDAL_USE_PCRE2=ON
+		-DGDAL_USE_PDFIUM=OFF
+		-DGDAL_USE_PNG=$(usex png)
+		-DGDAL_USE_PODOFO=OFF
+		-DGDAL_USE_POPPLER=$(usex pdf)
+		-DGDAL_USE_POSTGRESQL=$(usex postgres)
+		-DGDAL_USE_QHULL=OFF
+		-DGDAL_USE_RASTERLITE2=OFF
+		-DGDAL_USE_RDB=OFF
+		-DGDAL_USE_SPATIALITE=$(usex spatialite)
+		-DGDAL_USE_SQLITE3=$(usex sqlite)
+		-DGDAL_USE_SFCGAL=OFF
+		-DGDAL_USE_TEIGHA=OFF
+		-DGDAL_USE_TIFF=ON
+		-DGDAL_USE_TILEDB=OFF
+		-DGDAL_USE_WEBP=$(usex webp)
+		-DGDAL_USE_XERCESC=$(usex gml)
+		-DGDAL_USE_ZLIB=ON
+		-DGDAL_USE_ZSTD=$(usex zstd)
+
+		# Bindings
+		-DBUILD_PYTHON_BINDINGS=$(usex python)
+		-DBUILD_JAVA_BINDINGS=$(usex java)
+		# bug #845369
+		-DBUILD_CSHARP_BINDINGS=OFF
+
+		# Check work/gdal-3.5.0_build/CMakeCache.txt after configure
+		# and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71
+		# Commented out: not (yet?) implemented upstream.
+		# Also, arm64 stuff is a TODO upstream, but not there (yet?)
+		-Dtest_avx=$(usex cpu_flags_x86_avx)
+		-Dtest_avx2=$(usex cpu_flags_x86_avx2)
+		-Dtest_sse=$(usex cpu_flags_x86_sse)
+		-Dtest_sse2=$(usex cpu_flags_x86_sse2)
+		#-Dtest_sse3=$(usex cpu_flags_x86_sse3)
+		-Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1)
+		#-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2)
+		#-Dtest_sse4a=$(usex cpu_flags_x86_sse4a)
+		-Dtest_ssse3=$(usex cpu_flags_x86_ssse3)
+		#-Dtest_fma4=$(usex cpu_flags_x86_fma4)
+		#-Dtest_xop=$(usex cpu_flags_x86_xop)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_test() {
+	export GDAL_RUN_SLOW_TESTS=0
+	export GDAL_DOWNLOAD_TEST_DATA=0
+
+	# Two test suites:
+	# 1. autotests (much larger, uses pytest)
+	# 2. Small set of fuzzing tests (no download needed)
+
+	# Missing file for test-unit?
+	cmake_src_test -E "(test-unit)"
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+	# TODO: install docs?
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 33cfe7955fa3..ae9c07cc9e05 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index e43d2adefd12..34072886143a 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -9,6 +9,6 @@ AUX sbcl-2.patch 1072 BLAKE2B 3e16339b7b9acbbfcd424780432be4a4267b994c3a7a8774c9
 AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f93b949a05de9226d19d7898daf998cbedc61a77556c923f3f6f8e57508b73f3cae117f62d214d SHA512 110db85899241e1f9ea8427ffb397737aefe0bb6286d037c2c04cfad9726838521ef6403242aeb1e4246d06f13cf83af84bba38567a99b00ed6a081f17b38ead
 AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64de095ba088fa9c6a6076e4c0f7f57794804b588798c2289d36397a95101bde890c363aee9675bf8401e7 SHA512 5e5ab3196cf012ee768d108cc47da25c5afbaffca6f9a1aed9338a7154d377e6baf791d2c7bbe9191b823e056056379f190d8bf7b8ce689f44db892f5e375116
 DIST maxima-5.46.0.tar.gz 47492457 BLAKE2B 3d709c1647357477ef8c92ce1f3b0789664fcd86ebe16cf68a89b84c019cb30bc4896409fbe5236bb4dbb25cf972c17cf612c602e57c4c6100b2d86737715f48 SHA512 6c76292ac270b9d8e91d13035733d12038a69ef3510e70a28793b6116208eccd7bf6387e246e9e8c0a22a2e793b948f1233a56fc863ad8712a35e5b1b92fbeef
-EBUILD maxima-5.46.0-r1.ebuild 5970 BLAKE2B c5ba1dd7bed01c671c32e32cb012f5455e47846ed529511b4448d31cb908a814fe595b890546fc655faefde2bcce173fdc7eec53e8839c2499ddef07bd9e6d93 SHA512 3c14fb96c95d1a837c119b0600aeddf47144557e48cb848f23d0fc5858314b9431aa76d9bb907ec7fe6e55aaeaab7f862cb47c8cd92bb1ac8fc183b2c53d721f
+EBUILD maxima-5.46.0-r1.ebuild 5969 BLAKE2B a7ce5eb8d067bbfc50e32bd141c83c04dd6072b6f3b5b84d9fbf08329efa54a2800a7d6909ad511eb1ba4e029663078ca10c1b3ebf22c3690cefcc8a57e7dc6c SHA512 6ee870eed18dac583cd68efcbcbf710764a3bc28bc3a84e62733416092bf495fa564fa766a3bd087cd97b50c7d72d71ac8362b956d574672f710adf62006ffa9
 EBUILD maxima-5.46.0.ebuild 5969 BLAKE2B 9a4bee7cb52eff0e41e2456418efb318601ec4a613c4e8daf23141903577f73b893fe77e46a52d350b9ea3fdf6848d80c54e3c05dcd806670449c064de6606e9 SHA512 dea407c64fc8d4b1287e7c728ffc7c8680ec6aa08d0b5850a2c0d2000afeab77539d31f4a250076e56a41540bbe301d21cb2ac2d9fa4716f11e7a590c86161fd
 MISC metadata.xml 1736 BLAKE2B 0ad2ee8af914d2de42315204dc73650507abab4d671b1d531f426aa5d5ce7c9ebfb2815592327efab62768659ba7037419285f242adf4c453117836930fb0a95 SHA512 399a8f29bc3f1a3c4c2c1c926f979fb65c517ed165b95dd4b9585004d45c0075761a278ac928fa03ee7523262ddb930952775dc98b092425c89c1c7ee41293f1
diff --git a/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
index f7a15f268d76..e106fab26432 100644
--- a/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 
 IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test"
 RESTRICT="test" # bug 838202
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 2c9a5f34f3b2..43f2ffbc8ad9 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-gentoo-auth/Manifest b/sec-keys/openpgp-keys-gentoo-auth/Manifest
index 854a06fa951e..db322513caa6 100644
--- a/sec-keys/openpgp-keys-gentoo-auth/Manifest
+++ b/sec-keys/openpgp-keys-gentoo-auth/Manifest
@@ -3,5 +3,5 @@ DIST gentoo-auth.asc.20220101.gz 5775 BLAKE2B fd8caa753da59bcb9597e302d2c94e6053
 DIST gentoo-auth.asc.20230329.gz 3371 BLAKE2B 2d4940e50c8b415f48a0fe479b95dbe1f2ab83af8eceda582ecd9386fada54126cce2fa7e509611fe8d51b14dc1638b3aa19f87fbe2b7bb8dffc91657ead2a48 SHA512 b516104e6affbcdced8aba100a0eadb82b1fc3a6cc8ed907486e30c44e78f77dabd6dc1e02383537d13a380247f315b7c53711e3b5994242a84afeca4af755fd
 EBUILD openpgp-keys-gentoo-auth-20200704.ebuild 794 BLAKE2B 6e7d8136f715bdc903da9f0df26c590b4823c8af83667b6943741f388cc0f03f12b3b5d003426822f45a27adaf28066ad5d709500de709fceb4677bfc649494c SHA512 0d18aa00933c0cc1f8dddc2b15d4ccafd69a4a0e779e4355db5667015d21ff7f99cd854dd4503f93198866458a57643fe5b2b5be94436f2507487220e6b3ba7d
 EBUILD openpgp-keys-gentoo-auth-20220101.ebuild 786 BLAKE2B 10ffdd9503faffaaf806befb7fa73600cf9dbb2636d8164c7c098f88b627bc78e24f4b7b22d29780ea4f65bb64765d55d4097ddd311db3cf7142560085b74e34 SHA512 1f21a9f6eb74ecab1479726c8e2c6870ac28d3d799b730cdaaab2ec28b6cd6e2a761b94644d6edb9ae177cbbef296c492303337587432bf1839455656a9b92e8
-EBUILD openpgp-keys-gentoo-auth-20230329.ebuild 794 BLAKE2B 697c32cce5a2604fa77f7a73b3ec0537655b4ed723c53d27ee595848ee222ad388f6934583add207e262abfb680eca02b0df92689b48f1f871051834202b3af1 SHA512 2b402fc92239eb7151f4020e6ab13574d2310ca2f92790727be01cabfe5c4173a7e5de5d7318701c4b1f563db92d49ed459237f3fe693a2561fa8a991444bc00
+EBUILD openpgp-keys-gentoo-auth-20230329.ebuild 786 BLAKE2B 10ffdd9503faffaaf806befb7fa73600cf9dbb2636d8164c7c098f88b627bc78e24f4b7b22d29780ea4f65bb64765d55d4097ddd311db3cf7142560085b74e34 SHA512 1f21a9f6eb74ecab1479726c8e2c6870ac28d3d799b730cdaaab2ec28b6cd6e2a761b94644d6edb9ae177cbbef296c492303337587432bf1839455656a9b92e8
 MISC metadata.xml 272 BLAKE2B 583272860b0b9615e8d57fed7ced1a93035bf0c25285d230412ac7af2e48a8156c2e9d9c0581da80f913a2748eb76579b64648fd1e22ce0bc89da66aafa30809 SHA512 19c90c888b76564e32674364a753ba2d6a0b9ce6f3a97f45bb876c32f83c8206e6ec318e0960747b2003a4c3a426994f25c6b83da8b294d575f45e80c6105d89
diff --git a/sec-keys/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20230329.ebuild b/sec-keys/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20230329.ebuild
index 671ff3427de3..b751e4d95566 100644
--- a/sec-keys/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20230329.ebuild
+++ b/sec-keys/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20230329.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-auth.asc.${PV}.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 S=${WORKDIR}
 
diff --git a/sec-keys/openpgp-keys-gentoo-developers/Manifest b/sec-keys/openpgp-keys-gentoo-developers/Manifest
index 3dad165192c7..e26a2db4bb8b 100644
--- a/sec-keys/openpgp-keys-gentoo-developers/Manifest
+++ b/sec-keys/openpgp-keys-gentoo-developers/Manifest
@@ -1,7 +1,9 @@
 AUX keyring-mangler.py 3005 BLAKE2B e5435432b79156c26120af950f46f9a916af7261a78b40081eb140e18b3fd4f0d2ce55cd2ed305bdd4f60b569edfb513c1151a6255838a750d37225715e87e4f SHA512 bd4dc3dee66c0f0b8b657da1fabfbda96ea03b77d1080fa1d07b14d2a9571fe91f7589131893b75548122e772678760c7722fd8a46e120c40d8dbb8cb4341dc9
 DIST openpgp-keys-gentoo-developers-20230327-active-devs.gpg 3134134 BLAKE2B 31a06e5552253c494cdb8defdc81198fa55d1d2e33950415125edeff0075243ce170243188c5b016e4ecf4184c99d072d79a8b0de49a642bcdd1b4d01971ff47 SHA512 9b67b485a323f08786552a0e6dcc378cbe331accc2960b7121c344275629933733e5e268d3d5d96b70c40a541a1b6447c983fc11caadc1455d0b7609d9360b9c
 DIST openpgp-keys-gentoo-developers-20230403-active-devs.gpg 3033398 BLAKE2B 233549fa600d855df1f4130224c63b10d0df3312886bef1c0486553db3025554a4fff7af104a3f0869390d53837a8d0182d830432e855273da28c753ea579d7e SHA512 33264b9ef002656f5c58dc2b2ff568d01b624c68e2e42db0d388b9a99b45c2d605df0d5db7b5029c0946f524fa7168252ba87908336e6f9ad0717c20d43cd112
+DIST openpgp-keys-gentoo-developers-20230417-active-devs.gpg 3075471 BLAKE2B a1d35a6fa32cd92662ce7913000f043d15b2875865a7839df69c7c5648b70c20c43d59cc8fbc9d5bcbd4ea48ea7e7f8063a79fef624d39c092b60b6741e793bd SHA512 4637d67ab19512c80547f029ab95ba755308f9a88c7de4d417177201620b1e48fc21b4ae2bf40770222076aab10f812a71046ce198bdcfa1d08283a3211a4755
 EBUILD openpgp-keys-gentoo-developers-20230327.ebuild 7516 BLAKE2B 43511ae0601dba57fd74cacdcb54d8524daa8b7dcedfaed9db28743ba2a73fef0387be91a7d960bb1070dfa3d5cd5989f7625c7aa45a4bc66fb9936ac824f7e3 SHA512 ed9783038397f41655917fd354aca496f9bfa8b4ca54b736d5173d17308b056aa0ef87d2d9984a709fee3fc42c3d9fa2b36dc88058c2e86261989c7b47b84bf5
-EBUILD openpgp-keys-gentoo-developers-20230403.ebuild 7530 BLAKE2B a43990c1c1441f877c04ddeb45d3a96cb829c223d26986129f520219afe2e8dd43e67f9878e666fc71fbac357dc77e54426a20cc352029ed199e3374e958feb3 SHA512 9a896722504447f82d1e3431b4f9a38ac523a08c4f6e4cbb798e75133b20a2b54d4abe220b6ba5c7848804fb3b0aad9f02ede441acd36f11cd988d45c87eda50
+EBUILD openpgp-keys-gentoo-developers-20230403.ebuild 7522 BLAKE2B d48c00f39d882d632ad70651e47e06887af88a320623d6f5009ad735ff449895d18bc00838bc4fe72c905ebfbef233cffec407a359280fd4e88fb44b433e7e97 SHA512 7fa3f01773d5a3dfdc4f4221d6a15872f7eb74cbd262237fb6b5a8508b175a2e82679120efa5f686392f99402f71dfb1fcf833d5fbed76aaecb1aee37ac4ffac
+EBUILD openpgp-keys-gentoo-developers-20230417.ebuild 7530 BLAKE2B a43990c1c1441f877c04ddeb45d3a96cb829c223d26986129f520219afe2e8dd43e67f9878e666fc71fbac357dc77e54426a20cc352029ed199e3374e958feb3 SHA512 9a896722504447f82d1e3431b4f9a38ac523a08c4f6e4cbb798e75133b20a2b54d4abe220b6ba5c7848804fb3b0aad9f02ede441acd36f11cd988d45c87eda50
 EBUILD openpgp-keys-gentoo-developers-99999999.ebuild 7524 BLAKE2B b25f55fc15605a7ae98ea6c232c3c52c522478eef6e7c0454560874de41639b9af22b569b45e5363481ce5b1f0e55b0fae92c9be98fdd9cdd5a7a2c1b4cbd195 SHA512 59df2a70e59e2c029f383c971e0a00cd10c11fa8c8eaaf692fca4c11645a5877f0c0a4d121257fee42442b1f9252b497ba625e1ab1c4fd4d08aaaf59d91eff1d
 MISC metadata.xml 264 BLAKE2B 630ac0044f623dc63de725aae23da036b649a2d65331c06fbe9eb66d18ad1a4d3fd804cdffc4703500662b01272063af346680d2550f2fb6a262d6acee8c6789 SHA512 3cf1981080b4a7634537d20a3e837fa802c52ae5ee750531cc4aa3f8478cda78579375602bc058abbd75f9393f9681b79603c3ddd9af809a1e72f7336a708056
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild
index efd0694ab707..3c30975acd6f 100644
--- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then
 	BDEPEND="net-misc/curl"
 else
 	SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 S="${WORKDIR}"
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230417.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230417.ebuild
new file mode 100644
index 000000000000..efd0694ab707
--- /dev/null
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230417.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit edo python-any-r1
+
+DESCRIPTION="Gentoo Authority Keys (GLEP 79)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+if [[ ${PV} == 9999* ]] ; then
+	PROPERTIES="live"
+
+	BDEPEND="net-misc/curl"
+else
+	SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+	$(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]')
+	sec-keys/openpgp-keys-gentoo-auth
+	test? (
+		app-crypt/gnupg
+		sys-apps/grep[pcre]
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		curl https://qa-reports.gentoo.org/output/active-devs.gpg -o ${P}-active-devs.gpg || die
+	else
+		default
+	fi
+}
+
+src_compile() {
+	export GNUPGHOME="${T}"/.gnupg
+
+	get_gpg_keyring_dir() {
+		if [[ ${PV} == 9999* ]] ; then
+			echo "${WORKDIR}"
+		else
+			echo "${DISTDIR}"
+		fi
+	}
+
+	local mygpgargs=(
+		--no-autostart
+		--no-default-keyring
+		--homedir "${GNUPGHOME}"
+	)
+
+	# From verify-sig.eclass:
+	# "GPG upstream knows better than to follow the spec, so we can't
+	# override this directory.  However, there is a clean fallback
+	# to GNUPGHOME."
+	addpredict /run/user
+
+	mkdir "${GNUPGHOME}" || die
+	chmod 700 "${GNUPGHOME}" || die
+
+	# Convert the binary keyring into an armored one so we can process it
+	edo gpg "${mygpgargs[@]}" --import "$(get_gpg_keyring_dir)"/${P}-active-devs.gpg
+	edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc
+
+	# Now strip out the keys which are expired and/or missing a signature
+	# from our L2 developer authority key
+	edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+			"${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+			"${WORKDIR}"/gentoo-developers.asc \
+			"${WORKDIR}"/gentoo-developers-sanitised.asc
+}
+
+src_test() {
+	export GNUPGHOME="${T}"/tests/.gnupg
+
+	local mygpgargs=(
+		# We don't have --no-autostart here because we need
+		# to let it spawn an agent for the key generation.
+		--no-default-keyring
+		--homedir "${GNUPGHOME}"
+	)
+
+	# From verify-sig.eclass:
+	# "GPG upstream knows better than to follow the spec, so we can't
+	# override this directory.  However, there is a clean fallback
+	# to GNUPGHOME."
+	addpredict /run/user
+
+	# Check each of the keys to verify they're trusted by
+	# the L2 developer key.
+	mkdir -p "${GNUPGHOME}" || die
+	chmod 700 "${GNUPGHOME}" || die
+	cd "${T}"/tests || die
+
+	# First, grab the L1 key, and mark it as ultimately trusted.
+	edo gpg "${mygpgargs[@]}" --import "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc
+	edo gpg "${mygpgargs[@]}" --import-ownertrust "${BROOT}"/usr/share/openpgp-keys/gentoo-auth-ownertrust.txt
+
+	# Generate a temporary key which isn't signed by anything to check
+	# whether we're detecting unexpected keys.
+	#
+	# The test is whether this appears in the sanitised keyring we
+	# produce in src_compile (it should not be in there).
+	#
+	# https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html
+	edo gpg "${mygpgargs[@]}" --batch --gen-key <<-EOF
+		%echo Generating temporary key for testing...
+
+		%no-protection
+		%transient-key
+		%pubring ${P}-ebuild-test-key.asc
+
+		Key-Type: 1
+		Key-Length: 2048
+		Subkey-Type: 1
+		Subkey-Length: 2048
+		Name-Real: Larry The Cow
+		Name-Email: larry@example.com
+		Expire-Date: 0
+		Handle: ${P}-ebuild-test-key
+
+		%commit
+		%echo Temporary key generated!
+	EOF
+
+	# Import the new injected key that shouldn't be signed by anything into a temporary testing keyring
+	edo gpg "${mygpgargs[@]}" --import "${T}"/tests/${P}-ebuild-test-key.asc
+
+	# Sign a tiny file with the to-be-injected key for testing rejection below
+	echo "Hello world!" > "${T}"/tests/signme || die
+	edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die
+
+	edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc
+
+	# keyring-mangler.py should now produce a keyring *without* it
+	edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+			"${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+			"${T}"/tests/tainted-keyring.asc \
+			"${T}"/tests/gentoo-developers-sanitised.asc | tee "${T}"/tests/keyring-mangler.log
+	assert "Key mangling in tests failed?"
+
+	# Check the log to verify the injected key got detected
+	grep -q "Dropping key.*Larry The Cow" "${T}"/tests/keyring-mangler.log || die "Did not remove injected key from test keyring!"
+
+	# gnupg doesn't have an easy way for us to actually just.. ask
+	# if a key is known via WoT. So, sign a file using the key
+	# we just made, and then try to gpg --verify it, and check exit code.
+	#
+	# Let's now double check by seeing if a file signed by the injected key
+	# is rejected.
+	if gpg "${mygpgargs[@]}" --keyring "${T}"/tests/gentoo-developers-sanitised.asc --verify "${T}"/tests/signme.gpg ; then
+		die "'gpg --verify' using injected test key succeeded! This shouldn't happen!"
+	fi
+
+	# Bonus lame sanity check
+	edo gpg "${mygpgargs[@]}" --check-trustdb 2>&1 | tee "${T}"/tests/trustdb.log
+	assert "trustdb call failed!"
+
+	check_trust_levels() {
+		local mode=${1}
+
+		while IFS= read -r line; do
+			# gpg: depth: 0  valid:   1  signed:   2  trust: 0-, 0q, 0n, 0m, 0f, 1u
+			# gpg: depth: 1  valid:   2  signed:   0  trust: 0-, 0q, 0n, 0m, 2f, 0u
+			if [[ ${line} == *depth* ]] ; then
+				depth=$(echo ${line} | grep -Po "depth: [0-9]")
+				trust=$(echo ${line} | grep -Po "trust:.*")
+
+				trust_uncalculated=$(echo ${trust} | grep -Po "[0-9]-")
+				[[ ${trust_uncalculated} == 0 ]] || ${mode}
+
+				trust_insufficient=$(echo ${trust} | grep -Po "[0-9]q")
+				[[ ${trust_insufficient} == 0 ]] || ${mode}
+
+				trust_never=$(echo ${trust} | grep -Po "[0-9]n")
+				[[ ${trust_never} == 0 ]] || ${mode}
+
+				trust_marginal=$(echo ${trust} | grep -Po "[0-9]m")
+				[[ ${trust_marginal} == 0 ]] || ${mode}
+
+				trust_full=$(echo ${trust} | grep -Po "[0-9]f")
+				[[ ${trust_full} != 0 ]] || ${mode}
+
+				trust_ultimate=$(echo ${trust} | grep -Po "[0-9]u")
+				[[ ${trust_ultimate} == 1 ]] || ${mode}
+
+				echo "${trust_uncalculated}, ${trust_insufficient}"
+			fi
+		done < "${T}"/tests/trustdb.log
+	}
+
+	# First, check with the bad key still in the test keyring.
+	# This is supposed to fail, so we want it to return 1
+	check_trust_levels "return 1" && die "Trustdb passed when it should have failed!"
+
+	# Now check without the bad key in the test keyring.
+	# This one should pass.
+	#
+	# Drop the bad key first (https://superuser.com/questions/174583/how-to-delete-gpg-secret-keys-by-force-without-fingerprint)
+	keys=$(gpg "${mygpgargs[@]}" --fingerprint --with-colons --batch "Larry The Cow <larry@example.com>" \
+		| grep "^fpr" \
+		| sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p')
+
+	local key
+	for key in ${keys[@]} ; do
+		nonfatal edo gpg "${mygpgargs[@]}" --batch --yes --delete-secret-keys ${key}
+	done
+
+	edo gpg "${mygpgargs[@]}" --batch --yes --delete-keys "Larry The Cow <larry@example.com>"
+	check_trust_levels "return 0" || die "Trustdb failed when it should have passed!"
+
+	gpgconf --kill gpg-agent || die
+}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins gentoo-developers-sanitised.asc gentoo-developers.asc
+
+	# TODO: install an ownertrust file like sec-keys/openpgp-keys-gentoo-auth?
+}
diff --git a/sec-keys/openpgp-keys-gentoo-release/Manifest b/sec-keys/openpgp-keys-gentoo-release/Manifest
index 98d53a4f0e1d..82f45fd46b08 100644
--- a/sec-keys/openpgp-keys-gentoo-release/Manifest
+++ b/sec-keys/openpgp-keys-gentoo-release/Manifest
@@ -4,5 +4,5 @@ DIST gentoo-release.asc.20220101.gz 16588 BLAKE2B d28eb9834bbd908fd25435a28fc857
 DIST gentoo-release.asc.20230329.gz 16462 BLAKE2B 3ee5a2b9442731ff4498b448c5defe07b6fb299196f31445ba934360fff295150c0bcac037be01a1e5db97f00de1ccbfdb3a7abbf4ad0ff069d95ab42e28e680 SHA512 6e0720b0894dd80b19b769731aaa1862266371ad45c7d9e0fc9df173454b7d8b0f345dd16a47e3034d8ab34c50c3818a305f863af83edaaf7421f25bb03f4ad4
 EBUILD openpgp-keys-gentoo-release-20200704.ebuild 1355 BLAKE2B a60a4ef7e29aec0034faf5bf6ff2dc87c3475da9da7c6d84cf63afe77cd52788ecdcfc666d31ea449c4065f480c19bd57436b42ffd49404432dfb943162c7546 SHA512 222b3c990f17f34a7ec0cf0a9a7b1a833c3b89cfdc32fdfa9632f45c3df05e084029a332da52c06dde955c586d907d1fb6657d7bbc0877e1a52663bfbd2a22dc
 EBUILD openpgp-keys-gentoo-release-20220101.ebuild 1355 BLAKE2B a60a4ef7e29aec0034faf5bf6ff2dc87c3475da9da7c6d84cf63afe77cd52788ecdcfc666d31ea449c4065f480c19bd57436b42ffd49404432dfb943162c7546 SHA512 222b3c990f17f34a7ec0cf0a9a7b1a833c3b89cfdc32fdfa9632f45c3df05e084029a332da52c06dde955c586d907d1fb6657d7bbc0877e1a52663bfbd2a22dc
-EBUILD openpgp-keys-gentoo-release-20230329.ebuild 1363 BLAKE2B 6994493854e5ddebd9fd62907134077f7e8e24d14b495d352592ccf2fa5dd241dc791d75fbe4d8b892e18d50748802e244a0a6aef1b8b0326da56aed49606bfb SHA512 8f58c3226c59a66ce20d1b5fc13c8dc11bb270f86c6bf158c70ad5b83441eae1d986887d08479b2abc38681f9a29e1501166974b1045a962be538ead39ef3044
+EBUILD openpgp-keys-gentoo-release-20230329.ebuild 1355 BLAKE2B 1f217e2dc11d1ca7a4c0b03c0e7e40f2b5fc3080d443ddcd2402297a9579b554e0c97e24bc426434c8e997b83d9da483b36c456c2f4e0b8e19b4201c42fdc325 SHA512 dac6afa4db42cb0d8c140abeae32906df2c166a52a78a2668a30c09df87975219ba3b26aa9f656d41adba62452b8133c3dcbbcd79d3e20fb8cb564ad3c068088
 MISC metadata.xml 272 BLAKE2B 583272860b0b9615e8d57fed7ced1a93035bf0c25285d230412ac7af2e48a8156c2e9d9c0581da80f913a2748eb76579b64648fd1e22ce0bc89da66aafa30809 SHA512 19c90c888b76564e32674364a753ba2d6a0b9ce6f3a97f45bb876c32f83c8206e6ec318e0960747b2003a4c3a426994f25c6b83da8b294d575f45e80c6105d89
diff --git a/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20230329.ebuild b/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20230329.ebuild
index f64625ef2cc3..67bbc763b5ef 100644
--- a/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20230329.ebuild
+++ b/sec-keys/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20230329.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${P
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 94ff54345913..b4e4f7f967e8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index d7130783a988..b35517c5ff82 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -5,6 +5,6 @@ DIST nvme-cli-2.2.1.gh.tar.gz 706199 BLAKE2B e0026fc2ee3edeffa18b0fc8365703e3de6
 DIST nvme-cli-2.3.gh.tar.gz 733161 BLAKE2B b6da650379f24e0dc5c41af3d09fe15076ed70ad39cf48060fd949e3a4bbfe896eef4dd42e27314fab695710c9cb04985f3444e0384b71794cfbf489aa3e6244 SHA512 9ef654e782ba737d3858fb11f24caf27aea820480179d07d32599731be204e52693062cdb86786ab5cdd1d94fe32ae9028baa0a58693d2eaee5a2b71155e3db2
 DIST nvme-cli-2.4.gh.tar.gz 746955 BLAKE2B 7ca26f957bf6927f7af17ac18267cb1099d63ce0f19b085a412b3a1b343946311edf8c5d5924444b7c7d440fbf42597ee7b9717bf9f5dcdeed0a9a17f135d343 SHA512 155667a0b91e15267e3f991a30cf1d4ae26cb4c53b20c002e3d3341496dd463397e1afbfefcd7a8df88370d28417940ce44a060bda87c04482bbe3be4e901b73
 EBUILD nvme-cli-2.2.1.ebuild 973 BLAKE2B 0fce7c3f1c44b4ac5028132030db755dd99ab26ca30d5bbd30d7252ade6714c761d49b492d3ee3ff3baf41939ce52e17d7ea6091e4ad92cdde1def4977b6024f SHA512 86f0841abd19ec017b6c2c516333a25983997318309f3622a49e097427ae8934e607b194d81b08d6fbef1f0aa19c960d9bf63394adefb7f7e34f1a4f13a085ef
-EBUILD nvme-cli-2.3.ebuild 1037 BLAKE2B 08a39f38cc948b42bb211fc42096867f8c499ca2593591dc34b228f57a413c7152af41565fde2479a9ea06e78f494ed7d85ba458220fb16f2425c589c6904095 SHA512 5e4474d93ecd183a0f84ee05440a55ba5bafe0da5b8586b9f5a8ade720aea83ac78e462599dff2b2405d5fe7ef54592647ad2cd898c56be59384b07042707b21
+EBUILD nvme-cli-2.3.ebuild 1035 BLAKE2B 8f33bdcfefc9eed67cd23e33ad9c4a0e5687167224e9531a98084cf462fb0d5d4615dc2d18addd1f9d76e5bdbe446d74218d8d1ec86860f230487e038f8f79c5 SHA512 d8dd0842d02000aabd596e50adca00d7f23db8ef419bc4d16c48bfbe37b23c08c1230028defcc3416d22e6cc67203fc3aa8d682fac500ea44e90c2fa3fd307db
 EBUILD nvme-cli-2.4-r1.ebuild 1116 BLAKE2B ac8c58726c0ed4a06cf3f5d9d567b8fbb7d0a2ab59f93a79362ded3fb215f74ced84c676836d9d3d49deec87a100ba52650ef44968194350899ab4d36723fd2e SHA512 167657fe908d2cdb84e95df66a29a3e89ba5bf3efabb451fa40f8d60994267dd98b74bae91254cf2eacdbbab910ab07c370f3cb2f065ca22b23c31c3279b0506
 MISC metadata.xml 542 BLAKE2B ec93d6395b76ed201e05ec98e5813f025e74e8afa849084b664faa6c9dc03a8f8237cdb2fec5675db7cc70575b8c07383470d4f3d36b595980bcffdac83d2708 SHA512 ba2ed3173808235a4567152d23836f9828c345e8e716781ee5b7c1aeaa0053ff36ffd85ac12686302af10b1bd02a61e061446e4e1cb2600ce00da3bb1d72b6ee
diff --git a/sys-apps/nvme-cli/nvme-cli-2.3.ebuild b/sys-apps/nvme-cli/nvme-cli-2.3.ebuild
index fd549dd99719..6c230c4137fb 100644
--- a/sys-apps/nvme-cli/nvme-cli-2.3.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="hugepages"
 
 RDEPEND="
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index c5ae9cc23bb9..1ca6e7b842b7 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 6d03b5da7d32..13c3487a538a 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -2,6 +2,9 @@ DIST parallel-20230222.tar.bz2 2479116 BLAKE2B 3954f6e9dedb14c56881a4dcc329e06d2
 DIST parallel-20230222.tar.bz2.sig 2080 BLAKE2B 1e7c4897dcdb739c8ca64328ae805c85209279d5378d639fadb1c6c04cba4de3deff0491b72d4c756e4ba14024473342f3a7aaa10fa37b3014ab5511fec6ccc6 SHA512 4451b95dad47248481bcbadf19a246d0de5a79af73b467b3ce9ccb9fd7b585a49f1044694d189005c9771f37db8e4df1c60f2c63f880ef717df3026291ce8985
 DIST parallel-20230322.tar.bz2 2479384 BLAKE2B 6aa932f77b58f0982d40eebe4863efc009b0317753898edbd3c3fc385b2e4a094444bcceb5384037f656ceb3bc27c9ba5e042ff09a7a885bb5ba479ce7051cc3 SHA512 4100de413d855bfa38773bce137a289aebd20a5ca7a1806d7933a47e40e09eab9eda70719158f675f7dac49952017dc2df338e735f75682906ecec74ddec65d2
 DIST parallel-20230322.tar.bz2.sig 2080 BLAKE2B b26c5b934ca77b5d08c7eaa08ce906cca445541682ff0a4d1a827e9e7ca252918f4823a3e79210f75ff60b6fef4ec4c1447dcfc963b93d1e26b7ff87dd20b5fa SHA512 2239320e4bff7b19ecfe2fa2f7256ee591d4d68d53a9803070a0c71b22c267b3a2e8fbd7150ad532647381d6f0c15cad55873148daf81a146ba3d4fec90e2ec7
+DIST parallel-20230422.tar.bz2 2483116 BLAKE2B d89c6634d5884b008c1701730f1f09a1ab74148ea221eee69ed314f0e1823e224325cfbd3a08fc8060b60fadb7dfc62e4fe17df65d7376795cc4fb88c2acf53f SHA512 1e084746d6b108805d3f5828913450d1ff70a38ecd6655db55da89c5179a686d9622b13ca471ccf44b2034abb4e5c22664810b6a8e5859e3c0ecf241fa56c9ed
+DIST parallel-20230422.tar.bz2.sig 2080 BLAKE2B e4c052d3ef0f9c3e9e806f10ba166c8e164ad7983c4005a799084537e6afd37f7429490a7fd72bbdc5e41c9a6f19b9ca83306e9bb236294a00bc91c04fe70baa SHA512 432b9aa939e00a97eccbc2ca52d6c9858794826e38a6e8125fb30087679784d1145f6b98a4ed0f7b109cb2cbc3cfa0edbaa36a35959d8e0bbff711e93e58e0d4
 EBUILD parallel-20230222.ebuild 914 BLAKE2B ce37126c267be3b357491f7b76da476e7694201c57d5df67cba239a635e8b79597106a101ab107b257334ac638265147810115dd2f3adeb445c2db6baefd1c45 SHA512 529bcaff4277edccd24a0f4310e1f97d5cb5234695a783e96c183062bf2441340c16e49e597aad39165c83949d791dbdd64036640975b3b43d69d7c57930f878
 EBUILD parallel-20230322.ebuild 934 BLAKE2B ac3df2a05f9bf353e0876c4f0c53b9a0f8ba5a33488db759cceb0418f3f1cd01376686499ac289650a7029e25b0857ae94e1b8829dd017824639f6ce17f67128 SHA512 70edd2465966794ac1489cffc1835274abd5e306ae07704c5ea61bdf376809e6aa91f79bdd51e22aa3d465276f48510d39956dc27568de235c1c75200fe62158
+EBUILD parallel-20230422.ebuild 934 BLAKE2B ac3df2a05f9bf353e0876c4f0c53b9a0f8ba5a33488db759cceb0418f3f1cd01376686499ac289650a7029e25b0857ae94e1b8829dd017824639f6ce17f67128 SHA512 70edd2465966794ac1489cffc1835274abd5e306ae07704c5ea61bdf376809e6aa91f79bdd51e22aa3d465276f48510d39956dc27568de235c1c75200fe62158
 MISC metadata.xml 1078 BLAKE2B 190d48305a18559658e87132e6be2831db9d8c314b29cf4e5808b6308cf86cb5d46a1b80214fcb8f45f12578a18ebefad8b0b91912c9fbb68126be66ae62ad55 SHA512 80b649870b5b9e12b436f82ce8fd3efad8b3e251c919a90b8c32945332bb3dd88e5bfc96acca6a12a38f2d6e1ce63effa593ef975c8109bad3a85d2d69b2ed98
diff --git a/sys-process/parallel/parallel-20230422.ebuild b/sys-process/parallel/parallel-20230422.ebuild
new file mode 100644
index 000000000000..1e053ef0a780
--- /dev/null
+++ b/sys-process/parallel/parallel-20230422.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/oletange.asc
+inherit verify-sig
+
+DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
+HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Devel-Size
+	dev-perl/Text-CSV
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-IO
+"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 )"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 20191aaed79b..aeb320a60436 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c7c2c6b3bb91..d756379f5e23 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -28,6 +28,6 @@ DIST chromium_112.0.5615.49-2raptor0~deb11u1.debian.tar.xz 780000 BLAKE2B 2aa91c
 EBUILD chromium-111.0.5563.110-r1.ebuild 39047 BLAKE2B 9c5549a83388f11c149ab3fc7f6a10650ee1fdc461cc4c693ca814adfd0a45247170becb8cf5ca2462a62ced7109737eaf0d79205c514dc1d32aafa5327942a7 SHA512 3b0b324d60482e69989436cce5a3ec79b35b2676ce6ce135139e7f848fded45197c4afd0428a0b2c96a749fba281130ca1fd9feaa9a11fe41087149dc361a4b1
 EBUILD chromium-111.0.5563.64.ebuild 38992 BLAKE2B a48b79ba64e4d04ec413b0b7369af14887726823358218adb4cdbe039af67e3a5c87efdef17556649d581f2280edfc01d31b1b4d4e23a5e20d35a5f8af018729 SHA512 d0e2550b9a2ee76afeab5478b7f3effe69d23a50d994aa2c1e2268c5eff14019aafdd0e9b007a409843b3060417980a2dc6d33ea9b24650901f4bd6191ee7f29
 EBUILD chromium-112.0.5615.121.ebuild 38818 BLAKE2B 2b42ee08010f92a703b4c9b6679fc567c08ba7ad3a9f9edcdf1aa77b13a9bed621362ebd91724c89c323dc8695c509a375f255c6fba060315a1aba046dc5b9ee SHA512 12c728ce4713a62e66df347a771a4d48bf5bfa6490ed7bf6db6bd9b1af720ac900cbae0f696355a028b25a36684010156cb12cf38b69e24625f1f6cfe16fb8f6
-EBUILD chromium-112.0.5615.165.ebuild 38989 BLAKE2B 451c613cdb5933a9ecbdb0287795f96f74b127efaf6fdeb52f85e0f35ef75b6710168177ca4c4dc566afff4cb2690e8a5149d88f4c5e337b3b8687fea18b3435 SHA512 39f4d54baa2c6f1ac876ea8fff182062b47b7d850d7d0ffde9283956a8f262b0af2a0459d92496d0b0894150d952d9f38cac6fe3260109b4d2bc12bf229eb015
+EBUILD chromium-112.0.5615.165.ebuild 38988 BLAKE2B 984f98039ec0ede0b4f4ffd272c03b19d976edf9fedb5c21db226369d947677da909d6622b4d285bdfa86ef1669338dca8363db20df17d4bad68b32c517c019e SHA512 5e68d415eeb0e7e43177f66088579f12587cc84b6192e44fc2b990680fa3e5ba5c363248d73feef17d928a0f9b18951b266f37accec73738c4d5ced2d364ba63
 EBUILD chromium-112.0.5615.49.ebuild 38768 BLAKE2B ef5ddf8d7d4f1f2618d9b949ea1e3e3b86e2ae98212193b154e698a8a940859f67711489176d5585926cb5c059972a002705559e423c365079de2837dd3f3b55 SHA512 375d1497b7bd74af31c0d5a355ec6681c9cdb49aa32d9bb89ea13d26688013f7e4b1653c3b5cba70f9a4aab5d97f2a0d98249fa4a3a983aa37c24ff4220116e2
 MISC metadata.xml 2167 BLAKE2B 3ad0af16da80ea03ce1deb54468b5668d1565742773e583f44688df3f7ea58a72271ccb58f467f0424bd601f4c7256ef6dc340a31a9a66547c3860069c812492 SHA512 6671a247003dae4accf588e2e62242286caf2310869a5ed5b327f46b484848a25d03baaf179a740ca8f7b2c30bf3095cf72c166fae8f0a15c63dad9174fa28ca
diff --git a/www-client/chromium/chromium-112.0.5615.165.ebuild b/www-client/chromium/chromium-112.0.5615.165.ebuild
index 7ee6d75449a5..22f88f8683cb 100644
--- a/www-client/chromium/chromium-112.0.5615.165.ebuild
+++ b/www-client/chromium/chromium-112.0.5615.165.ebuild
@@ -29,7 +29,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid !libcxx )
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index bb63ba96cac9..8650534ab79d 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 24d76d86c9e7..78b4e7dca2c8 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -2,5 +2,5 @@ AUX monitorix 792 BLAKE2B c69ea9a0953928cac7020e5e3f7dd03b78b71770645bd90bc3556d
 DIST monitorix-3.14.0.tar.gz 393803 BLAKE2B 84a2b0a8417a405757e43c752b8e4aa0faf4c750895e5425801c3682f25671b8b4858ee4fdf94e4da181250c0ddbdc9237624af0d1dcbec4a29a8076f35a9fc6 SHA512 c7b11b2144b9cdcc5fdb33cfe208d5d5c7c8e27dfdacd51148a4077748632e592cf07dbecd5992c34ff4aea982e62a03a20d1920fe142da7f6ed5367729bfd2e
 DIST monitorix-3.15.0.tar.gz 404645 BLAKE2B f76f93c3c4bda3af501f60fa50a9c04e4f5b666827f725fd9f5c68c54d7320f0d5a8f14fc933328e33fb9fb24eb725fe18350b18c5dbf3b43fc00baa337d3a52 SHA512 1dffbd45f0aa7049296121da29f4d450d06e7960883e9a09390bcf6f4bb25d027c1154601b5f738cfbb74c6bbf5df25f61d68268428b730a0cce12834d2986ea
 EBUILD monitorix-3.14.0-r1.ebuild 3796 BLAKE2B 5d6dd9011de262a3c08051b0a3c9f7ab70c3aa7ef16197936e8e7fb53e33d99d8c844c50f17b6cbc871a47927e365d93d36a8dd3e6ebc1c3c8b03d4dd93046a0 SHA512 470fd6bf232267d2ca042e9670f95e937459b24723e3b738002de0322c43fd460d0b7c499489fa1cfd1484836fdf5aed6d58acd5cabed1aacf5d22d3f6ee306e
-EBUILD monitorix-3.15.0.ebuild 3727 BLAKE2B 713de1507632a00015359c71be0ad961d4805d0a63970aa6dce175fb6e077764ce06aa2b1e22231bc33337abee8df051754c2d033252f6c03b4c835e6021f521 SHA512 537f5b3f2ad3ece9c56e42e2b0028a1cbbd085002b3f9eaebbd00068337db1372ea13c0e76d8cb4e534bcc63a154f3286f8cb52eac857c2096e0a616ad3b987b
+EBUILD monitorix-3.15.0.ebuild 3725 BLAKE2B c3b3819d2c2d1b22f726a4f916dce6a145808b7b5a2c34f0fe1c6c848f212f369770e6abd4591dca5cc022ead478cd59122158541cd83392cb60d08e7e6a369d SHA512 5ac95f05fd9863a03a56b22fba499c1ffb561e66405d3005fd25bdba95b750a23a9e5f6665b7aa19788bda591cf282a5ee73fce8a534b03c8eedc10af5ddc25f
 MISC metadata.xml 487 BLAKE2B 6dade6679de9045464ce974db2e6b8a44bf64e97d689b566ded1342c5e1f2a578db10a6a95543bc9c2ab5189e33abb780540a2b4a5d0d687cc3c6c6bcbf9deda SHA512 0c0ffb4a7a744795f041f1bd515b73c251cfb11a50227104abde96d4d04bb837fbd1a550fc03c68ccd3414c6950f9addf934ef54b65ab193cd1833b90ced46ab
diff --git a/www-misc/monitorix/monitorix-3.15.0.ebuild b/www-misc/monitorix/monitorix-3.15.0.ebuild
index 005ac2f5bda9..6c77b32657b6 100644
--- a/www-misc/monitorix/monitorix-3.15.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.monitorix.org/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	acct-group/monitorix
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e91ae382c8b1..7350598ecacd 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index a878f95aee34..1d520f9a10d4 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,17 +1,13 @@
 AUX puma-5.6.4-logwriter-test.patch 528 BLAKE2B de30ccfa68916ef4ea3d460eb96d2b28711e619792848a0fd065eab836c88f03f4ecde8699773f963b745f595dda65df00772f0dcb096102612852687112833c SHA512 d24cb26fd89ec916ceea08eeb75dbcef89fda6babe7cd9a4f3a7f143c0e53dee4ad582a656cc002c054e89c960fd6b41f367ae490442ca1c6b69e6c3d1b8d0b7
-DIST puma-5.6.4.tar.gz 310770 BLAKE2B 124190a0ca791352d055f833caec470be3be910ec4dbae5dc6860b79f5c678566f9bada3c6cf1066bc12f040ab891e9ea1a1da3188a9715db7643ef8d8f6b26f SHA512 6321a08e99be1023a1216466914416fbc91f5436ecccec4ea4cbfdc9c4ebc4979f93894ae12b72654269b0410d6a3053230806b860cb912c1abdf89766683a27
 DIST puma-5.6.5.tar.gz 314953 BLAKE2B 2aca92ff3d32995be8f05b626c2299c07f8665f345a6830f3ec3a3a561dbeb41d68d65851cef9c33a56d1d508c9adf2ebb254ca5c1d4dd8fbc896d6d6d2b440a SHA512 0ad41f3372732bdea6594a20b116ec4fc03a8a1d2ff807b3c315e7769aef4e5361ff775975575125002fbfc83315e6906fa8691ce666161bd8beee8c469289d8
-DIST puma-6.0.0.tar.gz 345407 BLAKE2B eb7b1c44e04249441dd9c3084cb4a7965216fe31d3d851026e0548f91dc5d20355e2635d54a062a9c32622ee0b21ba64669b2c905976e2cae83e8fdb7a153616 SHA512 2b5b31e315fc4b5f8f510e7e08941100835c9ab33007569da178eeca0c729ac45955146b85294792d89b7a13168fbb9173a2c55c38e1cd1e10fa243c30966be3
-DIST puma-6.0.1.tar.gz 348199 BLAKE2B 5f27b6e1e688d875b90420382afe75c6aced0010bc89b9a526c9cc47d14cefc1171e6fc19f13596d127294842a85f4456a5cd8c65d9382aa60c39b72a7d16a6c SHA512 e5025613a23c3677caf120486e1e8072be0ddc61752706cfbda26abd4fa3e0e3c1e80ce3999bc90a6e3d75482ca129a842a7a9765537d1dc88d14bf61556618b
 DIST puma-6.0.2.tar.gz 348269 BLAKE2B b0bf0efe179e78259b7b9f5ed8b2a701829ae4619edff00975a7a7e21eefd6560d051957d47fc2f5a4ba10cc2c8bcc863d4340f640054b8f081a7aa7fdbf8ede SHA512 9202ff3767a5944558a34904e58db3c0c0dd9e68df1ebcc76f31fbccea90edcd0f2d60360bd7bbd517eb965be4b1a99faf31ed0a0c36a41c13e8b0573c40f530
 DIST puma-6.1.0.tar.gz 355394 BLAKE2B 664bd24be4afde93c7fb3c6b407f0fd943bcebd86ec183d6f6d965c194f1b111d460b044eb64bcbaaff743a2d24031f786fb340a9e4ae624f324c2b70273723d SHA512 642755f565d6f1f2baebac041112dad238ca2b815f85c5653cf913c0c007e9971212581036f48fa9bdcfe98b28261843ab80306ed693274c77849bce012125f3
 DIST puma-6.1.1.tar.gz 355892 BLAKE2B 025d8303f01dc09dfc9e15395cbd2a5507b3f578dcd3b22cf0985ca760ed304b2eb1b0f4c442efc542f3261f7300143bf5264bab5543360d1cb07eb0aa3e52d5 SHA512 76988e75110124dcac589fcd01b46ae659e37b7dc2e6901c8d88b3b20ab188c8e6cdefb114f73c9ce829581d5723392d52a8059485ab7c31b77c65204554ac60
-EBUILD puma-5.6.4.ebuild 1921 BLAKE2B 45b9df162d968af84748364e3f3d6b00964c017b35805a202b6b712c79411234ffbc503b7d68b9c3618811e252598ef84857ca01b2a5b8a5c6da0018168ef0dc SHA512 c6163f0b264d25cfbfa08cb9e9bb7b6c061c1dacddbc990b383e1db05e0c77e892fdd13c98e7f9c4e89e31fdc8119dcd641c2ddc7576cad92f0f1a5c050fd3cb
+DIST puma-6.2.2.tar.gz 358383 BLAKE2B aeea4410eb6b20f294131aa107d4d19ca19bea5a3447cee59250be151b5b8046feae2e2e096f40fade6ac81a6b630cf72608b1c6c76cf05c18be4e81c6f6e143 SHA512 b9eabec30761873d628acfff259cf4e5c55dbda735ecb871b0c6e3607930a96f55fe1ad4df58954b8d0b11995762b4918f47e930ae48ebc9557fdc0182a3db8d
 EBUILD puma-5.6.5.ebuild 1861 BLAKE2B 9fccd5ac7b24e5de70a7684621895ab5a0033c65d08a0879b831cb527696d3cdc65ffec4b8867b27b85fc3d66813b2e68594d9ef47f7bc90d9d8d447c0c5aa75 SHA512 d8a8f5a37c984531326b907dddca82514790637e9778d4c1c5d0adebf3bb3fbd49b3a17796888c349e1d0fa0e5de336e2b9310f368ea6fd02f0ab70e09badd1d
-EBUILD puma-6.0.0.ebuild 1890 BLAKE2B 701c88a61bbe44e2b72fce75921043036f3defe7fb66dd28a34afb42574a5bc05cc8d410903121a404be3b359cae9bde25ec7a59bbf447cf7ab6a51068ec1b1d SHA512 f8b81ac9e7432339cd8c0297ee4271eb4b67e74feaff9a999c70baa895a4fdc90355a5397db02c8b7b44a7d4fbc1d7c89dba02824a144183a01da2d5c89e15a7
-EBUILD puma-6.0.1.ebuild 1890 BLAKE2B 701c88a61bbe44e2b72fce75921043036f3defe7fb66dd28a34afb42574a5bc05cc8d410903121a404be3b359cae9bde25ec7a59bbf447cf7ab6a51068ec1b1d SHA512 f8b81ac9e7432339cd8c0297ee4271eb4b67e74feaff9a999c70baa895a4fdc90355a5397db02c8b7b44a7d4fbc1d7c89dba02824a144183a01da2d5c89e15a7
 EBUILD puma-6.0.2.ebuild 1890 BLAKE2B 157dae5ba217a3d4814b9ef1e3c08e633d04d48970783c3446cef4ac5497d0f0150630c4607ec6479a9d45e3e4e1880793084fc04189c6e258a5f30862265cb8 SHA512 a541171cb753ff342604bef4a460b969d74ba3751c3c57a62a0b5de87ef07acd1821226411bcd6e889ea6ece386ad687ec0e675465eb957e05d2d08001d2e486
 EBUILD puma-6.1.0.ebuild 1932 BLAKE2B 9e29e12283d4b906c4c1876719463f1a1379852bfddb4193a1983dd7376b664fa4bf6965a2cf3984dab011418ae33c33d2a582472b9a583c3d48b3fa3ae11549 SHA512 e9723db022c6a926fd02dba8ac760845d1ab475eb5eb4a999c24f87e92b9baa9b852d8976d14012dc9874bdd1138c225f72e4eef59cdb825efef4658b5d7ef0f
 EBUILD puma-6.1.1-r1.ebuild 2054 BLAKE2B 13795ef5ee9663509e07745737b12a5fb53ada23c5a35bed89e2ef6597f63b6cf0e4d76c51517fe1dea1962499b6fc286da7b6e0bc871d747845245cede3c885 SHA512 207c7be17c589935611b9a13506d31d406ce6126af64e2e45bb8537c820ff140cab1579f044772c34768506f3fbd29e4334086ee306bc472eb3f0dc9172a6e90
 EBUILD puma-6.1.1.ebuild 2047 BLAKE2B 4e3ee978e4dcfca58044b8da76e0071d7244360a126344bf28c8c844219cfa7d6e6a85c1a139a963a550fee803aa56e383a33041a0567c83d109c224affd8ac1 SHA512 5086424da2c1b596008311679127c55e8dff32d1e5c74e2d552efcc6a5b0020f67f169c52db75f995d40022662207c1aedbfcf7014d1403d1cb24b0e7d79f11f
+EBUILD puma-6.2.2.ebuild 2000 BLAKE2B 8a6fa210435f6ac52efea34f18fac6b820040c649a10934fd338e5af9e2b39d7512909f7328da77043e2a05ee4a5c1e8b58900c7edda6317245256c14948472b SHA512 61c94c011fbbe2d1624fa6fe38f70fbc71bce3b224a5e5de21198740271a2970fa45d42769e5789a94cedfecca2b4ed1e514f9052e1f2984165b240b59a0fb74
 MISC metadata.xml 710 BLAKE2B bf109653812999e453fb414a83bf404786d16df301ba9dff87c123e0f1dbff8e3024109e96b7f36a3d9e1ebe57eb7aecc7acfd923f0de1bc8c4f358a87b32379 SHA512 894c677c61b3c7f8081b1511c64c274497c4ea85171f5b19d9606a19e4dff33df00d169653e3aede3eee07737b1cf9faadb812eebcf67292be68150c026b7f8e
diff --git a/www-servers/puma/puma-5.6.4.ebuild b/www-servers/puma/puma-5.6.4.ebuild
deleted file mode 100644
index fd4e4bdf0854..000000000000
--- a/www-servers/puma/puma-5.6.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0="
-
-PATCHES=( "${FILESDIR}/${P}-logwriter-test.patch" )
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/localhost dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-ruby_add_rdepend "dev-ruby/nio4r:2"
-
-all_ruby_prepare() {
-	sed -e '/bundler/ s:^:#:' \
-		-e '/prove/ s:^:#:' \
-		-e '/stub_const/ s:^:#:' \
-		-i test/helper.rb || die
-
-	# Avoid tests failing inconsistently
-	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
-
-	# Avoid launcher tests since they make assumptions about bundler use
-	rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die
-
-	# Skip integration tests since they make a lot of assumptions about
-	# the environment
-	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
-
-	# Avoid test that uses unpackaged stub_const
-	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
-
-	sed -e 's/git ls-files --/find/' \
-		-e 's:_relative ": "./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-}
diff --git a/www-servers/puma/puma-6.0.1.ebuild b/www-servers/puma/puma-6.0.1.ebuild
deleted file mode 100644
index edca73aeeea8..000000000000
--- a/www-servers/puma/puma-6.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0="
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/localhost dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-ruby_add_rdepend "dev-ruby/nio4r:2"
-
-all_ruby_prepare() {
-	sed -e '/bundler/ s:^:#:' \
-		-e '/prove/ s:^:#:' \
-		-e '/stub_const/ s:^:#:' \
-		-i test/helper.rb || die
-
-	# Avoid tests failing inconsistently
-	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
-
-	# Avoid launcher tests since they make assumptions about bundler use
-	rm -f test/test_launcher.rb test/test_worker_gem_independence.rb test/test_bundle_pruner.rb || die
-
-	# Skip integration tests since they make a lot of assumptions about
-	# the environment
-	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
-
-	# Avoid test that uses unpackaged stub_const
-	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
-
-	sed -e 's/git ls-files --/find/' \
-		-e 's:_relative ": "./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-}
diff --git a/www-servers/puma/puma-6.0.0.ebuild b/www-servers/puma/puma-6.2.2.ebuild
index edca73aeeea8..2369f50156fd 100644
--- a/www-servers/puma/puma-6.0.0.ebuild
+++ b/www-servers/puma/puma-6.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
 
@@ -25,7 +25,7 @@ DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
 RDEPEND+=" dev-libs/openssl:0="
 
 ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/localhost dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
+	test? ( dev-ruby/localhost dev-ruby/rack:2.2 >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
 
 ruby_add_rdepend "dev-ruby/nio4r:2"
 
@@ -48,6 +48,9 @@ all_ruby_prepare() {
 	# Avoid test that uses unpackaged stub_const
 	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
 
+	# Tries to call 'rackup' directly
+	sed -i -e '/def test_bin/,/^    end/ s:^:#:' test/test_rack_handler.rb || die
+
 	sed -e 's/git ls-files --/find/' \
 		-e 's:_relative ": "./:' \
 		-i ${RUBY_FAKEGEM_GEMSPEC} || die
@@ -55,5 +58,7 @@ all_ruby_prepare() {
 
 each_ruby_test() {
 	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+	PUMA_CI_RACK_2=true \
+	${RUBY} -Ilib:.:test \
+		-e "gem 'rack', '<3'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{require _1}" || die
 }
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e3d56cb384de..8206134fed3c 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 4ab64c6f4b74..c7fc1945fe05 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,5 +2,5 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.74.3.tar.gz 3108228 BLAKE2B fbaaddbd5522ccffcba87da2f4080e93e46dfcdc22771a414daa813cdbc2982738c2bf6f068f4bddf788965b4cf45594f2720a697c04d71194f513d1d9b43875 SHA512 9f885571800e3aba327a46b3bc8677ca596fb2d0a58e2f65190d9e2bc90f013655947d86c1fc869e2d79a5c0ba8a7a4d907a00f8d7563116291df47d8c2c677d
 DIST zim-0.75.1.tar.gz 3212424 BLAKE2B 8db33315a8852b4efc5506cf94576f9b7cfa8574e77798d4e8bb61930a0d9ede5ea0bd2fc8c1ae479f49caee265981d70902b149e151e5f295cdcc5bbe98b131 SHA512 207d40af2342f16ba713a3809b06ddc6656bce22386fcaace65b0e04894218590d4c03b9c65d6eeb3c4edc46e85e103cfcf112e4298be07ba1f126d7732333c5
 EBUILD zim-0.74.3.ebuild 1827 BLAKE2B 44c738e81590a89088d535a374d58945a9ba7c2d2cdb8184e013e80707466124e2098d838b995af950dd63d18361e4a2d99ead2d3a70a378c10f53aa2ae66aa5 SHA512 aad716cb741690be4a1c5455b9ec1edaab3bdef8c28dbde24136b95eda1aa6a00d01ea71a85a684995f2246b99b19dd32aa67b66d8c906611a10bac72fb18760
-EBUILD zim-0.75.1.ebuild 2034 BLAKE2B 37e08133c6618703445e594a6b7477640654143fa78b7c6177a46a179a8287663601146084bb3a5edf53d1615a6703e60fe46a64cdcd025fbc17290bcf2163bc SHA512 769825e0602bddd55d86a69f084fd15639e113c00b13d197e1bc90459ea55889f52723a45018572fce66fa8cc7c40b0e12e45042c3d591a0f55df90bb158fb29
+EBUILD zim-0.75.1.ebuild 2033 BLAKE2B a3552feacf33ad7fc2ee3290938179231b3c5db262031e9218b94069082ba03fcae349edeb38299974d2614eb21d5997f85c3cec9ead50b01fe3d589aff5340e SHA512 415c383ffc2f8f96661d7d1aeb1f1bc4e8d1b8f2d5b3c8313d28eba74b5915911b6f86c1b3a3970c652541eee94ef2af1eb02f7b97e8b51efe8b5a52453feb78
 MISC metadata.xml 805 BLAKE2B 15e1443ba8c937c389eff2a4771ea9ae5c6cd52127fe991e02776bbf17cb18cafab377fcea5572779fa0784344b385d57b2fe19c8ba15c568ea6048bd9ea7a29 SHA512 2489ccdc635377d0e8029e60365a8b72fad3efeff99de9d191bf5e1143f32402ea08a188271cf5c31ff7570c81b9a21a9bca54c59fd50984062e91f6ae54225e
diff --git a/x11-misc/zim/zim-0.75.1.ebuild b/x11-misc/zim/zim-0.75.1.ebuild
index c670751098c1..c7f34f25a5a3 100644
--- a/x11-misc/zim/zim-0.75.1.ebuild
+++ b/x11-misc/zim/zim-0.75.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '