gentoo auto-resync : 20:01:2023 - 11:40:14

128 files changed, 1848 insertions, 332 deletions

diff --git a/Manifest b/Manifest
index 3a18a395d48b..93dd532dd9f3 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29776 BLAKE2B f89678c52155722a2e626d3311ceaf9a3098e6a0075a5c8fa43c6c46a327a124752f06ec48337915742b754eb4d8b94b000860793f326a6fe765b6573c01a5c9 SHA512 60e070db057fe4dab373b449c85935e0ae5b069bf6b400e059be478cc4724c5e8ad5f47acb1807e611b65260a7edc74d34754aa0ca9a4163d0dba1f000e90943
-TIMESTAMP 2023-01-20T05:10:08Z
+MANIFEST Manifest.files.gz 29785 BLAKE2B 2b119431696cd39dac063d58f5bbe521e6396b72d1272c9c5a57b9b8697abbba44e36fc5130d4f7f321c8b6d7b237e342a013ed843d2bc52a82dde04cb43754f SHA512 490d29ff2be3b134a3d491afd44e03806a5f64268ebba3866382891d303cf3435fb87f3d2c426c12b026add867cb030ad039139c0c661265133ed96dd4bdbd49
+TIMESTAMP 2023-01-20T10:40:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPKIjBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPKb4ZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAFhBAAsv7tnr89OuKYcLmtaHoZXpGz7pV0R0Os6hdcNTe9+CHwL7zyPObP7p5m
-9iB6VJGGVXl24czCE/folG4j+NDP7U45jnvZ/i6YU3RBAnRww87jiBqktTPFZdEW
-UeY83QSBed/ZwQkln22dDfWXgZJ5n13TGCdAZkJHovGpaDvpkj/T1m4b8mNRmsYJ
-zJZ9yolQfJ0MNlYP43HmjQ3OiuK/VklQADH4+13NcObOWr6a2ANP0luVneZlEvkH
-PYik6CYEma0jC7Y0IoFDRSWdWee7E2jKUlNTH56I+dhrXaeAUNqVFcoPBIvpZTi0
-sEJVzosvKTQS8XKyAjBiunZLR4WpL7JSh6nmq8qJllZpiBB8/8PX+JHny3r1HjMq
-DYd30zFZyIWiIYPIaosWDYn875odjAN7PiizVlwIhGKBsG/HXghdNCvNZVd3NSau
-eG3/zSPaKi0YioESV3y98kuAepqFKTS6MQMkURBglE8tFv3gj/Lzi89E8Cea/vV/
-HVfs0Y/yXpPYX9uIQvyoCHPbEYWMwDYUa9g+myIpGUyXEzKUhsXshDhU7+6B51f2
-yZ7NMnS+n0GejUB39O8wGLT/QmsOTPDsviGiMQZXeccFA0q1Hnku0QUlbZwTDF+S
-PqKaYudMorKHBbEqwe+gR/KNZKfNOqzE1ezs0tg3TNtOgl1Y5Sc=
-=6Im3
+klA2+RAAlkM4isQA0eSrQfTW/e99haDenRC6jBEf72uN9zidScE7eahI27MIMeD7
+9UtCBxV7CXjGs1t/3zwaAQwJi00pEvGRVMzCh3y7s/llS/a49ojs9MH8jJmHJDCF
+um2yKgiHvnRPwZxk+WFTEnndiI9E2rnP9H1OumTNKro9NhmPI6/lXL0LqmO604KM
+rC8Wor/BCjoZ4gAqyeEv5+VkBYidsQyRIiCK0pNkhA6jJApEsEHYQ0VSwvWXBQr5
+gXhclg8NVI9O/XOP+E1FUUB93oz5ITffyttwaDBBdCLlTwY+3hBAIPZs5LRIGI0X
++ZZB5OYGAn5RIK5vOZzC8v4hQATIq+RJ+ZUbxH7JZLzJYHC4otW5tXl+1DshxJJY
+/V6eo9JCooCi1NRT8rU+Y5eu7Y2yGSeXRtvarV5q3i90x2e/7qmurYid6gm7jRAY
+ZzZ6L7Jxogz3KsjB6D0ogtN0dBPaNGhQ4Z7e3PrBgbv43LNea2NOnHnQdv1sLtov
+TP3rvoWvoGD/nry9BhG0jqX7kaOgflBS36O5ymxUQYrhcS0IkRy5sJkBcSEo5otM
+zmPJEyxrO4Zb89H5iPt2sJBH9ZtUDErdOLgRT6FxrYTbLubxufvIvg5ZPGg/tbJK
+TJyiwU53EHN0h7O0p1PEiYDgo5TCYaPm5KN1xPooCYG0opjqu7g=
+=XA+a
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 534f3953f96d..2fa7646c1fee 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 12f27d71f060..75745dc8e299 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 38666d7cdb1c..2416306a7d7f 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -5,6 +5,7 @@ AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43
 AUX gkrellmd.initd 338 BLAKE2B 6ff2ab29e354578efc477af50af6a7e517bb7ec9267575d75fb5d5a12c9894a60996ffa37672760657eeee0680b9b7573d3d03d7d5efbe20122d330e5a55ebd8 SHA512 403431a0bfe8264ccdaf3c7e361e363a18a5e2deda8b2287919030c746c7caf80571b1a2dda407c113a9f878253078e67202017a026d83dec43bc5ca0389cc06
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.11-r1.ebuild 3200 BLAKE2B 5710db8a7d565d621cc170811600cc195044e1331ef3a41ffd81631b8147688bc1dca69fc7a2c6831c6b4b4a3104aa6cf638ddab3af805e3d85140b655b68642 SHA512 0360906aba0b6ed42f703b74554418f02943f0d1ff9190dcfed59057f45d53bdd8305486493c59ea09fa22932a61f4d902976e93f0be6bbe62548a5462aa781c
-EBUILD gkrellm-9999.ebuild 3218 BLAKE2B 0b298d66af4e1513c21a0c6d753090042bf227c3f83889930915782e272545ff7836350aaf3db487199a2bb9f767daac49d23a956c44f2c366499e201cb4b610 SHA512 4b4d3abe3b9b93adae1e18b1f6a69421365e332ba2cb27c09d9c7924f3c9e65e81a3d1e6fc42ec25944a6a880f8d15541db7d4b12ddaacf5e488a719d5811f80
+EBUILD gkrellm-2.3.11-r1.ebuild 3168 BLAKE2B b136622ad1eb71b40f8fd045ffed6b3c4b375477c4d74fe8481e4b650aeabf47646addbe2f59c1ea32a3aaf199c65e92c528614ed0e39b1b54746794253e3c8f SHA512 462609bbe615c6c4d42a6a0cc99ce17a9694aea1a0b18316fa19d9eeeeb6686b7f7c2cdfb7493865683303c72511ab41231ce5bb8ad0bdc8be9b911f8e5d2abd
+EBUILD gkrellm-2.3.11-r2.ebuild 3205 BLAKE2B bd8a8744897d172b6757c796bfbd014aaa6c919c5cb851d689511672b22027ac8e86e63a4a7fb1fa151a8fbfb60b645b98fe6f417d4972a19309967839e3516e SHA512 6a6bcde8964a2f0f2dfeffb83ca50c299a6d796a3ddf60f90fbe3a030a2ce527e1de9dd9a209979ace503245dddb18fffc1414dd357a87ec70967f83f457b489
+EBUILD gkrellm-9999.ebuild 3205 BLAKE2B bd8a8744897d172b6757c796bfbd014aaa6c919c5cb851d689511672b22027ac8e86e63a4a7fb1fa151a8fbfb60b645b98fe6f417d4972a19309967839e3516e SHA512 6a6bcde8964a2f0f2dfeffb83ca50c299a6d796a3ddf60f90fbe3a030a2ce527e1de9dd9a209979ace503245dddb18fffc1414dd357a87ec70967f83f457b489
 MISC metadata.xml 730 BLAKE2B cb17bd6be9a48e86f6571ee08a038ff939c52c1e0b37935679c3ce365da49bfcbb6f08d484c623f11d3c07af9727276454754aa342e9c6aaea216a2c54574563 SHA512 7a6b85156d81df30316bc301034f7be2ece3756e2a44efc31145b6052924921d751fedadd44353ac24af9d5ea5bd69ce7ecac6d738347e694cbb04609486e05d
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
index 1213ede77276..136f4e903e33 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit desktop systemd toolchain-funcs
 
-MY_P="${P/_/-}"
-
 DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
+HOMEPAGE="http://gkrellm.srcbox.net/"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
 else
-	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
+	SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"
 	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-3+"
@@ -55,8 +53,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
 )
 
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( Changelog CREDITS README )
 
 pkg_pretend() {
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild
new file mode 100644
index 000000000000..18b1fce7cd92
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop systemd toolchain-funcs
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"
+else
+	SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-3+"
+SLOT="2"
+IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X"
+
+RDEPEND="
+	acct-group/gkrellmd
+	acct-user/gkrellmd
+	dev-libs/glib:2
+	hddtemp? ( app-admin/hddtemp )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:= )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	X? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/pango
+		)
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	nls? ( sys-devel/gettext )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.5-config.patch"
+	"${FILESDIR}/${PN}-2.3.5-width.patch"
+	"${FILESDIR}/${PN}-2.3.5-sansfont.patch"
+)
+
+DOCS=( Changelog CREDITS README )
+
+pkg_pretend() {
+	if use gnutls && ! use ssl ; then
+		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
+		ewarn "No ssl backend will be built!"
+	fi
+}
+
+src_prepare() {
+	sed -e 's:-O2 ::' \
+		-e 's:override CC:CFLAGS:' \
+		-e 's:-L/usr/X11R6/lib::' \
+		-i */Makefile || die "sed Makefile(s) failed"
+
+	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+
+	default
+}
+
+src_compile() {
+	TARGET=
+
+	if use X ; then
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			STRIP="" \
+			INSTALLROOT="${EPREFIX}/usr" \
+			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+			LOCALEDIR="${EPREFIX}/usr/share/locale" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm-sensors "" "without-libsensors=yes") \
+			$(usex ntlm "" "without-ntlm=yes") \
+			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
+	else
+		cd server || die
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm-sensors "" "without-libsensors=yes")
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake \
+			install${TARGET:+_}${TARGET} \
+			$(usex nls "" "enable_nls=0") \
+			STRIP="" \
+			INSTALLDIR="${ED}/usr/bin" \
+			INCLUDEDIR="${ED}/usr/include" \
+			LOCALEDIR="${ED}/usr/share/locale" \
+			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${ED}/usr/share/man/man1"
+
+		docinto html
+		dodoc *.html
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}
+	else
+		dobin server/gkrellmd
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h
+		doins shared/log.h
+	fi
+
+	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+	systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+	insinto /etc
+	doins server/gkrellmd.conf
+
+	einstalldocs
+}
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index caea7327cbef..18b1fce7cd92 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop systemd toolchain-funcs
 
-MY_P="${P/_/-}"
-
 DESCRIPTION="Single process stack of various system monitors"
 HOMEPAGE="http://www.gkrellm.net/"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"
 else
-	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
+	SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-3+"
@@ -41,22 +39,22 @@ RDEPEND="
 		x11-libs/libSM
 		x11-libs/libX11
 		x11-libs/pango
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-BDEPEND="
-	virtual/pkgconfig
+		)
 "
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	nls? ( sys-devel/gettext )
+"
+
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-config.patch
-	"${FILESDIR}"/${PN}-2.3.5-width.patch
-	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
+	"${FILESDIR}/${PN}-2.3.5-config.patch"
+	"${FILESDIR}/${PN}-2.3.5-width.patch"
+	"${FILESDIR}/${PN}-2.3.5-sansfont.patch"
 )
 
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( Changelog CREDITS README )
 
 pkg_pretend() {
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index eed455fe0bfb..688f5e28cb53 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -6,6 +6,6 @@ DIST sudo-1.9.12p2.tar.gz 4909431 BLAKE2B 79eac710b757acae7aa98e6e6f495a475e5236
 DIST sudo-1.9.12p2.tar.gz.sig 566 BLAKE2B fa679038c33d2bf1476b56944872d3a18b66bf5c5fb2e660d1f8777cdb209928912ddd8d89d878bd2218df3acd1e7fee5aa850e8d01a1cfac6ab310c788149fa SHA512 0b2f10488c44bfcd94eed97002865d89f4a03a92ef3b890fac3121ef0f9e6c55387771ddead1a94dc92d85c35e3d28b4730f35cdc2aafb51128594555ea29876
 EBUILD sudo-1.9.11_p3-r1.ebuild 7412 BLAKE2B 1ddfa12c7fed0f71ba2ed700009aee4dfbdf08aaee350e61e67e0ede62904f0eac97233285b94c820dd3da75c4fc4aa09c31673db42b973f3ac18519ec8fd814 SHA512 13254ff59e0360c2979d6e31d3f9491560cd43a03b03628640426a9535ecde6568706db7037cb4b1e4e74fb555381cc2d42d24b2a4b2b97d7d142179e61df46e
 EBUILD sudo-1.9.12_p1.ebuild 7413 BLAKE2B 194be3b58af6bf18b65325ac3577427f493dee3ff26b03002203016b89f447b9250aed80e10f3dac46a5868cbda5d85bbae0b6ab57d95a656e18cd801d615b02 SHA512 5c82e0b52f4e3bd6381f6f910717d1f6522978332468942ac67359ded014ecd010bb16dae07f71f178c43531e5539bae1b17cd6ef45de77c61ea001a9aaa7e1a
-EBUILD sudo-1.9.12_p2.ebuild 7415 BLAKE2B 32ac6166003ede59ed9bbe3ee8a3e4853c4b2e8973958063677e9d07e104be7634d758ea474e1a95f1442dc8833ff59518b1f95d9eb5f43b6603316e75028e0f SHA512 72e81eafc2972f1c65b6023fb407a3fed7f5022f69d99d849ba214dcce2227a1283e7f65f2b53aa32ee4f9078ff962bdd70e26731b19b026daf59b133991c47c
+EBUILD sudo-1.9.12_p2.ebuild 7413 BLAKE2B 01eccb2c827cced39e5395355448123e0be8e94bd9adbe4ea9abbc1c9bd2e6c14a92069dd445823a8298be6989067f6d24db1bc485708ccf161b27ea8206a8ff SHA512 b31a539c56c0678d5be6040ff6764604de4ebfb021f387c83f497b63d05c81766040d4b552ad47c37be4ba71adfff460d0c5f4787130a7442aff59ad5d3a5ddd
 EBUILD sudo-9999.ebuild 7421 BLAKE2B 9dfa40600141a49f26cfec28051914943fe0efbffd6e4b34d87c3f1e45dca65bca2f9a5d7584805b8411bb2ae4e70a2728525df893dce72af3484763bb9e92b0 SHA512 f392e4fe27f4df3ff162ea9c1d44ab91c03a63b5d65e6d60fceade321cb339395bd3c0cdfa9429e3c32ff90c992bdaa2118ca8b1ff485932dd85851f6d649efe
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.12_p2.ebuild b/app-admin/sudo/sudo-1.9.12_p2.ebuild
index a5da2fe74a15..a609ac940882 100644
--- a/app-admin/sudo/sudo-1.9.12_p2.ebuild
+++ b/app-admin/sudo/sudo-1.9.12_p2.ebuild
@@ -33,7 +33,7 @@ else
 	"
 
 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris"
 	fi
 
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index bfbc5d69acc5..0da35ef8e061 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index 617723eb5ead..2c1f8c521d55 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,5 +1,3 @@
-AUX tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch 1025 BLAKE2B 4f957dc6a7ceafe53dcf68ded61e2d75d9c09f4b8c056ab92857662e42223b83d99595d7d5c4f89547d3001427a27370d45597349be5261ebd35f30dd105a498 SHA512 6505fa8eba5ead5b75b48d6b4bd1bbf65ac5060fb1d5b77a2b3eec14420fb80d4a712ebb01c7485fc8dd36c5c9a1e9f0b1bd3d9867338858fa63a0070abfec10
-DIST tpm2-tss-engine-1.1.0.tar.gz 394448 BLAKE2B 0502907dc9ce872f31be3b980f975a02af2e3e4b369d188afa5327bd4475d93dbf43769dc7ddc11e8cbda8d1fde09f28a9aef9145e859a90225cd397f62c7a2c SHA512 5d2e08178be54350e8672245023d601a0d9d520f8c49e977af49d7c59b91d033c14b4a347b71e042fe7c5ff12af9fcc43b69fd1dc83a9f0db12d47d43e1107f4
-EBUILD tpm2-tss-engine-1.1.0-r1.ebuild 873 BLAKE2B a08a6ac9fb15bb90576eba365aa80e3c23b67df12a6186a84df4f949e2dfb7995d928ffeddfc66367f93fa62b9da9e0898f617f263aaab16e6caed237f912086 SHA512 828b2b3317317f049a00bd073c257db6b39d3aae9d902a6fc6e8206615b18a6f78e3ad26a1f93bd564ac209d2a9defea80dce849c648e6da550af9557516a823
-EBUILD tpm2-tss-engine-1.1.0-r2.ebuild 995 BLAKE2B 637e5639800057b2f132781774944431bb6bbfcf6c66ad64c08dccfa6a8c1b2a720055788db69a45907e1e1760133d82fa82b83c960ee49053aa07b5a8ef7c48 SHA512 d357f6ce46b93ef9d7d3546dec2d128ff91d5a5aa288c5f69ed18b4e436e618771005610e9d8448c9be4333148495e9101492d9725e1ac01d88f78188ce03caa
+DIST tpm2-tss-engine-1.2.0.tar.gz 410605 BLAKE2B f6b88238ed780315cf23dc9caac4639220e76e8daeeb35a0e9bf2f23efb1b45497dd24f43f97d0f4018440b33e2e80de4f321254b9e58708d04a15a3bd922aae SHA512 cd0f1c3b5251ab2f21159099cdb9c0b1cc68d7ad334d4c5245bba9c07274ecea7c86a531afc9ce6250635a9d0929a5147f461cc3760b15cd6ad099342af87ad0
+EBUILD tpm2-tss-engine-1.2.0.ebuild 912 BLAKE2B 166e641ff7298fdc284dffbcd84293c5be7a8f4232321faa5d6bfe7105216bbc57b3f55ef923efffec9f101da7c4a9ef95acf55aaa8fb7ab3568e001c130b028 SHA512 01f494ce396b6407449034b5e2855bda27692719da4336106a8406eaf11272be968072c08a29079d77ef088cc5c849e2cfb95df509644d8fe0a91eafd005f0a2
 MISC metadata.xml 498 BLAKE2B 00c3e4cdaaf71d33864bfdca3585e9874a6d984aa6d825e8ed2dcc00afa022c5908b37da3e391238f4c7519408d4dcaafff40ceee644312e568627c44bfdecec SHA512 459f2c5d0a6051a81cf5f3c17f65248fe8e1681db2032ccebc2a1c0de6ea427c45bb317ffd374bb141f5f06bc16305e61bc591df9d943821fe1ac0f31e4f5323
diff --git a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch b/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch
deleted file mode 100644
index b8114b4c25c0..000000000000
--- a/app-crypt/tpm2-tss-engine/files/tpm2-tss-engine-1.1.0-tests-Allow-compilation-under-musl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/833531
---- a/configure.ac
-+++ b/configure.ac
-@@ -174,6 +174,8 @@ AC_ARG_WITH([device],
-             [with_device_set=no])
- AM_CONDITIONAL([TESTDEVICE],[test "x$with_device_set" = xyes])
- 
-+AC_CHECK_FUNC([backtrace_symbols_fd],[AC_DEFINE([HAVE_EXECINFO],[1], ['Define to 1 if you have the <execinfo.h> header file.'])])
-+
- # Integration test with simulator
- AS_IF([test "x$enable_integration" = xyes && test "x$with_device_set" = xno],
-       [integration_args=""
---- a/test/error_tpm2-tss-engine-common.c
-+++ b/test/error_tpm2-tss-engine-common.c
-@@ -7,7 +7,9 @@
- #include "tpm2-tss-engine.h"
- #include "tpm2-tss-engine-common.h"
- 
-+#ifdef HAVE_EXECINFO
- #include <execinfo.h>
-+#endif
- #include <stdio.h>
- #include <unistd.h>
- #include <setjmp.h>
-@@ -17,8 +19,10 @@ TSS2_RC
- __wrap_Esys_Initialize()
- {
-     printf("Esys_Initialize called\n");
-+#ifdef HAVE_EXECINFO
-     void* b[128];
-     backtrace_symbols_fd(b, backtrace(b, sizeof(b)/sizeof(b[0])), STDOUT_FILENO);
-+#endif
-     return -1;
- }
-     
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild
deleted file mode 100644
index a737e7269f55..000000000000
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="OpenSSL Engine for TPM2 devices"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss-engine"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-crypt/tpm2-tss:=
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable test unit) \
-		--disable-defaultflags \
-		--disable-static \
-		--with-completionsdir="$(get_bashcompdir)"
-}
-
-src_install () {
-	default
-	find "${ED}" -name '*.la' -delete || die
-	dobashcomp bash-completion/*
-}
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r2.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.2.0.ebuild
index c320b9d81d6f..790eff2f51b6 100644
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r2.ebuild
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.2.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools bash-completion-r1
 
 DESCRIPTION="OpenSSL Engine for TPM2 devices"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tss-engine"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
@@ -23,10 +23,6 @@ DEPEND="${RDEPEND}
 BDEPEND="sys-devel/autoconf-archive
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-tests-Allow-compilation-under-musl.patch"
-	)
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 06dd0dad2eb3..f2ef148c18d0 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -2,8 +2,11 @@ AUX tpm2-tss-3.2.0-Dont-run-systemd-sysusers-in-Makefile.patch 2556 BLAKE2B ea87
 AUX tpm2-tss-3.2.0-slibtool.patch 3603 BLAKE2B f0a0047b316396dfa5800702b793bf5247d62be75704be42968b7719a87a25200b6870e14f87ccb45876b53600052b6716386493ddcbead87857093188608621 SHA512 8c20df4be8857dfcf030770e74f27dc14c31f4a5b6eb1a90c9dca6f0dd01987a7983478c0dfe9774669b9f8fc9ddace66d5d51f991582ba3689bcdcea64a1b86
 AUX tpm2-tss-3.2.0-test-fix-usage-of-FILE-in-unit-test-fapi-io.patch 4895 BLAKE2B cb6e4d4544bb78e4fb768b4943dc0ebd381e2a480528d824634f486343955ea29370a731f5bbec222f653a3194615b4cbf13749fa089b58e2ded29e6bcaf06b8 SHA512 1fae2396bcf7bf1af55d4a8e6aa522e8a86344252a3b642c16f84158a3e3eb98dd2d0e2e41c2f13fa25af9452dd1a252bed4af91896aa2efa23029aa0ed1bf2f
 AUX tpm2-tss-3.2.1-Dont-run-systemd-sysusers-in-Makefile.patch 2651 BLAKE2B a14f328ff6942ad76ec16e818730073b2086bcf97542d966ee252cf36e417932ef45c1780f69436af5f032c7b11095e6645bd0a1cf9ab56a93fccdd4bb88ca75 SHA512 434ffe40495bc5adca0eea2a58ae8ef1fc7ff145cc7e096cdd436e96eee420f6f671e9bf5be7254918810773ae2f6a91d04b6039e5cb6cc472b12066ffe5bc49
+AUX tpm2-tss-4.0.0-Dont-install-files-into-run.patch 880 BLAKE2B 8ae9b55e853dcd117730eebc274252ea7afc4e3e415eafb21d3994690687cc9daa796a97536597da8cbfc4f54567cbb678fe61ba4eb4fdc1dee6d851d472efa3 SHA512 811dd1d2597557cf9fd08d7231cd5f48a8dd9dc76adf33bc4a0ee978dc8973fc5309bdc7386cbd9878b78dba1b4a8ecf9c2e2f856c887b141a423f0d94e3244e
 DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23
 DIST tpm2-tss-3.2.1.tar.gz 1638566 BLAKE2B bdf5eeca1e7269a639cefd8b4a38e16c5b7c08518411a22718dcd14bc9fe3b621eee77cdd98f9ece0f6d9a52319bce5e0a502ff9a6e4ba6716341bd01f5967a9 SHA512 dbe5e29349d78621fcd608d9c75fa58f5e6462264b9654ca85af9f9faafebe1107d9f735a1b6ad4956a089b0dd96cbda3f46364cabd846f9fb29a419b074c78f
+DIST tpm2-tss-4.0.0.tar.gz 1787084 BLAKE2B 9b9d466eab77ae71ec916c911f9e1321013fe49594e103610fcb03492a2f20e811a2faddc2237519b710a1931226d5664581cd671d2318319a92e16bcb5ccfb4 SHA512 1058aa74e2358bfb60a17b85291dc642d40b49bb076453810c5b2b0c37c72671c319d783c879f719ccbe7aaeb5f464e0144c6ee12d28242b477be5d579cb3f9c
 EBUILD tpm2-tss-3.2.0-r4.ebuild 2770 BLAKE2B 72a9aeab39843fa5f59a73c1cd52148ec74d785222474a576f369c78c95be2d76fbc10e8eb8715f3314f5cc3504a09fbd8be26f59867435616af537979254009 SHA512 6dbf11de1a9615d1b19183a84df5fbd113c59cc6df1c82e642461f637bf6334a00e15d5fb28d039473fc594167248ca087e1f2203d8340a4a32c92b1d4e63813
 EBUILD tpm2-tss-3.2.1.ebuild 2239 BLAKE2B 977935a7d06de6eccfa56a2ca9b3ef9ec1c35e66f34e03f866a21cb4b8e88941f8c9e99ee05e9f4bc03d882c262e996b8a59e4a55a28fa48ce7fe070b352544d SHA512 5dae9dbe08390dbfe91c07abe0e5754e61098e41c819c57be66695244d22a3de6ef0599d4d12e3714a0a9d34051d524c3aa702613d3edecb40151432756231df
-MISC metadata.xml 747 BLAKE2B 0462c5942012c444e13bf094be03e0cc142b3b5e3e613570506f84be45bb3019876f3f44454b078668c7e3cbd4a60819cd2ea57c588cab34bfe82f76f222bcf8 SHA512 dab6f379190e40b0321597f0c5fa03ee5731eb77e91dc5d82d2f57c896cf40a074598ba1dedd1575e4e23e1fc5ed306f83cb50992fca6cc2bc1a1db822765a7a
+EBUILD tpm2-tss-4.0.0.ebuild 2319 BLAKE2B f5e3f54f8e99ca205d7c44697515c278da77fec5fe45d8338a6283c777e06f97ee5dd8dcbd1ad06abf5500e45c0a18be08043a74b5dc1b904a6c84340aa1050c SHA512 01f3084f04fb88d177f75e4a9fb6592c6288d1b6e1b06b6ea8fa2910c131522beb156325367cf375f4c53205e3e0554c94499bbb5142c820dcd80ba777c20bb1
+MISC metadata.xml 835 BLAKE2B 58fcbb63b8fd77dd42f081e060cec1fc5593d13ad9237bd644462fd839a1fea9936342d5339a3ec8d339106ca6074c73ac31e7546feb0f1c5f0f212b21831d8a SHA512 941bfce986619b387410d49fe046218a388243c257a3164293033f8ebb4e2d64d7ff06d35dd4ef770a9e9194035839d68dcf1f00edbe439272c2e9c01ecb3c6b
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch
new file mode 100644
index 000000000000..ca51ab7f9382
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile.am b/Makefile.am
+index 2c81cfa9..2673995c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -767,13 +767,11 @@ define set_tss_permissions
+ endef
+ 
+ define make_fapi_dirs
+-    ($(call make_tss_dir,$(DESTDIR)$(runstatedir)/tpm2-tss/eventlog/) || true) && \
+     ($(call make_tss_dir,$(DESTDIR)$(localstatedir)/lib/tpm2-tss/system/keystore/))
+ endef
+ 
+ define set_fapi_permissions
+     if test -z "${DESTDIR}"; then \ e
+-        ($(call set_tss_permissions,$(DESTDIR)$(runstatedir)/tpm2-tss)) && \
+         ($(call set_tss_permissions,$(DESTDIR)$(localstatedir)/lib/tpm2-tss)) \
+     fi
+ endef
+@@ -784,7 +782,6 @@ endef
+ 
+ define check_fapi_dirs
+     if test -z "${DESTDIR}"; then \
+-        ($(call check_dir,$(DESTDIR)$(runstatedir)/tpm2-tss/eventlog/)) && \
+         ($(call check_dir,$(DESTDIR)$(localstatedir)/lib/tpm2-tss/system/keystore/)) \
+     fi;
+ endef
diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
index 0a726fa2d171..ada5791c33d5 100644
--- a/app-crypt/tpm2-tss/metadata.xml
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="fapi">Enable feature API (requires openssl as crypto backend)</flag>
 		<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as crypto engine</flag>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto engine</flag>
+		<flag name="policy">Enable policy library (requires openssl as crypto backend)</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-tss</remote-id>
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.0.ebuild
new file mode 100644
index 000000000000..ba650e60ee44
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.0.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( mbedtls openssl )
+		fapi? ( openssl !mbedtls )
+		policy? ( openssl !mbedtls )"
+
+RDEPEND="acct-group/tss
+	acct-user/tss
+	fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
+		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	test? ( app-crypt/swtpm
+		dev-libs/uthash
+		dev-util/cmocka
+		fapi? ( >=net-misc/curl-7.80.0 ) )"
+BDEPEND="sys-apps/acl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0-Dont-install-files-into-run.patch"
+	)
+
+pkg_setup() {
+	local CONFIG_CHECK=" \
+		~TCG_TPM
+	"
+	linux-info_pkg_setup
+	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+}
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+multilib_src_configure() {
+	# tests fail with LTO enabbled. See bug 865275 and 865279
+	filter-lto
+
+	ECONF_SOURCE=${S} econf \
+		--localstatedir=/var \
+		$(multilib_native_use_enable doc doxygen-doc) \
+		$(use_enable fapi) \
+		$(use_enable policy) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable test unit) \
+		$(multilib_native_use_enable test integration) \
+		$(multilib_native_use_enable test self-generated-certificate) \
+		--disable-tcti-libtpms \
+		--disable-defaultflags \
+		--disable-weakcrypto \
+		--with-crypto="$(usex mbedtls mbed ossl)" \
+		--with-runstatedir=/run \
+		--with-udevrulesdir="$(get_udevdir)/rules.d" \
+		--with-udevrulesprefix=60- \
+		--without-sysusersdir \
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
+}
+
+multilib_src_install() {
+	default
+	keepdir /var/lib/tpm2-tss/system/keystore
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process tpm2-tss-fapi.conf
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8ecb8adffc15..9006a322abd0 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 7a59277ad284..e1dca52b3867 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -17,5 +17,5 @@ EBUILD mupdf-1.19.1.ebuild 4490 BLAKE2B cf556d6ba654118ccd0316fb75f2f970cb96990f
 EBUILD mupdf-1.20.0.ebuild 4750 BLAKE2B 7f6c496689aa27a9652b025f06825a7acfe7f642265f479fcf49aa1a4b71bcf4056ec24bbb642d4a667c13686a89a0eeab619fe7881fb9ad50391b4600add06f SHA512 50d58af35937363f58d129931374e4b17ca0864ea9064a14e09ebe40122aba5eb999d139b824440e082f8420181108e641c90eccb0fd1da97946ec7a52489e80
 EBUILD mupdf-1.20.3.ebuild 4780 BLAKE2B eb2f4aaf2aa01d067ecc81bc71a4ddb97addf585fa79fca9e49f10d7070c83f2755be77cca15fa81cc71e386670077fb9dc431872b76cc114453084444e22d5e SHA512 d37b11930ab067bb85604cb11c87eda4cca371368b286f49beb5d551d0808677eeb5208ed17b77bc3401ac6c648e5eee4c070d8dc9288acfaf9ea3d869b27053
 EBUILD mupdf-1.21.0.ebuild 4744 BLAKE2B 1eedbb5b4aeecd9718c820e40ec40aa517d08b29d7cdca2c7a397824ecbf21a3dfe70cd6aff0afec2a1b5beb4baa7f4eb1703d1ab193be1430e3a226329ddbd6 SHA512 253804764cb8465bfa0b5f534d53e9e561e5ea5c2205cb5b05a1e401d412a05eb12ae0920de348677ad00c73194e372204e5b586d53c92ced42065477bc5e8bf
-EBUILD mupdf-1.21.1.ebuild 4887 BLAKE2B 2099e7e3e9b258581105526cb6f2b75f9303d41c3f8ab8a537f1f1805fe362266ffab3aaf30b360f9efdd9198e740977b420ed1647bfafb8e7ffd3f99f72aa7d SHA512 69e07e758694e18fdb722aa624a4b35500980b224fe6c56d077fecb407c2ee887f897a1cf4c6c53a618dcff81585a545d03aaf81024e3912bca082300c2faf0c
+EBUILD mupdf-1.21.1.ebuild 4891 BLAKE2B e3bd33a65d8d488e0b074e0858840bb22f932f51a1da55db4207a85c4af64ca349fac9ff0e5c0fc48d4adae87d98c04213ea623413e983cbd869d04d2764b5f1 SHA512 b244163c4d284b19a60975ed1dd12e9c15124c5ca6f000fdc9fa2474d4a8f8e14e2953938046b93c0fa7728bb08f4f4765153b037f04e25a77b9296167f49b02
 MISC metadata.xml 497 BLAKE2B 35e16ef688aa8b046f3e8ceaa7399da31379ba50b2cbc36d842696d1589aeea5a55eede13d79188f08ae8ff411c16385128633a1fbdaba04ee115158ac7e529b SHA512 225727e22fe2756480f3d502f49a62abbd0fe09d6266c1e00c09b04c2b5da181fc46bb06b19020290fa857b1feb0d557e6a77084f6269b5e0fdfec593cd46709
diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.21.1.ebuild
index 5eb70637cf2a..0d782560357f 100644
--- a/app-text/mupdf/mupdf-1.21.1.ebuild
+++ b/app-text/mupdf/mupdf-1.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -52,8 +52,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
 	# General cross fixes from Debian (refreshed)
 	"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
-	"${FILESDIR}"/$P-no-drm.patch
-	"${FILESDIR}"/$P-fix-aliasing-violation.patch
+	"${FILESDIR}"/${P}-no-drm.patch
+	"${FILESDIR}"/${P}-fix-aliasing-violation.patch
 )
 
 src_prepare() {
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 474f9bee7cb0..d6affa8bc4d7 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -2,5 +2,5 @@ AUX wgetpaste-2.33-tests.patch 2742 BLAKE2B 3bb6c60de41ff4e428048816b093f40691de
 DIST wgetpaste-2.32.tar.gz 16626 BLAKE2B a8628a47edec5797f011fdf648cccf4147043bb699fe6ebfc38b66d1bbff1840147613e1de1a2abf1048b83247e9a16026bed4174be605f99e59035cf7c64f9f SHA512 57f6194c864adf3eabffe46163d1c83a5c2c30affc4c353fee5cafe6aaf19cfa306e134cb5dd216577eb34cc93eee66b28297e5a1d4fa92d78d38597170d40bb
 DIST wgetpaste-2.33.tar.xz 16408 BLAKE2B 78baebf4edb6e6340a73127099366d306359d02c0c1eab137822c56669da0609a5479940b4fb2accbc79978df091dcd34415876618e64aa556d1584f74773736 SHA512 9bf1f379316da372b4f69296b54f9a266dcf9fdaa2a8718165a2029571f4c2c0166304ffebeb2ec4657ea6f49087793f40d9da383f5da052bce0543c90ea13ab
 EBUILD wgetpaste-2.32.ebuild 664 BLAKE2B 1eace63001f98a34bfc3b3a55ed42acaa15b99645844bca4b16cb6c39ca82622bf9f7d9016d5f0785bb872aed9bcd9c8bf75ebc42893b9863ea97e694d9cf81a SHA512 caf06b9f8c9b0e49213ee02b159d2c33f1b534771e7e694ea6fe387e524400b8a16a1a3548bfcf78cff73a35cbd50c4087068465dd9c080e75c075c72d20a2c5
-EBUILD wgetpaste-2.33-r1.ebuild 957 BLAKE2B 1c74dcc709d5f5968a7cb312d3473e07ec7741e74be1abceba0ec6d5f3ce90b00a0be6246a4dac17539f6745186da4d6b9969ab07736fe1481f4ab59064d2049 SHA512 3267c3e8289540d1cf7995422acb99925f1037397ab40ce51eee4d89e95a0402a8d1a65b936be1b9215fc2f2f5e6fe8f18f85f0b1bdc26dbc911539a7867c86e
+EBUILD wgetpaste-2.33-r1.ebuild 949 BLAKE2B 17d7ffd72d029337a6667be7f7398c38f950a36813da0127c8148cc0d610b086a91b5032b4c006d64c2e318f17aa5ca4dd40cef2a494cee04fd86c24a747adcd SHA512 d095a347e93368312d5808dee72bef73dd0fe4d8d047f682ca98b1d5ebbb35b192d47a867395d713081bc1f80c4281b848ccd2ebd9b9e16239a32aaa41c8ecd3
 MISC metadata.xml 566 BLAKE2B 1f63219976e414e688b0e8b5d0ce84dc4480af3e59ebbbe550d26ca5973ac22148b87d1b43304bbbfbcaba1731d14a6f7639b7352e2b77d1141f8dee6875d2ce SHA512 779b873177a5b294e6a140d8d658980469b50cdb1c65f6c4a387e8af82f996f109ed14ae208f8603cdfc80ac0f9f0a50ad00202e92c0f5c6aaea13d01ecf8862
diff --git a/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild
index 71e79ddd02dc..4c9afff880ea 100644
--- a/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+ssl"
 
 PROPERTIES="test_network"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 6ea1aa1d495c..4c910d46dead 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 895941e618d7..a0b8feb2486d 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -1,12 +1,16 @@
 AUX etcd.conf 978 BLAKE2B 2aaecc5c7b3d0b7a44f8de65d8362333bdcf9616de55a2c4fa1551eca91d80061c146165f1bf077c1d93e6874b4444384889875b3fe81299e46e10fd6e24d8ec SHA512 3b543104df93ebd6013b5e50c1e17b947e089bf27ba976859574f9fa57f2ed0ba16342984d12a68a00ff6745f37d229b1fe3206df7d713805e289d029774be0d
 AUX etcd.confd 129 BLAKE2B 1d7aff8c57e4dc0f4348a5de4bfff0a1552e8b4d228ee0f0ba2eb6eb944daefae1b5b55ba6b5416697b923e9144884d0828612403a11e627f8f7e82fa7444f68 SHA512 a08b1c1701370dc23ebd86db915d1e65747dc4ca57ce44d8cba6cf8434d5711786ac96725eed3285f4ba7cdde25ea25a51539d6cd74fc2f4b713f48cda15c4c3
+AUX etcd.confd-r1 50 BLAKE2B 59c5cfe561b553a484acada6c328d204e778d9d6f3dc81f196ea7b3156655692a71b8eb6e61126c4f92ae0d7135b8b2df54ff0edc0657c23638815d326f5f57d SHA512 4148228437cbc9935e484d9797f834ececac108086622c6c6a5adad18d7d34454318efa43471f407ac5f07d4d7ccdcd86354dac9f8a6cc2ad46d8f9b9a3db812
 AUX etcd.initd 821 BLAKE2B 5eba7f0e8d134ff45caba8c1eb3aaf6afb412082b9a5df95925f36fb83841be15ffca0f0f9b7c7c4bc6989665aa4e8a51fc73b0c66b5d2f960c6795fc21040da SHA512 5b8c12285b5d609abdfc5440589f7703951f6550e53783fe5e7eb3a4a3b12625d6f0526cbaf7e9922de3fbf0b86ff9d3f40de1ef55f26261f61d11d177d9a580
+AUX etcd.initd-r1 580 BLAKE2B 26213ae349b07f936b60ec9b48f63920b28f0d501adddbad2134f41f2fbc1516edd28d7aaefdb67f5842e675a9e1f45d4fe4af560a91564db1f45b4a4b34d78e SHA512 8beebff5013582e4e54b32425031d4361626955f132ed2828c62b0a54f82092674f800763cd961adfe37eaa2e3f8314a11d35d74f000b7b26ffe573b62149452
 AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12cb0ff7fb877527df33a91dedcaa4bbbffa190b4f9c2f53868aeca093b93e9cad50718a23eb5fdd46 SHA512 64d3181a936f8bab635a17f90679041c2d70a712307928feae03a517ad02252fc37e25738979bc1ccd0657ef70439e65cb0306759bec3939e940ec382a02d94f
 AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961
-AUX etcd.tmpfiles.d.conf 76 BLAKE2B c5cb2b9dc0aa756554cade2832884033058b5fda43828eb974b25018443a1e34d94fd22d03038e8a66aac858565295f6b513d557f8538fb02db4f2afc1cda41e SHA512 a2a580edc2ec492ec2891af96053a5af9f55907d40ec8bd742047ccaeb86558601f09b448da59760e5708d32c3471180c9ca7323cfae75fe0474dd8d4a2b661e
+AUX etcd.service-r1 458 BLAKE2B 4e2dd4934350821d01de1a0d9b8c4a402eeb87bf81a24f484652570e3e1c55f23acc3bc17c747400a09f9e26227c89a442a2a308586767595a9458a3a2f16688 SHA512 f105394411a2af0694bcb559a4b2447ed82402101f750af44315e3556afa77660f41d9404fdd04cc363d0dcd980adedf066c6b238a40e14c07706c8f67325fd4
+AUX etcd.tmpfiles.d.conf 72 BLAKE2B b567592de5cc69c8e55ef16c537d0ad9207fd5f932bd2ca622f66909362033bb3387289af4675be53c0a5a7cf513805c4dfe45391091128a6ada3ffea4377420 SHA512 403fa63c0284811c655e5e9f3e7f6eb81ad6c10a1b0eb8df400e7e85c621c56b9580457bbb2a823c0ae3c2fac10f6b8bfb73991a10d9373e87f10b906d8d50cd
 DIST etcd-3.3.24.tar.gz 6518759 BLAKE2B bff713b5f754e6ed86f4265be7691f5cf6ad0bc1576ef15a4364b34dda827bef4390024d7a9bb032907dc8a95d8d3884e9f2ddf5a37b3b7e4ab476a13e61b8ac SHA512 a3825a1d6ec886a5f30317929bafc1f5b2657f374a4cb7a0348786a7c4f6b073197b2bdeb4d725e78cf5c99cead3e38dbf468ea023b3e7689bdce857466a72d3
 DIST etcd-3.4.16-deps.tar.xz 36600528 BLAKE2B 3c8cbaef04b673962858cde9846a6a118eec785c0fc76b6e600b1686fd6e684f4b73af4aedb5886dfca51434e5738fb9bd0a39cdb81eda922e374c7668f0c0d0 SHA512 9119e09fc50bb916c3e436b9a4eea4b041184384865955f9b1a0f12e1334d9a143d49cc241ee51229e04fdfaedbbce24a66159107f52519b88a1e95cd64222df
 DIST etcd-3.4.16.tar.gz 8853228 BLAKE2B 576d3f038f6e9e3eadaa9ba3935f8372271e9fd2cfb8ab193ce16ee57a55419daad4d8496f6ad27dcb833566e6eb077052422e1c86053d176a86b4305c8cc525 SHA512 3f413debe8bd723a00a3e39db05f6dbf414b7dc02f40f07d3037445c63b31c7bd8adaf77152ae01aa6aae3966f65393c5c8e352bbc2b86d01e5e2dd979c1c2e1
 EBUILD etcd-3.3.24.ebuild 2095 BLAKE2B 87028715b8c371c240ce404e13da229fb62a6f4df1975591c8729dc12dc91dd700c7a8236d74be94bb0678d852fff41341b563f346eeb1040e1f8357a92808d8 SHA512 3e276c755307bc83255d679edfb60990341a492fcc2665764e02a38c7c0dfc81743fcc488bae8574a900135047ab182051e35e87c4f12c5d3f26dd501efaf072
+EBUILD etcd-3.4.16-r1.ebuild 2037 BLAKE2B d4927bd6a2c341967c912de694d5ca47607c2950f63a4417822bc7b3fbd0a449b5d357e9099189191b77fe906086e1fca20b235ff402be5336174428e05d7d7d SHA512 820ca871924d3f73ce3c42d019f888e02d8d3d69542762e7cc040de4c5e9cbb294ff50c0960171c16d1071f83d95a4060be025c361765389ecf7b61f5e83e80e
 EBUILD etcd-3.4.16.ebuild 2102 BLAKE2B 820690325566f81fd1f9de36cbdfe3f3b03e590a4c8e46e245bc7a0dbc81755d187fb9decee2b4c3fd66e775fd80081a0559fa6061abf7c7d508bca1d55ce1b7 SHA512 07caba3725d64c30bf5331020bec2cc15bd46948d43d92288ff9e50f1c84470ddaa2a88d7a0584aeaf8fdea76f679b8200d3117c90fd2e000ba566975020ff67
-MISC metadata.xml 574 BLAKE2B 17444a268dbcc374ea8ee5457f3e81faa7ca9f7d99cacd3b0fba69ae0122dd8eabc09e6916318b90ee3dddb513010921dc546d33eb1d11ba4a73c6d973344c20 SHA512 8a506ba2858659e00abfb6107028e521db02605b2a985c4aaa3dd580d89a8929a084b93b02f784ee7e5c5935c361112b94b4e9076e92d9bb7b901c761ccaa375
+MISC metadata.xml 421 BLAKE2B 5498a48643720f59f55d3b37d21fa80a4d8c984e7dc0e9beaccdb4f08d53819025e5849e481a7ce14fc519de15fdbed622f3c3912335cf81a678c522ba367b32 SHA512 ed8b5d3b552fdc284301ed63b941c2ce87cc808718dc15191597932d6543606907a175c929416f51193c63e12d79fef7993d0f91d9d0f70aacf75447c3744b73
diff --git a/dev-db/etcd/etcd-3.4.16-r1.ebuild b/dev-db/etcd/etcd-3.4.16-r1.ebuild
new file mode 100644
index 000000000000..2f0ad3af3b4a
--- /dev/null
+++ b/dev-db/etcd/etcd-3.4.16-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+GIT_COMMIT=cf54fab42
+
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd"
+SRC_URI="https://github.com/etcd-io/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="doc +server"
+
+COMMON_DEPEND="server? (
+	acct-group/etcd
+	acct-user/etcd
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# Tests fail with this error:
+# fatal error: checkptr: unsafe pointer conversion
+RESTRICT="test"
+
+src_prepare() {
+	export GO_BUILD_FLAGS="-v -x"
+	default
+	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
+		-i "${S}"/build || die
+	sed -e 's:\(for p in \)shellcheck :\1 :' \
+		-e 's:^			gofmt \\$:\\:' \
+		-e 's:^			govet \\$:\\:' \
+		-e 's:^			govet_shadow \\$:\\:' \
+		-i "${S}"/test || die
+
+	sed -e "s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
+		-e "s|go test |go test ${GO_BUILD_FLAGS} |" \
+		-i ./test || die
+}
+
+src_compile() {
+	./build || die
+}
+
+src_test() {
+	./test || die
+}
+
+src_install() {
+	dobin bin/etcdctl
+	use doc && dodoc -r Documentation
+	if use server; then
+		insinto /etc/${PN}
+		sed -e 's|^data-dir:|\0 /var/lib/etcd|' -i etcd.conf.yml.sample || die
+		newins etcd.conf.yml.sample etcd.conf.yml
+		dobin bin/etcd
+		dodoc README.md
+		systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+		newtmpfiles "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+		newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+		keepdir /var/lib/${PN} /var/log/${PN}
+		fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
+		fperms 0700 /var/lib/${PN}
+		fperms 0755 /var/log/${PN}
+	fi
+}
+
+pkg_postinst() {
+	if use server; then
+		tmpfiles_process ${PN}.conf
+	fi
+}
diff --git a/dev-db/etcd/files/etcd.confd-r1 b/dev-db/etcd/files/etcd.confd-r1
new file mode 100644
index 000000000000..c7913d259409
--- /dev/null
+++ b/dev-db/etcd/files/etcd.confd-r1
@@ -0,0 +1 @@
+ETCD_OPTS="--config-file=/etc/etcd/etcd.conf.yml"
diff --git a/dev-db/etcd/files/etcd.initd-r1 b/dev-db/etcd/files/etcd.initd-r1
new file mode 100644
index 000000000000..f38b977a7568
--- /dev/null
+++ b/dev-db/etcd/files/etcd.initd-r1
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile=/run/${RC_SVCNAME}.pid
+LOGPATH=/var/log/${RC_SVCNAME}
+command_user=${RC_SVCNAME}
+command=/usr/bin/etcd
+command_args="${ETCD_OPTS}"
+command_background=true
+start_stop_daemon_args="
+	-1 ${LOGPATH}/${RC_SVCNAME}.log
+	-2 ${LOGPATH}/${RC_SVCNAME}.err"
+
+depend() {
+	need net
+	need localmount
+	after bootmisc
+}
+
+start() {
+	if [ ! -d "${LOGPATH}" ] ; then
+		mkdir -p "${LOGPATH}"
+		chown "${command_user}:${command_user}" "${LOGPATH}"
+	fi
+	default_start
+}
diff --git a/dev-db/etcd/files/etcd.service-r1 b/dev-db/etcd/files/etcd.service-r1
new file mode 100644
index 000000000000..e3b701551510
--- /dev/null
+++ b/dev-db/etcd/files/etcd.service-r1
@@ -0,0 +1,17 @@
+[Unit]
+Description=etcd key-value store
+Documentation=https://github.com/etcd-io/etcd
+After=network-online.target local-fs.target remote-fs.target time-sync.target
+Wants=network-online.target local-fs.target remote-fs.target time-sync.target
+
+[Service]
+User=etcd
+Type=notify
+Environment="ETCD_OPTS=--config-file /etc/etcd/etcd.conf.yml"
+ExecStart=/usr/bin/etcd $ETCD_OPTS
+Restart=always
+RestartSec=10s
+LimitNOFILE=40000
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-db/etcd/files/etcd.tmpfiles.d.conf b/dev-db/etcd/files/etcd.tmpfiles.d.conf
index b93ac987f287..67a720ae29cf 100644
--- a/dev-db/etcd/files/etcd.tmpfiles.d.conf
+++ b/dev-db/etcd/files/etcd.tmpfiles.d.conf
@@ -1,2 +1,2 @@
 d    /var/lib/etcd 0700 etcd etcd - -
-d    /var/run/etcd 0755 etcd etcd - -
+d    /run/etcd 0755 etcd etcd - -
diff --git a/dev-db/etcd/metadata.xml b/dev-db/etcd/metadata.xml
index 46163bd16f36..c5db413df944 100644
--- a/dev-db/etcd/metadata.xml
+++ b/dev-db/etcd/metadata.xml
@@ -2,10 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<upstream>
-		<bugs-to>https://github.com/coreos/etcd/issues</bugs-to>
-		<changelog>https://raw.githubusercontent.com/coreos/etcd/master/CHANGELOG</changelog>
-		<doc>https://github.com/coreos/etcd/blob/master/README.md/</doc>
-		<remote-id type="github">coreos/etcd</remote-id>
+		<bugs-to>https://github.com/etcd-io/etcd/issues</bugs-to>
+		<remote-id type="github">etcd-io/etcd</remote-id>
 	</upstream>
 	<use>
 		<flag name="server">Installs etcd daemon</flag>
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index e3f736451907..50d28622b81b 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -2,6 +2,8 @@ AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c72
 AUX mysql-workbench-8.0.19-mysql-connector-8.patch 624 BLAKE2B 0cb899a8b0127664471877bb9cdcda946c35ed7a159646b94891a791a618c77201cc7696d6f2893e95fd78dbc13325cef752740f76e69974e10c0f88084594fb SHA512 09c2349cb42393f6d32f24804e2c3438a5d846fc9611e0684ccf2139fd30b0abcb0f2aa7b205c60a081259e073fb345cd72837dab1a216e6a8aaaba5ec3decf7
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e SHA512 a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.31-src.tar.gz 19350289 BLAKE2B eac2024763f1129020584f1f0d019567b88a5de6236607d9c5c140e3041c6570a50bed50d3783f5a51ac2d16331300d49095f16f786d5152bb378f0d8f5cb548 SHA512 7ff9b6636292d6fa1708903e5fd26fdcd07150e34217ddb6fe552dd46c026ed49cd5086e7f43daea09d90f390cd14b59ddd8371b308dc6c9b3f0fe3455e04b7a
+DIST mysql-workbench-community-8.0.32-src.tar.gz 19353724 BLAKE2B 0ae8b7cfa0c73b4637ea62bdb46ff4102a374a6dc0b84eed8df414c07277763c61312996a011da82af668c6600bb76f723be60995509b7108ec184fde514f7b0 SHA512 368f9874a996efa782b6e0e6cf8b8919aacd2d7d4ad273f8ab5ed1ac6c9490e2c37bc1413867c5ed85169f04773bafcea7d513c8fc12323ba225cdb411b9ff05
 EBUILD mysql-workbench-8.0.31-r1.ebuild 2719 BLAKE2B b5be3215099ad752d89869990e96381e5d870610dce1dcbcafa4d1dfdfc68a2bf3f2b4764400cbb4c78487e212d717428bda4e8167c1b71c51570f9f50b8912c SHA512 294c67ce5bd4bb2f82a1c667f737e0b56a2dac485a1dd3f17646c7b08b7990b58c4e0a46a5936dfa625d6ce02261d42dc1e51104634601ea2c9aa4d9cdba4896
 EBUILD mysql-workbench-8.0.31.ebuild 2713 BLAKE2B 4c7f552ed2ec0d22562b2a821e36ef098d59e033877190e38acb933e7da77ca5f057cf17cc1067c45f8d29cb4f08af69296e5acb323821890fb741809265650b SHA512 b0d55f643924db9668ced192dd4dc4df25278153d2206e32317a7c23a66537418c82c7da594720eb38cb99b3ef9bbcbe98d01a7fd0bc73cfa27324b3cd669f87
+EBUILD mysql-workbench-8.0.32.ebuild 2719 BLAKE2B b5be3215099ad752d89869990e96381e5d870610dce1dcbcafa4d1dfdfc68a2bf3f2b4764400cbb4c78487e212d717428bda4e8167c1b71c51570f9f50b8912c SHA512 294c67ce5bd4bb2f82a1c667f737e0b56a2dac485a1dd3f17646c7b08b7990b58c4e0a46a5936dfa625d6ce02261d42dc1e51104634601ea2c9aa4d9cdba4896
 MISC metadata.xml 312 BLAKE2B 8c491f0d45e24b9e367ef63f8822daf6925a17f8d44ff822b8faf7485f729524de02309b91e18411421b4533aa086853914c4a0b2a93d3fd5573a289fa1e3715 SHA512 01f2f645d167290bdb313e6c1c386b0426b41edd0ee9b50acf538a7353855c84321111ffd11c213c71424c7df73aa48b8fb9f3f2af914b595fb2961cc6b3186c
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild
new file mode 100644
index 000000000000..9b199f066c5a
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.32.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_REQ_USE="sqlite"
+
+ANTLR_VERSION=4.9.1
+
+inherit gnome2 flag-o-matic python-single-r1 cmake
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/"
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
+	https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+		app-crypt/libsecret
+		dev-libs/glib:2
+		<dev-cpp/antlr-cpp-4.8:4
+		dev-cpp/atkmm:*
+		dev-cpp/pangomm:1.4
+		>=dev-cpp/glibmm-2.14:2
+		dev-cpp/gtkmm:3.0
+		dev-libs/atk
+		>=net-libs/libssh-0.9.5[server]
+		x11-libs/pango
+		x11-libs/gtk+:3
+		>=x11-libs/cairo-1.5.12[glib,svg(+)]
+		>=dev-libs/rapidjson-1.1.0
+		dev-libs/libsigc++:2
+		dev-libs/boost[nls]
+		>=dev-cpp/ctemplate-0.95
+		>=dev-libs/libxml2-2.6.2:2
+		dev-libs/libzip
+		dev-libs/libpcre[cxx]
+		>=sci-libs/gdal-1.11.1-r1
+		virtual/opengl
+		|| ( sys-fs/e2fsprogs dev-libs/ossp-uuid )
+		dev-libs/tinyxml[stl]
+		>=dev-db/mysql-connector-c++-8.0.27-r1
+		dev-db/vsqlite++
+		|| ( dev-db/libiodbc dev-db/unixODBC )
+		dev-python/pexpect
+		>=dev-python/paramiko-1.7.4
+"
+
+RDEPEND="${CDEPEND}
+		app-admin/sudo
+		>=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+		dev-lang/swig
+		virtual/jre
+		virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+	"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+)
+
+src_unpack() {
+	unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+	## remove hardcoded CXXFLAGS
+	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+	## And avoid -Werror
+	sed -i -e 's/-Werror//' CMakeLists.txt || die
+	## Fix doc install directory
+	sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
+
+	## package is very fragile...
+	strip-flags
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	if has_version dev-db/libiodbc ; then
+		IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
+	fi
+
+	append-cxxflags -std=c++11
+	ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
+	local mycmakeargs=(
+		-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
+		${IODBC}
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
+	)
+	cmake_src_configure
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9885fd7ff599..e802471e48e5 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index 3aaef0a7c2c4..6d22506520e8 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -4,6 +4,8 @@ DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870
 DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
+DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
+DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
@@ -11,6 +13,7 @@ DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd820
 EBUILD tomcat-el-api-10.1.4.ebuild 1374 BLAKE2B 4296a5b0314ecb8bf78fcba7c536a182e1abf4a52a89d18532b6a8083552926cb94f301bec141c85008d49f5aa12277c2b0807867fa882115f349bf3b11b7c9b SHA512 b1812d67e3405123bb2ad21469268df419141f75f1a9bb23da6ace7bea9a9f740c08301b0dc06c54525359c7dc3ef8767bf58f1c4dba923207285c1d6f50d367
 EBUILD tomcat-el-api-10.1.5.ebuild 1378 BLAKE2B d11b6f478292ea873911be713ae0e2dd118ab2fe7dfa2be6a134ce9cd9a3145cd36373b953b1bc6618f7540b000d875c23b316ce4bdaac58a7e2e3a3cf629bfe SHA512 f1b2cbd4ec5dcbd01a93e660e651618f26734ca3cb5d14a08a73b29e380f033607490e9933991bc40d6f6af9675e4dc5d40f19af502d3f12dd467689e36693ef
 EBUILD tomcat-el-api-8.5.84.ebuild 1370 BLAKE2B 34bacef959f8b2ffeae59deeac238c6ea7c13c587e29ce1ca648fabd5eaf331903c2056390feda0f603c2652414b12955af2727efb01184cd8c81365f26269f9 SHA512 cfbfbd055abd5a30836268389bb16aac872fef7c3a9f9fe249c08c994681f075e4bcc49f6e09d89eb67e7492c22098b9e9c19d1e7f026619f13e5284891b3ec7
+EBUILD tomcat-el-api-8.5.85.ebuild 1374 BLAKE2B 95b7f6a842eb6124d0eab88af050f1b9fa0775250df03d0abfcaab8bc8e79e80121619b6ba18776746720ae159cf2f0146267107300fa5ffa4364bff380c3120 SHA512 4fdf7597b51c8fa348fd3ddf483c768a385f3cc037bfb76f996f347c132cb58f9f9ebbf0156ccfc52dbdbb9af04168b8ab3d30814463497d5537844aa10075f5
 EBUILD tomcat-el-api-9.0.70.ebuild 1370 BLAKE2B f218b5ce0baf1563b88edff9a1720353367ecfe16907a880dabd9be2e88ede18eacd6fed334982a1f9c2902e0db5068eb75a6ac28059c59b4843d4fb102a8988 SHA512 7742cb95728b30becf186873b61a362cea048b9504a9ff993a1bf838afdaac7d7df85097639118d9bb61cd817f7c84701061fd6922a5225f0533f904345662c7
 EBUILD tomcat-el-api-9.0.71.ebuild 1374 BLAKE2B ab4d7145110aede19acf139547170ab4ea1e72d502132683961dd4648861ee877c247b473a6e4da3183e0e33fb856dd8256bff1ba66b80050fdef0c6d32aa8e3 SHA512 a53c4b29a2163ac9c3272521668a38116b0f2786c5004ea06a394d66de003881d3913970ddce47e76d56616f458067348f105459defeaca13223b9bbe7b11e33
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-8.5.85.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-8.5.85.ebuild
new file mode 100644
index 000000000000..03f80bf1421f
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-8.5.85.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:8.5.85"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/javax \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/javax resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index 40fb9927776e..c71c1ab066b5 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -4,6 +4,8 @@ DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870
 DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
+DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
+DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
@@ -11,6 +13,7 @@ DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd820
 EBUILD tomcat-jsp-api-10.1.4.ebuild 1417 BLAKE2B 03236d9990abcf733d8eb1cdd16deac9d38fbed148aef64ffde58c9f3564bf272fa0228a5ed11f3eb4c9a9e60b7250af0bf68deb608c9dba4f93fcd9a5eff078 SHA512 f10d63de0ea589d81d08c6c5cdd0961539096f4e5b1d946b49367f70cc304f2005630bceb8a08022cb9b80aa3110a90895f7e5dc6a1df1b68989f87197042725
 EBUILD tomcat-jsp-api-10.1.5.ebuild 1421 BLAKE2B f635868f212bc9cca81680f44a920d5c93540a8a0893bc21e1fb48c26d91beded4427d32de39b94c079225afcfa8b9e2573a6579cf72aec1c694703ba3fa226c SHA512 328855cb5b7d63cc19f7ed65df763c5204b7511e03bce576a7f4720a646a77dc3a1b2e68429d31752cadd729cf7126474030bd5ce290456e4d90202eb9a13826
 EBUILD tomcat-jsp-api-8.5.84.ebuild 1413 BLAKE2B b8bbb03d477442ddbd45f7b234bcc985b1b1f37d4ad07caf66a25d8db7b48dca1e3a1c21198a445730c82aec7a37baebab6eafeedaa7997d416166cf2b3032c3 SHA512 4dd898389dded9ddf958a931d4843d22806eee262c78128d3ce5ed961ff6c8f2be36bd256cc03ee57066ba729e3ef920ff31fd8a651b5c3a67a05386b0579359
+EBUILD tomcat-jsp-api-8.5.85.ebuild 1417 BLAKE2B b5f7318f885d8cd792e4bd05ee7d0611b5e42514c99adbb89395dd39f6031bd0dc6015a4f1024d6fcb8bc40cf76e07e7590db89674788e6c88d6f701d2557b27 SHA512 0d780b14b3f7063f559209acb8cf080e7db1f58c012c2dac6ba1eab64ac15859ac03cc242895c1f41f4e07b5f9882f821f8cb248a9871a855700054f50d9f589
 EBUILD tomcat-jsp-api-9.0.70.ebuild 1413 BLAKE2B 3695a4ee4b5365c8716e6cf465556e29920893f8361d2b015a091ee8984d7d38483dc44a4b55ea9d77ea9f561d4dfee2cd159a2d4ac4a5926b4a2e86fd21797f SHA512 153f9e1adea22e21250077e471c1d2d524659da13055a6be5f2f507a928773a933171e66384a8b3591336eb2c2b83cc30f6bbaede56b97099f15f2aeb18376bc
 EBUILD tomcat-jsp-api-9.0.71.ebuild 1417 BLAKE2B 84c3e02a8e4b627a2687fcc27f45004c85c609f41f596e6562be7ee7470c2bcacdb36417ad91142f688bc95d708afe7dde0d149386d478dd55825019681fef3a SHA512 bb10dddaa47d2b877e51fd524ff64e81a32d0531f0bc0f8b542375a9549efb88e1651b6fa1f9315c5febc61a61e6d3f4fcc2f12b0d9d82b294f7ec2c5a9e584e
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.85.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.85.ebuild
new file mode 100644
index 000000000000..b690896a299c
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.85.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:8.5.85"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's JSP API 2.3 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:3.0
+	~dev-java/tomcat-servlet-api-${PV}:3.1
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/javax/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/javax/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 24cf4fbb10df..9dd0a5a91dc7 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -11,6 +11,8 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
+DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
+DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
@@ -22,6 +24,7 @@ EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.84.ebuild 1620 BLAKE2B aa001d0cb52ec13e07f6c5e7b2512a770c46c17e3f29d99a90d0c2170adabba96d6ab20ab4f6b7447331911c0c5848df1f962b8067b8a9f92cd8e2dc5b5053f3 SHA512 e12ef8bf6cccca578ae5d099e0b3c391a7bb3d6a6b096f3a05b9c3041b15bc44150c99a2e0546b54e3738ea70f20c0f21de4959d94186949aa5751e28baeeff7
+EBUILD tomcat-servlet-api-8.5.85.ebuild 1624 BLAKE2B 3b3e351187dbb4a02b0151f906f4b43caddcbe5236b1be1fc6cfd01d1255babe44ef7e29680ac832c1405f6a747ca3b109be6b7de4659267537e1a5865988b93 SHA512 03d349d1eb87ca353cf52dc063a14a817746f1cdefd7247d28121806fb8cdf4d3f855b9ac1505e0e04656a0fe619027a1dd8f64af2142cf4c7ea4f67d70e3083
 EBUILD tomcat-servlet-api-9.0.70.ebuild 1460 BLAKE2B c330792fab85ca2b354b65ac58b5423f81e80ff7cf646e26fce93b552af9bb6b89dce92a821c97f2a2371a33462d213b64fb601c1fa50217b41dccd2abc0829a SHA512 1915129e4a4d72e8f155b537d0fb0e0ed03e4cf507ee9c091d9b0a16f5910af0a69f703d22b59b5099445910e74d8267ab375ce69d9ea91cdbebd5b9ee8e0e21
 EBUILD tomcat-servlet-api-9.0.71.ebuild 1464 BLAKE2B 4071ee6f118f195bf54f1af8a55a3514a41662feea2b7dc5824e0aa8a09f90e881c93f17ab75ad1fd624da59619c241dacb51cce745f564d4f96a7ebabc96d79 SHA512 051c599de1e74b323a7c5ce68bc525eed039d55d896d5a8065a35f6c1b659a44ebe6bb00dd3e97ced98902122394077e3d15963e2710d982582cf052832103d1
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.85.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.85.ebuild
new file mode 100644
index 000000000000..0ce7d279ab5d
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.85.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:8.5.85"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's Servlet API 3.1 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+# we can't use the exact same version of el as tomcat 9 implements the same slot and
+# it would prevent from installing both tomcat 8.5 and 9 at the same time
+CP_DEPEND=">=dev-java/tomcat-el-api-${PV}:3.0"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/javax \( -name 'el' -o -name 'jsp' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/javax resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 1b2701ba3455..272cbc94076a 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index acf70d463070..6add7cae251b 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,6 +1,7 @@
 AUX spidermonkey-102-known-test-failures.txt 6640 BLAKE2B 3158083ec95cfcdb552a077562a0851809c7ffbd7dc346e346eda73035ecdf97bda2bc87a9eb84382e42ff49d969c4b37e5e83d7d339511f3f52782e4d0478c9 SHA512 5d57efcf3fee66c6e31a6c5b6fcd3f1f4a9ca2cf51caa324b25be4695709637e6028a980482f9532749af9006844320c117627dd748848f5c81d0936d72b60a3
 AUX spidermonkey-91-known-test-failures.txt 10531 BLAKE2B 905a76f6c4b6a00dd7ffe0eff1c92c467bd48105ab612272fa5768f661fafffa3db691882674816ac38039fc74a97e2d7ca1b87b3d87966e3b35d7e6d911401f SHA512 3439eca54200c638f80f23762d358f47c43b0a9b522e72c023e158cb310d15e16f1b6c5fb95f8e4f1fdaf32cf6b3d2ca7e1d0d44fc437873ba23695de539704c
 DIST firefox-102.6.0esr.source.tar.xz 478856656 BLAKE2B 2094bbb3ba00fc2d726a620e9946ca1ec98ad4c930ed611486ac92a7c74aa84da9c15b1353603eb36ce0a9098bd1f311dea2bea255f2bb6dd06fafbc7808d52c SHA512 c0f0160bea612d0ae74c29dd44beb7fd9a1c292694b8cd5c4faf2e54feb5c27684eee821b67dd40df714d69866a4e3a8b19e22182d9bc3023050d2d96b02d308
+DIST firefox-102.7.0esr.source.tar.xz 479538092 BLAKE2B bcfc62fce9ddaa12c25951178cc865af5d230de453dfea28ff46ad40976b08d31479c1a81dbf235dcf3c9ddbf949bee447ceb5bb384aee1f2da633ef2199f114 SHA512 2a9d212b5d15e1bf7a6156495126cbc9161d2057aeedea8f7a5a0670a19a9b00cf35044075935c8f3c788118856ba2cc00f9b297c5ac713f094857683f7cd13b
 DIST firefox-102esr-patches-07j.tar.xz 23012 BLAKE2B 41b706f5ae8695ddd33e971cf1aa99317382a57618cf19163c5bca09ed5d430dba672ac51b7ab3072360452cc89ac50397bb7992882a61a3adda37022239e654 SHA512 7048353ea5504e34d9d3950e3e5e3125f631f95269d5c9e422ca052173a316718fdd4b57ea7980a452139b1192805cb598f47f398fb148a426a85a5e979c6cdd
 DIST firefox-78.15.0esr.source.tar.xz 330819568 BLAKE2B dc8785613c2f72c55d484642c89c2545765a9efbd609bc7c2cf57b4a3a06a2ea22e6959e42b5b8af867db782e8b2097a67dec858796b744e47008a8e575e2316 SHA512 ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378
 DIST firefox-78esr-patches-19.tar.xz 88424 BLAKE2B fdc7bf8f28b3e799551a70f1cec7a695f52c4712f3b28733648fcd7dac5a599613f4c3d2cfa169266dc62b65619b7f28c0e06d32317adb8ec0056ca79c87e9f6 SHA512 3c81dadc9bf74207c4e361605127ef6141d77700c5c54f1f9cd5ad3be13df9f73c6eec2f51d779558e4bdad1e7395c6aa8943a93415bd1786d461042bc03550a
@@ -10,6 +11,7 @@ DIST spidermonkey-102-patches-04j.tar.xz 3996 BLAKE2B 468697521adacc5d647b04f222
 DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2
 DIST spidermonkey-91-patches-05j.tar.xz 5964 BLAKE2B 13f09f77bf16bc61b03c9488b7ab521552e179bfb123e390d0883ea4a3f55e87e0a5d5a246f31a9ddc35f212ea84655fe9d4fc364bbdddc1aac421eb28dbe41f SHA512 4d9cf21b712234ff6a18554a010badd756028e6147597040c423f7e27d260e3984938f956d9bc3572557163a144345ed28d9f88e459fc959aaa6fd448f6deab7
 EBUILD spidermonkey-102.6.0.ebuild 11294 BLAKE2B 03ab2e77a5b35ae1daa33c958ad2318d72d7a8a0ad75ee6f63eb6b72ee1b3c35ed6ec9c21dcd1f85fb477d71c5d5a62ae18db95aec1c62dc04ed4f85b93471d5 SHA512 4028151d1aa5a46d365250ecdf513265f3c784c03bddf1250cbeeefd25bb9c5df3f5baeac1a5dd62e3ae3b860659e3ed750f8d5003e580bcbf0480b7a2168b94
+EBUILD spidermonkey-102.7.0.ebuild 11301 BLAKE2B b382f6c938ecfed63043e0b54dae89c4be8dce2192f7671a1eae69375c53d414da0af1bd43c1d1342dd12c6203d91d8dad63a33c599373941baf80b44b6effb0 SHA512 ea59f221e69c6d357ba30670383a164adf77c14098cf32d908c5c014421a9ef10e9468afc482c0b453d1d1c176b51c10fbc014098aef35aa300bc97f45f6db0a
 EBUILD spidermonkey-78.15.0.ebuild 13130 BLAKE2B 337e98fe2f59474c46f1cae1277babfbf5d48ed4d68ca629c37494aab236af0fc7d979ad9bc54eb3fa219a42f164b1e1711acbb4515497da304e8b98eec21c17 SHA512 27da18685bd7753a9f0ea73273a6b877e9f3f0194f3ff65b64a07b74d0d256d1e59169eee115e719b3a95773943ce8de02afe7eb2ad4fc2c8600c3dfdd9fab06
 EBUILD spidermonkey-91.13.0-r1.ebuild 15292 BLAKE2B f30309c1590ed7ba56c2563bc20163781a04cb45d0ad5dea46442709d505d30f98f6f9d8c6fe1ba115c1e3895f44cd05d9e634e635c669e43f71e4a06283a8b3 SHA512 affe566c6ac89baef29b5b610a0d4db8fb98a42ce040eff5f30e6c0217adbd40129d0280589bef63c0a788364285d8921e7dda05d4a1f1d2c179e6cd3b14cabf
 MISC metadata.xml 575 BLAKE2B e7f3717d36ba723ed41a6dc5adc798390ec98cbd018447b52b4b59a692cea93a4430524a3d545649e08057210e3d5427943d15e97aa5e33da859d8b8e352274d SHA512 9fc1545caf99002b574a675fdf8b8ee0cfa2791129109dcb40e01e658d3de283848d63958876208ff1c384ca6041b20d4e6d34b84a445521df3e240c9ea9dfe2
diff --git a/dev-lang/spidermonkey/spidermonkey-102.7.0.ebuild b/dev-lang/spidermonkey/spidermonkey-102.7.0.ebuild
new file mode 100644
index 000000000000..779793c30ba9
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-102.7.0.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+# Patch version
+FIREFOX_PATCHSET="firefox-102esr-patches-07j.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-102-patches-04j.tar.xz"
+
+LLVM_MAX_SLOT=15
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="ssl,xml(+)"
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
+
+MY_MAJOR=$(ver_cut 1)
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="firefox"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{juippis,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+	https://dev.gentoo.org/~{juippis,whissi}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html "
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+SLOT="$(ver_cut 1)"
+LICENSE="MPL-2.0"
+IUSE="clang cpu_flags_arm_neon debug +jit lto test"
+
+#RESTRICT="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/llvm:15
+			clang? (
+				sys-devel/clang:15
+				virtual/rust:0/llvm-15
+				lto? ( sys-devel/lld:15 )
+			)
+		)
+		(
+			sys-devel/llvm:14
+			clang? (
+				sys-devel/clang:14
+				virtual/rust:0/llvm-14
+				lto? ( sys-devel/lld:14 )
+			)
+		)
+	)
+	!clang? ( virtual/rust )
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	)"
+DEPEND=">=dev-libs/icu-71.1:=
+	dev-libs/nspr
+	sys-libs/readline:0=
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/firefox-${MY_PV}/js/src"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/llvm:${LLVM_SLOT}" ; then
+		einfo "sys-devel/llvm:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+			einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use lto ; then
+			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+python_check_deps() {
+	if use test ; then
+		python_has_version "dev-python/six[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_pretend() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="7000M"
+	else
+		CHECKREQS_DISK_BUILD="6000M"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use test ; then
+			CHECKREQS_DISK_BUILD="7000M"
+		else
+			CHECKREQS_DISK_BUILD="6000M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_prepare() {
+	pushd ../.. &>/dev/null || die
+
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+
+	eapply "${WORKDIR}"/firefox-patches
+	eapply "${WORKDIR}"/spidermonkey-patches
+
+	default
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	# use prefix shell in wrapper linker scripts, bug #789660
+	hprefixify "${S}"/../../build/cargo-{,host-}linker
+
+	einfo "Removing pre-built binaries ..."
+	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	MOZJS_BUILDDIR="${WORKDIR}/build"
+	mkdir "${MOZJS_BUILDDIR}" || die
+
+	popd &>/dev/null || die
+	eautoconf
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
+
+	cd "${MOZJS_BUILDDIR}" || die
+
+	# ../python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	local -a myeconfargs=(
+		--host="${CBUILD:-${CHOST}}"
+		--target="${CHOST}"
+
+		--disable-ctype
+		--disable-jemalloc
+		--disable-optimize
+		--disable-smoosh
+		--disable-strip
+
+		--enable-readline
+		--enable-release
+		--enable-shared-js
+
+		--with-intl-api
+		--with-system-icu
+		--with-system-nspr
+		--with-system-zlib
+		--with-toolchain-prefix="${CHOST}-"
+
+		$(use_enable debug)
+		$(use_enable jit)
+		$(use_enable test tests)
+	)
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		myeconfargs+=( --enable-rust-simd )
+	fi
+
+	# Modifications to better support ARM, bug 717344
+	if use cpu_flags_arm_neon ; then
+		myeconfargs+=( --with-fpu=neon )
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			myeconfargs+=( --with-thumb=yes )
+			myeconfargs+=( --with-thumb-interwork=no )
+		fi
+	fi
+
+	# Tell build system that we want to use LTO
+	if use lto ; then
+		if use clang ; then
+			myeconfargs+=( --enable-linker=lld )
+			myeconfargs+=( --enable-lto=cross )
+		else
+			myeconfargs+=( --enable-linker=bfd )
+			myeconfargs+=( --enable-lto=full )
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	if tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Use system's Python environment
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# Forcing system-icu allows us to skip patching bundled ICU for PPC
+	# and other minor arches
+	ECONF_SOURCE="${S}" \
+		econf \
+		${myeconfargs[@]} \
+		XARGS="${EPREFIX}/usr/bin/xargs"
+}
+
+src_compile() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+}
+
+src_test() {
+	if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
+		einfo "Smoke-test successful, continuing with full test suite"
+	else
+		die "Smoke-test failed: did interpreter initialization fail?"
+	fi
+
+	cp "${FILESDIR}"/spidermonkey-${SLOT}-known-test-failures.txt "${T}"/known_failures.list || die
+
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "non262/extensions/clone-errors.js" >> "${T}"/known_failures.list
+		echo "test262/built-ins/Date/UTC/fp-evaluation-order.js" >> "${T}"/known_failures.list
+		echo "test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js" >> "${T}"/known_failures.list
+	fi
+
+	${EPYTHON} \
+		"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+		--exclude-file="${T}"/known_failures.list \
+		"${MOZJS_BUILDDIR}"/js/src/js \
+		|| die
+
+	if use jit ; then
+		${EPYTHON} \
+			"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+			--exclude-file="${T}"/known_failures.list \
+			"${MOZJS_BUILDDIR}"/js/src/js basic \
+			|| die
+	fi
+}
+
+src_install() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+
+	# fix soname links
+	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
+	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
+	popd &>/dev/null || die
+
+	# remove unneeded files
+	rm \
+		"${ED}"/usr/bin/js${MY_MAJOR}-config \
+		"${ED}"/usr/$(get_libdir)/libjs_static.ajs \
+		|| die
+
+	# fix permissions
+	chmod -x \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
+		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
+		|| die
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ad77342acc10..928995223d1e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index 34b5860c2ea3..32d179881086 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,3 +1,3 @@
 DIST pymountboot-0.2.3.tar.gz 4065 BLAKE2B 81ef6c967a2e8eaa76155446e0c59208ee10e5e3b40fbe9d910d5e4faf3ac1963146ef1df634c4795b56e709b90fb92edb57916586c8a1e5fa14ad92e1721f42 SHA512 fee4c8444b89ff0375c75eb44ec396d1c1e65d4bb08ff230ae0fdb1f822115ed44bf9904c284d3623768df0b4041ef7ab4cf9717596148d3df76badd0a3aa92a
-EBUILD pymountboot-0.2.3-r1.ebuild 508 BLAKE2B cbde1f12f02934ae7179219fa67332b6da3604a953043c847b80767289ce69631657672075565f122b10ceef5c52c00ce5837c38ec12ad61e6aed21fd5a8cff3 SHA512 29e4caea4dc8fce94000ba108549f65a5c15066a094ea92d59f5fb7c03ce2e4306d10e90d067d02707ac05d9563ed8a7bcf3eb184b60004448319908f10cf8d8
+EBUILD pymountboot-0.2.3-r1.ebuild 536 BLAKE2B b39a0b13444af1e51139911114eb84ff486e10f94741a0fcd289a03e8152513dfd8dee942b07030c93b326080b3c1ab58b253ae76f3e62e7a83633e4fa774e87 SHA512 587f432bae816e2f9c9f36b63ece62bb049db261fe8befc603b35c4227c26cea0748962d9aa568c0812c8ca09bf9ec3365febd9f46aabfbfe48b225ec1da0e08
 MISC metadata.xml 534 BLAKE2B 11562644ad15b24e6583a26cc616a04ef0000d24a90bb5b6c357b1094819126da2cc14eb77ce720efbdfcecb3bd2fd1caf6e1cfd560a9979a7d6356a73d4e625 SHA512 ba2416007b2b6ecb418081153a6ee9e2fa5bb79c64ccd6607e0679a3e2575eea529f48e655cbfc458b3c892e82fd14d02db1d4facad362fb63338eb977794486
diff --git a/dev-python/pymountboot/pymountboot-0.2.3-r1.ebuild b/dev-python/pymountboot/pymountboot-0.2.3-r1.ebuild
index 90c2d0863dc6..cf4345c9068d 100644
--- a/dev-python/pymountboot/pymountboot-0.2.3-r1.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.3-r1.ebuild
@@ -20,3 +20,4 @@ KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND=">=sys-apps/util-linux-2.20"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 1ab9922f9860..7351d27af54e 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,10 +1,6 @@
-DIST snakeoil-0.10.1.tar.gz 176054 BLAKE2B bd056911c993d274d6c0c79ee4660629d8a6b8c276835a1b29bea16f977907b76a5edebe142b168b282fce3baa9c97b465233d91f5a279fba26a2c04aec0c784 SHA512 9e16652663dab1bd88f620a4fb80ca6602a181d4738a34bef89116f962a2035988cf9fb036b6a12de39b05a5251ade0e933b1df63c020b900338a89169619397
-DIST snakeoil-0.10.2.tar.gz 178557 BLAKE2B 2bdbb99cb6c9aab3f491895d4f4f51b47484a36cb97b3e41240b7b72b9918c0a85b9ad0f8cf977e5f9a2b618f1ca50535d5c7290626807dd78d1ab2fa0b9c24e SHA512 9b0e124faef00840e0a21ff8b1632bdfb15b5c03c7305e65cc7b709e57a55060c65094d6c978ec1b3f6677e6bf0f22aba6036eb7d1c434a32f64242c1a008f33
-DIST snakeoil-0.10.3.tar.gz 179090 BLAKE2B 5b819da874b93531ebe615e15fda08bcafcf077c6f1926ea6eab68aa7df64c12de1ebf592b4c299802c92e1941f3fbb99ad812f659d2b691532e4206451cfe94 SHA512 e82427960d98c1856215ee1a48836f9835483d468cccec97f3e892277cada67359ea62f00538ee573e4a6d14991a8dcce2a42e4689ff6f96abf56b29ca8f9fc6
 DIST snakeoil-0.10.4.tar.gz 181814 BLAKE2B 953432469bc588623f154103ba8e698073a39222e5a6d6496759067ee269e587bec86ae96ba7665e75c83936f2f78e9bec1fa51c4e9f98a3ff1b1e72d75f1fcb SHA512 815707f13fbf0ae17b5e2188a9357df66d2564e5f8c5dc0ed7e8d07e2eea21cd15d79b8fc44b4072ef4524446d27d6742f6f95a650c327103e656c4b6b78e72f
-EBUILD snakeoil-0.10.1.ebuild 742 BLAKE2B 0c3e451c620f2c9b7cb1e7e0986db6b8ffcaf224141146ab418f8a5cf4e2f6c4157f26e89e854fb7ec3988616d6fc8cfc76345eab0c3cdb2a3485c4c3241b05d SHA512 52eca9a9f5267699d2d0e24bca20048f5aa48f6aecc1d11185eb438c0fbc3763190a346ed80546ed27cab38451b51f3066adc9e5725895e0a8ab4a0c29b8f518
-EBUILD snakeoil-0.10.2.ebuild 808 BLAKE2B df7d8f73632d9da3320f2339a10fbe7f13c34264c3a14ac2bd53eaf2e92bfb1774738c79ffcaba2ec22030542a7476a0d6afdaded4b0410f5f7692c026be2a65 SHA512 185dbef5c07c609f0f666e89bf5886917551f1ba860ab253277573aa539664cabbd333402e44a83bd03135893586aa2e464111dabba75ac1dfe85e28e5d3e4cc
-EBUILD snakeoil-0.10.3.ebuild 800 BLAKE2B 10a7e24ba2d5925717c86da82a5cbdb745958d677345b337a62051f5d854d9d3b2fb3f812b084bbb7e2dd32a8c8394f8872e96e14ee3e305dc5810462254606f SHA512 eac7a603d6192a3ba9f6d3b601bd93ec42cef21f3fdcaef60f13960b1a15d5f15403206da44afc1eaba190de294a6d5a9f276219fedf2e7e74a45b26816ba0b8
+DIST snakeoil-0.10.5.tar.gz 183358 BLAKE2B 6154eb0b5ce55aefc67484dc33c8a6e36ee903bce4293045252a8c9a3b4ecfc27690c720bb46842c1bca8c14ef59fbae4d3c1f02ebd46a7c91c1c9fbd1aa1532 SHA512 fafc04aa65423ebb3db66daa9c239bdf0968722b8ac14c1206dd3f26e3960d832fd15001e320463f98ca142ec7e1d6bff73ebc0ab10c3c5d3cde241b8160fdc3
 EBUILD snakeoil-0.10.4.ebuild 800 BLAKE2B 5cbcd7c1815d2e520dc36cbc11db030ffe315915c07a23c933102f76c76d7ad76af34323f93327084f8b1f0ec4b1672df0cbb05da71df30da718f7c9ff84c837 SHA512 49ebb849b9b878237e47eacf8bc591d455f6997079a3e7acc32f8c2e16c8ec10097bc815b2200c127391a672b039a2982936166512cfcbbdc6c60fe4c74c6126
+EBUILD snakeoil-0.10.5.ebuild 808 BLAKE2B acc97fe422d3270ce8a69fcbadbdf9ff8827587858135ca8820f1c36e2aa7dc184587ca4af2b2b9dbc8f12121b9c8c5191245ee76f5bd0f97d6955a1e967e61d SHA512 9ffbebc1fdf74c90799d9b0b7e638ca25b896bf07fa0489b95adab5f45711df8f80d9242d45cba530ad81ebf7221a0e4db10e1ef6ee43ef67857ca8f59f9b88e
 EBUILD snakeoil-9999.ebuild 808 BLAKE2B df7d8f73632d9da3320f2339a10fbe7f13c34264c3a14ac2bd53eaf2e92bfb1774738c79ffcaba2ec22030542a7476a0d6afdaded4b0410f5f7692c026be2a65 SHA512 185dbef5c07c609f0f666e89bf5886917551f1ba860ab253277573aa539664cabbd333402e44a83bd03135893586aa2e464111dabba75ac1dfe85e28e5d3e4cc
 MISC metadata.xml 394 BLAKE2B 1f11a6a69a1ed5736bdddaf949b97760d2986eaf848bbceafa706dae01dd8e84f2977d130179324856e35353702e8f84e2cf7b2e30587b5f21a7113237825c3e SHA512 71abd7d9037eb4412a992bcf6933999f0dfec0c39465fe5bcb63e6a8437ff901764c03ad65e363f4ce5d8789f364b7f732542c7f298f1d04a2a68343acbc2129
diff --git a/dev-python/snakeoil/snakeoil-0.10.1.ebuild b/dev-python/snakeoil/snakeoil-0.10.1.ebuild
deleted file mode 100644
index aad44f78b948..000000000000
--- a/dev-python/snakeoil/snakeoil-0.10.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD BSD-2 MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/snakeoil-0.10.3.ebuild b/dev-python/snakeoil/snakeoil-0.10.3.ebuild
deleted file mode 100644
index d2381d899739..000000000000
--- a/dev-python/snakeoil/snakeoil-0.10.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD BSD-2 MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/flit_core-3.8[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/snakeoil-0.10.2.ebuild b/dev-python/snakeoil/snakeoil-0.10.5.ebuild
index 50e5f7ee3893..9a344ead0fff 100644
--- a/dev-python/snakeoil/snakeoil-0.10.2.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.10.5.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
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 57563ce52bd9..04558a5789eb 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 9ca2ae38ae61..9b8665d66398 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -3,5 +3,5 @@ DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B 9b8dca943fc60a68f8474549d75c021dd91571952
 DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
 EBUILD mpv-0.34.1-r1.ebuild 9733 BLAKE2B 0edc617690adea48d4cd253a28aa56906684a55272630a9163b2573887afad4fd288bd9db72133494ac9cb58cb9415b9195415d61671430e4a1c19f63e833df3 SHA512 8710249d67c5c48dc4c9788ad8e0fef7a6ace8b52306da1b900a3098227115c547ed3b86b2389c32798df3d13bfa7a458303d8e0266258ffc205f7387823572b
 EBUILD mpv-0.35.0-r1.ebuild 7585 BLAKE2B 8970d3f707e5b630776a4afdf0a29ebf6d97a4931119425b859e9eec082cc7c1e0db7c5f188e47e91800e60150cb87d28a5f010156be38216375d8f728664d52 SHA512 470ff9a4cd90d8f0f983f8ccc527ca5ba2675f7de99efd35d9f72459829f669a8f6376db578387a1412c62ba56ecc497797640b8ea90b76963cb7cb3ce83c631
-EBUILD mpv-9999.ebuild 7532 BLAKE2B fc773d08ae4fd63175c4d7c70aeb0eac86a07fd8928fdccd56bcc4b78d09e2839c1b9a6ad32df85b00465fda8042e4992a36747881fb63b3b96842fdcefdfb85 SHA512 4579b88d256c74c728c4aa37aebd4bbb5c1da08107bba6d80dc1d3a8d0525a7ac074eb389518f4349c93328d1bcea9e2bd5ae3f2f0b5791a862eefba1fe6de91
+EBUILD mpv-9999.ebuild 7623 BLAKE2B 839cb1bc830f416b749519307791f329f90cefb176dc941b94cdfe9862939278fb45fe99122e3c602e9144425967eba0ee47b33d13a9c58ad022adb4411ddc0e SHA512 18f536d5363ab5924ebd84ae77c121c341a2cc5341f7636ef954f0580d8f9378dcc8a3ed49ac8588afbf40ba822cd25d9e183c1ab3ec0d1d19e3806b3996bd01
 MISC metadata.xml 2537 BLAKE2B ce08ff18966b0937d5c1564a32d8da1225d603626d02b081f8a236531683890770d134fb7898a208bceffeb7ed2d1cabf34f4d211a97d1d0d95287830b93ddbc SHA512 5dc6cdacffed6f751a05d261a23e765cf3eaa16bd0757853635da977176666f5fc75f0a6c759ccbfcfdd63c2732a0b53858f0379d5f3437bcd9b40a7cb82f59c
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index ac0f9dd62ae7..2c923f2ec44e 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -260,6 +260,9 @@ src_test() {
 		[[ ${test} == @($(IFS='|'; echo "${skip[*]}")) ]] ||
 			edo "${BUILD_DIR}"/mpv -v --no-config --unittest="${test}"
 	done
+
+	# currently only does basic libmpv testing, do in addition to --unittest
+	meson_src_test
 }
 
 src_install() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 88647d9989ef..d254d1e6e23a 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7350e21ae323..750bd88f137e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 20 Jan 2023 05:10:03 +0000
+Fri, 20 Jan 2023 10:40:02 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 1fe304cff03c..2f12279c7c02 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-01-20T05:10:08Z
+TIMESTAMP 2023-01-20T10:40:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPKIjBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPKb4VfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBtnhAAjWUDaw3ZSN4IT5WLB9PKe+1ndo2mKNdkx3JAsFkNr6/rzE1hwKzPiQKv
-/cn2SlT17vIXpwcg+LI28qwvb8ctYsL+LBPVbIJMTBp6h6eia6JUoFHCWDFZDbAa
-nlvsuW7ns+o/wMRvPRzasEtJWRMLCHqFqF74fUiRBGqErrwb/566b1vp0Eg5PnMK
-Gy37qZnOZD+/juUH/Xo5DPIgwU9SU79seAReI0SZ5tRo0OKiybRpP2iJ/K7CPL8p
-DeJEo0JACEV+32P6OZ60q1T1wNqVWg9igQ0H6hsBI/BrhKzZMUwRzafBSB0q+oKp
-zIEK7MzAJZdc93hYbMSniNvrB9iBokhpmyYJo1GCWiRumd01OMsZ5f1grFNwidPx
-5CXrLTytCQpntHNtZONXvsd5lsimZmr25EQc3rO1RZBhHYnlcDSRgZc4RYBFZ/Mp
-UFPQAtSZ7k6nzG8JmYAYzbRKIEw3G+3NBRxfeOxwKg+vI7wiDIXV7EYPBHUhSQT1
-fQIVygg+IMwR1b5WizvdERV4W80CQarb1UxAN2QrdVK3IMWfr7vHN/5a0IBkZG6a
-POQIoOyG/5Ws6DBz1MN2donfOi6iP3jMv/3x0+68dhodPBmynvcBWkWQ6NBDVUig
-j6++ljCKj71GM/1A8IuaqXU65qb134DHlJwNTXH2ay/Gygi512E=
-=GV0B
+klCEBQ/9FC3jw6/V9hBcPmSf0XthEkOKi4FvDNdzfu3MkgRCVS6I/aYjXhscbndq
+6HieXsCsTbRrdTTOWdG0GbePqjLm3prdyFi1YK5OIO/h8CudW7sUN7X0Q1nBjgOp
+IIiiXK/4mImchlek1qKyAMye3xmBHL0Ng0vsrOU9Bt/aZvRf5TGRnmJWY454W1Mi
+vdb7tLkU2exGMI+AKB0tPQmiPAMjizDAi4Iboi0yl8QEhznnbdPZu8SP/UMy/utk
+ynrN1yIzVmjTzbMKyWx6asWTbpJluhBv+uAbe372OR4+50wEKEdTyX9EkvptPJGx
+Xn6r6FAYVb/qgdS7bhaD9pZIKzOLn5OH5RpFitIG2vso5Px1TlmqyO6BfMBmIvIl
+Yz3g4oFvLDfW6Ozy30uOMWOcQJJBnE+RUXqzJdRK7MIMiLu3xMNcsePVW/R5GYO3
+j4rLhSxOVl/thR/ia9CXEc8zbfyViXa3YO1SXUvO5JHV0mbeyhti7+FekBWV4v9C
+I9xE6fMq/oECaAIuDXxrGpXZvJbJKPkBUpB2DD+MF5xqHyrYJnGtzMDgwh4P/mvC
+hdKBhyhlnb+VhUn4Snype0T+55aMOx8amuc2joNwttQrUxu2wk/Mw1m3VaSVbtch
+AdHAgSJDoYiq62qa2/RSz52lj8WY+R4ePXQ3QhEciMGbtzLzhWw=
+=kMpM
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7350e21ae323..750bd88f137e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 20 Jan 2023 05:10:03 +0000
+Fri, 20 Jan 2023 10:40:02 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1af1f53830c6..19c2ff80b763 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index ef3291badafb..9c9427f307c9 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.11-r1 b/metadata/md5-cache/app-admin/gkrellm-2.3.11-r1
index 5f7404792f65..718b25a1ef7b 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.11-r1
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.11-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile install prepare pretend
 DEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) nls? ( sys-devel/gettext )
 DESCRIPTION=Single process stack of various system monitors
 EAPI=7
-HOMEPAGE=http://www.gkrellm.net/
+HOMEPAGE=http://gkrellm.srcbox.net/
 INHERIT=desktop systemd toolchain-funcs
 IUSE=gnutls hddtemp lm-sensors nls ntlm ssl X
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
 SLOT=2
-SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.11.tar.bz2
+SRC_URI=http://gkrellm.srcbox.net/releases/gkrellm-2.3.11.tar.bz2
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=23bb792c4ce2d6135c4f7dbb85e9ce4b
+_md5_=694eeaa1329cf09853c19b94e5bf803a
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.11-r2 b/metadata/md5-cache/app-admin/gkrellm-2.3.11-r2
new file mode 100644
index 000000000000..f7737294f72e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.11-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install prepare pretend
+DEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) x11-base/xorg-proto nls? ( sys-devel/gettext )
+DESCRIPTION=Single process stack of various system monitors
+EAPI=8
+HOMEPAGE=http://www.gkrellm.net/
+INHERIT=desktop systemd toolchain-funcs
+IUSE=gnutls hddtemp lm-sensors nls ntlm ssl X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
+SLOT=2
+SRC_URI=http://gkrellm.srcbox.net/releases/gkrellm-2.3.11.tar.bz2
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=14ed62384b8c8e7acdc58c05c4bdcd53
diff --git a/metadata/md5-cache/app-admin/gkrellm-9999 b/metadata/md5-cache/app-admin/gkrellm-9999
index 24c25ca68591..24d604c36bcb 100644
--- a/metadata/md5-cache/app-admin/gkrellm-9999
+++ b/metadata/md5-cache/app-admin/gkrellm-9999
@@ -1,8 +1,8 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare pretend unpack
-DEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) nls? ( sys-devel/gettext )
+DEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) x11-base/xorg-proto nls? ( sys-devel/gettext )
 DESCRIPTION=Single process stack of various system monitors
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.gkrellm.net/
 INHERIT=desktop systemd toolchain-funcs git-r3
 IUSE=gnutls hddtemp lm-sensors nls ntlm ssl X
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
 SLOT=2
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0a7ee77e7e81bfa03d4ec74a70f863be
+_md5_=14ed62384b8c8e7acdc58c05c4bdcd53
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.12_p2 b/metadata/md5-cache/app-admin/sudo-1.9.12_p2
index a510bd359732..cacb8c37931f 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.12_p2
+++ b/metadata/md5-cache/app-admin/sudo-1.9.12_p2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.sudo.ws/
 INHERIT=pam libtool tmpfiles toolchain-funcs verify-sig
 IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.12p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12p2.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.12p2.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12p2.tar.gz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=0d510cdfe8ac3084af4140db081e83e1
+_md5_=4140e8b7bfd40fb5e098acb6b30df78b
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index a8dcb9559fb0..9ba04138949c 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-4.0.0 b/metadata/md5-cache/app-crypt/tpm2-tss-4.0.0
new file mode 100644
index 000000000000..864ef18f1319
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-4.0.0
@@ -0,0 +1,17 @@
+BDEPEND=sys-apps/acl virtual/pkgconfig doc? ( app-doc/doxygen ) 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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.80.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(-)?] ) mbedtls? ( net-libs/mbedtls:=[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? ( dev-libs/openssl:=[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? ( app-crypt/swtpm dev-libs/uthash dev-util/cmocka fapi? ( >=net-misc/curl-7.80.0 ) )
+DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
+EAPI=8
+HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
+INHERIT=autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
+IUSE=doc +fapi +openssl mbedtls +policy static-libs test 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=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=BSD-2
+RDEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.80.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(-)?] ) mbedtls? ( net-libs/mbedtls:=[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? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/tmpfiles
+REQUIRED_USE=^^ ( mbedtls openssl ) fapi? ( openssl !mbedtls ) policy? ( openssl !mbedtls )
+RESTRICT=!test? ( test )
+SLOT=0/4
+SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/4.0.0/tpm2-tss-4.0.0.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=8bbd30d235b01a6e999d8a5be8251302
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0-r1 b/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0-r1
deleted file mode 100644
index 380b564b464d..000000000000
--- a/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive 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=app-crypt/tpm2-tss:= dev-libs/openssl:0= test? ( dev-util/cmocka )
-DESCRIPTION=OpenSSL Engine for TPM2 devices
-EAPI=7
-HOMEPAGE=https://github.com/tpm2-software/tpm2-tss-engine
-INHERIT=autotools bash-completion-r1
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=app-crypt/tpm2-tss:= dev-libs/openssl:0=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tpm2-software/tpm2-tss-engine/releases/download/v1.1.0/tpm2-tss-engine-1.1.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=e7e5d93ef92ed92aa4017cdac4da097d
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0-r2 b/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.2.0
index ff025e1648b6..ea29880dc812 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0-r2
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.2.0
@@ -2,7 +2,7 @@ BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig sys-devel/gnuconfig >=app-p
 DEFINED_PHASES=configure install prepare
 DEPEND=app-crypt/tpm2-tss:= >=dev-libs/openssl-1.1.1:= <dev-libs/openssl-3.0.0:= test? ( dev-util/cmocka )
 DESCRIPTION=OpenSSL Engine for TPM2 devices
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/tpm2-software/tpm2-tss-engine
 INHERIT=autotools bash-completion-r1
 IUSE=test
@@ -10,7 +10,7 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=app-crypt/tpm2-tss:= >=dev-libs/openssl-1.1.1:= <dev-libs/openssl-3.0.0:=
 RESTRICT=!test? ( test )
-SLOT=0/1.1.0
-SRC_URI=https://github.com/tpm2-software/tpm2-tss-engine/releases/download/v1.1.0/tpm2-tss-engine-1.1.0.tar.gz
+SLOT=0/1.2.0
+SRC_URI=https://github.com/tpm2-software/tpm2-tss-engine/releases/download/1.2.0/tpm2-tss-engine-1.2.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ddf392dc4e493671fca5dda99cad8cb0
+_md5_=b682b7240982de7839f7134da8fe6241
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index f9a5f9ecd166..843708d35efa 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/mupdf-1.21.1 b/metadata/md5-cache/app-text/mupdf-1.21.1
index e510be676a80..2dfe9f179782 100644
--- a/metadata/md5-cache/app-text/mupdf-1.21.1
+++ b/metadata/md5-cache/app-text/mupdf-1.21.1
@@ -14,4 +14,4 @@ REQUIRED_USE=opengl? ( javascript )
 SLOT=0/1.21.1
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.21.1-source.tar.gz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=22cd40f32dd947f3cf60b466c6874975
+_md5_=c0a2e6dc053ba702c95d834be8ac89f2
diff --git a/metadata/md5-cache/app-text/wgetpaste-2.33-r1 b/metadata/md5-cache/app-text/wgetpaste-2.33-r1
index edd4c00ff316..7ed36c0c4ff3 100644
--- a/metadata/md5-cache/app-text/wgetpaste-2.33-r1
+++ b/metadata/md5-cache/app-text/wgetpaste-2.33-r1
@@ -4,7 +4,7 @@ EAPI=8
 HOMEPAGE=https://github.com/zlin/wgetpaste
 INHERIT=optfeature
 IUSE=+ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 PROPERTIES=test_network
 RDEPEND=net-misc/wget[ssl?]
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zlin/wgetpaste/releases/download/2.33/wgetpaste-2.33.tar.xz
 _eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=7a8a2e714b2d5b4bc34285baadeb462b
+_md5_=b0e87dfabe9380f68a657ad58dd085b6
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 6fcd0d50d3dd..5815d4d73411 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/etcd-3.4.16-r1 b/metadata/md5-cache/dev-db/etcd-3.4.16-r1
new file mode 100644
index 000000000000..eda904d01738
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.4.16-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare test unpack
+DEPEND=server? ( acct-group/etcd acct-user/etcd )
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=8
+HOMEPAGE=https://github.com/etcd-io/etcd
+INHERIT=go-module systemd tmpfiles
+IUSE=doc +server
+KEYWORDS=~amd64 ~riscv
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=server? ( acct-group/etcd acct-user/etcd ) virtual/tmpfiles
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/etcd-io/etcd/archive/v3.4.16.tar.gz -> etcd-3.4.16.tar.gz https://dev.gentoo.org/~zmedico/dist/etcd-3.4.16-deps.tar.xz
+_eclasses_=go-module	4c4b34f361efda91762ffeda8f632c02	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=5c6f66224305e282894ef25ba3c03056
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.32 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.32
new file mode 100644
index 000000000000..4e3541a99339
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.32
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) app-crypt/libsecret dev-libs/glib:2 <dev-cpp/antlr-cpp-4.8:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.9.5[server] x11-libs/pango x11-libs/gtk+:3 >=x11-libs/cairo-1.5.12[glib,svg(+)] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 dev-libs/boost[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-fs/e2fsprogs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-8.0.27-r1 dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 dev-lang/swig virtual/jre virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=MySQL Workbench
+EAPI=7
+HOMEPAGE=https://www.mysql.com/products/workbench/
+INHERIT=gnome2 flag-o-matic python-single-r1 cmake
+IUSE=debug doc python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) app-crypt/libsecret dev-libs/glib:2 <dev-cpp/antlr-cpp-4.8:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.9.5[server] x11-libs/pango x11-libs/gtk+:3 >=x11-libs/cairo-1.5.12[glib,svg(+)] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 dev-libs/boost[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-fs/e2fsprogs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-8.0.27-r1 dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.32-src.tar.gz https://www.antlr.org/download/antlr-4.9.1-complete.jar
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f4ebb1ddd70ce15fbd5f11ee51eb5bf8
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 29da7ab38e91..ec221df37c5c 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85
new file mode 100644
index 000000000000..951d79596675
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.85:8.5.85 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's EL API 3.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.0
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=cb23e972ecb00296b7c84d368d743300
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85
new file mode 100644
index 000000000000..39d81a658765
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.85:8.5.85 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-8.5.85:3.0 ~dev-java/tomcat-servlet-api-8.5.85:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's JSP API 2.3 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-8.5.85:3.0 ~dev-java/tomcat-servlet-api-8.5.85:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.3
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=5b35ce0a431a791a5ce4c16dc14abace
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85
new file mode 100644
index 000000000000..ac5ebb3ba5c4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.85:8.5.85 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/tomcat-el-api-8.5.85:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 3.1 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/tomcat-el-api-8.5.85:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=6e8b35a15b07a5738f09c91b70b0a6c8
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 9d5ce53513c5..d9336c1e5a66 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-102.7.0 b/metadata/md5-cache/dev-lang/spidermonkey-102.7.0
new file mode 100644
index 000000000000..0d04b61ee88e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/spidermonkey-102.7.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11[ssl,xml(+)] >=dev-lang/python-3.10.9:3.10[ssl,xml(+)] >=dev-lang/python-3.9.16:3.9[ssl,xml(+)] ) || ( ( sys-devel/llvm:15 clang? ( sys-devel/clang:15 virtual/rust:0/llvm-15 lto? ( sys-devel/lld:15 ) ) ) ( sys-devel/llvm:14 clang? ( sys-devel/clang:14 virtual/rust:0/llvm-14 lto? ( sys-devel/lld:14 ) ) ) ) !clang? ( virtual/rust ) virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.1:3.11[ssl,xml(+)] dev-python/six[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10[ssl,xml(+)] dev-python/six[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9[ssl,xml(+)] dev-python/six[python_targets_python3_9(-)] ) ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.13-r7:2.1 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/icu-71.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib !!sys-devel/llvm:0
+DESCRIPTION=SpiderMonkey is Mozilla's JavaScript engine written in C and C++
+EAPI=8
+HOMEPAGE=https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html
+INHERIT=autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+IUSE=clang cpu_flags_arm_neon debug +jit lto test
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-libs/icu-71.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib
+RESTRICT=!test? ( test )
+SLOT=102
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.7.0esr/source/firefox-102.7.0esr.source.tar.xz -> firefox-102.7.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-07j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-102-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-102-patches-04j.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=b4c75ace8ae54bce7a36f0e465caf512
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 1c38a857d7fb..40ea97b6f34d 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/pymountboot-0.2.3-r1 b/metadata/md5-cache/dev-python/pymountboot-0.2.3-r1
index 8e72bc44bc81..89e7e37e8106 100644
--- a/metadata/md5-cache/dev-python/pymountboot-0.2.3-r1
+++ b/metadata/md5-cache/dev-python/pymountboot-0.2.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=virtual/pkgconfig python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sys-apps/util-linux-2.20
 DESCRIPTION=Python extension module to (re)mount /boot
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 SLOT=0
 SRC_URI=https://github.com/mgorny/pymountboot/archive/v0.2.3.tar.gz -> pymountboot-0.2.3.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ad49ca089cbfd61962cf038507100ed9
+_md5_=4fdca056b1640c1037de0cf50e560800
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.10.1 b/metadata/md5-cache/dev-python/snakeoil-0.10.1
deleted file mode 100644
index 0946691c69e9..000000000000
--- a/metadata/md5-cache/dev-python/snakeoil-0.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=misc common functionality and useful optimizations
-EAPI=8
-HOMEPAGE=https://github.com/pkgcore/snakeoil
-INHERIT=distutils-r1
-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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD BSD-2 MIT
-RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.10.1.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d3857d67157b56f999d58365824d0a1e
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.10.3 b/metadata/md5-cache/dev-python/snakeoil-0.10.3
deleted file mode 100644
index a5fa31197c6d..000000000000
--- a/metadata/md5-cache/dev-python/snakeoil-0.10.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/flit_core-3.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=misc common functionality and useful optimizations
-EAPI=8
-HOMEPAGE=https://github.com/pkgcore/snakeoil
-INHERIT=distutils-r1
-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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD BSD-2 MIT
-RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.10.3.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a03858bef6d884692b05835b8a225a63
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.10.2 b/metadata/md5-cache/dev-python/snakeoil-0.10.5
index 94d5bbb661ab..ceb0cb88db24 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.10.2
+++ b/metadata/md5-cache/dev-python/snakeoil-0.10.5
@@ -11,6 +11,6 @@ RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.10.2.tar.gz
+SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.10.5.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=3d830f302e2d8325db1929458e05df4f
+_md5_=26b0a700d65a4472c4e2ae11837e76c0
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 18a44cfef650..5e059f4d43fe 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/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 8d6401e54348..9ff643edb54c 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d343eeb0ac5fd349c0c9f1db6ec37d99
+_md5_=8f5baff7bd1bf45ff8f3770a5e896015
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 85dba4233a14..dc7e3cc876b9 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/nessus-agent-bin-10.3.0 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-10.3.1
index 3ae5153c2089..650134b76b33 100644
--- a/metadata/md5-cache/net-analyzer/nessus-agent-bin-10.3.0
+++ b/metadata/md5-cache/net-analyzer/nessus-agent-bin-10.3.1
@@ -8,6 +8,6 @@ KEYWORDS=-* ~amd64
 LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
-SRC_URI=NessusAgent-10.3.0-es8.x86_64.rpm
+SRC_URI=NessusAgent-10.3.1-es8.x86_64.rpm
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	rpm	f73e907469f65e52192f110dec72dce0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=15bf68dc31e7f53b32facc416fced197
+_md5_=75742f2594741daa0890b037f48f8aea
diff --git a/metadata/md5-cache/net-analyzer/nessus-bin-10.4.1 b/metadata/md5-cache/net-analyzer/nessus-bin-10.4.2
index 6235a1dae25e..9bebf097418e 100644
--- a/metadata/md5-cache/net-analyzer/nessus-bin-10.4.1
+++ b/metadata/md5-cache/net-analyzer/nessus-bin-10.4.2
@@ -8,6 +8,6 @@ KEYWORDS=-* ~amd64
 LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
-SRC_URI=Nessus-10.4.1-es8.x86_64.rpm
+SRC_URI=Nessus-10.4.2-es8.x86_64.rpm
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	rpm	f73e907469f65e52192f110dec72dce0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=86de51d49f2f42f3fc9b3a84f01e00fd
+_md5_=c3d08d45ddc90b14f94c977a743e1aa3
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index dda0c57b85da..5b340092de62 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-apache-tomcat-8.5.85 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.85
new file mode 100644
index 000000000000..10b170a2bc7d
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.85
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-80.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=8.5.85
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/KEYS -> openpgp-keys-apache-tomcat-8.5.85-KEYS.asc
+_md5_=b711da39319582bfa9895d14c40940f0
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 59f3bd6acea8..e5ecbbae985f 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/tomcat-8.5.85 b/metadata/md5-cache/www-servers/tomcat-8.5.85
new file mode 100644
index 000000000000..55ff7a75ff92
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.85
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.85:8.5.85 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 >=dev-java/tomcat-el-api-8.5.85:3.0 >=dev-java/tomcat-jsp-api-8.5.85:2.3 ~dev-java/tomcat-servlet-api-8.5.85:3.1 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/glassfish-xmlrpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 >=dev-java/tomcat-el-api-8.5.85:3.0 >=dev-java/tomcat-jsp-api-8.5.85:2.3 ~dev-java/tomcat-servlet-api-8.5.85:3.1 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=38d6b56be7fed0f0498d3d634be37648
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index b0ee07dea310..05bf854a3fa9 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/lightdm-1.32.0-r2 b/metadata/md5-cache/x11-misc/lightdm-1.32.0-r2
new file mode 100644
index 000000000000..365d50fd3605
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/lightdm-1.32.0-r2
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) 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 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libgcrypt:= dev-libs/libxml2 sys-libs/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) gnome? ( gnome-base/gnome-common )
+DESCRIPTION=A lightweight display manager
+EAPI=8
+HOMEPAGE=https://github.com/canonical/lightdm
+INHERIT=autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
+IUSE=audit elogind +gnome +gtk +introspection non-root qt5 systemd vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-3 LGPL-3
+PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
+RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libgcrypt:= dev-libs/libxml2 sys-libs/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) acct-group/lightdm acct-group/video acct-user/lightdm >=sys-auth/pambase-20101024-r2 elogind? ( sys-auth/elogind[pam] ) systemd? ( sys-apps/systemd[pam] )
+REQUIRED_USE=^^ ( elogind systemd ) vala? ( introspection )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/canonical/lightdm/releases/download/1.32.0/lightdm-1.32.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3c5de34fa7ad962f533d276303f28dcc
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 5fb38a0f38e7..feb233798a0b 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/guake-3.9.0 b/metadata/md5-cache/x11-terms/guake-3.9.0
new file mode 100644
index 000000000000..e0f71c4706e6
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/guake-3.9.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( dev-python/setuptools_scm[python_targets_python3_9(-)] test? ( dev-python/pyfakefs[python_targets_python3_9(-)] dev-python/pytest-mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/setuptools_scm[python_targets_python3_10(-)] test? ( dev-python/pyfakefs[python_targets_python3_10(-)] dev-python/pytest-mock[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/setuptools_scm[python_targets_python3_11(-)] test? ( dev-python/pyfakefs[python_targets_python3_11(-)] dev-python/pytest-mock[python_targets_python3_11(-)] ) ) dev-libs/glib:2 gnome-base/gsettings-desktop-schemas sys-devel/gettext test? ( python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) dev-libs/keybinder:3[introspection] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.3[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DESCRIPTION=Drop-down terminal for GNOME
+EAPI=8
+HOMEPAGE=http://guake-project.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=distutils-r1 gnome2-utils optfeature plocale virtualx xdg
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) dev-libs/keybinder:3[introspection] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Guake/guake/archive/refs/tags/3.9.0.tar.gz -> guake-3.9.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=82f40e67b3000163362de34d4debc49c
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 531ba317e173..af8673b630b8 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/murrine-themes-0.98.11 b/metadata/md5-cache/x11-themes/murrine-themes-0.98.11-r1
index 5d49f1d22654..7f210d5a9af5 100644
--- a/metadata/md5-cache/x11-themes/murrine-themes-0.98.11
+++ b/metadata/md5-cache/x11-themes/murrine-themes-0.98.11-r1
@@ -1,10 +1,12 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=install postinst postrm prepare
 DESCRIPTION=Themes for the Murrine GTK+2 Cairo Engine
 EAPI=8
 HOMEPAGE=https://tracker.debian.org/pkg/murrine-themes
+INHERIT=xdg-utils
 KEYWORDS=amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=x11-themes/gtk-engines-murrine-0.98.0
 SLOT=0
 SRC_URI=mirror://debian/pool/main/m/murrine-themes/murrine-themes_0.98.11.tar.xz
-_md5_=bb645f042d46f02a2aaaaa0b6036c852
+_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=eb97dbc950ccda0b75f76a19bf8302da
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 542c74f1d3fb..61c40f070a6b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14966 BLAKE2B 687a7b166f711e4c3c75d588b8febb4831fac9bee694b4222597007a9b433fee3a5aa6e187f1fc35937c84f642d144e511d63be549688dfd15f1839a5369d701 SHA512 bd9169c0f73f3e95819cf527d7df79adcfc029e6bfc752f29b75c7be14518984914e4ae2cb94e42a6398dc1af3b2a3e52070736093238502bb4eced7f5775b16
-TIMESTAMP 2023-01-20T05:10:08Z
+TIMESTAMP 2023-01-20T10:40:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPKIjBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPKb4VfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDx/w//cEOtIFTvnKbXuoe+JS6Qd/NBfOv4zb0Q+CYF+cGuucRXzcbk0GLNNvzF
-hoPYrW8/HGZSsJTRJ9Su1FEHxbySPUm/89CuopvqFa0ENSBRTSiRfl2A84LDFOPW
-70FuHwh0nmJ1co8tSzemAGGYhBG0OYt4BVpbMRzrM1PRFpSCPDaRKjxwHnLx7K8d
-3UpMtk9qYZFN7z3X/v2yIuAXJ74Vh9nkssDYELgYAmzAcFssvPBODzn4R/ky4UCW
-ZyrU6a1E3CB+G6WiBbdyKzlAOuKBX4s8buG3hfAcbuyHW8uQL45oAnO5DRPwgfEB
-sOA1eXBxfdMTJTfuMt6/evagDS4cy1vhlaGIq9MkNYu4lBq6GNWv4Vvk5a6FFdS5
-2PhICAnBEd8eNlc6gUad2o0IbcWhq4aY2Ow5IHCuHquRKo4d4eud4CGKtgyA5Pse
-71dXos7gwbd8ipGbArCA4+irOJfEfmf3SSgGmEggBAADORq+3P3iy1+5yFJssoW2
-LeOzgZL5E/tCDkyLiGMk1q0XJTgigLN8bc6Td3sC5OTEkYW69V1fQNnuJIzEPjXM
-9YKJzqtPkirMWwAun4wSdZnkz8Ilgo8BjdVSEHDBb+gM6067MJ0thccBcsCnH5eS
-ixh959R3Rw7pfIa5CNrt/n54EUMmNBXtcNqY7RHasyZaTle4ccc=
-=GaTl
+klBAQg/+I/7qYlndfvuxmQCrLS/XZH23h0SV3Am2TlDpTIOjai5AtpBlW6WU04WA
+QFt5BrmHMgAXcrivqlV6C8HBEZFeiIVHq8oGVbNw04VgqQmKBxuzUBpiPWWIyuFO
+CwyqSYuthk7Eq1ORA1FBmKSoJiYvAyFAY2CSda1qV3At1gNMGAjD3mhGjpjek7Ou
+/pGSl6ToiOIE3IyvmQ+BHTPvq8cSM0iZ6RXUz5NPvhsXJWb26NYvgHUeEg6r8vMx
+i+x0AN7sJ6/fRuMBapoZ59XfB/YwIjIGfRCmTel1h3RHqc3JQf8GMBTjHYogF9zu
+/S9p0CQqWp8cq24zwJnKIoWICw5fgrxd9QlAjx2saVsW3VaHDmqPZ2NH+okId1WM
+a1hzQaZq01Z9Gw9h84lpDY4pTbhOCFWnWyEULeN3oGDiXrm5nM16VVS2EY1IAXsk
+Rj3CchbDbQ9yrbqAUmL+CHRuc66UIhWb3LuMeCttgPSluzVKl7uVwf4j0T5jmMPm
+6VmGC2PMr3ddFVxL3HFbbkM9Uhmc/XGOw+SQw+vNdgSpw7UYiPEj+HMq2ajeD9/h
++COpBGilyH885jq65ISa224iyJw4ckCeyrPzaBkD/FjtbSf3rfCqqJVVTRuGxvsF
+rnZCy+4D9uMOaH5e7kQOaxGTkAr9gN/WtLjSV0SiH55kQHIHWzw=
+=VdzI
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7350e21ae323..750bd88f137e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 20 Jan 2023 05:10:03 +0000
+Fri, 20 Jan 2023 10:40:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 978dfd2d82f8..e8141c42a4b5 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jan 20 05:10:03 AM UTC 2023
+Fri Jan 20 10:40:02 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 382139453fe4..76f7fbed26e0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 20 Jan 2023 05:15:01 +0000
+Fri, 20 Jan 2023 10:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 624439dba958..f6dc70098879 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d616f4a483f144cf04395a9864e72789a44d7ef9 1674190203 2023-01-20T04:50:03+00:00
+7f6e04a9631927951cf1b49431622dac5e70ed22 1674207422 2023-01-20T09:37:02+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6f8f37845051..87a899701208 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1674191401 Fri 20 Jan 2023 05:10:01 AM UTC
+1674211201 Fri 20 Jan 2023 10:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7350e21ae323..750bd88f137e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 20 Jan 2023 05:10:03 +0000
+Fri, 20 Jan 2023 10:40:02 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d3f6d087f6cf..4f3a1f590852 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 9e332ace3a90..1a4462d8a54a 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
-DIST NessusAgent-10.3.0-es8.x86_64.rpm 18364092 BLAKE2B 077516860f13785849976feed527b0e597aade011f4fd7657d64efcefd8426d163a484280c7127d06d6b80fd396e48a3e6a68a51b214dbd5807b5f59e9fc5aa2 SHA512 b951bfb2eada1c4d51d25580122d60d82ee4c42a7bab93d4240fe7b663c8409a13f46feca834e0ec1f726a78c1bdf4f9d675bc306a90ac4b205c72e3c2af37dc
-EBUILD nessus-agent-bin-10.3.0.ebuild 2404 BLAKE2B 9acd344ad2fb42649d244a50dc32b4ba3cbeda46dda39cdd09a43dc89920dc157c25536ca8d2d5b58d726217343d241c44c9226aeea7b646a86f298b6c72bf47 SHA512 e47b652629b74e0e15921f859b72c79a496a59d2452d4241782780cceb2054faabe537d1218542537ab8ed8f165212a54d5c668ec34f92121d9006ae997f3f73
+DIST NessusAgent-10.3.1-es8.x86_64.rpm 18369680 BLAKE2B c3658b9a870d157539a9de3c1913a2dc4e350177845abb108cb5c0a172c73f52765d025c0510001702e3944a2b347f83afea76635dc54d2c118388b20c8b9b02 SHA512 cf03df4179fbee756e20bfbe02cd1f07a9f12ed103f33a172b5eaa70500966a1af80858924b3ea384b1ba8756078981899595f80031c0ec8b12160c989720473
+EBUILD nessus-agent-bin-10.3.1.ebuild 2404 BLAKE2B 86dec4e6891037dc05a601284757a1dbf63ab6d2ec3645db3617c6e7971633b2f4b985fd5d0e9ec99a282a89952ac8b985c6a0542d541bf6d562529c0081e3fd SHA512 ae3bd361645eb204a1b9f768b30fb4b937c62ff5a01980fa86265bc51455154f8d31f8f5e3a78a6b5584a8819d7effb5ea9186b786bdac918167fe2bee9da9e8
 MISC metadata.xml 354 BLAKE2B f3d046b6610423bd40c2cdbe29c8aa35d8111c56f6565d5b84aea31e03a8612b3a173965496833ec2ad2a38412b68d39f09d389e41797a0cda399758c85034a5 SHA512 1f4021d2781ddbccbbf0bf91492b50af18f142200bfc959a36b527941b9e8452a7814e12a1f720fcc62f6d069158cdb5093ae3760bc1b3b09d2cb73e4ab7f715
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.3.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.3.1.ebuild
index 67bf24f29e08..eaffa49c058c 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.3.0.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 79d799ab6dfd..9d0939860301 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
-DIST Nessus-10.4.1-es8.x86_64.rpm 53119552 BLAKE2B b28cb948c5b31701e33d02ad4b64b71ac675bc9c05d3c4df6e83b1eaad3fddc365b35c63819ac8b14aa4971c8a57ae9b868bd6a776e6aae7bef33f39ad3d700f SHA512 de7a9139ae20306ed8df8acd03c2d20165a77e2862c3db84a807f6cf69399f294e86bd2b9b8b8281fc28a42b7b58d7143e04d4f8cc850940078194a203fc8754
-EBUILD nessus-bin-10.4.1.ebuild 2077 BLAKE2B 1a2dd1f02110ed588a05ef33d16e0c498f5b16babc4faec6207f0a4ca0d9f5036283bd686c4933488e0b0b8e4501eb1769e788a4196c76d6e1bae039a20b3882 SHA512 0d03b55443e563fd13df14f46a22e9c2604831e8e38a5d3d885436289e79b76736d21796c2bfd70d26d3e41b3467a43d124e61d65bc000f9066f4d4722ee1c7f
+DIST Nessus-10.4.2-es8.x86_64.rpm 55108384 BLAKE2B fd1f76b95ec2b2c33749f25b93b66dc053a600f137f9c30a754d4dd38f1aef6179c61ce699f30d13f9e4463dca35e0c0124ed20ff11035f511917edb08761cb6 SHA512 3ca06c25c2909097c747b77768684e1842e7b73901d869f95f916ca0d0cf17cf15a16d128d8cd1a4de3299cd84eec643d6fa2932b2eb2900230ae4e664083d34
+EBUILD nessus-bin-10.4.2.ebuild 2077 BLAKE2B 23727704c0271ec829d06b730bc8433fb794f45ca8421f3eff7a6906fa7dbd8720754cef4177bfbdb9a7716248ba35d962676d77b03f3740ad926e3fc7049942 SHA512 61d91c4304a7562fad842309db2aa3bff690c415a0d0caa13c22f1d5d0bbab9af0b53c50044057586c8331408a6c3f0d844015f7f92340cb4ecee01a8b696a75
 MISC metadata.xml 346 BLAKE2B 5e72f68ab557c56cc09cedcaaa9760f3619723bd6fc58b8ecc921526b1b42b6b65e971876ec569c1e68a26e55def24767c5d896fd9eb6a706041b485a8885023 SHA512 ab7e122c344a3f5078b2d497ed36a63f6af74fcfa7f2b98d6299ec7c82e7cbaf427da8fa595e6445e49ee041114ac581fb5b1d703f16fc70a54ee98375062e82
diff --git a/net-analyzer/nessus-bin/nessus-bin-10.4.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.4.2.ebuild
index 185df57e95c4..3be0e651b61f 100644
--- a/net-analyzer/nessus-bin/nessus-bin-10.4.1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-10.4.2.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
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 35addd11eb7e..109edef2fc15 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3182f61ff3eb..c9c402950452 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -395,6 +395,7 @@ app-crypt/tpm2-totp:plymouth - Add sys-boot/plymouth support
 app-crypt/tpm2-tss:fapi - Enable feature API (requires openssl as crypto backend)
 app-crypt/tpm2-tss:mbedtls - Use net-libs/mbedtls as crypto engine
 app-crypt/tpm2-tss:openssl - Use dev-libs/openssl as crypto engine
+app-crypt/tpm2-tss:policy - Enable policy library (requires openssl as crypto backend)
 app-crypt/veracrypt:asm - Enable assembly for optimization
 app-crypt/zulucrypt:gnome - Enable support for the freedesktop.org Secret Service API via app-crypt/libsecret
 app-crypt/zulucrypt:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 4beb01c77bc6..0fd854394d23 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index c056295bf96b..1bc2ef215b0c 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,11 +1,13 @@
 DIST openpgp-keys-apache-tomcat-10.1.4-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
 DIST openpgp-keys-apache-tomcat-10.1.5-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
 DIST openpgp-keys-apache-tomcat-8.5.84-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
+DIST openpgp-keys-apache-tomcat-8.5.85-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-9.0.70-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 DIST openpgp-keys-apache-tomcat-9.0.71-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 EBUILD openpgp-keys-apache-tomcat-10.1.4.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-10.1.5.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-8.5.84.ebuild 562 BLAKE2B 8098448a887a6e53fb964ec0f009bcb9e593859eecaf4acb60ff28b983a266cceacea63c109a0a2bd88b3c234f694c8501e0c60f88b4b5ef32d11131e987343d SHA512 82eaf7b5ccbf41d3ee3ba07447f1c932d76c012bab82059c155ca13ad4263a3262a1e994bf31ae95aeea1f33f513fa28f38cc5301bf9691437cd06e510a60c8e
+EBUILD openpgp-keys-apache-tomcat-8.5.85.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
 EBUILD openpgp-keys-apache-tomcat-9.0.70.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-9.0.71.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.85.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.85.ebuild
new file mode 100644
index 000000000000..f17ae55806f2
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.85.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-80.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e63eda65d889..70a5dd2f3b6f 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c4653f9919fd..6c18335d43ad 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -12,6 +12,8 @@ DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870
 DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
+DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
+DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
@@ -21,6 +23,7 @@ DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672e
 EBUILD tomcat-10.1.4.ebuild 6535 BLAKE2B fe7d420607b9a0be02b0a51e4d15d2340187157bc921d6dcc3329edaa045e1404ef123ec2e3a17ff41f16653ea90376685111e3e82b106c52eb558aecce59d1b SHA512 d8b2da94ee390e6f6ea38f6849d4a32d96b9dc0f5553b952b05d675d73dd32b40a6a1b5309c869f4bef7ca3bf7d3c139f0597d8086c11e2298c84f22173ae3f1
 EBUILD tomcat-10.1.5.ebuild 6536 BLAKE2B 17a176b1da199b5fd3c07ab162279ed5e45c0e288ff08b423f3499148e6a88c3372b1ac6890bfdc32556893527ff8739b34aac9adcda08d648af9e252b12ce36 SHA512 024100bf609f16c0ae4f95e2538f6a754dbdb5ef92cb5787ca85f4105aa7ed8d115e0d1badf6a1856bac6eac1f2bd39953d6bb47e890e61694ed1a6b53cd95f1
 EBUILD tomcat-8.5.84.ebuild 5433 BLAKE2B 779607815b07ff151b82e94c6547acd08407b536f297fd4bd56453b5738230ad6c2b35a438d84ce75677234516cd85ac921343ac42c19b148ed8ffafe093565f SHA512 2bb0cbcab94901ffafb0d31a0e8a198e1835e3a432ee36b02764e24db199946308aed92c244432d5143d6791787a694667f28bb3d65609d92b88771b1d871c4c
+EBUILD tomcat-8.5.85.ebuild 5434 BLAKE2B d20cffe2292e462a34bb243185c5f659f2c6161f81ada57f7a89356b02b4ed9d43c92e65f8a58d38f956d5570c979c26ba9504af9f540a8cffee14a5cffcf0e8 SHA512 d4d06b4b33b990fff928f368e406c66632d536df64a7071bebad767be6c7fd466b85227f04a2fee1871651956cd9aecc406b7a96afbf2d15b068a16b8aba2c45
 EBUILD tomcat-9.0.70.ebuild 6424 BLAKE2B 2189fb588d1e9d65c7ba6e00acc2db9bf747af77693011e9333be410a217c4c6aea6836e168f3b2929edbd63d32d5d45ed443f4e950702ee8b80482f9409ddff SHA512 64bd43df27bad8e5119e1e42d5af81a9a8381a108be27dcb3f143ad4755215aeab7424acf3a389a237cc139603a8c38603dda81f961e34c1a509e3d136bd2766
 EBUILD tomcat-9.0.71-r1.ebuild 6425 BLAKE2B fcc0e5e759a00c5bd2b36b58d8b38afb9e2aa08235f96c34e0589826dadfe3c2eb5fae64b6b23a2ee58ac78d42c6ef34a941ec8c50e854b890a7e3dcd015f13e SHA512 4b1e89f0f3feac57fc859143806fda8467e0a419b9ee57ef77e73bc9f832afbec95359f5d39728e4ff0927fd473d3b8d47e36f87e4487afc6fb10c7f08ccbdae
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-8.5.85.ebuild b/www-servers/tomcat/tomcat-8.5.85.ebuild
new file mode 100644
index 000000000000..24b29230a155
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.85.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SERVLET_API_SLOT="3.1"
+JSP_API_SLOT="2.3"
+EL_API_SLOT="3.0"
+
+# we don't use ~ for el and jsp because the same implementation
+# is also present in tomcat 9 and it would be impossible to install
+# both tomcat 8.5 and 9 at the same time
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	>=dev-java/tomcat-el-api-${PV}:${EL_API_SLOT}
+	>=dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT}
+	~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT}
+"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-1.8:*
+	doc? (
+		dev-java/glassfish-xmlrpc-api:0
+		dev-java/wsdl4j:0
+	)
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-8.5.66-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 8954a22ffce1..ac26f6e8182c 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 90b0aab7458c..9ebdc0a54bea 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -11,4 +11,5 @@ DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d
 DIST lightdm-1.32.0.tar.xz 518168 BLAKE2B 90191559895a58e2c5892705ea95766aaaaa87d3470f1372ab90fcf3991d27f9280d5bbabe0cfce70e25f960d63c1e7eab7beeeb501341996afd155788cbe1c7 SHA512 81497fb25904bc2e8687dc99992628eb534f7418f72e1908c4766e917fc1221714210d998739417e1cae2ee15e3197a2eb8d4981cb944cfeb0334dc9e356e716
 EBUILD lightdm-1.30.0-r3.ebuild 4139 BLAKE2B bb436a18ccb2e229b57ec10be9524542fc81dae8034b802b00dee64b69f704723a9d79b270c2a46ac056edb837c47827c7fab9fe36efe78ce4015f0cda886d20 SHA512 c004da29823aa0dd3db06c22a0bb36548d6d25a593636cff79511c1972b695f1b7920e17f23f4a7b911b7bfd45e0bc1cfea81986bf7d92c463536ca3549740f7
 EBUILD lightdm-1.32.0-r1.ebuild 4143 BLAKE2B ba5dcc3c64e8d49514ac9c863dd8f0f6c16247667e3a83b74fcce5b528061b218e0629421c6b029ce59fc21d66b521a8e8a0f703ac52f5d89e0874c39e82812a SHA512 f8200c98656b35f078a5858193c364b2c33cbe9d5957d3c6e439380eb18b93b9de315d84e2d0aa13e57cc7fca30f165242495ad0ad78a47a516fc94afcf5f8c7
+EBUILD lightdm-1.32.0-r2.ebuild 4546 BLAKE2B fde4292af8e9c3f709c3420669e7c8aa57f8cdfb369d7bef0e44291541cd134fa14834991c4e3f7e83746f5baeb6d50a4c29ef069fa28181d68dd4477e55066c SHA512 282b18efd5debb5edb24fb9d48115ab9817f4a1880c837c34b79d83e17590df8078486a9812030ec5216ae8d9b8f501c7a152d80732bf3cbce8a9c1dea98b9a5
 MISC metadata.xml 454 BLAKE2B 66c069f7c5e3b820059e67736ebd898389a8243bce08fd364c8d0a1704f484a13a935bc2a7a31ad975535f8df5a091cbc337c48ea65f45a1cebdcb2c0888b8dc SHA512 f5e5c7467eef552ac808daa8289f803438fc72c81028b48cb20f4f18ff2462216520312294eeff8fffc1357a4330e1e264da70dd35ef3c20baff2c5c26bc654e
diff --git a/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild b/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild
new file mode 100644
index 000000000000..1209f8df2a34
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="https://github.com/canonical/lightdm"
+SRC_URI="https://github.com/canonical/lightdm/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="audit elogind +gnome +gtk +introspection non-root qt5 systemd vala"
+
+REQUIRED_USE="^^ ( elogind systemd )
+	vala? ( introspection )"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.44.0:2
+	dev-libs/libgcrypt:=
+	dev-libs/libxml2
+	sys-libs/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	audit? ( sys-process/audit )
+	gnome? ( sys-apps/accountsservice )
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/lightdm
+	acct-group/video
+	acct-user/lightdm
+	>=sys-auth/pambase-20101024-r2
+	elogind? ( sys-auth/elogind[pam] )
+	systemd? ( sys-apps/systemd[pam] )"
+DEPEND="${COMMON_DEPEND}
+	gnome? ( gnome-base/gnome-common )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.30.0-musl-locale.patch
+	"${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch
+)
+
+DOCS=( NEWS )
+
+pkg_setup() {
+	export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
+	vala_setup
+}
+
+src_prepare() {
+	xdg_environment_reset
+
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	# use correct version of qmake. bug #566950
+	sed \
+		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
+		-i configure.ac || die
+
+	default
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user="$(usex non-root "${LIGHTDM_USER}" root)"
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	local myeconfargs=(
+		--localstatedir=/var
+		--disable-static
+		--disable-tests
+		$(use_enable audit libaudit)
+		$(use_enable introspection)
+		$(use_enable qt5 liblightdm-qt5)
+		$(use_enable vala)
+		--with-user-session=${_session}
+		--with-greeter-session=${_greeter}
+		--with-greeter-user=${_user}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${ED}/etc/apparmor.d ]]; then
+		rm -r "${ED}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	newins "${FILESDIR}"/Xsession-r1 Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	keepdir /var/lib/${PN}-data
+
+	find "${ED}" -type f \( -name '*.a' -o -name "*.la" \) -delete || die
+	rm -r "${ED}"/etc/init || die
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -r "${ED}"/etc/pam.d/${PN}{,-greeter} || die
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+}
+
+pkg_postinst() {
+	systemd_reenable "${PN}.service"
+
+	# Bug #886607
+	ewarn
+	ewarn "If you have a Nvidia GPU and ${PN} fails to launch X, edit /etc/${PN}/${PN}.conf to include the line"
+	ewarn
+	ewarn "logind-check-graphical=false"
+	ewarn
+	ewarn "in the section [LightDM]. See https://github.com/canonical/lightdm/issues/263 for details."
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 0155a674afc5..46c4ec4c6242 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index e61ee0b2d01e..71924d303cbf 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,3 +1,5 @@
 DIST guake-3.8.5.gh.tar.gz 1112897 BLAKE2B 221e6a388c3a5904cd20a762e6a669e30b59a742a550e5c2a411534c3b0730c7622f42c67fdc72785fac199c432a297beb9fb53be2b5e2b7545a5b03c2b8b545 SHA512 40605fadb3a0149ea488a7e93f1b7e4f5250f62fe058292f2c02f03f837f22e13171b28c4a9d1a14c2e4897c0066a683cae547e03862397310bc650d149181fb
+DIST guake-3.9.0.gh.tar.gz 1118696 BLAKE2B 0c9fdcc5ff11d2f7263154594060a2145cefe678410cebb562dfd355a375019870a240ba4fb3868e69fdb5cf5bf49e73c3c5c2a1acef00251f68feebd8efdeba SHA512 d90e8a12285cd7488fe1132dc5af05d5eccec19a43ae98202631a15d12dfd21c3bda542e5f31ec409481d987a1bd013892c9343e7a74405a784e530efbd83503
 EBUILD guake-3.8.5-r1.ebuild 2320 BLAKE2B 26872f816ed222a6cdc63506b8e70573f648ee4d4ad900075c5b9816fff98d90ba911ae1c92828b1824d5c6da1cea3a7f66f5f3727224165cc811efe1390f690 SHA512 fad17805eb7cee1f161e6b797bcaef275581562a4c94a26526d47fa946a599899ce7d79a049af362c2f790c437d6444e739907ed0d7854b8ebdef23182fb30e4
+EBUILD guake-3.9.0.ebuild 2380 BLAKE2B b29002bf01ddcd7f8ee1ebcab2ea3de8e40517b15af2b83e9345c967d5a509a7a56334af09d4ac88f635b702f61c9159225f682bcf75a4db578bae4bafc48a36 SHA512 4c1efc0c577003075030d352752a945125bc4fe527a9582aa368347d8631f6c2baa07afccf54f593e7af0a34a3f5dbd3549538533da5cb4e09a65c3c750cd96b
 MISC metadata.xml 418 BLAKE2B 4eaf1e46ca71463bf5e7c54f31941d391851b2415872e06e41bc97b8d2278ac58c544ff869a5050e4d20abc670c20d4c7d364a8d68a7d9fb21baae2fa061af69 SHA512 52a8f383fc6bd2757dfc41fd0758c2b47ee177ecf49bf840a4e8ee8b32421a8f3c6a08270fa72f8cd2d87f8bfe663390ae18f17ea9ad18715099fe575de726d1
diff --git a/x11-terms/guake/guake-3.9.0.ebuild b/x11-terms/guake/guake-3.9.0.ebuild
new file mode 100644
index 000000000000..737722966865
--- /dev/null
+++ b/x11-terms/guake/guake-3.9.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 gnome2-utils optfeature plocale virtualx xdg
+
+PLOCALES="ca cs de el es fa fi fr gl hr hu id it ja ko nb nl pa pl pt_BR ru sv tr uk zh_CN zh_TW"
+
+DESCRIPTION="Drop-down terminal for GNOME"
+HOMEPAGE="http://guake-project.org/"
+SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+	dev-libs/keybinder:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/vte:2.91[introspection]"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		test? (
+			dev-python/pyfakefs[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+		)')
+	dev-libs/glib:2
+	gnome-base/gsettings-desktop-schemas
+	sys-devel/gettext"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} # needed with github's tarball
+
+	local po=($(plocale_get_locales disabled))
+	po=("${po[@]/%/.po}")
+	(( ! ${#po[@]} )) || rm "${po[@]/#/po/}" || die
+
+	emake PREFIX="${EPREFIX}"/usr prepare-install # paths.py.in -> paths.py
+}
+
+python_test() {
+	# - uses /usr/bin/bash if SHELL is not exported
+	SHELL=${SHELL} virtx epytest
+}
+
+python_install() {
+	# use right schema/data dirs, done here so tests don't use the system's
+	sed -e "/^SCHEMA_DIR/s|=.*|= \"${EPREFIX}/usr/share/glib-2.0/schemas\"|" \
+		-e "/def get_default_data_dir/{n;s|=.*|= \"${EPREFIX}/usr/share/guake\"|}" \
+		-i "${BUILD_DIR}/install$(python_get_sitedir)"/guake/paths.py || die
+	python_optimize "${BUILD_DIR}/install$(python_get_sitedir)"/guake/paths.py
+
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install-{locale,schemas}
+
+	dodoc NEWS.rst README.rst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	optfeature "utmp management support" sys-libs/libutempter
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 4c700acf3dac..db849c89d89f 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/murrine-themes/Manifest b/x11-themes/murrine-themes/Manifest
index 1ad95abb77c0..516699894f6d 100644
--- a/x11-themes/murrine-themes/Manifest
+++ b/x11-themes/murrine-themes/Manifest
@@ -1,3 +1,3 @@
 DIST murrine-themes_0.98.11.tar.xz 150604 BLAKE2B 2173af65f04e46a5048149146181fa0658f6ba62f69e1e1939fe877dc7dbb0bbce82347d390e0836c98e3351cebbac7ed8817502c4116d1e5aa60dabb798539b SHA512 2dccb8a0a27a26d9d2b8f5a943204af7738f4a140f1ba1d7d39580bc4c7eb0b0b2feccf7a1857f7ccecfddc1b429aa88bdf8d12564659fba686ba4b4812b66d0
-EBUILD murrine-themes-0.98.11.ebuild 694 BLAKE2B de4a5c1477ea99742207e562c37f43baf9ae0b7a92513bfc84e3def97b54bc6647471f3ab310707c8e1ff0f68961919482e22698b5447a6d5da9c6640e8e6391 SHA512 d8b81f0595681da068fd94bfa1daa60925a542b1af15779d5ddf60f989848497c642541230bfbec5f0d6ead5f5d90c99422ef0b1a5f9a35854c95054454889e9
+EBUILD murrine-themes-0.98.11-r1.ebuild 797 BLAKE2B 1f258b7269594b5a71aa3d1c7237ae2111e29699a87dca219c119077cc81b1f6114fdcf6bce4203c4f0aaf43683ecd2b9427863affd157cfe516efe5faebd3da SHA512 c93cc63430c2c1e3041a4bcb64f898889fd42c25d4ad5e07749d246b07cecd93438b7fc8bc5d8df53f811545a3a8432a8d6c6a720b658119d373426be464de04
 MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/x11-themes/murrine-themes/murrine-themes-0.98.11.ebuild b/x11-themes/murrine-themes/murrine-themes-0.98.11-r1.ebuild
index 39b61a1305cd..979a40e1f122 100644
--- a/x11-themes/murrine-themes/murrine-themes-0.98.11.ebuild
+++ b/x11-themes/murrine-themes/murrine-themes-0.98.11-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+inherit xdg-utils
+
 DESCRIPTION="Themes for the Murrine GTK+2 Cairo Engine"
 HOMEPAGE="https://tracker.debian.org/pkg/murrine-themes"
 SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
@@ -29,3 +31,11 @@ src_install() {
 	insinto /usr/share/themes
 	doins -r usr/share/themes/*
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}