gentoo auto-resync : 23:01:2023 - 06:54:34

author: V3n3RiX <venerix@koprulu.sector> 2023-01-23 06:54:34 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-23 06:54:34 +0000
commit: 9a1d1c6b10a4640cea10e7040ed173cf593f4cab (patch)
tree: 10b7aaa9608311a4b8a7561c6a8da3003ebb061d
parent: defbebad0d311b0ce0694b17989a9f26cf000250 (diff)
247 files changed, 1792 insertions, 4547 deletions
diff --git a/Manifest b/Manifest
index 4ad080d71fba..22bdd74b1e9f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29808 BLAKE2B 6c61f4b75035c667cfe75b2c37a39892dee6af8cf8c9812678c9f47018008a4a8fbf1efd75e7405328f5558ed450023d847e94d964c9c28cb5f0f98d59c00da6 SHA512 22c17791fa69469139f466df523cbe6906fac14f2678ad8061a271200994e84c14932e6ffd1f4c4dc0645af09ab13a8555e23bc149c78245e61a36971bb0a505
-TIMESTAMP 2023-01-22T23:09:44Z
+MANIFEST Manifest.files.gz 29796 BLAKE2B 283c30e7e15fe1a4b1490d661c82819854cdba37fc600789cf595f41e45e2edb55349ef37057433bb3057e6a180dd29f08a434faba79301f9e6127bfd87ab8bc SHA512 57e02de77e6e5f366d97f9d72b2459cff688fcc969aadc3ecfb67fdffa63a3f774a51cf4593d2235bee2b41d47b7e81e94403bb43613712e49369062520bbe62
+TIMESTAMP 2023-01-23T05:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPNwjhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPOHaFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDMRg/+NyVn9HOcW9jdsSXPCSNOQiwR1pBomCRoslO34kBNrJRG5B71usIzsXXh
-Mj4uEQ59OWdbb5ByBfT1MzfxDitJVS8svei80lS6h6tklXklzaPDN28ikRY0PhPu
-Ul6OJcgwM5qOV8RrtjPuAKubDkrAhUW1NvjphcAJYmdxDao8mqOSWZOwS6Ov54an
-BxfruumruznX7c8alS67fwHGtY2lIl7o0krwjevB7JaCxx4YpEU9xpiQd3nrNskg
-up7RHwBt1SM5DwCLpp8TRgeBtkVGAjXoUAqEPUNc4ufvsPvEScrAdOx2e8NOHuUA
-/q7ctEwBmm3HV2i/15PEcvqUlixF3SgpfE4rfsiN+SoQfibY6I1tALLNvIuljIdF
-YFArKE3G5QpwHa4y8nFvcaQSL6WwoH1Mm8XlEvIZTHKPrIRBV129/ZPK+tqXqYKg
-NjXOz/242jZi2/yV9Y89HzfpQov6M5Ou6iYfGCIs5HsoJFC2wgY/sS1ZTJxp6Qe4
-j4g3oLfAQS2mrfUjsgZavX/xuKS1Y4xZtO0EQWQ+SRB+tJvJrIl3LfF2v5nGQPM2
-Se1xze63YzX3Yfgr7oTYpcjoGrM1M5oXRfsTJHeWrMeLondjGueQWoSndl1x3978
-rsp6p+SsULxAXFHhPayJz6NneD8ZLHfFHWu3Mfm2j1Skb5FtKJ8=
-=JR0s
+klD54w/+K+9LQuQ78BT6siXWASrzKQCE5MoyG+8SQgcw2ZfufFkvnnNLjpXs4XOX
+5SZFgOal3+WTrcb06AVBfztPnzHI8AgNW4ZEqx1uzJo+aEmr3ZR7MOy8JKjCpib/
+DNwvp4vRam6vL6Bl8SFrSI61JFczDQmWhSwlmA0DR1YGXqqH2x4L+/rbgst1o0GS
+LTxfzRawhGPPbDm3Q5uBzV2QqVLTSwmEABzK3BLHKjHv/QsHpTXxIVhANbqM8O97
+H8kj26xdEzY5xhNbCeu/31hD6d9Yky7Oh8uDFogMVnAI+MTKiarlyhLkIKb2FZDL
+PiJZR+WgEvtwav4nebHdaZFtbTLKAiDtYsMaOgwn408GwsuUDOfyqX6copsTFtaZ
+N2xbKKJxZzLCocwrohxpRpAXX/eR1JAl2HIJoLjugmoEKWp/Losi/cXEf0V2FD+U
+WHvZoJPblAxYUIA2ERakPS/3Sw8wUlGH27O90bh/CjH9LtzzfC4AFvwhXdLOyMCB
+1UB9AwoEGem2FVraCyIxyQML2adAmzLEjIurehU0H3MhBsutSWF+btH6RFFOneJZ
+THxCrBe4ZpPhIqjp14dSLIoV1tGY87bBu0N2NHGeTHGBGZm9/HbCJ3bgDIYuIJtp
+ic7MJJAm2da8wb3Z2WRy5qR9fcyA5T6fi13WO3NpXOb3etA/Ymc=
+=KWld
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 502bd3035ac2..e6c86e425635 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e97bfd2bdc17..f7684da6c2cf 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 7f5a01d75662..6259c8831bb5 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,7 @@
 DIST gedit-plugins-43.1.tar.xz 913072 BLAKE2B ebfaa6311aac490c75339cf506a58ce60864925ebee8284d72cc4b42634696511d7060eca1b8988d574e1b17dc0e0d32cc934da3c29421339044a220ea5e854e SHA512 2aad05ce15e148121b8e0dcf59546061e448aac09f42c28cee7dfc0b3c16965716059cf147c6391f1c439ac04241e94384bf6ff8dfaa40303dfe80d8de1e2fbc
 DIST gedit-plugins-44.0.tar.xz 913176 BLAKE2B 325b70566ba32d6f10edf1681df6d31bf10329389331c9ef4a89671da1b538ff4faebd07c224d5309a113fbb28d40b777fc34c27b8ab1c894abdfeeb2d3683b6 SHA512 878fb3df8ab4e9a338b25da7a8c89c8d8c2dadb78095d2c620448423a2c506e7ab4ac27e823452f0c624ecab97766cc35385271d5889f58a5963b0e343bd63ae
+DIST gedit-plugins-44.1.tar.xz 913228 BLAKE2B a153b82da23f7838da9fa24b28687eae2fd0e4381693515f45e665fc6d9bc2715b37fa6bdac7a8a6ebd947ba0a3a70e5c12708bb14a053c9ad0384549e8ef4f6 SHA512 d5d767210b362747e4ba51b61b4d1c58bf5b37aa5f942cb9654f71c534d8bce2594ebc9004bed686627403fe1c3a6af84a45f4ce72af1f27fa7b644d11cdc9e2
 EBUILD gedit-plugins-43.1.ebuild 2587 BLAKE2B 153f1b9fadf48552f0eae523e62b438c5473d81c0b061d94a8817dcb2e4dfdb66f041851e46b42ea34e79875dab5389fb2e4c628d9a883547d261a3c2fc0e524 SHA512 330aba95e9039b2b6f126e39b1e497255079c685dcb9e14f39c5a685b734623054eaa3de49ee5ac25b20c1ed3fa050656ee0a5155d00f98cf5bda3a734daddfb
 EBUILD gedit-plugins-44.0.ebuild 2589 BLAKE2B 664cd7f73785128594b7d346d8bce178aad0bceb1fe03fc1093fe621a354862a568b0c85e98c2c21337959ac2e7306e10b21e41f9d6f764e93f8751750092ccd SHA512 9c4b4aee5b01ed15b4356423c741632c05a3b871351e8a29fc0f437e8a6fbdab7eeaa4c873391e6eede91e3860234bd21c87f878083dd5495d36f4e4ecb6ee01
+EBUILD gedit-plugins-44.1.ebuild 2589 BLAKE2B 664cd7f73785128594b7d346d8bce178aad0bceb1fe03fc1093fe621a354862a568b0c85e98c2c21337959ac2e7306e10b21e41f9d6f764e93f8751750092ccd SHA512 9c4b4aee5b01ed15b4356423c741632c05a3b871351e8a29fc0f437e8a6fbdab7eeaa4c873391e6eede91e3860234bd21c87f878083dd5495d36f4e4ecb6ee01
 MISC metadata.xml 596 BLAKE2B cf545e591c160fc584c5c2b1e3f5fa6a47922a958f981daa5c85f3f6c8f7eaed2a520d6265241998dfe211098f70c75a0fdfff033e55e892e5775b678ea9ef5b SHA512 0a3b9e748bc2d22ea16a694f8ebd6196d05e6652f552523bfe6fa60f1c69ab50110692cda7a59239c8f6946c06d3139a4225f1744e0dd40ccbdef3e8b396f692
diff --git a/app-editors/gedit-plugins/gedit-plugins-44.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-44.1.ebuild
new file mode 100644
index 000000000000..96f086de69f3
--- /dev/null
+++ b/app-editors/gedit-plugins/gedit-plugins-44.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ThirdPartyPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+SLOT="0"
+
+IUSE="charmap git +python terminal vala"
+REQUIRED_USE="
+	charmap? ( python )
+	git? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	terminal? ( python )
+"
+
+RDEPEND="
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=app-editors/gedit-44.0
+
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.9:3
+	>=x11-libs/gtksourceview-4.0.2:4
+
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			app-editors/gedit[python,${PYTHON_SINGLE_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+			>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		')
+		>=x11-libs/gtk+-3.9:3[introspection]
+		>=x11-libs/gtksourceview-4.0.2:4[introspection]
+		x11-libs/pango[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+	)
+	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
+	git? ( >=dev-libs/libgit2-glib-0.0.6[python] )
+	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+" # vte-0.52+ for feed_child API compatibility
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dplugin_bookmarks=true
+		$(meson_use python plugin_bracketcompletion)
+		$(meson_use charmap plugin_charmap)
+		$(meson_use python plugin_codecomment)
+		$(meson_use python plugin_colorpicker)
+		$(meson_use python plugin_colorschemer)
+		-Dplugin_drawspaces=true
+		$(meson_use git plugin_git)
+		$(meson_use python plugin_joinlines)
+		$(meson_use python plugin_multiedit)
+		$(meson_use python plugin_sessionsaver)
+		$(meson_use python plugin_smartspaces)
+		$(meson_use python plugin_synctex)
+		$(meson_use terminal plugin_terminal)
+		$(meson_use python plugin_textsize)
+		-Dplugin_wordcompletion=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 68f4b225555d..1848dee09537 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,7 @@
 DIST gedit-43.2.tar.xz 2724036 BLAKE2B 64039018c604874945cc6835bba14d80f969b0a860c0384d969af7fc81cdc4ade568539a80571440af605f14eaf33730140a48b48b92d1bdb652199770ca3411 SHA512 447f0da946ff7474637bb6b88f41eb53e5ba886c66e8b9f8c17e67d2f52e3eb115d905a850300f70488cfebcd6654a14ce8c57044760f4fdb3394cedf4e91f23
 DIST gedit-44.1.tar.xz 2735700 BLAKE2B 275a614993c4a38d52455eb22c435697a452069f62b4332b4df8b1b83daa18192fa2159162387996122144645069500d3d48826d05a4b4133df285af387a8f52 SHA512 7eb48c8020726e0648565abff6aca32ddf464bc651c2e2298402b9ee3ff8c6ba64d4becc6da3290ac8a4b58705a5f3e09b7958a6cebe357d701708c525d6e3df
+DIST gedit-44.2.tar.xz 2741932 BLAKE2B ef069084b0a11d86a081f10542ddfe39e9a6989dd0d7e5749af3f62267ea52c6885bf3a50065227307cca6062098c460b05da89f1cd2de0b8d2e6c9c81feb8ad SHA512 c9dd412a16d7d0ba17214164017948bd1184ee5f9c44475e9e02880c0597b2fd9840f9488df7262cb413baedf5e16ce49dd32410b02ed0f53cf4bc94d3e3a4c7
 EBUILD gedit-43.2.ebuild 1770 BLAKE2B 6db7fca127817a49476a412ff406c7ef00c1f5ef05f1a43a2cf1d7a06dc1b53644eb21067abcced50d3b13ff5a85f1c4e3082a58e5e89afcbfd94e78cba62ec8 SHA512 847a75c410132db0b4ef948f24bbcdf4f36914a551b029604306956976436db9ef3afc09446b3c537e6fbeceb97ab4e25752d0e7969ecbe1ad63ad57db9529f3
 EBUILD gedit-44.1.ebuild 1773 BLAKE2B b856375dc7848e8a73ae2508b9bf66b449763cece236a1d5f41fc2f1c88f20b9a3cad6fef33031460d6c7d39cc6e702feacbd67f62dd572eed0cc2a84e8fcd85 SHA512 95c3df0e19bda1601740b38d909068b6742118e7c16ffa9aad29f0a61c345bf7a50c5f6c2935ca164cf0bc701c86b0cbb812ef9cfe8923d6efba70df5a165471
+EBUILD gedit-44.2.ebuild 1773 BLAKE2B b856375dc7848e8a73ae2508b9bf66b449763cece236a1d5f41fc2f1c88f20b9a3cad6fef33031460d6c7d39cc6e702feacbd67f62dd572eed0cc2a84e8fcd85 SHA512 95c3df0e19bda1601740b38d909068b6742118e7c16ffa9aad29f0a61c345bf7a50c5f6c2935ca164cf0bc701c86b0cbb812ef9cfe8923d6efba70df5a165471
 MISC metadata.xml 346 BLAKE2B 59226b3220bd9b1770fad0f5acf3b1888a57a3496f9e0a6eb0eb09c12b7a5aa461961753dd8a5a6f01db1cdb97af5b28d6a8d1d632b60f499f86e0864e29264f SHA512 3e1d83ad67b85a681b85f8fece9d6c2c3eab2f2f726447230dc1f2399a21cba211d97e11d8c06d0d1b1803fafe67be4b32c04b39c5f8586a421c525624f6697d
diff --git a/app-editors/gedit/gedit-44.2.ebuild b/app-editors/gedit/gedit-44.2.ebuild
new file mode 100644
index 000000000000..8d5861b5f198
--- /dev/null
+++ b/app-editors/gedit/gedit-44.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+python gtk-doc"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.70:2
+	>=x11-libs/gtk+-3.22.0:3[introspection]
+	>=gui-libs/amtk-5.6:=
+	>=gui-libs/tepl-6.4:=
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=app-text/gspell-0.2.5:0=
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+
+	>=x11-libs/gtksourceview-4.0.2:4[introspection,vala]
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+"
+BDEPEND="
+	$(vala_depend)
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_documentation=true
+
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use python; then
+		python_optimize
+		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index dfd392dbed6b..89ec2663dda5 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index a11d79f629a7..baddb8a87c8f 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,3 +1,5 @@
 DIST gnumeric-1.12.53.tar.xz 18125272 BLAKE2B 6c25107977492391152c403d2ad6fef79161bc9045660090e12cdd281e5832b4f9e414a0ef5e67f93c10ca789097b510fafed712dcea5b6210f67428a2dc7dd7 SHA512 6e9d7b12f9448c75d39985984fac9880c61583fbac10ad9070f5ec7a5bd573874d79e13372d9a185616a5cdb5f53d3f67aeda6ca4bae33e3f5ca0a2160045d7b
+DIST gnumeric-1.12.54.tar.xz 18127208 BLAKE2B e9ca517d9d305ec0bbd9d1755b2f510b88e4b9311684f83b20edf804eb885ca7951411a44ff15d7b2ff33b9b938a304532f81839c0da75413c08822b51ad2a9c SHA512 6d390373fcd85ee7090a3eaf6a3fc84b7cb3545c5b64ada59fc3c3bfe04b387a08597bdf85e53bd59e11bfd7d40e8f239eff3fd5e5ec775649836507975e7567
 EBUILD gnumeric-1.12.53-r1.ebuild 2369 BLAKE2B da511944ca6b23eb1e76d9a6ee1c7a45efedbdadea8b08cd9ae96dc4eefa709c786124eb6ad258ebcd74df3947e1d9d136f1f7c5dd03b1357b75ea8807aa4a87 SHA512 fd5917b5adad8d7a967393353517a3b5dc599c2429c968504a89abc927ea65bd562f7e28ca584770f52c128111cfab63abfbdf3ceb0d75789c090464d8cb4b17
+EBUILD gnumeric-1.12.54.ebuild 2370 BLAKE2B 1597143ef8e5d1cf3d2c02099ce427ad8d01fe4e67543b595b4fddcb747380651106434e26a5f32be20b8b1578114e9026ec4a31feade6535a6b8a1cb431c8be SHA512 e7f5327b600b4dc3cf8a029b357e722341dbb604e75e853241da47fba0a996a83c61f88f0db06eb97520f26c5e17a5921be20d4f973065ca11ccd9ae27f0d266
 MISC metadata.xml 627 BLAKE2B 6704cf7889bf073ee97e1af9145395462f326aa44ad6fa04f4cc4908bbde8a486518c0f11e3a9ab887835c0af862868b8a86ca29191ac1bdf179aa060c621020 SHA512 451313a3c0d62af5f647bcdce0ac76bf1948189bb70c555f6aa871245bf3ce62b0ad306c8835a7c42b24333c3e9ce449a209d3d6967e487ec061792969092107
diff --git a/app-office/gnumeric/gnumeric-1.12.54.ebuild b/app-office/gnumeric/gnumeric-1.12.54.ebuild
new file mode 100644
index 000000000000..ed5f860e947f
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.12.54.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools gnome.org python-r1 xdg
+
+DESCRIPTION="The GNOME Spreadsheet"
+HOMEPAGE="http://www.gnumeric.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+introspection libgda perl"
+REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
+
+# Missing gnome-extra/libgnomedb required version in tree
+# but its upstream is dead and will be dropped soon.
+
+# lots of missing files, also fails tests due to 80-bit long story
+# upstream bug #721556
+RESTRICT="test"
+
+# Gnumeric has two python components
+# 1. The python loader for loading python-based plugins.
+#    This component is pure python 2 and a port "is not currently being worked on".
+# 2. The python gobject-based introspection API. This component is compatible
+#    with python 3.
+# Component 1. can only be re-enabled once someone has ported the upstream
+# codebase to python 3.
+# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	>=dev-libs/glib-2.40.0:2
+	>=gnome-extra/libgsf-1.14.33:=
+	>=x11-libs/goffice-0.10.51:0.10[introspection?]
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24.0:=
+
+	>=x11-libs/gtk+-3.8.7:3
+	x11-libs/cairo:=[svg(+)]
+
+	introspection? (
+		${PYTHON_DEPS}
+		>=dev-libs/gobject-introspection-1:=
+	)
+	perl? ( dev-lang/perl:= )
+	libgda? ( gnome-extra/libgda:5[gtk] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/yelp-tools
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Manage gi overrides ourselves
+	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
+
+	# Changed from 'elibtoolize' for bug # 791610
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--disable-static \
+		--without-psiconv \
+		--without-python \
+		--with-zlib \
+		$(use_with libgda gda) \
+		$(use_enable introspection) \
+		$(use_with perl)
+}
+
+src_install() {
+	default
+	dodoc HACKING MAINTAINERS
+
+	if use introspection; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 42f79997ccae..5aa7d5f9fca3 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index b7428ace638d..41b633cf8ba5 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -3,6 +3,6 @@ DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88
 DIST zathura-0.5.2-manpages.tar.xz 9696 BLAKE2B 23c6e94d5b44c1e20338ea04afb7644e4c76618cdc4902d2edd436734498c6b17e1522b37269d67a62801632595f535724d8f5d4c9817e017e6341c5365c5842 SHA512 3bb431f0564ddc1f67bcd21f019a43f6af95c3e3b42b264b7e1f01f10cebd7c05115e452a868dd176e5a0d65a9085ac3d554d69e553aa53569593ea494036f7c
 DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f
 EBUILD zathura-0.4.9.ebuild 1355 BLAKE2B 82e932b9fddd23316066c358a6aede8480532c970a992270f9f6fa2a3c7545b4286249d4ce9a96b9079500ede0e2371fe8682e2b234a93c4e351d1781507b7ea SHA512 7978966e9716677442b274af5792aa3e2a682f7e1963ed6c3ed094f322e8a12db1118525b06c600c407c362177584c543679de2583cfadfd5e4ad95e86d30734
-EBUILD zathura-0.5.2-r3.ebuild 1469 BLAKE2B a339cd614e4d0d8c9ac1c6ce1359cb38c98d525711e4cf0acaf52497b62f9610041b6a60b47da2c2b141530ebc3d64ed6d44a198bd3f72ba3868a00d3ef4ecb5 SHA512 46550377f291b825800c7aaa843d0996161164c1ae8460349ab724281118cbfd607463c01ed1fb993d9d237a49e7767f46f06754c35b8e2933d3844d4439fab2
+EBUILD zathura-0.5.2-r4.ebuild 1478 BLAKE2B b797e92f70e32cee6f2b49d0a4b54ed2a602771e2530d2574edb72ff18ce75c81f18581fb678b842abd7abc7dd89a64e47bb6150ee720edd6f1066040b18174c SHA512 e9ae7ddb8fb8589a86b02efd3513c2381dcaf54e2a513c93498e5319ad97f307441723758cd9c9b837c480dfa3bd250f1ec65bbb6f8b5a931b53c68341c6a37e
 EBUILD zathura-9999.ebuild 1344 BLAKE2B 4963fd1b776f6028efc676cb1280ff7502c4f05de97a6481d397229bfde7e3e76c3fd58547af96a1e46d1e02581c653bb1823dc7f45e734b0a12b54629163cc1 SHA512 270f4ca7ce870b493504b6a26b9b3d31ac5788a442b0d44422a51a40e77fa03d46e032a1701c6a30a6cbe04ea34eefc992680bf0fb712f48da6022666da09cdf
 MISC metadata.xml 821 BLAKE2B 1e00497e754b684be18ced6966f830350bb6c9529a3993c4a1c17b9f0f6d3512e864dafc10966be8e5f338a8f4484335f2debe239914ddf2d0bc0ed99895bf63 SHA512 ff0cacc5dd1ed909ddd5080fc949dc997ffcc1b5ed429b9cf9d5e3d1447bfffc89ddce79371ef387c5064fd0df65f15d85c665ee2125d4269093e536a7b80c6c
diff --git a/app-text/zathura/zathura-0.5.2-r3.ebuild b/app-text/zathura/zathura-0.5.2-r4.ebuild
index 15177a979378..6fe10b0117a9 100644
--- a/app-text/zathura/zathura-0.5.2-r3.ebuild
+++ b/app-text/zathura/zathura-0.5.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,8 +59,7 @@ src_configure() {
 }
 
 src_install() {
-	default
-
+	meson_src_install
 	doman "${WORKDIR}"/man/zathura*
 }
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 0c5ee2fecd22..c1174dd20fc9 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index ab21583f39fd..ea1f1c686b27 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,9 +1,6 @@
 AUX muParser-2.3-export-cmake.patch 13652 BLAKE2B a83680f1214a6941a89f28fbdf0789fd665ca002d4259ffb802cc32c37f83a48f45b601c52640a9e0bcb39b4e4869317ccb71898b557f9b19caaf5b3ee11ecec SHA512 a126199cb71e8160f78bd3872fe252ce7cc77f99185af8922750bee85b0a60a2657a688913a9df897d15c76bd0446d16371cf792f334b96e101e07d84856bb6b
-DIST muParser-2.3.2.tar.gz 103979 BLAKE2B f892b4d440a1b7326be27aa0a2b703ccafc02de5e881ef4780e8907688cf7905284f3e5f5855ad2596683f1dad309d287ebae527d917ebf5e0dad045551df7de SHA512 8ef5c8b3834da3995a782b7364a4eb4197fb706bee4cadabe5511d2a9cf2912c3db6de422a91eff7f9690f8c9c355b9900335e940749d5c243cb732ac1992aef
 DIST muParser-2.3.3.tar.gz 112100 BLAKE2B 79a0a29781596f114aeea9756a5a2141eed19857c08d0a32093353eb049f8b179af577cbd07747d2b8093e448714397b47f36c68e54bbce22386f5ec06365bda SHA512 f7e01c83f6ffe71e240653c47fdb8f3152d7fdf61b5997a3c717dec50d0175065c4fc4241ec95fb35b60b968c5c965a820009163ebe84f0fa57d64b3a23226b4
 DIST muParser-2.3.4.tar.gz 112693 BLAKE2B 860c24d45140ad4339efcd5f5c221454c051565a1362907fd01499cfda0ef3c304333507c4d9c43644dac63e5fb4963fef6e3a2e565febf1a80807e0a0242c87 SHA512 5226fd666eaf3ff7e661bbf72e60114d0ceed10491ffa4ed2dd34cd669c6c21c037eff0388402d6b9d60b0a5a27b03ca35153e0c048328abc75dfd1eaf38ceca
-EBUILD muParser-2.3.2-r1.ebuild 766 BLAKE2B d6e020d1aa13605d5c536c7ff3b58896c6ce0508632a2f2e179967864a183bf0e1116a3e51fca65019c69b3e4454482fb57c2def00b6338ac9a9a361da07f851 SHA512 c19e25ac61184f2bf491b443e44c7210389555bcb89fbd627daa89922adb26bf75f48185e734dc9aa6e394a11f2bb6fed3119bcb8660cf756a8b52346f02922b
-EBUILD muParser-2.3.3-r1.ebuild 798 BLAKE2B 37f43990024c4428771ea3b61cd0a9ba1109e56348c83bc849375019a71ac98cc76dff50d81b47f4877474849e9609a8c7d5444f478492767a13c021d8d43906 SHA512 5ea937070a0a571d2da06cba7b6249329a8fbbb8a39c8394c8e7d29a222ea099cca68491c169beaf37657b1a2699d4567d1337eb7be74f375e90796dddcaa9be
-EBUILD muParser-2.3.3.ebuild 795 BLAKE2B cbe789a0ac294ddd3722eb55958e436babfb9585e9e8502e19680a96295cc199afcde1dd4b8cb8fbf30ba0780101d14b312035165261c8816676e3dee6c08877 SHA512 31650bf11f7c542c9d878e3234672741dd03c77707640283183e6ae8d93f97baff292575bcb7a0520b360193b53ea23c104bd085937955be091deaad22e5585d
-EBUILD muParser-2.3.4.ebuild 711 BLAKE2B 2a6aeb4df3e990c549bf23b8c9eb0f4f131b827d11ed45280491ff6434ca0656118249dae46322cd64ea5d36aeb4fade4aa7dc2171ec2043081ad6270a3c3f8d SHA512 40ded9a6dcbec162e6c9d726bd317dcd2eaf9ed72187ca7fab53355b8a7310742cbd93c78c6f6d62846159ca72ddb28cc9cca12d6393829ce9ff20383fcb3d66
-MISC metadata.xml 709 BLAKE2B 5d0cd5c59febf43e133ac02eda2385845011a02875825df5db2cfc357302e4a012d79ff569a3eb68259e43bd9b369534c9ce54762724c4ce7eb8879f61566f70 SHA512 97adfbf9f21d728f340d653c51f6f4e4937963418a910cd45b53bd3a0b99305b0f5736aed2f8b0facdd2de12c2df332f3def4d0ba6560e2ef31c9de1b58bc092
+EBUILD muParser-2.3.3-r2.ebuild 937 BLAKE2B ec56cf14ddded4bc76529a7530ac4315e01a0f91365b747e879b315665325afdb9d0549a348436b99d2f030fcd096be53e5eaefc2894e2b3a759a1bd47c8229d SHA512 c82791f4bd593acf74bb3b40f5b591cb115b69fe6c573d9c3c0aa20b88e5f16f27495117ff97c31de1c19538347997878e0d5f5bd7279ba453a1d5eeab1a3737
+EBUILD muParser-2.3.4-r1.ebuild 848 BLAKE2B 9f6de447ecafe0a1b3babae677b8c79503e0f4ca06f40cb275953e452a6d85b84ec1c77679eb5cafd637479d0f8f4a016439355b5ca5a3faa254862550922ce7 SHA512 eb30fe2b56c0fe0d56fe769173d6d0929e8e5991a7945518fe078270dd7e411b0d178788975e5093f4ab85380189c7c8e49e3ef116f04ca40f80bf8e44ad84b7
+MISC metadata.xml 625 BLAKE2B 319444cf45ae4e0e7ad24cc11590e5141a5a7b05404fcb9b95373e548e4ca0b23dda45057317a68051006805c77d031cdd4ff55b6b4c827e1cdf36ac9b0df3b7 SHA512 029296e964eecf47ba83943e51bb14dc251d55de449a0d6c3f0396f5b3e8fcd19c02074f46ad5d71dd03f46c61029d6300569d3b9bfaa106464515adecf0b1ee
diff --git a/dev-cpp/muParser/metadata.xml b/dev-cpp/muParser/metadata.xml
index 05a26448f3c7..c81547b2e58d 100644
--- a/dev-cpp/muParser/metadata.xml
+++ b/dev-cpp/muParser/metadata.xml
@@ -14,7 +14,4 @@
 		<remote-id type="sourceforge">muparser</remote-id>
 		<remote-id type="github">beltoforion/muparser</remote-id>
 	</upstream>
-	<use>
-		<flag name="wchar">Add support for wide character (wchar_t)</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-cpp/muParser/muParser-2.3.2-r1.ebuild b/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
deleted file mode 100644
index 9023bc7bc987..000000000000
--- a/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Library for parsing mathematical expressions"
-HOMEPAGE="https://beltoforion.de/en/muparser/"
-SRC_URI="https://github.com/beltoforion/muparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/muparser-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc openmp test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/muParser-2.3-export-cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENMP=$(usex openmp)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_compile test
-}
-
-src_install() {
-	cmake_src_install
-	dodoc Changes.txt
-}
diff --git a/dev-cpp/muParser/muParser-2.3.3-r1.ebuild b/dev-cpp/muParser/muParser-2.3.3-r1.ebuild
deleted file mode 100644
index 669ac8313f52..000000000000
--- a/dev-cpp/muParser/muParser-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-# The upstream tag is v2.3.3-1 instead of v2.3.3
-suffix="-1"
-
-DESCRIPTION="Library for parsing mathematical expressions"
-HOMEPAGE="https://beltoforion.de/en/muparser/"
-SRC_URI="https://github.com/beltoforion/muparser/archive/refs/tags/v${PV}${suffix}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/muparser-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc openmp test wchar"
-RESTRICT="!test? ( test )"
-
-S="${S}${suffix}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_WIDE_CHAR=$(usex wchar)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_compile test
-}
diff --git a/dev-cpp/muParser/muParser-2.3.3.ebuild b/dev-cpp/muParser/muParser-2.3.3-r2.ebuild
index fc2e66b58f60..cc9e5ae7de10 100644
--- a/dev-cpp/muParser/muParser-2.3.3.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 # The upstream tag is v2.3.3-1 instead of v2.3.3
 suffix="-1"
@@ -21,6 +21,14 @@ RESTRICT="!test? ( test )"
 
 S="${S}${suffix}"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_OPENMP=$(usex openmp)
@@ -31,7 +39,3 @@ src_configure() {
 src_test() {
 	cmake_src_compile test
 }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-cpp/muParser/muParser-2.3.4.ebuild b/dev-cpp/muParser/muParser-2.3.4-r1.ebuild
index d085086ce7f7..8c41fb6efaeb 100644
--- a/dev-cpp/muParser/muParser-2.3.4.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Library for parsing mathematical expressions"
 HOMEPAGE="https://beltoforion.de/en/muparser/"
@@ -12,14 +12,21 @@ S="${WORKDIR}"/muparser-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc openmp test wchar"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc openmp test"
 RESTRICT="!test? ( test )"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_WIDE_CHAR=$(usex wchar)
 	)
 	cmake_src_configure
 }
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d765249c2d22..8849d8498cf8 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 695e50387a5f..96789c4be3f5 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,15 +1,9 @@
 AUX openjdk-jre-bin-8.env.sh 573 BLAKE2B 02f032b60578e95a5f370afce4bec7aef12262b5f87c854a4ffc3844a4db5e88abcfb6e7539152b05e447eedb99c58e0a5944ffc2af82c10b5b0f04e447ea1ef SHA512 79bf447ffb50782348396ed1a64737f0a4adacfc21ef70d5f652db782e9492cde89f2ba740c28b6465eb4a6c32a483b2f50daaee784a03ff3d371e843f712fe5
 AUX openjdk-jre-bin.env.sh 342 BLAKE2B 194a81416378ac4729fc333f40c210bb33dea66cfc2b6a5341aab048c63f2c7c9a7bf9c45f10f5d23e2d7dd99cde80b03e79a79c30d08b6be90d6d8d6e850ec2 SHA512 6690285c5fa3866731ef28e0ff2153395e94a3e37837bf334ebea8fb132915a37002d70457810dbddbcaff78d5404f14818735ab6a722456780add4ad9efdafd
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.15_10.tar.gz 42471028 BLAKE2B a88fa041ffdcedabbcdadbb1eb4a0052456666ba779eb0f82bc27ea7f2923a1b2e538d14d5f615869e456b1bce48859211134c6bd9d31c2c082068686b68fd59 SHA512 a8a8a9c9f243aaf9b051bd0c35009ec96a28dcf47b53139dd59891a5ff2ced590e56961edb093cf67b8239d92a4b407f631b389fdff986fdb746316f420abf34
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.18_10.tar.gz 42824761 BLAKE2B 481317f316bac10e098d706a04e94b57bad4388c94168da27403e18489f66d322177f7f9b59c5ebdfc6f3e70080550f6f5e5fc922e9b21a9a59dcc60116243be SHA512 07a0483b4536129974706ee79864e9fd737810b396a605170e68c74dacdb3c65e10ccde9073e8ec0c907709172dd2e08e7c454a5bd88cf0e92f879ace1eedbd0
-DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14
 DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.6_10.tar.gz 46078462 BLAKE2B 2d0bc958f64da82e82b3a8a9d6bc686ecd2a09943e851f0f1a8efcec7cf0135b76a65abfa7f1175d09bc42583d151a4161d891a9861050751ae0c8aa4b1bbdc2 SHA512 253a030ab87e949091b24bacd638a91c673d775e76f3a83e8ab0c1824f697516405fe8fcf7d3b460bd25ddbb441685fa396b390e7ab8bc802294ea36b4700fac
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u332b09.tar.gz 41336220 BLAKE2B 52eb9aa2623335bca7be71d1aca6b4292a029554ef9f9e0e1209a7fa0892931c37b670f9f90586d4ff3cd35540a3a7cb230f20789481836d20f04d4cfcc56596 SHA512 c62002aa1a28547b0b0cefea3f83af2cf6507002bf296b1b83bd04406f4c362f4c74940209ebbd3803513395bec7503882aac7f8d35dcbf6a6e02e9155a53cdd
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u362b09.tar.gz 41359704 BLAKE2B ae4238725544b03abdc32f82fcb1e13fe2aba460c13a48ccc8ccd608f1e8b0f5ac6036b06e941e89b936f01250a4fc3f6fb0f9d7eb5ae9129b8cd5de6c1da33a SHA512 6cb0bdc28596e23807f3e7f31c40f095d20395492bf30dae26a735686f82d9d216110403d59c769700a23dd3187a2603832bd84204051800d474af24c68c8cbc
-EBUILD openjdk-jre-bin-11.0.15_p10.ebuild 2012 BLAKE2B 9fe6d8bad9d14ff1c5a559fa4d0f1b5f59548058049f4886eb6a94ddc5708218c6fa7dd3c23454999d8acc5b2fa13dacb0ac6682c4ae630c2bb743066551034d SHA512 6cb229e2488081126a870842bd7d2fc4bea0a894746db28dc883f210e2c3bc76bdd073ac539617daec12553d98ce2b64a4b9cae343052609f5690c6f2c76224b
 EBUILD openjdk-jre-bin-11.0.18_p10.ebuild 2001 BLAKE2B 98d53b34c852c12d05d91388863aeef3a6976a57624a6218a07224b3d04334a8970027bfb2b3dec37cada90489fab5b55007f93caccedf4b65b72901d3d3a96a SHA512 be1ceaf5466a9dd574925386d6bfd3e5f82c32dc4d069be22c650c4027ee3749115d7a5940d770e7ed26941a2ac45fb851b0a0d83c352efcb5b6252f12b344e1
-EBUILD openjdk-jre-bin-17.0.3_p7.ebuild 2012 BLAKE2B 9fe6d8bad9d14ff1c5a559fa4d0f1b5f59548058049f4886eb6a94ddc5708218c6fa7dd3c23454999d8acc5b2fa13dacb0ac6682c4ae630c2bb743066551034d SHA512 6cb229e2488081126a870842bd7d2fc4bea0a894746db28dc883f210e2c3bc76bdd073ac539617daec12553d98ce2b64a4b9cae343052609f5690c6f2c76224b
 EBUILD openjdk-jre-bin-17.0.6_p10.ebuild 2001 BLAKE2B 98d53b34c852c12d05d91388863aeef3a6976a57624a6218a07224b3d04334a8970027bfb2b3dec37cada90489fab5b55007f93caccedf4b65b72901d3d3a96a SHA512 be1ceaf5466a9dd574925386d6bfd3e5f82c32dc4d069be22c650c4027ee3749115d7a5940d770e7ed26941a2ac45fb851b0a0d83c352efcb5b6252f12b344e1
-EBUILD openjdk-jre-bin-8.332_p09.ebuild 1832 BLAKE2B 31dd2783dad44148857303b74c82b556d1360338b80747f36fc19052c5091ba7106837777b6bfffb088b5c31fc4072529cdea994cfc35b4f56bc032d5830a000 SHA512 df9a819e9673d952422d9dcee7d1f901cde3982dae1e64ce4ddce39b28ae7eae96d1598718c311412d9727a977ad4ed1233e43c933564ef0e9afd7fc97817d56
 EBUILD openjdk-jre-bin-8.362_p09.ebuild 1832 BLAKE2B ad07e15885ed32db182bcf7207dca702fc99ad4b1f106dd985e6916e2fbf837f0cb2291ee70ad13e0a84aafd614a5cb60b0d870f2aad98e376638ba0f0511a0c SHA512 6410d06da667332e2374f03f18cc62001d8194b5a9cd7619aebcc332698514e76981c3419f1aa78b1dedaa58b9907a52469c06864a214a82f5d50df1083d4ed7
-MISC metadata.xml 896 BLAKE2B db8489d7738bb5444ee789ae0dc516941ece1b814ce4c4d0e12284e4027315aa20b141027ca6db8aae7ab6580d881e79bcb1b4dffa8a890f75da6d7177c7c279 SHA512 8833e637b8b935247972eaf7afbf3787cc17013080d9747defad4784ea89c2b147d0f2284327e9ade30100594a0d1e638f0ecd01f0375101372028dbfd0b31a3
+MISC metadata.xml 767 BLAKE2B 4abe0ed797f2d768f97350c023175d98e197b4632c6c7f31fa7ef2a1f6e88f154970b535f2b7ab36306ed36e84ba17c7380ca68eeaa3bc011c2ffdcd73adaef9 SHA512 6cbc1cce8c7827a9111b3b26f565706b4f41664475a4311ffe3fc2a12a12ca7ab184e67d68bc3aa42287716175411605750e180b75b65ecce0e698063548a059
diff --git a/dev-java/openjdk-jre-bin/metadata.xml b/dev-java/openjdk-jre-bin/metadata.xml
index 2a0dc8d5f54c..f60a999cf34f 100644
--- a/dev-java/openjdk-jre-bin/metadata.xml
+++ b/dev-java/openjdk-jre-bin/metadata.xml
@@ -16,6 +16,5 @@
 	</longdescription>
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
-		<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild
deleted file mode 100644
index ae3ecf2e8fe9..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.15_p10.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild
deleted file mode 100644
index ae3ecf2e8fe9..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.3_p7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild
deleted file mode 100644
index f337effa4a4f..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.332_p09.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v lib/*/libjsoundalsa.so* || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
-			bin/policytool || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index f8a237ce10f0..374e6d892e2e 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,21 +1,10 @@
-AUX openjdk-17.0.3-fix-nullptr-cast.patch 5052 BLAKE2B d4a75732ba3f6c10279f8d33f58cdf854622fe3bd45fef924b153ab1c5502d414ba40ee36c351f12897672d0a91c4718f521c4e768555ebc166b3dcc99c2e077 SHA512 a9cc08391c3055c73953113df4fe22a37cb7a2785eae360ee323dfbfebb96ad7b2798d64e1fc596eadf2af8871842d8288690d862a579463bb32de844e94cc00
 AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
 AUX openjdk-8.env.sh 687 BLAKE2B 4bb851545955fafa6a4b08f2589fa9a5441ef37484eb21ac5db06cde111d325903e70b5b7473659973a0bab972386c8f33ded1da57858fdca325cfa29b1122f5 SHA512 a43fc0fcf57108350235d47d6da65a12fb9f77f12f6163c649ceceacb3317c6a25516efa060efe129b74138a529945163343e5a7d1de2b7af36f6580054ed5e5
 AUX openjdk.env.sh 432 BLAKE2B 8779a373af2f9e52473cb5e3bc2bbcb7fa83c6d09382d498466888dd322299adc1b736c6e3723fa68e92a80067599228b3511cc2826e1ebc3c5845a7a2f62fa3 SHA512 e6604a88fb857945a618e4b7735d49dbc23bdd4c6fb70fc5753470e9c1047825208a40fe25107bcde95f290656b44f92e1667ebc414454cbae2e71f16fec5fbd
 DIST java17-riscv64.patch 2253475 BLAKE2B a10a257f0b8bf590cdc011cf0c5af4854d49d6bbdf68dd74b2f996b70e0ecdd2b87bc4a02394f67ded5e664efb41f8dd03bb312fbfcffd84c289afdcbf7868de SHA512 06230b121e1f28189877025a4eab99e6d8cba176a17c88f073498fec6c73ab26130ce1500ea4f83235cc6abbc1742e47b227d60b5ff77465740048abdc52d165
 DIST openjdk-11.0.14-riscv.patch.xz 279088 BLAKE2B f67cf5707246b22285de8217b68fb806e3c18b7289cb81428c0fe83c5a4dcd60233be10aaca0853ffb00ac24fa60cae1b1d60ed300ad6bff8b07e881bddf8650 SHA512 32bac5f0c0f5df883de344718586bf798db6c8a5738058ea5d4902f5a0a3fc841c1893dec3379a74b9468c1c37af5c31a3e296476549972d3f1305401354060d
-DIST openjdk-11.0.15_p10.tar.gz 122902351 BLAKE2B a2dabad415a92765d548b19261e22e2cd483a17b478c8ef98342b44e88b39b23d89d31aecc80f93b27fce8df50ba41f4e6e5f10b66035bbfc1e0c03fc4707a40 SHA512 9d9e631046769d3ad95229172f392649ef4162161eb2d6fa7371665619600a04db440e1b3d30c580e283ad2b6bd7580d1199fc854fad3cb962d79f18b2347c67
-DIST openjdk-11.0.16.1_p1.tar.gz 123134756 BLAKE2B 727294bb9d07193bb74b01a3e3e35f491b54be4cf3b6230e59df56ea7a9166b0b138f82b3d3c302c32b21efa8e9ac71437ca430a68a9ad8b69a7755d289bde17 SHA512 c694a8e6b0ff664b2c6a43ef3445d98e3b4ddf59c7fe94a21390b2d7756870ea7c7e34cb99d40bd66708ecaee93ffeb4dfc9ab7e2162bd6fc19479f23963560d
-DIST openjdk-11.0.17_p8.tar.gz 123284789 BLAKE2B 413f88b1b0e3c26c87d8e9e69468c14cb39e50f193908c029828c7e7f77f3408eef9675860223a8a04f73e4417cedef1f1e23f337c0c9bd00127093cc2a824a8 SHA512 d7229bf96591494edcff950a7263a718ef8bb5ce918b1873b7d8987fddfaab0a0955c88cbdc5d09d294e2461c4fefa020d7642c221953ab881e8c642f585c28f
 DIST openjdk-11.0.18_p10.tar.gz 123369840 BLAKE2B 1fa6a147ac0685f51b82f7b958b81d4ac56dd0d94234dab54d4c3641d4d5b0905b4778fa73f2d8582249f251839dd3ff5b8835c2ff3eb24f402d1399cfc27ffe SHA512 10a48066ad1d2b627cc9be5c6e06a0deef7241f3b95b917b3bf86ffeb53ea043915e0eb7784ea244332d9c3941c8c5056c154e5aff4522b95aca8c8372c19474
-DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 9b2036493a485a1e245230488a5985af4f5d5c6a85912d73d8a712742fdfc26d5eb08ca8e69dac04f0d516fb361e6ed057c95a3839b04639d129581cf00f0620 SHA512 692b5e39e5c6eb1222f25c3012e9a73366d9c98f5c29c2f2d35f41991cdcb026a644398b6f3fdd8c9d8368b4b1f5dc4d89b3dbd594a2e7751de96a140551d445
-DIST openjdk-17.0.3_p7.tar.gz 104797560 BLAKE2B 025ff6be360c74288990622bce31769e5780f3f326b0eed2b78a776cc4df8bdf8cb99dfb0d7dd3f03f8558ca9a66acc5c5bd04b227ba4dffe18f8586a287b74b SHA512 3bebaaf0469cd6558a3f033b768005e880ec95d5bb2a24b8929d2f6a05f18ca9977b291ad49b220a904f661cf6b47780a1cfd776109ed11d4e34d5345be8f66c
-DIST openjdk-17.0.4.1_p1.tar.gz 104892822 BLAKE2B e5c4ae7e59b7f078c3927ca74cdff4fe1f378da874eca45a7655fa7419c9abac6b9f81632c104614b7f1d6c20fbc5ee7f4b0a8e2aaef39a66f31377543e926de SHA512 33396f9d8101db605aac0b064d518a800194421b211f0d903d681968beab58540367e53293fa26d4751e4bd1f459a0d07bb08b2010ac64ea5438717ea1517f76
-DIST openjdk-17.0.5_p8.tar.gz 105048497 BLAKE2B c707633a247e5ff4f5083623e874200d694c3fa37519dad65db5271e8c218632846efc01520ddfa3f9ffdecf7c1209f85ee3320a92660af8fa1b1fbc9184f468 SHA512 8446b6ed93b286a39476fdb215be0da8ba679fb475f117a6a92f72a833759ac821c4ed87d033be56992d147c1b6d3ac1348ad2a6ad8a3e057c7b85b589266ff9
 DIST openjdk-17.0.6_p10.tar.gz 105221267 BLAKE2B c885c10aea273e779bbee4463106598900790378e06012f0019bfbbba8987a99a6aad53aca39bdc5ffba5f610a84e6c4cfd98c697e46404d388d32186b2ccd6b SHA512 7fa47285fb1776802dc35352bfe64d6b376cbc73d7b72ef7d5c8ad41c181d8aa9dc6fb392fe3b1c799974765d40c03a6643ad6afeb3ddc9ab45e546b747ebb3c
-DIST openjdk-8.332_p09.tar.gz 88130953 BLAKE2B 9c7419851588dfbca92610f8fbb8b74fa7516282f82e8c7c37af88c776ba0c83a22fb3d4a1c2c2b98d44e394025217d095cff9c79fba53f9c5a32a43eb91ad70 SHA512 f6a717f77cc0e85bc2eb3c3c599d09e06a4004e4987a2caf0773b1197336722469e2abcca9d39c1f4c534d15cd77408d6405c9ee6edb3815bccd8e4872571aaa
-DIST openjdk-8.345_p01.tar.gz 88173976 BLAKE2B f0eca11f4fcb532a8fd156a74ff6629ea2d948c5d29d9b9638b526c57598618f5c3782ace26654be61f8d9ab229f44aa46112234c2d2e8a9bdc367c1071b6e53 SHA512 bb01156f751a0ba25290d1337356f9dd78121373220e2e2df07a4536e2ab31390865ab63d628901de7983d1679dd6dfd4bc3c6304911e6c76fe4c616bdf07eab
-DIST openjdk-8.352_p08.tar.gz 87951551 BLAKE2B da24a507583b820ae30b9f7e0d7661a8d5fac86f25dd27aab747d7ed0bea387b00379e067c0f2cdba0f44815ea6689e50c0a21a1b9a2ff807480a8ecbe1f6f8f SHA512 85f17830bee92b88afa69957b0c2fa49333845d65acd48c5f6548a020a3a69a82d8691884757e07f4d146223e7725c5e0cc51d2d3d6c984d457d3772e3b7c862
 DIST openjdk-8.362_p09.tar.gz 87939909 BLAKE2B cff08a04e2e0cf0af776d8ae8220cae86afb322a4dbb83df39444b08a23dd59fea761a0ee403d24d7fd639e1982eac7c77764920c7efcfeb877dc64763c9f672 SHA512 6579e881f36902db49db8d136f1cd9d2b2659705b216bfe014df99441d1984b4d7678998bb36edf78b77049bdd8315a8dcf22e6a598b485b972fee3784fe2ef7
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
 DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
@@ -24,16 +13,7 @@ DIST openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz 116557680 BLAKE2B d20e45a5a76e30e
 DIST openjdk-bootstrap-17.0.1_p12-x86.tar.xz 111479904 BLAKE2B 17d33f8ee81c2846f417d8e7cd1429eb611e916a6b375c76127179dc6afc55b0254248360c892ce37a178fd553934d952ec8955ff5d0613eb66678b8ecefe917 SHA512 094bcc960801e5fd7e1c966c8101c195ac7fa5e222d9c8e79ca64f8a3e6812613c17a0356211e7dd831325fa11af88cc22ed56c434d65504f18dd4f4ceaedfdf
 DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab078085f094bbcc65448458d98a0f521e3b754c5118b1b4f957cfa00c24e896c811c2a477822c469ffcfe0de1ad6a8d0b7db23b0b09ae3b459eaf8c4fc8 SHA512 e30acd6c64a0095f4203129ecf2cff4c6b4293bc017457465d3abb746d280a2f5d89028eed22f7f3d236890d047149c7aa257e3b49593d7a6ab4dd6b777a7c26
 DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f
-EBUILD openjdk-11.0.15_p10-r1.ebuild 8425 BLAKE2B 71dd261987e7a0690b685211b645b9ac53f3b8e01cba388f82893b4bb4afc2ba69c7c4a8fd2095d097f0f0cce613d7ef9b9f080a010e30a72746990a11745747 SHA512 e1d242e838f10210c9bfaef0b2ec70f59f38bafca7c1d22c2bdc7df46c22fcc3d48f27468a02488f415fe765e5c418279cee320e55fe6eb13cbcfddaa92ae098
-EBUILD openjdk-11.0.16.1_p1.ebuild 8429 BLAKE2B 8d4f3e16513d52f5a92a917057c0e46283b29c17853f40c08f81939cef0e5f1aa7e2c99535d776be13f37df6e9e5f51762a861c48d2bec9c6bda6d6a99e0cfed SHA512 f4598d99b1e26d1f08cc7c9aa5a8f93424665e18bbc913562460a080738b5ca9d990618dd47206b161f81908efdfcb3cc6444341753c1b5dec83645156a58b60
-EBUILD openjdk-11.0.17_p8.ebuild 8429 BLAKE2B 8d4f3e16513d52f5a92a917057c0e46283b29c17853f40c08f81939cef0e5f1aa7e2c99535d776be13f37df6e9e5f51762a861c48d2bec9c6bda6d6a99e0cfed SHA512 f4598d99b1e26d1f08cc7c9aa5a8f93424665e18bbc913562460a080738b5ca9d990618dd47206b161f81908efdfcb3cc6444341753c1b5dec83645156a58b60
 EBUILD openjdk-11.0.18_p10.ebuild 8425 BLAKE2B 77168c2472fcf6d1cb2a1971362c6c326f42336a6894724f72960ce5ec086afe2f366c1023d17620b8430ec451b3f8023e25f57684167b621961fb7a2d9d0289 SHA512 9f7e5b35f199623f70948dd0f8e1176f284a24c0e3d742ccb39d0aafb11fb8b7aae131b301f12e78ab2f9a55ff8c0330d66fee2c8b76355111be629d5b1faeb1
-EBUILD openjdk-17.0.3_p7-r1.ebuild 9182 BLAKE2B b398b29f7dc72d8e5afcfd76552879699de72e748a288ea44cfdcea86703f764bcabf3e4dcd585d62186bdabb47ff7b3f3fc529b1beff3ad19f1bf0ec223e5a8 SHA512 6498f31530c69a7b2129748d2056cac6f4a0420566af27ef1a8f5918a4c2973eac9c162acb646314f7599cbcf9d825acfdba06af39ee2fc6db578d62c2353ebf
-EBUILD openjdk-17.0.4.1_p1.ebuild 9147 BLAKE2B 82f18b43d61b3333e064dfb31044fc6cb7d1ad3ef7694df275dcf3bc4e004a76c067d1652dc45c7f11306e14e5904944d84dd377a964c0908b9cb1f3edb09ef0 SHA512 3e14c36d05a6a37ede1faceb5dfb1a5799910004c627634864f7b0a769a54b2798d697f75c84bf03ded4d61c028ce274a8eb9ab495e1c480fc4dc24a476165f6
-EBUILD openjdk-17.0.5_p8.ebuild 9209 BLAKE2B 9e9bc4c14e053300df1ab19cde9c84ec81b44baf84c08f49e83618c0dbe8df4e70e3d0750c034f4d51eb9eb7455afafa365b819cf30537bb8c2bd91f9e1e0049 SHA512 e509473f27d6be8ae0796935d15abe62fc7a48b4899dcd264d93dbfd4a0784d11c4483c52ba7b4b5cfd9263cf73a4e87512795c966951d53aed63196ba7142a2
-EBUILD openjdk-17.0.6_p10.ebuild 9205 BLAKE2B ab0ccdce211278268b3c8b2389c03e6cc8a3b50488915058852f924734198e2d491b57e0da671f1b03c7cc2307c9e6386f953cd46b5be6ef8d3652713745d7a2 SHA512 0279d731b194436f64821da2b36aac5cb3810cde49db15048aca20452a5cc770eb58fd4e5b84d530474b18145bbf55568916107b8cf27851bd9b959133f9ef91
-EBUILD openjdk-8.332_p09.ebuild 6183 BLAKE2B e1519d397a5bbb99c91485181af982d1ef6ed674a51e0dff54426eaf1a1222cf38d2a4b30990f33cb868a6385ce4d433fa6b18e9b41db381259d2bfc5e421db8 SHA512 ca2653a9f7f74bb057f8c0023fa7a7b7ab9b367d8571bf5db7f2532939a0bcf7500c062628cc5055d1ee58e28a666999e0df5da5351c2a1c609509a0a74c272a
-EBUILD openjdk-8.345_p01.ebuild 6187 BLAKE2B 4a46442662eacfe3eb99348863592a7b40515f91aab59556ce16e70fb004b7b57d4401072dae4a6e4951054497ac91970a4209611895935ba05d1c218778a8db SHA512 0fc74381d7e3dcc658366bbb9e04ffcfabcb403d109b9145d12f8f9427451af3b99885fcfab0d2296ad8044e9c36aa4db5826d9b5a8959d8c5568f9b3a3bf4dc
-EBUILD openjdk-8.352_p08.ebuild 6187 BLAKE2B 4a46442662eacfe3eb99348863592a7b40515f91aab59556ce16e70fb004b7b57d4401072dae4a6e4951054497ac91970a4209611895935ba05d1c218778a8db SHA512 0fc74381d7e3dcc658366bbb9e04ffcfabcb403d109b9145d12f8f9427451af3b99885fcfab0d2296ad8044e9c36aa4db5826d9b5a8959d8c5568f9b3a3bf4dc
+EBUILD openjdk-17.0.6_p10.ebuild 9207 BLAKE2B e93c98f6687634007af18c7d66ecfc8bd747e78e617a74832d8097a61a0305dfc952f06cdc55a93da14447c8141c86857e528da4b5e929871943016cc4fae880 SHA512 6397b76ae0f6d30ff10adf47426c8b15d3e1a2e3d240c50af2b7b4d331c4f053aacc0c289d630ea7c958d06dc6216df31a5e0fab29bb9e20cbbe47bcd7ced50d
 EBUILD openjdk-8.362_p09.ebuild 6183 BLAKE2B 8ef098742c8f8e6b40fd93d715747dd17227829e804b0061510d9c6ba31cade00bb84c929395de8f49ec57b52a028bea583cc820d8cc9110e49d4a2798218d2b SHA512 5e973ebdd2f750aa8600a435c5dba52d0c9e5c555c3215311d6dc07268bda3c29fbcfd36039374aa1fd7957872d52e6b97c38f3aa782b84b116e2f5a544a6b05
-MISC metadata.xml 1736 BLAKE2B 5911a98287022f27f1e0247e33b483981aa4d7a21c387305661039b5d195c458ff603c1c50e54dfb1116bcb932f4bdf09e191130ed6ea3c7c19fc698e4c70730 SHA512 e120118ace1e053d7e3899343dbf82ac54d7758caaa354f4e29c68f3a705ba61cfe545334441b46eac425bf2b81d2b1c107890c3ca6bfe96c3b783fbecc7bbee
+MISC metadata.xml 1607 BLAKE2B 166efc846c7aedb0e25b7479bc2d804079ea52a1fddbf5f1bb8e463c777a79b5cebd901e9c897e5135140ba2e5067bec7a02aedf5d15da12bd4063505a711d48 SHA512 c54bc02d391ecd8ab2fda8b8a37b0e28bbddf71d821ade63a1b353eb02bf8fa92983f42a4d470ada6d8d835e0bf012aea8409b6f6fd3f4b25c86949a35167eba
diff --git a/dev-java/openjdk/files/openjdk-17.0.3-fix-nullptr-cast.patch b/dev-java/openjdk/files/openjdk-17.0.3-fix-nullptr-cast.patch
deleted file mode 100644
index 11f159680d8b..000000000000
--- a/dev-java/openjdk/files/openjdk-17.0.3-fix-nullptr-cast.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-https://git.alpinelinux.org/aports/tree/community/openjdk17/FixNullPtrCast.patch
-https://github.com/openjdk/jdk17u/pull/347
-
-See also:
-https://www.openwall.com/lists/musl/2013/01/09/1
-https://git.musl-libc.org/cgit/musl/tree/include/unistd.h#n20
-
-Subject: Fix cast errors with latest GCC (11.2)
-Upstream: No
-Author: Simon Frankenberger <simon-alpine@fraho.eu>
-
-This patch fixes multiple casting errors reported by GCC 11.2
-
---- old/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
-+++ new/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
-@@ -205,7 +205,7 @@
- 
-   // Note: We don't need a keep-alive-barrier here. We already enqueue any loaded reference for SATB anyway,
-   // because it must be the previous value.
--  res = load_reference_barrier(decorators, res, reinterpret_cast<T*>(NULL));
-+  res = load_reference_barrier(decorators, res, static_cast<T*>(NULL));
-   satb_enqueue(res);
-   return res;
- }
-@@ -216,7 +216,7 @@
-   oop previous = RawAccess<>::oop_atomic_xchg(addr, new_value);
-   // Note: We don't need a keep-alive-barrier here. We already enqueue any loaded reference for SATB anyway,
-   // because it must be the previous value.
--  previous = load_reference_barrier<T>(decorators, previous, reinterpret_cast<T*>(NULL));
-+  previous = load_reference_barrier<T>(decorators, previous, static_cast<T*>(NULL));
-   satb_enqueue(previous);
-   return previous;
- }
---- old/src/hotspot/share/oops/access.hpp
-+++ new/src/hotspot/share/oops/access.hpp
-@@ -294,8 +294,8 @@
-   static inline void arraycopy(arrayOop src_obj, size_t src_offset_in_bytes,
-                                arrayOop dst_obj, size_t dst_offset_in_bytes,
-                                size_t length) {
--    AccessT::arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast<const T*>(NULL),
--                       dst_obj, dst_offset_in_bytes, reinterpret_cast<T*>(NULL),
-+    AccessT::arraycopy(src_obj, src_offset_in_bytes, static_cast<const T*>(NULL),
-+                       dst_obj, dst_offset_in_bytes, static_cast<T*>(NULL),
-                        length);
-   }
- 
-@@ -303,7 +303,7 @@
-   static inline void arraycopy_to_native(arrayOop src_obj, size_t src_offset_in_bytes,
-                                          T* dst,
-                                          size_t length) {
--    AccessT::arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast<const T*>(NULL),
-+    AccessT::arraycopy(src_obj, src_offset_in_bytes, static_cast<const T*>(NULL),
-                        NULL, 0, dst,
-                        length);
-   }
-@@ -313,15 +313,15 @@
-                                            arrayOop dst_obj, size_t dst_offset_in_bytes,
-                                            size_t length) {
-     AccessT::arraycopy(NULL, 0, src,
--                       dst_obj, dst_offset_in_bytes, reinterpret_cast<T*>(NULL),
-+                       dst_obj, dst_offset_in_bytes, static_cast<T*>(NULL),
-                        length);
-   }
- 
-   static inline bool oop_arraycopy(arrayOop src_obj, size_t src_offset_in_bytes,
-                                    arrayOop dst_obj, size_t dst_offset_in_bytes,
-                                    size_t length) {
--    return AccessT::oop_arraycopy(src_obj, src_offset_in_bytes, reinterpret_cast<const HeapWord*>(NULL),
--                                  dst_obj, dst_offset_in_bytes, reinterpret_cast<HeapWord*>(NULL),
-+    return AccessT::oop_arraycopy(src_obj, src_offset_in_bytes, static_cast<const HeapWord*>(NULL),
-+                                  dst_obj, dst_offset_in_bytes, static_cast<HeapWord*>(NULL),
-                                   length);
-   }
- 
---- old/src/hotspot/cpu/x86/interp_masm_x86.cpp
-+++ new/src/hotspot/cpu/x86/interp_masm_x86.cpp
-@@ -1122,7 +1122,7 @@
- 
-     bind(loop);
-     // check if current entry is used
--    cmpptr(Address(rmon, BasicObjectLock::obj_offset_in_bytes()), (int32_t) NULL);
-+    cmpptr(Address(rmon, BasicObjectLock::obj_offset_in_bytes()), 0);
-     jcc(Assembler::notEqual, exception);
- 
-     addptr(rmon, entry_size); // otherwise advance to next entry
---- old/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp
-+++ new/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp
-@@ -443,10 +443,10 @@
-     _from -= Interpreter::stackElementSize;
- 
-     if (_num_int_args < Argument::n_int_register_parameters_c-1) {
--      *_int_args++ = (*from_addr == 0) ? NULL : (intptr_t)from_addr;
-+      *_int_args++ = (*from_addr == 0) ? (intptr_t) 0 : (intptr_t) from_addr;
-       _num_int_args++;
-     } else {
--      *_to++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr;
-+      *_to++ = (*from_addr == 0) ? (intptr_t) 0 : (intptr_t) from_addr;
-     }
-   }
- 
---- old/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp
-+++ new/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp
-@@ -267,7 +267,7 @@
- 
-   virtual void pass_object() {
-     intptr_t* addr = single_slot_addr();
--    intptr_t value = *addr == 0 ? NULL : (intptr_t)addr;
-+    intptr_t value = *addr == 0 ? (intptr_t) 0 : (intptr_t)addr;
-     if (pass_gpr(value) < 0) {
-       pass_stack<>(value);
-     }
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index ab5c5e686f17..367d2eb36d3e 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -20,7 +20,6 @@
 	</slots>
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
-		<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
 		<flag name="javafx" restrict="&lt;=dev-java/openjdk-9">Provide JavaFX support via <pkg>dev-java/openjfx</pkg></flag>
 		<flag name="javafx" restrict="&gt;=dev-java/openjdk-11">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag>
 		<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
diff --git a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
deleted file mode 100644
index feaa4c78cbc9..000000000000
--- a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
-RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
-X86_XPAK="11.0.13_p8"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
-	local suff="tar.xz"
-	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-	local ver="${2:?${FUNCNAME[0]}: version not specified}"
-	local cond="${3-}"
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
-}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri riscv ${RISCV_XPAK})
-		$(bootstrap_uri x86 ${X86_XPAK})
-	)
-	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
-"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-			dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-		)
-	)
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	if use system-bootstrap; then
-		for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-			if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-				java-pkg-2_pkg_setup
-				return
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	use riscv && eapply "${WORKDIR}"/openjdk-11.0.14-riscv.patch
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	if ! use system-bootstrap; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	fi
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #713180
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--disable-precompiled-headers
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype="${XPAK_BOOTSTRAP:-system}"
-		--with-giflib="${XPAK_BOOTSTRAP:-system}"
-		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-		--with-lcms="${XPAK_BOOTSTRAP:-system}"
-		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-		--with-libpng="${XPAK_BOOTSTRAP:-system}"
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--with-zlib="${XPAK_BOOTSTRAP:-system}"
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-		$(tc-is-clang && echo "--with-toolchain-type=clang")
-	)
-	! use riscv && myconf+=( --with-jvm-features=shenandoahgc )
-
-	if use javafx; then
-		# this is not useful for users, just for upstream developers
-		# build system compares mesa version in md file
-		# https://bugs.gentoo.org/822612
-		export LEGAL_EXCLUDES=mesa3d.md
-
-		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild b/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild
deleted file mode 100644
index 055cb96bc4a9..000000000000
--- a/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
-RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
-X86_XPAK="11.0.13_p8"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
-	local suff="tar.xz"
-	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-	local ver="${2:?${FUNCNAME[0]}: version not specified}"
-	local cond="${3-}"
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
-}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri riscv ${RISCV_XPAK})
-		$(bootstrap_uri x86 ${X86_XPAK})
-	)
-	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
-"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-			dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-		)
-	)
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	if use system-bootstrap; then
-		for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-			if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-				java-pkg-2_pkg_setup
-				return
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	use riscv && eapply "${WORKDIR}"/openjdk-11.0.14-riscv.patch
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	if ! use system-bootstrap; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	fi
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #713180
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--disable-precompiled-headers
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype="${XPAK_BOOTSTRAP:-system}"
-		--with-giflib="${XPAK_BOOTSTRAP:-system}"
-		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-		--with-lcms="${XPAK_BOOTSTRAP:-system}"
-		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-		--with-libpng="${XPAK_BOOTSTRAP:-system}"
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--with-zlib="${XPAK_BOOTSTRAP:-system}"
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-		$(tc-is-clang && echo "--with-toolchain-type=clang")
-	)
-	! use riscv && myconf+=( --with-jvm-features=shenandoahgc )
-
-	if use javafx; then
-		# this is not useful for users, just for upstream developers
-		# build system compares mesa version in md file
-		# https://bugs.gentoo.org/822612
-		export LEGAL_EXCLUDES=mesa3d.md
-
-		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-11.0.17_p8.ebuild b/dev-java/openjdk/openjdk-11.0.17_p8.ebuild
deleted file mode 100644
index 055cb96bc4a9..000000000000
--- a/dev-java/openjdk/openjdk-11.0.17_p8.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball
-RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball
-X86_XPAK="11.0.13_p8"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
-	local suff="tar.xz"
-	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-	local ver="${2:?${FUNCNAME[0]}: version not specified}"
-	local cond="${3-}"
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
-}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri riscv ${RISCV_XPAK})
-		$(bootstrap_uri x86 ${X86_XPAK})
-	)
-	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
-"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-			dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-		)
-	)
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	if use system-bootstrap; then
-		for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-			if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-				java-pkg-2_pkg_setup
-				return
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	use riscv && eapply "${WORKDIR}"/openjdk-11.0.14-riscv.patch
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	if ! use system-bootstrap; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	fi
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #713180
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--disable-precompiled-headers
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype="${XPAK_BOOTSTRAP:-system}"
-		--with-giflib="${XPAK_BOOTSTRAP:-system}"
-		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-		--with-lcms="${XPAK_BOOTSTRAP:-system}"
-		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-		--with-libpng="${XPAK_BOOTSTRAP:-system}"
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--with-zlib="${XPAK_BOOTSTRAP:-system}"
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-		$(tc-is-clang && echo "--with-toolchain-type=clang")
-	)
-	! use riscv && myconf+=( --with-jvm-features=shenandoahgc )
-
-	if use javafx; then
-		# this is not useful for users, just for upstream developers
-		# build system compares mesa version in md file
-		# https://bugs.gentoo.org/822612
-		export LEGAL_EXCLUDES=mesa3d.md
-
-		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
deleted file mode 100644
index 9f355b7b9030..000000000000
--- a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-ARM64_XPAK="17.0.2_p8" # musl bootstrap install
-PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
-RISCV_XPAK="17.0.3_p7"
-X86_XPAK="17.0.1_p12"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
-	local suff="tar.xz"
-	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-	local ver="${2:?${FUNCNAME[0]}: version not specified}"
-	local cond="${3-}"
-	[[ ${cond} == elibc_musl* ]] && local musl=yes
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
-}
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-MY_PV="${PV//_p/+}"
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
-	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri x86 ${X86_XPAK})
-		$(bootstrap_uri riscv ${RISCV_XPAK})
-	)
-	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-riscv.patch.xz )
-"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-IUSE="alsa big-endian cups debug doc examples +gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.3-fix-nullptr-cast.patch )
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-}
-
-src_prepare() {
-	use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	if has_version dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
-	elif use !system-bootstrap ; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	else
-		JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
-		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
-		export JDK_HOME
-	fi
-
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #713180
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--disable-precompiled-headers
-		--disable-warnings-as-errors
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype="${XPAK_BOOTSTRAP:-system}"
-		--with-giflib="${XPAK_BOOTSTRAP:-system}"
-		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-		--with-lcms="${XPAK_BOOTSTRAP:-system}"
-		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-		--with-libpng="${XPAK_BOOTSTRAP:-system}"
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--with-zlib="${XPAK_BOOTSTRAP:-system}"
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-		$(tc-is-clang && echo "--with-toolchain-type=clang")
-	)
-
-	use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
-
-	if use javafx; then
-		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild b/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild
deleted file mode 100644
index c528b135cd20..000000000000
--- a/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-ARM64_XPAK="17.0.2_p8" # musl bootstrap install
-PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
-RISCV_XPAK="17.0.3_p7"
-X86_XPAK="17.0.1_p12"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
-	local suff="tar.xz"
-	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-	local ver="${2:?${FUNCNAME[0]}: version not specified}"
-	local cond="${3-}"
-	[[ ${cond} == elibc_musl* ]] && local musl=yes
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
-}
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-MY_PV="${PV//_p/+}"
-
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri x86 ${X86_XPAK})
-		$(bootstrap_uri riscv ${RISCV_XPAK})
-	)
-	riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-riscv.patch.xz )
-"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-17.0.3-fix-nullptr-cast.patch )
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-}
-
-src_prepare() {
-	use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	if has_version dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
-	elif use !system-bootstrap ; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	else
-		JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
-		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
-		export JDK_HOME
-	fi
-
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #713180
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--disable-precompiled-headers
-		--disable-warnings-as-errors
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype="${XPAK_BOOTSTRAP:-system}"
-		--with-giflib="${XPAK_BOOTSTRAP:-system}"
-		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-		--with-lcms="${XPAK_BOOTSTRAP:-system}"
-		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-		--with-libpng="${XPAK_BOOTSTRAP:-system}"
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--with-zlib="${XPAK_BOOTSTRAP:-system}"
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-		$(tc-is-clang && echo "--with-toolchain-type=clang")
-	)
-
-	use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
-
-	if use javafx; then
-		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-17.0.5_p8.ebuild b/dev-java/openjdk/openjdk-17.0.5_p8.ebuild
deleted file mode 100644
index 11d2c503987b..000000000000
--- a/dev-java/openjdk/openjdk-17.0.5_p8.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-ARM64_XPAK="17.0.2_p8" # musl bootstrap install
-PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
-RISCV_XPAK="17.0.3_p7"
-X86_XPAK="17.0.1_p12"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
-# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
-bootstrap_uri() {
-	local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
-	local suff="tar.xz"
-	local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
-	local ver="${2:?${FUNCNAME[0]}: version not specified}"
-	local cond="${3-}"
-	[[ ${cond} == elibc_musl* ]] && local musl=yes
-
-	# here be dragons
-	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
-}
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
-	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-	!system-bootstrap? (
-		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
-		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri x86 ${X86_XPAK})
-		$(bootstrap_uri riscv ${RISCV_XPAK})
-	)
-	riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
-"
-# riscv patch origin: https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
-
-REQUIRED_USE="
-	javafx? ( alsa !headless-awt )
-	!system-bootstrap? ( jbootstrap )
-"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/harfbuzz:=
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	media-libs/libjpeg-turbo:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT}= )
-	system-bootstrap? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-}
-
-src_prepare() {
-	use riscv && eapply "${DISTDIR}"/java17-riscv64.patch
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	if has_version dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT}
-	elif use !system-bootstrap ; then
-		local xpakvar="${ARCH^^}_XPAK"
-		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
-	else
-		JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
-		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
-		export JDK_HOME
-	fi
-
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #713180
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--disable-precompiled-headers
-		--disable-warnings-as-errors
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-freetype="${XPAK_BOOTSTRAP:-system}"
-		--with-giflib="${XPAK_BOOTSTRAP:-system}"
-		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
-		--with-lcms="${XPAK_BOOTSTRAP:-system}"
-		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
-		--with-libpng="${XPAK_BOOTSTRAP:-system}"
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PVR}"
-		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
-		--with-zlib="${XPAK_BOOTSTRAP:-system}"
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-		$(tc-is-clang && echo "--with-toolchain-type=clang")
-	)
-
-	use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
-
-	if use javafx; then
-		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	if use !system-bootstrap ; then
-		addpredict /dev/random
-		addpredict /proc/self/coredump_filter
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-17.0.6_p10.ebuild b/dev-java/openjdk/openjdk-17.0.6_p10.ebuild
index d021fc38d7a1..6eb35e1cadb9 100644
--- a/dev-java/openjdk/openjdk-17.0.6_p10.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.6_p10.ebuild
@@ -48,7 +48,8 @@ SRC_URI="
 	)
 	riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
 "
-# riscv patch origin: https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch
+# riscv patch origin:
+# https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch
 
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
diff --git a/dev-java/openjdk/openjdk-8.332_p09.ebuild b/dev-java/openjdk/openjdk-8.332_p09.ebuild
deleted file mode 100644
index e2f8f421b145..000000000000
--- a/dev-java/openjdk/openjdk-8.332_p09.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
-SLOT="${PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-		dev-java/icedtea:${SLOT}
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# new warnings in new gcc https://bugs.gentoo.org/685426
-	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-		hotspot/make/linux/makefiles/gcc.make || die
-
-	chmod +x configure || die
-}
-
-src_configure() {
-	# general build info found here:
-	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #706638
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	tc-export_build_env CC CXX PKG_CONFIG STRIP
-
-	local myconf=(
-			--disable-ccache
-			--disable-freetype-bundling
-			--disable-precompiled-headers
-			--enable-unlimited-crypto
-			--with-boot-jdk="${JDK_HOME}"
-			--with-extra-cflags="${CFLAGS}"
-			--with-extra-cxxflags="${CXXFLAGS}"
-			--with-extra-ldflags="${LDFLAGS}"
-			--with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
-			--with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
-			--with-giflib=system
-			--with-jtreg=no
-			--with-jobs=1
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="b$(ver_cut 4)"
-			--with-milestone="fcs" # magic variable that means "release version"
-			--with-vendor-name="Gentoo"
-			--with-vendor-url="https://gentoo.org"
-			--with-vendor-bug-url="https://bugs.gentoo.org"
-			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-			--with-zlib=system
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-			$(tc-is-clang && echo "--with-toolchain-type=clang")
-		)
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		CONFIG_SHELL="${BROOT}/bin/bash"
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	# build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
diff --git a/dev-java/openjdk/openjdk-8.345_p01.ebuild b/dev-java/openjdk/openjdk-8.345_p01.ebuild
deleted file mode 100644
index 0981ff23ed4e..000000000000
--- a/dev-java/openjdk/openjdk-8.345_p01.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
-SLOT="${PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-		dev-java/icedtea:${SLOT}
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# new warnings in new gcc https://bugs.gentoo.org/685426
-	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-		hotspot/make/linux/makefiles/gcc.make || die
-
-	chmod +x configure || die
-}
-
-src_configure() {
-	# general build info found here:
-	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #706638
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	tc-export_build_env CC CXX PKG_CONFIG STRIP
-
-	local myconf=(
-			--disable-ccache
-			--disable-freetype-bundling
-			--disable-precompiled-headers
-			--enable-unlimited-crypto
-			--with-boot-jdk="${JDK_HOME}"
-			--with-extra-cflags="${CFLAGS}"
-			--with-extra-cxxflags="${CXXFLAGS}"
-			--with-extra-ldflags="${LDFLAGS}"
-			--with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
-			--with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
-			--with-giflib=system
-			--with-jtreg=no
-			--with-jobs=1
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="b$(ver_cut 4)"
-			--with-milestone="fcs" # magic variable that means "release version"
-			--with-vendor-name="Gentoo"
-			--with-vendor-url="https://gentoo.org"
-			--with-vendor-bug-url="https://bugs.gentoo.org"
-			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-			--with-zlib=system
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-			$(tc-is-clang && echo "--with-toolchain-type=clang")
-		)
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		CONFIG_SHELL="${BROOT}/bin/bash"
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	# build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
diff --git a/dev-java/openjdk/openjdk-8.352_p08.ebuild b/dev-java/openjdk/openjdk-8.352_p08.ebuild
deleted file mode 100644
index 0981ff23ed4e..000000000000
--- a/dev-java/openjdk/openjdk-8.352_p08.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
-SLOT="${PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-		dev-java/icedtea:${SLOT}
-	)
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# new warnings in new gcc https://bugs.gentoo.org/685426
-	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-		hotspot/make/linux/makefiles/gcc.make || die
-
-	chmod +x configure || die
-}
-
-src_configure() {
-	# general build info found here:
-	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Work around -fno-common ( GCC10 default ), bug #706638
-	append-flags -fcommon
-
-	# Strip some flags users may set, but should not. #818502
-	filter-flags -fexceptions
-
-	tc-export_build_env CC CXX PKG_CONFIG STRIP
-
-	local myconf=(
-			--disable-ccache
-			--disable-freetype-bundling
-			--disable-precompiled-headers
-			--enable-unlimited-crypto
-			--with-boot-jdk="${JDK_HOME}"
-			--with-extra-cflags="${CFLAGS}"
-			--with-extra-cxxflags="${CXXFLAGS}"
-			--with-extra-ldflags="${LDFLAGS}"
-			--with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
-			--with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
-			--with-giflib=system
-			--with-jtreg=no
-			--with-jobs=1
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="b$(ver_cut 4)"
-			--with-milestone="fcs" # magic variable that means "release version"
-			--with-vendor-name="Gentoo"
-			--with-vendor-url="https://gentoo.org"
-			--with-vendor-bug-url="https://bugs.gentoo.org"
-			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-			--with-zlib=system
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-			$(tc-is-clang && echo "--with-toolchain-type=clang")
-		)
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		CONFIG_SHELL="${BROOT}/bin/bash"
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		NICE= # Use PORTAGE_NICENESS, don't adjust further down
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	# build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-	einfo "JavaWebStart functionality provided by icedtea-web package"
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 97c03480627e..8bc736dfc719 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 1500706d12b4..6038ec7a3420 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,5 +1,3 @@
-DIST astyle_3.0.1_linux.tar.gz 172483 BLAKE2B 4c80491cbcc976aa38ff294014df0dc01b39685eafdac6989bea082b1f61120c3985d14ff6db9f76606bbe8da1aaa344c2e0c9c2999a014f5d54384c0420cf97 SHA512 3e8d617c0ec89682bfb076081bb63ae9d44e897de0c85d5109b28adbbfe0620d5dacf59a4bd96ac30a5a4fcb3be136758e9c6fe2c69258b37956c212890a7158
 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
-EBUILD astyle-3.0.1-r1.ebuild 2387 BLAKE2B a91a68c3161f8938a3c2be1f005d03e54d10755043b6c0aa69cec1af145136ef90fa388f37acd6aa625252b55d205cb52fba1d9cee4d7452a37ae7f480d00b65 SHA512 9865738112a2ff3c012f09da2cd8b73b13a9f981d1242eeb60e14b6fa4ae783961b0807a1fb56638415b5f0cb593a306a4958dab46115924dcb1d5179b8380a1
-EBUILD astyle-3.1-r2.ebuild 2394 BLAKE2B a43d343d01a3a67181552ef4ee270567e8d56ebe28057a2e95c69f7e67364334ac4e289c48d2b9a95c80d3eeed31f098f2996a480d68f2f12232cbbab5100dda SHA512 060a9a0f576df46da55553d2cfd7c1b08bf78c870ce791a611b88c3a50f283183f688c45fcb3ce23e9062bdc143e0bf9f430d40ad64e498d0244499df66734c9
+EBUILD astyle-3.1-r2.ebuild 1891 BLAKE2B fea27eafaf14eaf1245a87a873dbfa327a23987468a291a9bf8de1af50d57f168143ae94b6dfb8dadfdf121ee3fc13f6efd90656962bd866093e27c2477544be SHA512 ecab4c77e646ee8dd2f174e50e8b5c3af9a077b1c1ddfac4ab05ec56e1b83e82ff7f8053d3f52454c282a9f545a470ba2caa2f1786956a26514b6f0adb988fe7
 MISC metadata.xml 754 BLAKE2B c034556afe246a6d75d57b2e37399bdd24a37046a1bf0181757ed449f144f099964e7cdf470502f83542707094c752de3841d92bf2844fa7ee0b6038d25494f2 SHA512 0e4087bab09255528dfce61e21b12a4a05b93d3eaf75874b2a2b12f168046c0e9e040c29321766cfd505bdc5360eb6d16d320a73b317849d19b2555a95415396
diff --git a/dev-util/astyle/astyle-3.0.1-r1.ebuild b/dev-util/astyle/astyle-3.0.1-r1.ebuild
deleted file mode 100644
index 7396f1662f61..000000000000
--- a/dev-util/astyle/astyle-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs versionator java-pkg-opt-2
-
-DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
-HOMEPAGE="http://astyle.sourceforge.net/"
-SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/3.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples java static-libs"
-
-DEPEND="app-arch/xz-utils
-	java? ( >=virtual/jdk-1.6:= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if use java ; then
-		java-pkg-opt-2_src_prepare
-		sed	-e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
-			-e "s:ar crs:$(tc-getAR) crs:" \
-			-i build/gcc/Makefile || die
-	else
-		default
-	fi
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	tc-export CXX
-	default
-}
-
-src_compile() {
-	# ../build/clang/Makefile is identical except for CXX line.
-	emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \
-		${PN} \
-		shared \
-		$(usev java) \
-		$(usex static-libs static '')
-}
-
-src_install() {
-	doheader src/${PN}.h
-
-	pushd src/bin >/dev/null || die
-	dobin ${PN}
-
-	local libastylename="lib${PN}.so.${PV}"
-	local libastylejname="lib${PN}j.so.${PV}"
-	local libdestdir="${EPREFIX}/usr/$(get_libdir)"
-
-	dolib.so "${libastylename}"
-	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)"
-	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
-	if use java ; then
-		dolib.so "${libastylejname}"
-		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)"
-		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
-	fi
-	if use static-libs ; then
-		dolib.a lib${PN}.a
-	fi
-	popd >/dev/null || die
-	if use examples ; then
-		docinto examples
-		dodoc -r file/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	local HTML_DOCS=( doc/. )
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -n "$REPLACING_VERSIONS" && "$(get_major_version $REPLACING_VERSIONS)" -lt 3 ]]; then
-		elog "Artistic Style 3.0 introduces new configuration verbiage more fitting"
-		elog "for modern use. Some options that were valid in 2.06 or older are now"
-		elog "deprecated. For more information, consult astyle's release notes at"
-		elog "http://astyle.sourceforge.net/news.html. To view offline, see:"
-		elog
-		elog "${EROOT%/}/usr/share/doc/${P}/html"
-	fi
-}
diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild
index 7f30eabb7a36..82c533c6d7d1 100644
--- a/dev-util/astyle/astyle-3.1-r2.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit flag-o-matic toolchain-funcs versionator java-pkg-opt-2
+inherit flag-o-matic toolchain-funcs java-pkg-opt-2
 
 DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code"
 HOMEPAGE="http://astyle.sourceforge.net/"
@@ -57,11 +57,11 @@ src_install() {
 	local libdestdir="/usr/$(get_libdir)"
 
 	dolib.so "${libastylename}"
-	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)"
+	dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(ver_cut 1)"
 	dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
 	if use java ; then
 		dolib.so "${libastylejname}"
-		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)"
+		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(ver_cut 1)"
 		dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
 	fi
 	if use static-libs ; then
@@ -76,14 +76,3 @@ src_install() {
 	local HTML_DOCS=( doc/. )
 	einstalldocs
 }
-
-pkg_postinst() {
-	if [[ -n "$REPLACING_VERSIONS" && "$(get_major_version $REPLACING_VERSIONS)" -lt 3 ]]; then
-		elog "Artistic Style 3.0 introduces new configuration verbiage more fitting"
-		elog "for modern use. Some options that were valid in 2.06 or older are now"
-		elog "deprecated. For more information, consult astyle's release notes at"
-		elog "http://astyle.sourceforge.net/news.html. To view offline, see:"
-		elog
-		elog "${EROOT%/}/usr/share/doc/${P}/html"
-	fi
-}
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index 33a64f95fc25..9b84ef5084f9 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,5 +1,7 @@
 DIST cloc-1.88.tar.gz 548402 BLAKE2B 0da417d907703e42c9c69e46f39792652e6eca49994a8008b0074899bfb999262d529432ab1e8a1c7cc80dc1fefc9514596f099a4238c4768618057ba3b180e8 SHA512 0acd152b387d3088d8bd35d121677d00accb03f882d83bfb34924915d40700b0c23bca1bde924d1999b5fa910503d33af230567fcc8f452f7d00a69caaaf8c4f
 DIST cloc-1.90.tar.gz 596758 BLAKE2B 273a0ade1cb5d95fda3404b46869fa970276aae0f4f733efafad7949170e63713059e1a09dffae23a3469517bcce1ab6029b4a91b1900ddc7aa4dd5ec0ab2127 SHA512 d2950d56ac4d8a6fe53059759375d8245aa8a8474462daec385a8b4e2f36961270c08390c361d4a0566e529357b0d302cef31c8fc69dc680655f4c3ea3a1d813
+DIST cloc-1.96.tar.gz 646774 BLAKE2B b632d07e1f3b89b210feee80d861e840f16b66899182c1787212b0aebadb9fa6a7ab33935e3df9f9727ac3a696b776f877f5ab858d506c6917babaa3203ff9fc SHA512 459633ec1b0cf9b17ee7a502d0573b6c35ba76518a9d94f9c4e4f99d85873c8934782ac0cffa8616848378e500bc6dfa74b278cf771a7542cedb505f69471708
 EBUILD cloc-1.88.ebuild 688 BLAKE2B 4d4301e39c40b0a6113f2ada061eb65864c69b0e11d514e4d60bfb992da9d850ed9e0f470ba4c9523aac6c2bb16c4db34a14c54b0716bcaa0254a513fe6b140d SHA512 ed2bc861df08dd911e5ec06bdf7fa76dd76b7fea2b0906d6bdf5982ef259ccb6b6e59e1f402af48eb111663ec2d6117cb9a4eac191e65b177c14198cc6cdf754
 EBUILD cloc-1.90.ebuild 706 BLAKE2B 0b1ee3f9dcf498ea639451953bf6ac5aecb8dbe069e9f3956f41e9006084bfbb098d00f0036a5d08294caa78fbe07ce19be5ba2e05305f36d6a28e3aa5efa421 SHA512 063f6649bf507ba5d9b47ec08af5ffb91bdd6d6e44814ed54e6091ad63e3696e11d5efd32faefbe1d234e1ef7e78e111d45e2f6e0aaa486c0c08f9954a64c953
+EBUILD cloc-1.96.ebuild 708 BLAKE2B ab1ee92e8ceb7563a62e45e2ecfdb43593f43f55340d8b20d88612d089cdb944466031a22ebcdfd9aa1b74deb78d33a5e9a9b4cd38110cc154fa5f5f148ac5b6 SHA512 e33fb560d3ff5ea4b86a326d63b57aa5ed72faccff23759960c81f090e257325ef24965d0fcd90591daf50d2093fd67c29713955ff505b0e1b86460f63788a5e
 MISC metadata.xml 730 BLAKE2B 55d88ba6367e16aed1fbe5877a777bf1fb09793c040d8b317e8b09d73419fd61ee66d800835e518c09ed3470b6ea034cfb572335a8d312583e8172f36a74b11d SHA512 f7b98f9dc54bcb268fc51151fce719e2c89d1d251c4a9cbe3632faccfd68e5fd5705d7a8ae985e3599241bd72784103b382b53e7ef6a615d7c5637bbdebe14d4
diff --git a/dev-util/cloc/cloc-1.96.ebuild b/dev-util/cloc/cloc-1.96.ebuild
new file mode 100644
index 000000000000..7918ec1d987b
--- /dev/null
+++ b/dev-util/cloc/cloc-1.96.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Count Lines of Code"
+HOMEPAGE="https://github.com/AlDanial/cloc"
+SRC_URI="https://github.com/AlDanial/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/Algorithm-Diff
+	dev-perl/Parallel-ForkManager
+	dev-perl/Regexp-Common
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long"
+
+src_compile() {
+	pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
+}
+
+src_install() {
+	doman "${PN}.1"
+	dobin "Unix/${PN}"
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 181fb038798f..be96bda5fca6 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,8 +1,8 @@
 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
-DIST pkgconf-1.9.3.tar.xz 308612 BLAKE2B 90d48171e24235906c41e97f7a2fa53825724c7500e90e502e5e2e4d668d3be863119e39b83a8e02adcef83a7def42e1c5e3641e77f6194bd81f653776bc95b4 SHA512 f65583f78571e4da161201d6387091562b38893adc31df421b0e6d560a060deb306a0b7ad8b28266253244c935d0a8169f35e04825a7857f21a09527d36f921e
+DIST pkgconf-1.8.1.tar.xz 302372 BLAKE2B 591961f0b1fd185834fd8e2a672199cffc035139599817b1d56d571300d2aa800a719c9477aac4023dfade597ad3cc3b45360babe57498977568ee57077c7bbe SHA512 7a7d5204c1c9bfb6578bda56f299d1fa0300e69a133a65730b10ad77aefbf26fceb74ae77cecda326b3ed5db5736f27fcce94764b3a56d40f4bb99fecdc80bba
 DIST pkgconf-1.9.4.tar.xz 309164 BLAKE2B f0a99f9c7aaf571b14aa24b6dae441fb041d794294e560601232c03254e521a49a5724e41c5ada537f7933bb4831b63482896c8569a9502c8c5d841190e1d091 SHA512 079436244f3942161f91c961c96d382a85082079c9843fec5ddd7fb245ba7500a9f7a201b5ef2c70a7a079fe1aacf3a52b73de5402a6f061df87bcdcf0a90755
 EBUILD pkgconf-1.8.0-r1.ebuild 1628 BLAKE2B a331c5e6da602547564a077f346d24cd8ec374d61806a2504203bbf0ef2409850556a641294678142a6da04692e395e73020404b1c556c3e275c7c1278fd3cd6 SHA512 fbd538560cfc2a4440519d89abe3dac785145f468bd9f8d1def6e7a7838e30c2af1da36032736d4c035f5b28a4e9c50618642f2ad50ba3c4d55051978590e983
-EBUILD pkgconf-1.9.3.ebuild 1621 BLAKE2B 0053a74d4104c9913bed7cf8bebe00d31635c7fd1cf5fa5f12cfe03dd97bf67b169a8ce1b37b313fb01d1c87bda58be0e165f1b23caebc38477c96f0e654649e SHA512 d22ccb7de7591d90e1ac82b5673df9be62e94d3f4079a01957ddc242231e4973740a57bcb3f5ccb9608d59a0f25b629874268974ca2407853d8c94350fe8f8c3
+EBUILD pkgconf-1.8.1.ebuild 1617 BLAKE2B 9ebcbe85582ab382a61c7bdb692ffe865d16bd8c0c0360af184ef35823dd646846b1e49174eee2ce00826a1366e227c6846466eb140861c19788f8b545154ee1 SHA512 7b0ec467a6a5354514e0732ae19d4e90d6ff902f4a64c7560e38912aed1f233c3f66a78320fdbdbbc374bbdf18852504f3ee758bc8e97f4366a6ec7fff7d8b23
 EBUILD pkgconf-1.9.4.ebuild 1621 BLAKE2B da3f310e7f3aba9be5e6b001a4137356f2baebe91c7e0a484a26f89f3f4ee5d069baf6ec09e9269bfd6d7da7acc85994925e8f83d2ff8a50f42ccfeac46ad29d SHA512 9b98f592d34118a9dc6878bc00f4e52af17735658791c593c3bd9f744a0648c0f94df3f59808ab8f81eae61b57a4c7bda20221a9099c42ffa93c349f66c946ad
 EBUILD pkgconf-9999.ebuild 1621 BLAKE2B 0053a74d4104c9913bed7cf8bebe00d31635c7fd1cf5fa5f12cfe03dd97bf67b169a8ce1b37b313fb01d1c87bda58be0e165f1b23caebc38477c96f0e654649e SHA512 d22ccb7de7591d90e1ac82b5673df9be62e94d3f4079a01957ddc242231e4973740a57bcb3f5ccb9608d59a0f25b629874268974ca2407853d8c94350fe8f8c3
 MISC metadata.xml 482 BLAKE2B 3bf8c3349711340133d9e7d81ca94172ce16e607b4fe9135cb7145d0214c0e9753bc884d248d89e2f5d2ab83368b07a95713b2b2a26ad5aaaffe10086a70a9b7 SHA512 6c372c1bc8e8794015838ad7646a503dd19f06890c8a425ce1ed12f3e5211ff01b1c8cc7ee1685b7ffe10c3b1fb89b81a80152f114be72861c27e5bcc6f17653
diff --git a/dev-util/pkgconf/pkgconf-1.9.3.ebuild b/dev-util/pkgconf/pkgconf-1.8.1.ebuild
index e962927aff1a..311850a40d1d 100644
--- a/dev-util/pkgconf/pkgconf-1.9.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.1.ebuild
@@ -1,26 +1,26 @@
-# Copyright 2012-2022 Gentoo Authors
+# Copyright 2012-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit multilib multilib-minimal
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	# Per release notes, 1.9.x is a testing/development release.
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
 HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
 
 LICENSE="ISC"
-SLOT="0/4"
+SLOT="0/3"
 IUSE="test"
 
+# tests require 'kyua'
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -29,26 +29,30 @@ BDEPEND="
 		dev-util/kyua
 	)
 "
-RDEPEND="!dev-util/pkgconfig"
+RDEPEND="
+	!dev-util/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf$(get_exeext)
+)
 
 src_prepare() {
 	default
 
-	[[ ${PV} == 9999 ]] && eautoreconf
-
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/pkgconf
+	[[ ${PV} == "9999" ]] && eautoreconf
+	MULTILIB_CHOST_TOOLS+=(
 		/usr/bin/pkg-config$(get_exeext)
 	)
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
+	local ECONF_SOURCE="${S}"
+	local args=(
 		--with-system-includedir="${EPREFIX}/usr/include"
 		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
 	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	econf "${args[@]}"
 }
 
 multilib_src_test() {
@@ -65,6 +69,5 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-
 	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 3db1d25029fb..b56e844f63f2 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,16 +1,9 @@
-AUX radare2-5.7.0-vector35.patch 907 BLAKE2B f8bf7cd898a5bda19a50f8966b765bfe3d3b8bb39c9d7132fbe21e5c877400279ee7e79b4b0b367c46c05911cea401e7f2bcc1859ec7128321d7d6842a30ac78 SHA512 f6e2b1f5aa3fc33c09f273ecfc52dff7f9f4c1cf860e83f1928559a6555d0552b3b35aa02e7d1ebddd8c7d31757353779866581564bb8dd48b0dfb8da8beb154
-DIST radare2-5.7.4-vector35-arm64.tar.gz 1050970 BLAKE2B 17b9f730b514d959640bd259af9ebdb44b951eb839dc62160da167f2ea3906a60b10e20ff32561cc9b625dfffd1a83d25f484c91e1976d61a18dd04b9bed9862 SHA512 bee2f8685dc3760fd51eaa2ab9c68aed2833386145fe164ca6dfc4a5aab20596d1c6305167da2c7410c25be1391853f82fddc1cfa2bfa8e473d7f52129c44a3b
-DIST radare2-5.7.4-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
-DIST radare2-5.7.4.tar.gz 9814654 BLAKE2B ae8ed1d7b417236c27ee4857f7c33d657d379b46119391037bdb82ddb5b36ab89088c1c0d958757b7cb7fe87a70dd1b288e082af802c818d83d159e7a8460a8a SHA512 e3fc159f2c009ef98c14930086a34cbbb848f779b37206332ee713daa25d803911652d9f1c28b4f23eca02ac103efe9bca4dea65758f1a2077b1eb1279fc1212
-DIST radare2-5.7.6-vector35-arm64.tar.gz 1050960 BLAKE2B 12faa86a4cdfd9cdc8e307c16d8f797ae3ee800b72e76c6ace84cb7cb5108198dbfbc9a00df6b70448628dc869c94bf8cf9794460d05be99e5a08ee5a3ed40de SHA512 478f06c3fe09232152bbb63e500a440ca8546cc11fe59f9d489a25d327469b1869fe80b4e2e2cfad8a2b96261857cf74b6708628ac30ec8dabc5da05d04c1cfd
-DIST radare2-5.7.6-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
-DIST radare2-5.7.6.tar.gz 10071795 BLAKE2B e0bd54fcf4a56b34ec6f3b87ab6a20a8be23514e48842d66d7a30f517fa9ba871bd1e740604840fb16a3ae1329221ee67645774ac7df9f8f8d00dc3548dc7830 SHA512 04717ddb4bef9ed415c22aa25a0bf626f05c5d32133ac46d5e8a30ebe83e7b782a2b1835233f17f16315a99a39b33dd4e67c34798eb8ae9fbc6db51ca1051e94
-DIST radare2-5.7.8-vector35-arm64.tar.gz 1050960 BLAKE2B 12faa86a4cdfd9cdc8e307c16d8f797ae3ee800b72e76c6ace84cb7cb5108198dbfbc9a00df6b70448628dc869c94bf8cf9794460d05be99e5a08ee5a3ed40de SHA512 478f06c3fe09232152bbb63e500a440ca8546cc11fe59f9d489a25d327469b1869fe80b4e2e2cfad8a2b96261857cf74b6708628ac30ec8dabc5da05d04c1cfd
-DIST radare2-5.7.8-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff
-DIST radare2-5.7.8.tar.gz 10324020 BLAKE2B 628b0c146a8e797f34f43f8d76166fb8c5e945a45232c2e4d63b2c2ce89aef96a20349c519ceb62921bad75ce5faaa8ea51ab1dac79156e00eef8f9ef06f5a45 SHA512 7c819a052f5e4b3da72b945915fca92a747c52dc2e2fa8483a8c2d8e71479ce374efbbe2bc02b1b4af26db6a891b6e44cdbb9e062de2f13b22a258cceab561f6
-DIST radare2-testbins-2fdb78f7f754b3aea90377588d45b774ccb41086.tar.gz 120580683 BLAKE2B ba16206f3c44f43c36fbc3079e43d29cd5b6266f8bd31602d7ec218a2b14601173c9022be9329975bd28de948933deeecc052f56c2acd9d6dfeb5576049ec32f SHA512 2c66c8f68df7c51a52a73b33e854b095a4f5435c60eab2a1456f366376aac0f7c39836699e09eae2918f31e75b7c6562994f0916f45de53ae6a480506da95dcb
-DIST radare2-testbins-602471f72caa60d6ece43c3fa483c43decf7052c.tar.gz 124090448 BLAKE2B 446f4b730095dc263f31bbd886b350fbf3cbde0cd3bc6f5ed0c5d65a90a66b4d97a7397798c0f6fb7596722d827a3805c6d4d810d06837cf46e8798cedb1fea4 SHA512 b490ec951813827bed940ca4fc772691f8e446ce14cf2f0cc7fe2027a481c91939e6212ce94237f71091c18ac8428c9a4a4f35fc58f41ba076c1da75835d0ff4
-EBUILD radare2-5.7.4.ebuild 3228 BLAKE2B 651cd352b8b8c2507f2c1952c98af40cf83affb0ecdf8e1aad7b333f6603bffbfdff0e45f94f9cc8002ae2f589696646d19450b62d10181e747e384c4944ba4c SHA512 d2541eb73826e730996ad80b5f151d03055174c53fe770a6df8e7680c672cb5f80463b6a81d918fe804fe680fe6285a4cdec5f030e3fff61875565304a18f7a5
-EBUILD radare2-5.7.6.ebuild 3228 BLAKE2B d89e881b5039acb23dbb049e225b1d7806238bf73be045f30a9e799fba02899fedae5321904a71a96c7938f7cca2da3d9899888483628ac4dcf3b9a0a207f1b6 SHA512 9432d5208c70523295808f26102c9a79aab2d779b2b3fc91a770c6d80104d7857e0a8093974f27c97c99a56c4e07bbebc0390d0181ee16e523ce8847159e839e
-EBUILD radare2-5.7.8.ebuild 3228 BLAKE2B d89e881b5039acb23dbb049e225b1d7806238bf73be045f30a9e799fba02899fedae5321904a71a96c7938f7cca2da3d9899888483628ac4dcf3b9a0a207f1b6 SHA512 9432d5208c70523295808f26102c9a79aab2d779b2b3fc91a770c6d80104d7857e0a8093974f27c97c99a56c4e07bbebc0390d0181ee16e523ce8847159e839e
-MISC metadata.xml 397 BLAKE2B 0da99624e778e490f84d0187d28a27b7f73a3c780fc3151619ef3196ca5c01b3758f0e07b6412b9c4f9fddb8738d5005b412d9bce6456b107e24931ba0ea5052 SHA512 02227b3d952b7dadc9f893246b7913cc7910b440ca6c54e7e0f9efcba95db711f691811a767ca1d81fba3e5c073c56b6154361df4beef7fc621fa8176fc05d47
+AUX radare2-5.8.2-bundled-capstone.patch 562 BLAKE2B 9ec99a25383f17615ba548d67516179dd4f860dad5e1f68674f0e3ac80df9d3edab6f0b6e3911758bf6010bd7be1628d7d4f88b68161739088662007543ea782 SHA512 44972fd7d337c14169a123fcb6e5e27ea71abac84c1cdd654a81fc9c8e6112c6cad596b529b20ce1c85245e1726149dd5e2103c30ca0b7f16faff3ccade838c2
+AUX radare2-5.8.2-vector35.patch 882 BLAKE2B 6453cdeec6e5656ff86af84f0876fd7543896ac289810e1783cc66eecea0e86513ef6374a93109845b6a78d211fff4b82c87e6a66f21b349291ed54f99a36642 SHA512 b9fb378d1817bba06945802d2b1e243c3df493f688d5e1b294acf410666e6e3946cc2438ffb9ef0d60485e4c76995d832ff02c12e6c2ca486a6ead68e23b5c57
+DIST radare2-5.8.2-capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
+DIST radare2-5.8.2-vector35-arm64.tar.gz 1021315 BLAKE2B 8741de83cddda878536627c0ff6be1f7d4842cf0fefeae2895fe751e39768134f6048167d5aa265169bc22b229a8b66ce37f4ef4df3abc2b3e304dc1f1fe17d1 SHA512 9b0fcf9119304e90b3fbed5e0509a819a0a561953681f5e5f408b55db3b0c962dca59c48553cffef21a56772db7871a3987f0f7c07b5538fd4b7d1af005ccdb0
+DIST radare2-5.8.2-vector35-armv7.tar.gz 255278 BLAKE2B 8b5191c48fad2e7602dc2f7053f9c9ea8cca8e9bc5d68a0cdb7ccff9ecc65c5d1ff6a434e28488dbd6fb71fc7482fce08a0a69c358e5c3d6c017ac1e4cee3b21 SHA512 40c048b29856f48300d4539bc7bda38e6ceae1e8d4d9d131c4a7546b6e26b2fb96309c483b67e2c2290b06cea5fc52a7beb30557d54e89296e7734cc1ab06d10
+DIST radare2-5.8.2.tar.gz 11017554 BLAKE2B 712941ac5871f2201ba806dc7b68ae1825c8dbe896b11aaa6b086651ff28a6d3b7e54b55621e7cc143748d7760ea7007f4dc70232ef16dfe5523a0ab87f0f266 SHA512 3c09d89172ac9a5cee6e52294f10b144237acb31b3d470521a7c8650511a58d1732c73004f2dbb1e6e3c43829e3e310b89d6a8abd5f1fb4fdfd3fea8779a72ec
+DIST radare2-testbins-1f0ea409f2af83fc4d0b685855de9d3b0f9eee41.tar.gz 125596301 BLAKE2B 55b876b09150e780359e753d26143640d410c1c15ace2e29bc06d2163657af2089c5044847f107e20256875c7ea5e7cc72460010df0c662c9da933a0388a3f0e SHA512 44662f0217871a51b856f66e876eb57b2006f6350e6bcfae6629b800197b6f30196caf2474d52881a398fd1d65c68364d870b7de692c9e9a2bd1fab493afe3d0
+EBUILD radare2-5.8.2.ebuild 3486 BLAKE2B 04134fc1770b67190e8448072272bc8f8c056c25ad902db6db8b722c55653fe1077ab41429660d232faa2ae613978e7955fd9c1c48b71756ccda1dbce7c51362 SHA512 4bc612ec51d5bc44df73bd0f7f663781b3bfbca3beeadeb8fab389a50d6fc83f168ebcc1e7fbe0948aaab4b481363fb048f75ee7292fab8b7afe4c43eaf65b7c
+MISC metadata.xml 479 BLAKE2B 57c303d3344fd8a086d7c41ca92ca18d7291c77abbfc8eab6f9f3f1ff11481235aae3b04cc613e3ad28202ad972e9e24e5516a3a1d805341da2dd0ad74efb77b SHA512 e798ed2144748ea2784f7cd89da1a81c59d44bf77f67738de8bc11c797d50ea3c5e45a8cee7801c06c3fff4c634f400e28ef46c0d9bd1063ecc3066ba1b1809e
diff --git a/dev-util/radare2/files/radare2-5.7.0-vector35.patch b/dev-util/radare2/files/radare2-5.7.0-vector35.patch
deleted file mode 100644
index c358d94ff427..000000000000
--- a/dev-util/radare2/files/radare2-5.7.0-vector35.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/libr/asm/arch/arm/v35arm64/Makefile b/libr/asm/arch/arm/v35arm64/Makefile
-index afc4322b83..fe77126a08 100644
---- a/libr/asm/arch/arm/v35arm64/Makefile
-+++ b/libr/asm/arch/arm/v35arm64/Makefile
-@@ -31,7 +31,7 @@ $(ALIBS): arch-arm64 arch-armv7
- ## ARM64
- arch-arm64:
- 	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
--	cd arch-arm64 && git checkout -q radare2-wip > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
-+	cd arch-arm64
- 
- $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- 	rm -f arm64dis.$(EXT_AR)
-@@ -41,7 +41,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- ## ARMV7
- arch-armv7:
- 	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
--	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
-+	cd arch-armv7	
- 
- $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
- 	rm -f armv7dis.$(EXT_AR)
diff --git a/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch b/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch
new file mode 100644
index 000000000000..31de9b72bb37
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch
@@ -0,0 +1,21 @@
+Need to unbundle capstone due to broken capstone-5 compatibility:
+
+https://github.com/radareorg/radare2/issues/21204
+https://bugs.gentoo.org/891805
+
+diff --git a/shlr/Makefile b/shlr/Makefile
+index 5626a061ff..5e8af3b99b 100644
+--- a/shlr/Makefile
++++ b/shlr/Makefile
+@@ -225,10 +225,7 @@ capstone-sync: capstone
+ capstone-clean:
+ 	-$(MAKE) -C capstone clean
+ 
+-capstone: capstone-$(CS_VER).tar.gz
+-	tar xzvf capstone-$(CS_VER).tar.gz
+-	rm -rf capstone
+-	mv capstone-$(CS_VER) capstone
++capstone:
+ 	$(MAKE) patch-capstone
+ 
+ # already implemented in capstone.sh
diff --git a/dev-util/radare2/files/radare2-5.8.2-vector35.patch b/dev-util/radare2/files/radare2-5.8.2-vector35.patch
new file mode 100644
index 000000000000..6b67f39b40c4
--- /dev/null
+++ b/dev-util/radare2/files/radare2-5.8.2-vector35.patch
@@ -0,0 +1,24 @@
+diff --git a/libr/arch/p/arm/v35/Makefile b/libr/arch/p/arm/v35/Makefile
+index a7a40ddb97..1ef40746ac 100644
+--- a/libr/arch/p/arm/v35/Makefile
++++ b/libr/arch/p/arm/v35/Makefile
+@@ -30,8 +30,7 @@ $(ALIBS): arch-arm64 arch-armv7
+ 
+ ## ARM64
+ arch-arm64:
+-	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
+-	cd arch-arm64 && git checkout -q radare2-wip > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
++	cd arch-arm64
+ 
+ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ 	rm -f arm64dis.$(EXT_AR)
+@@ -40,8 +39,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
+ 
+ ## ARMV7
+ arch-armv7:
+-	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
+-	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
++	cd arch-armv7
+ 
+ $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
+ 	rm -f armv7dis.$(EXT_AR)
diff --git a/dev-util/radare2/metadata.xml b/dev-util/radare2/metadata.xml
index 0ba1db190ab2..0ed6c8845228 100644
--- a/dev-util/radare2/metadata.xml
+++ b/dev-util/radare2/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">radareorg/radare2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/radare2/radare2-5.7.4.ebuild b/dev-util/radare2/radare2-5.7.4.ebuild
deleted file mode 100644
index 26de380f0f15..000000000000
--- a/dev-util/radare2/radare2-5.7.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="https://www.radare.org"
-
-ARM64_COMMIT=fddb6d0fb0489c4e797a61b1553ac0d771fbf657
-ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
-BINS_COMMIT=2fdb78f7f754b3aea90377588d45b774ccb41086
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
-		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
-	"
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="fetch !test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib
-	dev-libs/capstone:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-5.7.0-vector35.patch" )
-
-src_prepare() {
-	default
-
-	# Hack for vector35 arm plugins
-	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
-	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
-
-	if use test; then
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
-	fi
-
-	# Fix hardcoded docdir for fortunes
-	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
-}
-
-src_configure() {
-	# Ideally these should be set by ./configure
-	tc-export CC AR LD OBJCOPY RANLIB
-	export HOST_CC=${CC}
-
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		--with-sysmagic \
-		--with-sysxxhash \
-		--with-syszip \
-		$(use_with ssl openssl)
-}
-
-src_test() {
-	ln -fs "${S}/binr/radare2/radare2" "${S}/binr/radare2/r2" || die
-	LDFLAGS=""
-	for i in "${S}"/libr/*; do
-		if [[ -d ${i} ]]; then
-			LDFLAGS+="-R${i} -L${i} "
-			LD_LIBRARY_PATH+=":${i}"
-		fi
-	done
-	export LDFLAGS LD_LIBRARY_PATH
-	export PKG_CONFIG_PATH="${S}/pkgcfg"
-	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit_tests || die
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d ${d} ]]; then
-			rm -rfv "${d}" || die "failed to delete '${d}'"
-		fi
-	done
-
-	# These are not really docs. radare assumes
-	# uncompressed files: bug #761250
-	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
-
-	# Create plugins directory although it's currently unsupported by radare2
-	keepdir "/usr/$(get_libdir)/radare2/${PV}" || die
-}
diff --git a/dev-util/radare2/radare2-5.7.8.ebuild b/dev-util/radare2/radare2-5.7.8.ebuild
deleted file mode 100644
index 8d4bfd6a4e75..000000000000
--- a/dev-util/radare2/radare2-5.7.8.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="https://www.radare.org"
-
-ARM64_COMMIT=9ab2b0bedde459dc86e079718333de4a63bbbacb
-ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
-BINS_COMMIT=602471f72caa60d6ece43c3fa483c43decf7052c
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
-		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
-		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
-	"
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl test"
-
-# Need to audit licenses of the binaries used for testing
-RESTRICT="fetch !test? ( test )"
-
-RDEPEND="
-	dev-libs/libzip:=
-	dev-libs/xxhash
-	sys-apps/file
-	sys-libs/zlib
-	dev-libs/capstone:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gperf
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-5.7.0-vector35.patch" )
-
-src_prepare() {
-	default
-
-	# Hack for vector35 arm plugins
-	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
-	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
-
-	if use test; then
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}" || die
-	fi
-
-	# Fix hardcoded docdir for fortunes
-	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
-}
-
-src_configure() {
-	# Ideally these should be set by ./configure
-	tc-export CC AR LD OBJCOPY RANLIB
-	export HOST_CC=${CC}
-
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		--with-sysmagic \
-		--with-sysxxhash \
-		--with-syszip \
-		$(use_with ssl openssl)
-}
-
-src_test() {
-	ln -fs "${S}/binr/radare2/radare2" "${S}/binr/radare2/r2" || die
-	LDFLAGS=""
-	for i in "${S}"/libr/*; do
-		if [[ -d ${i} ]]; then
-			LDFLAGS+="-R${i} -L${i} "
-			LD_LIBRARY_PATH+=":${i}"
-		fi
-	done
-	export LDFLAGS LD_LIBRARY_PATH
-	export PKG_CONFIG_PATH="${S}/pkgcfg"
-	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit_tests || die
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d ${d} ]]; then
-			rm -rfv "${d}" || die "failed to delete '${d}'"
-		fi
-	done
-
-	# These are not really docs. radare assumes
-	# uncompressed files: bug #761250
-	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
-
-	# Create plugins directory although it's currently unsupported by radare2
-	keepdir "/usr/$(get_libdir)/radare2/${PV}" || die
-}
diff --git a/dev-util/radare2/radare2-5.7.6.ebuild b/dev-util/radare2/radare2-5.8.2.ebuild
index 8d4bfd6a4e75..e54517f249a2 100644
--- a/dev-util/radare2/radare2-5.7.6.ebuild
+++ b/dev-util/radare2/radare2-5.8.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
@@ -8,9 +8,10 @@ inherit bash-completion-r1 toolchain-funcs
 DESCRIPTION="unix-like reverse engineering framework and commandline tools"
 HOMEPAGE="https://www.radare.org"
 
-ARM64_COMMIT=9ab2b0bedde459dc86e079718333de4a63bbbacb
-ARMV7_COMMIT=dde39f69ffea19fc37e681874b12cb4707bc4f30
-BINS_COMMIT=602471f72caa60d6ece43c3fa483c43decf7052c
+ARM64_COMMIT=c9e7242972837ac11fc94db05fabcb801a8269c9
+ARMV7_COMMIT=f270a6cc99644cb8e76055b6fa632b25abd26024
+BINS_COMMIT=1f0ea409f2af83fc4d0b685855de9d3b0f9eee41
+CAPSTONE_VER=4.0.2
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -19,6 +20,7 @@ else
 	SRC_URI="mirror+https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz
 		mirror+https://github.com/radareorg/vector35-arch-arm64/archive/${ARM64_COMMIT}.tar.gz -> ${P}-vector35-arm64.tar.gz
 		mirror+https://github.com/radareorg/vector35-arch-armv7/archive/${ARMV7_COMMIT}.tar.gz -> ${P}-vector35-armv7.tar.gz
+		mirror+https://codeload.github.com/capstone-engine/capstone/tar.gz/${CAPSTONE_VER} -> ${P}-capstone-${CAPSTONE_VER}.tar.gz
 		test? ( https://github.com/radareorg/radare2-testbins/archive/${BINS_COMMIT}.tar.gz -> radare2-testbins-${BINS_COMMIT}.tar.gz )
 	"
 
@@ -37,7 +39,6 @@ RDEPEND="
 	dev-libs/xxhash
 	sys-apps/file
 	sys-libs/zlib
-	dev-libs/capstone:0=
 	ssl? ( dev-libs/openssl:0= )
 "
 DEPEND="
@@ -46,14 +47,20 @@ DEPEND="
 "
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${PN}-5.7.0-vector35.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.8.2-vector35.patch"
+	# Maybe temporary, https://bugs.gentoo.org/891805
+	"${FILESDIR}/${PN}-5.8.2-bundled-capstone.patch"
+)
 
 src_prepare() {
 	default
 
+	mv "${WORKDIR}/capstone-${CAPSTONE_VER}" shlr/capstone || die
+
 	# Hack for vector35 arm plugins
-	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/asm/arch/arm/v35arm64/arch-arm64 || die
-	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/asm/arch/arm/v35arm64/arch-armv7 || die
+	mv "${WORKDIR}/vector35-arch-arm64-${ARM64_COMMIT}" libr/arch/p/arm/v35/arch-arm64 || die
+	mv "${WORKDIR}/vector35-arch-armv7-${ARMV7_COMMIT}" libr/arch/p/arm/v35/arch-armv7 || die
 
 	if use test; then
 		cp -r "${WORKDIR}/radare2-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
@@ -62,7 +69,7 @@ src_prepare() {
 
 	# Fix hardcoded docdir for fortunes
 	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
-		libr/include/r_userconf.h.acr
+		libr/include/r_userconf.h.acr || die
 }
 
 src_configure() {
@@ -72,7 +79,6 @@ src_configure() {
 
 	econf \
 		--without-libuv \
-		--with-syscapstone \
 		--with-sysmagic \
 		--with-sysxxhash \
 		--with-syszip \
@@ -90,7 +96,7 @@ src_test() {
 	done
 	export LDFLAGS LD_LIBRARY_PATH
 	export PKG_CONFIG_PATH="${S}/pkgcfg"
-	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit_tests || die
+	PATH="${S}/binr/radare2:${PATH}" emake -C test -k unit-tests || die
 }
 
 src_install() {
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 3802d16675be..8969539766ac 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,14 +1,14 @@
 AUX musl.supp 758 BLAKE2B 168ff4f38cc6b3c11e949fbc6d7c1e024259d2c02ae1424123b1f99d77c123994270ab56067ac6f1923c0dc1e8b29336a2f9fa7a9010f99e5731f6a7be5bb7d1 SHA512 55f57c84241ad32443095e7cd74607ec8ebd1dd1e67de3ab2b87e996e416980484cc9b9ef13e54bb0c0584d2ffbbd4ae9389cf1215b9c8751dcb77d2816e49f0
-AUX valgrind-3.13.0-malloc.patch 1086 BLAKE2B 004bb1c56f4e8b73838c62563503a3a550d8ced9fda8114d3dd02dc3013171de8116f1510561010256c1855e5ff3e62dd1921f82cfcb14ae78cb566d43423d60 SHA512 15b4d485bbb1fadfaea0ddc0e10874f09438ec4085bf70c2209c0854eaa9bd587f96bc0cf1c367a07fb09acb9dee17b5756a41237d04ceaa573bba0bda0ec523
+AUX valgrind-3.13.0-malloc.patch 1024 BLAKE2B 3917fe49e5b7f8f678801edd3236b76fbc3eaf790bc19db7a1055cd949df802fc7612b8ec8fb40371814790d24f15fc2cdfd5349297ed5b48e28d3224bb2d170 SHA512 57086a768f3876b26b0e507bc159a73f0955f03d5af8cc30e21103e348ca67f2e58b5555a5a97f299751c6602692ad43d8346bb68a80917d740fb4d65bba9665
 AUX valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch 650 BLAKE2B ffb545d6af214a5bd43ff800d52e0d7cfc03feac8d2466da8d4935db659172cd50cf3e2d63b3aff46d81b21846b304671506cd235b710037218fc16e0ef66438 SHA512 7cb5a46c2d8ed4360053289994014b334e32d48b0608ed58662486bd432c31835ef16e2cdfd734f3e4d720e272d2507ec76f0b77e1364237e9f6dbbd97a8abb6
 AUX valgrind-3.19.0-clang-15.patch 1263 BLAKE2B 0b1734061165735c0eba127d46250bca3bffc4a5c884c4ced121172561e36c7bebc9e138ef6e0ee519de5fb3dac37050540fdf576da5e7690e47a8ecac6a6f32 SHA512 d7af318c02815f705cf307ab673622de7c1b9afa4cc9fdbedfe6b06a98ac7798e1d19ee5836826f0d45c331a2ec2518c5515f7d908b6b8f22d3e4753b176d977
+AUX valgrind-3.20.0-musl-interpose.patch 904 BLAKE2B c2f3e1942bf1a713c993d63ee7e69506feed7dd0c34b906b3b65fa065ea9fff081c49b8ed4341f3f48350b22235bbc0896ebf099a5ea211fe9d502efe899851e SHA512 74a2f29a68ff5d7c10d829469302946982c2ff558f5a9b08d0f6e74a5e73a713461838469efc11b5bf93212d67f9e2922aed3c6f7d772bb037eeb461f2cc6729
 AUX valgrind-3.20.0-tests-clang16.patch 715 BLAKE2B d81ca99227e8175d9ab4ad5e6c706e5033d25527ac9ff7fe784cfded3dd42783c0c27dfa7c97908cb50ce24d2b6ceecaa220e79fc6d77ac9e322ebf86ff2fd5a SHA512 e3d79c67d1589c6fdb26018b146ddf896aa19e5b45ce15ae6d6ef449c72c0ba151c2903e6600ae33a7f76205562f094fbe5d4ed3370ded87d2216d25b5b62b23
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
-DIST valgrind-3.18.1.tar.bz2 16149159 BLAKE2B a98322e4c12ae1bc495659217bd398b85e459288e775ba5f543b9ce1faa5bdfc17791178c0e7b9703a31588cc4c7cbde814b7a43b2ec76e7362e2aeeb100d935 SHA512 a03b5cd7eafab4a1cea07f46464c1546ae1cb3d106649626b1e55658badf90e58d1f3854a38a33d5dffd8237f5555ae7e1f27a4b40e06254f87825c7fc61b59b
 DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a33a083505b42adaa94ee3af659cbe073e516bc98163ef56233e6cd9de2125839b71ee443fbc0db6557dcb35a6c05280 SHA512 f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2
 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
-EBUILD valgrind-3.18.1.ebuild 3703 BLAKE2B 8cebf6e55574abde88bb9cb173c35ccb283b1b7c4d62664d26137478f5174b6ca7c366100e09540357caa27d4a221d8e3b5225aaa019fd6b1c7cfe6928932569 SHA512 eba7ba77309a201722ccb4b1e30e1ab7f41a3b90344e4003c64e34cc3e7d71adcba2efe829b31622e9fc2258a49ecda0e84a1b48bd245e8b795518b31d868cac
-EBUILD valgrind-3.19.0.ebuild 3959 BLAKE2B a4599eeb28141def0b522a3e23abe83db44ec8ea47e1438ea2e10abb9bf49fc643e2c1fc7d8cab414ae4108479041575c30c8b204ae296f22b1076fea013db53 SHA512 ae7bc5cdb6f2fc9a882508ea7d7e5407851354fb34a4e8f1dbe5e48814e0d30426c2ab9089217ce4ab57716b4bee42fa54d24e70fe90d8316f956ddc261cf432
-EBUILD valgrind-3.20.0.ebuild 3957 BLAKE2B 5355dd10f03e926d4932e2fc5ace4f429be2e51e48d6a12ff1b390d8ada99acbbf24c22ab84e5246bf8e44961a2ba76e4f2d3e740c0def03aa33fca7ceb2f996 SHA512 26aea2c9a8b0844d6baeddc1035a131baf8f419c6b8ec175ae83c6a15a18e039703746bd356f070595b28ca7e6711448a0495188a4f5405fa5dfa54ec8a0cae5
-EBUILD valgrind-9999.ebuild 3921 BLAKE2B c0f5ce239d2e5990afe6f272de7006219c9ca97e8859ec9491f64f7211c6760f5feecd453356ea3e89e77d14dfa4c27375259c1aa1d886ee0ee028611221fb84 SHA512 655489b4b0cb46f12607edd429277fd677db5793dfbd6e4743c3ac02e160353e3238802c1923d14e533ac040242478730d5091ab756e00ad505b1da832f6eed1
-MISC metadata.xml 1028 BLAKE2B 5e6d52b6a5e657f56dc8da70f83d340c8ad8ff1448b109916d77a51b62f9018dafaf20586684d9d5c0984647df9fb3886b9fc0fabcfd62bcd13ef8d5e1de223e SHA512 1b9bd9d815de416b73e03bb13f88b662b14b4c135a36549ea5ad69a59c9395a240b80c30e6847eaecc2318ca88a2081e71fed41af2e9eed5162dfca78c7af920
+EBUILD valgrind-3.19.0.ebuild 3958 BLAKE2B 993c8677d095cfeb55bb22c3db5f46161b3b615e5559f4b2bf613bb8596fa8c2e4116ef9b0ba4aba8a8ef6dd2ca8a9da82e6b7a73c5061767707444a672b224d SHA512 8af1c7c7cd56ad77d7f81aac35d234b999b502f7288e7881431b8e6c8a7c9c46cecb0f3f1075b879b02aa6c8314540dd90c377366d08f78b1845d04cd71c85b1
+EBUILD valgrind-3.20.0-r2.ebuild 4018 BLAKE2B 519b00b584e9dc9474d1aa544fbaec314e0da9d6c025708b2030dae4785b034b4882aa31c0b784b90f15ce0995206b32f515e3049cdbe70dc8fe5a7525b57baa SHA512 43c9e6e1e2a910e8240937d4dbce1b285e48ad7d6aac29190148dc7207852a66e44009df62e971a0b952c763010c5df39ee02f89ea57534600eba2d43d2eed23
+EBUILD valgrind-3.20.0.ebuild 3956 BLAKE2B 2482b90a5b52a6e92e10dd6616c8355de8807ebfbff1377e8c8378dbf7ff9dc24a1d556d900d5bb19a35714c36e6aa85559b5c81f41e0f4df1dd8a631e7112ae SHA512 ffb496cda3673082efe0f6f02c65ee8cba47d4d65f742b579234c810671a2118e6e8dee59791675f1c12e41307d72f816714676280324e4f5db5501673f97bdf
+EBUILD valgrind-9999.ebuild 3978 BLAKE2B b233178c80db51e40f89496b499ce9f6295cef8806b5f7924f25d0235af889f9f1713513aa6a549644b2b01438ac6851eff332bb4a250080f52e346b53048367 SHA512 2c5c21b0895557ff441229d3906d8b5a720f1741452970e97c10a32fc1ea682ae4d3c4e2d5e087d4338194096e2fb3239e806076e35b1ac505dd7e2125e56222
+MISC metadata.xml 1150 BLAKE2B 05b2508ff61ac0659472f75ab074a5f0cc82a3ead6e9bd6e779984bf11c8257afcadd5734b0c34defa5739f1eb0dadeb2168a448c0482848d8d7bf8b598d5dff SHA512 80841b7058fee9293b9bddeb4ed2b1d2b53b4957d43973d9d748e9797c5a5a4b50f7377d9e6bdf31cc1a0c87702327e02568a15e3e354f1fa6cf280eb439b317
diff --git a/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch b/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
index ac6d90fef50f..d0eb795b84be 100644
--- a/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
+++ b/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
@@ -1,5 +1,3 @@
-From: https://git.alpinelinux.org/aports/tree/main/valgrind/
-
 --- valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c
 +++ valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c
 @@ -765,13 +765,15 @@ static void init(void);
diff --git a/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch b/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch
new file mode 100644
index 000000000000..6ede22f8b5ec
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch
@@ -0,0 +1,30 @@
+https://bugs.kde.org/show_bug.cgi?id=435441
+
+From 460d0c9a6c27edfffed8ced623cecf64466619f2 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Thu, 4 Nov 2021 14:26:40 -0700
+Subject: [PATCH] Bug 435441 - Handle weak symbols as global for redirection
+
+Weak symbols are global but with lower precedence, so they should
+be handled the same way as global symbols during malloc replacement.
+
+This fixes valgrind on musl 1.2.2 when it is not patched with a
+soname (as is done on Alpine Linux).
+
+https://bugs.kde.org/show_bug.cgi?id=435441
+--- a/coregrind/m_debuginfo/readelf.c
++++ b/coregrind/m_debuginfo/readelf.c
+@@ -429,7 +429,8 @@ Bool get_elf_symbol_info (
+    }
+ #  endif
+ 
+-   if (ELFXX_ST_BIND(sym->st_info) == STB_GLOBAL) {
++   if (ELFXX_ST_BIND(sym->st_info) == STB_GLOBAL
++       || ELFXX_ST_BIND(sym->st_info) == STB_WEAK) {
+       *is_global_out = True;
+    }
+ 
+-- 
+2.32.0
+
+
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
index 446b8b725919..e0de6e2950ab 100644
--- a/dev-util/valgrind/metadata.xml
+++ b/dev-util/valgrind/metadata.xml
@@ -5,6 +5,10 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
 	<longdescription>
 		Valgrind is a GPL'd tool to help you find memory-management problems
 		in your programs. When a program is run under Valgrind's supervision,
diff --git a/dev-util/valgrind/valgrind-3.19.0.ebuild b/dev-util/valgrind/valgrind-3.19.0.ebuild
index 598db5186193..949500bb17c8 100644
--- a/dev-util/valgrind/valgrind-3.19.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-util/valgrind/valgrind-3.18.1.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
index 1b0f898873ac..0268876b1061 100644
--- a/dev-util/valgrind/valgrind-3.18.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
@@ -1,26 +1,34 @@
-# 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 flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
 HOMEPAGE="https://www.valgrind.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
 DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	# Respect CFLAGS, LDFLAGS
+	"${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+	"${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+	"${FILESDIR}"/${P}-tests-clang16.patch
+)
+
 src_prepare() {
 	# Correct hard coded doc location
 	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
@@ -28,10 +36,12 @@ src_prepare() {
 	# Don't force multiarch stuff on OSX, bug #306467
 	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
 
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+	if use elibc_musl ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-3.13.0-malloc.patch
+			"${FILESDIR}"/${PN}-3.20.0-musl-interpose.patch
+		)
+	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# upstream doesn't support this, but we don't build with
@@ -42,8 +52,7 @@ src_prepare() {
 		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
 	fi
 
-	# Allow users to test their own patches
-	eapply_user
+	default
 
 	# Regenerate autotools files
 	eautoreconf
@@ -64,12 +73,14 @@ src_configure() {
 	# -fstack-protector-strong See -fstack-protector (bug #620402)
 	# -m64 -mx32			for multilib-portage, bug #398825
 	# -ggdb3                segmentation fault on startup
+	# -flto*                fails to build, bug #858509
 	filter-flags -fomit-frame-pointer
 	filter-flags -fstack-protector
 	filter-flags -fstack-protector-all
 	filter-flags -fstack-protector-strong
 	filter-flags -m64 -mx32
 	replace-flags -ggdb3 -ggdb2
+	filter-lto
 
 	if use amd64 || use ppc64; then
 		! has_multilib_profile && myconf+=("--enable-only64bit")
@@ -99,6 +110,9 @@ src_install() {
 
 	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
 
+	# See README_PACKAGERS
+	dostrip -x /usr/libexec/valgrind/vgpreload* /usr/$(get_libdir)/valgrind/*
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_names on shared libraries, can't turn them into bundles,
 		# as dyld won't load them any more then, bug #306467
@@ -110,9 +124,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "Valgrind will not work if libc (e.g. glibc) does not have debug symbols."
 	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
+	elog "and remerge glibc. See:"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
diff --git a/dev-util/valgrind/valgrind-3.20.0.ebuild b/dev-util/valgrind/valgrind-3.20.0.ebuild
index 3988dcd1f6ae..bf165cdd0c9a 100644
--- a/dev-util/valgrind/valgrind-3.20.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index aed73f6be21b..b690f11f1222 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,10 +35,11 @@ src_prepare() {
 	# Don't force multiarch stuff on OSX, bug #306467
 	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
 
-	# Conditionally copy musl specific suppressions && apply patch
 	if use elibc_musl ; then
-		cp "${FILESDIR}/musl.supp" "${S}" || die
-		PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch )
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-3.13.0-malloc.patch
+			"${FILESDIR}"/${PN}-3.20.0-musl-interpose.patch
+		)
 	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
@@ -108,6 +109,9 @@ src_install() {
 
 	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
 
+	# See README_PACKAGERS
+	dostrip -x /usr/libexec/valgrind/vgpreload* /usr/$(get_libdir)/valgrind/*
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_names on shared libraries, can't turn them into bundles,
 		# as dyld won't load them any more then, bug #306467
@@ -119,9 +123,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "Valgrind will not work if libc (e.g. glibc) does not have debug symbols."
 	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
+	elog "and remerge glibc. See:"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
 	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 6905d4cd3e6f..3ca50de29d53 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 1e9df624767e..0155e044e805 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,4 +1,5 @@
 AUX s25rttr-0.9.0_pre20200723-cmake_lua_version.patch 296 BLAKE2B cabdc87d6184e59f0896762f3d3434a137fed4fd1c2dae84d30dbee5d4903e68ba01c30b92d0d5290dec9b371807c317b462213a421cadd172b78b08407f66aa SHA512 074ac3e70fec0da6bd4a9602052989a8b6c26b5cfef669d6330d9177547bbeeeef2a4e6b9d83a9e9cbdf4ec33df7dcce50a862e3c9e533049ad8452df6073816
+AUX s25rttr-0.9.5-gcc-13.patch 1527 BLAKE2B 23399f2a2d0e350d990a122195a2fbb6ece1f010ad31c7da24c3b7a4356f7cadf793149e40748c98d958ef5a3d0e401e8caeacc4b8872f66e148688e8caca9c5 SHA512 6208a550524d3a3364718a5aaa7b69205c48903394635f03339173920c2481ecd014b4f5e847ba5390a060100c848f7ebd48bd038ea99f9e17a9b72508f10799
 DIST s25client_src_v0.9.5.tar.gz 30305585 BLAKE2B 77857743b5a1693ed373cb048c40fed150a4bf3d59f1314ffbb268f3e03ba8db2f44c20962c390f3a8c5b5b443ee0465d5c7bf726998ddf0334a861304211db8 SHA512 4926653075c7ba01e1e4ca516c52ad1694b46557c40c418e2a1f18d0a8fac9d4b73c20adc5403365ad6ba643823ed23dff5296717b3e057c42b17f1c20feb802
-EBUILD s25rttr-0.9.5.ebuild 2635 BLAKE2B dc26fd45caf1c684cf016c3c3a88cc92dbdd1d4fad936bd0290fbe6bde80cc024fb4c8d3a0fd43473a106fa07035b49e79cdf139aa7cf78af7dea9de285894e5 SHA512 87a91e0d42addf9402682ad7bc0a22081c9d7fca4158ebc537f1cb8e12668d26d4608848fda774e95cc206a2d7fce9f54fb10bd5d2086a0a3c8e4fe219b1d519
+EBUILD s25rttr-0.9.5.ebuild 2675 BLAKE2B 962e67d0e88034b1968ced39f23c681f319439c9eb45470858766698c7653f7c6d9980dfd8e8b0448ddaab7a6528cfb1768beb901cdf0ff6ed7cfff2a661de15 SHA512 1309ccf2030e98b9bc8cc49ec895d2e7195c3cbdabb719615ed54a3206c29ac08130b83fbe00876f1a4deb371c52a3f16b91b8ff4bacdb4ec9f35c0417de1fda
 MISC metadata.xml 348 BLAKE2B bc23c51bcd3458b4f39a6b42dd73f35060319cdae4563a4288ef2ae9dc9e2a85e8bc4b357dff37d70f20abf5d79a4a5c20fb1a8c2ab4c994dd3290ea18d49c34 SHA512 c145a48fb294eb11195885f0cd97095c7258d3286bf1cd926b5d40682aea1767c52a5a163283345fe12416659a9c7500de58993379b0ba3c743f18e172696c6f
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc-13.patch b/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc-13.patch
new file mode 100644
index 000000000000..117c2645cc40
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc-13.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/891713
+https://github.com/Return-To-The-Roots/s25client/pull/1548
+https://github.com/Return-To-The-Roots/libsiedler2/pull/21
+
+From d59abd4b565cd6f11dd64f6e4f497c9797e52c5a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 23 Jan 2023 01:49:47 +0000
+Subject: [PATCH] LanGameInfo: Add missing <cstdint> include
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so <cstdint> etc is no longer transitively included.
+
+See https://www.gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Closes: https://github.com/Return-To-The-Roots/libsiedler2/issues/20
+Bug: https://bugs.gentoo.org/891713
+--- a/libs/s25main/gameTypes/LanGameInfo.h
++++ b/libs/s25main/gameTypes/LanGameInfo.h
+@@ -4,6 +4,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ class Serializer;
+
+From 6a289fa3a3f50f0967a072292f3e0c628144ab8d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 23 Jan 2023 01:47:19 +0000
+Subject: [PATCH] oem: Add missing <cstdint> include
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so <cstdint> etc is no longer transitively included.
+
+See https://www.gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Closes: https://github.com/Return-To-The-Roots/libsiedler2/issues/20
+Bug: https://bugs.gentoo.org/891713
+--- a/external/libsiedler2/src/oem.cpp
++++ b/external/libsiedler2/src/oem.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include "oem.h"
+ #include <array>
++#include <cstdint>
+ 
+ namespace libsiedler2 {
+ 
+
diff --git a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
index e5f8470614a6..4986896fd623 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.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
@@ -41,6 +41,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-0.9.5-gcc-13.patch
 )
 
 S="${WORKDIR}/${MY_PN}_v${PV}"
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index fde34c9304b1..f7e0f8472e43 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index 3e7bc18ee218..63ef6bd3a515 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-commander-1.14.2.tar.xz 6868340 BLAKE2B 6b6f2a9435b9bb34a0318ddec0c509e1bef58399ce3bc1a77cf8ba6d97d5fec5e001d301e26ec7575e4c5a2f265ad0ca2e08e86f9f8045c04d6f558c17002bde SHA512 bfbc201ecaf6f9c0a71c7eba73f5d6ef9ba88f0ce8dba5d586058d87125bc51fc4b7f5e9752b7003343d686ea83db916ef78adf8c9d0df1e8715a3c88f9d1ce2
 DIST gnome-commander-1.14.3.tar.xz 6862280 BLAKE2B 802a3d147c056b08025164b68d48dfc731a0db0d78ada3c5e81866e0918903d82c101fc688bb6a101760605fa17e6d45bb18800aa659b7150e376844d00d0a22 SHA512 a3a89b922c23b49587d1b459760a263c886636735549c8dcd592b1ccb838838a3748ec83eb65ca8bbb62d82d4b588479a7673314d6924075b733b31318e52756
+DIST gnome-commander-1.16.0.tar.xz 6235496 BLAKE2B a888acc48e6b402d12aec5e447c3354cf7d9a6c9138787728231f4dca837cc7fa57f7dd0b678618e63ce90ba405441e819bafe4d86cb7feee0ed2f7bf09bf212 SHA512 9e23afb9b58e1f24e8a67f81fcf9c9bbae02c07d184cf9ffd4bc56d1e4b705ea355b95ce16209d50b743898cdb7bf0b6b8730eaa44f09001d9fa9a834fcbccae
 EBUILD gnome-commander-1.14.2.ebuild 1237 BLAKE2B b7cd462bea2d11cd90042a95a4b1522121bf45f2ea2a3d8834ba71f397f2448f0b0e845248eb547f63e075d5a25d59f2901a0efa0209843471d926fe625d231c SHA512 40305dfb2e51557189f36e6542b946e0f134ecac8f1c835f77352f0e0790a2cf719d3fd2ada735c6e71b738085d37fac6b01724bae8c8f2e0df7a6a0fdc40cad
 EBUILD gnome-commander-1.14.3.ebuild 1237 BLAKE2B b7cd462bea2d11cd90042a95a4b1522121bf45f2ea2a3d8834ba71f397f2448f0b0e845248eb547f63e075d5a25d59f2901a0efa0209843471d926fe625d231c SHA512 40305dfb2e51557189f36e6542b946e0f134ecac8f1c835f77352f0e0790a2cf719d3fd2ada735c6e71b738085d37fac6b01724bae8c8f2e0df7a6a0fdc40cad
+EBUILD gnome-commander-1.16.0.ebuild 1321 BLAKE2B 8335fce73edfeab96ce7afe35365ebafad4249d57ba0afe6ef125325a7cef0a8542cc56491adf0f751978e408988382d54f68904880817f87d7db38ce9cc99b0 SHA512 252e2deb479265b2c74c735e7ec3700994b38492a3b63296aa19865c05ac0d2f673e223af99f1ab668248d4e43fe4b285329784eabd7acdfb756dfe3b7213045
 MISC metadata.xml 1046 BLAKE2B a109c4421019a8a0b406c954cf62737feadab93204ecfcf612de0433429097370d9fb855ae6ba36434b32eb2e9008586677508f35435da58debd9cd6a340f2ec SHA512 0792dd5702b27f5c44bdf478bd934a6701ba5639a5cfc27478ea5993b63779448b0061cc173c79c08cbb958f7a96b99e6d3e2c7e76826a7ae947370aaef1ddf5
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.16.0.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.16.0.ebuild
new file mode 100644
index 000000000000..d9ff00029c93
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.16.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson optfeature
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="https://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc exif gsf pdf samba taglib test +unique"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	doc? ( gnome-extra/yelp )
+	>=dev-libs/glib-2.70.0:2
+	>=x11-libs/gtk+-2.24.0:2
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12:= )
+	pdf? ( >=app-text/poppler-0.18 )
+	samba? ( gnome-base/gvfs[samba] )
+	taglib? ( >=media-libs/taglib-1.4 )
+	unique? ( >=dev-libs/libunique-0.9.3:1 )
+"
+BDEPEND="
+	doc? ( app-text/yelp-tools )
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature exif exiv2)
+		$(meson_feature gsf libgsf)
+		$(meson_feature pdf poppler)
+		$(meson_feature samba)
+		$(meson_feature taglib)
+		$(meson_feature unique)
+		$(meson_feature test tests)
+		$(meson_use doc help)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "synchronizing files and directories" dev-util/meld
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 08aa8fe74a8a..47d6d2816e01 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index f0eb05907849..22b6bb7c7d35 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,5 +1,7 @@
 DIST libtgvoip-2.4.4_p20220117.tar.gz 1098045 BLAKE2B 752b3b26f511316b8261d9ebb833e2b74df91377daca255fbbeefb18b3ab3811b97eaee1d9965e95ed9d215467e6ff5dc857369d381d470570cb87c3bfec33af SHA512 b9d8e354e9b8f9226d5e06397fdf3c91f71fee890db7d180dffae2e3fb6f74bca1c31b7f87049257c3edf44c2171780ed5781877cf8f2d40b2d56c1f5385ef77
 DIST libtgvoip-2.4.4_p20220503.tar.gz 1098061 BLAKE2B 5389a3783fa5179d10a18ef0282ab65d1526c829852095718384c2ba476ebfb1ee1f997f71b47424ef60a826055bc63d0d2dde7980de98c978860d72717ffefb SHA512 68f1e5b46df3b974d39333949e586ed00243044ff4bcac31937cba7eced6266fdacfd6ff3c6453f7dfa64ec82dd3aeafa251411dc85de0aae26b2cd0d8a79013
+DIST libtgvoip-2.4.4_p20221208.tar.gz 1098020 BLAKE2B 6f1eae38e4396ca3b88ab4337176a6076d5f9008b2a865cd286265a9b73d83d44c2cc6828b65dcb580a897a19badeab502395e2128a15c276ae796ac1ab0da68 SHA512 62243629890b1c13f1dbbffae4f82964a0fe23d2071852730674ccbef31126c6e205cfa526f07ba1549ef8eae31e371fb4335ce5f95fd649560bee2b3b530e64
 EBUILD libtgvoip-2.4.4_p20220117.ebuild 1586 BLAKE2B 8ee4658a921472e3c5aaa2cccb6059620041f71ee4c8fb24fdcf3759b4f5bbb99c481c888f71300cc82a49ec4037fec96065f89c36145b57b293a9818cba3e54 SHA512 0159bdc29c80a8c2ac03783bded57b68908d814a1113431db85b62042b1c00b433f9bce4359201ec43a79205e27463c84b33a33254cf3aa3b25a9343fe1039e2
 EBUILD libtgvoip-2.4.4_p20220503.ebuild 1586 BLAKE2B 8219e767ea77c7a3777012ddf59d25a536ea7bec408db6cdb81d668e3ccc0084a418c7b7285ebf5cffc6b8be47907a62dd9f3bd8d010f2cd58fe0b154c385962 SHA512 e3f2d19cd142b64a3ba4fbc4cf99f24c150c2b750f05a47a03fa58bbd8faf20424817ca001ae30110036982c0f2c4809d250ce871cd3207365f8b5261dcf001e
-MISC metadata.xml 543 BLAKE2B 56f3e74859e09ff7ecaa4f068e1872257213a7239cd946c920c0b2e7e12cfc0bdb314ca1fb0a75b489abd5ae5c4e5b4218ced1b3ee78e60a4e82558100d68e1f SHA512 83e39833446eb97c76280a81e428bdd64b5c46a052e1b87bdc19a5db31478f1004e3ae6f323c7983992541bf9d15f155037523990964ccae4ad8653396f7534b
+EBUILD libtgvoip-2.4.4_p20221208.ebuild 1587 BLAKE2B 2c82a5c99a19e2e6dfdc31e2b98cdba038223802f607253923a597a3a3647383bd1ba2717f3477a9d9ebad9507a68a3a3b325f8567b2aee9f902daeb9a5ef499 SHA512 e5c3723a0e91f3c232fbf697df73bc6ec0e0cad40b78eb25c92277a07512a7d14a972ae733ad7fc0e60c15a29a1c07655b0777f00d29a862c64d983dbb34195c
+MISC metadata.xml 633 BLAKE2B 53413d3bf4124e2d415bd0851deac01649bdf5f44069805a8e8904b93a0ad731df46169813955670aafedb6630a6fe7102b5954339df59435aafa6a6a35bd954 SHA512 96a69dcfd9e0b615fefb8ea9a8715ad2a2d4c62ce59e725434de3fe42889bb93c2b4ac1fbd2d20a23be62c9a59ca70e93f883247a83f344ff9abde2970cd4e50
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20221208.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20221208.ebuild
new file mode 100644
index 000000000000..4bd604dec9f6
--- /dev/null
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20221208.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="VoIP library for Telegram clients"
+HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
+
+LIBTGVOIP_COMMIT="0ffe2e51bfe14b533b860002f1c2e87e5f8c00c0"
+SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+dsp +alsa pulseaudio"
+
+DEPEND="
+	dev-libs/openssl:=
+	media-libs/opus
+	alsa? ( media-libs/alsa-lib )
+	dsp? ( media-libs/tg_owt:= )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+"
+
+src_prepare() {
+	# Will be controlled by us
+	sed -i -e '/^CFLAGS += -DTGVOIP_NO_DSP/d' Makefile.am || die
+	# https://bugs.gentoo.org/717210
+	echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Not using the CMake build despite being the preferred one, because
+	# it's lacking relevant configure options.
+	local myconf=(
+		--disable-dsp  # WebRTC is linked from tg_owt
+		$(use_with alsa)
+		$(use_with pulseaudio pulse)
+	)
+	if use dsp; then
+		append-cppflags "-I${ESYSROOT}/usr/include/tg_owt"
+		append-cppflags "-I${ESYSROOT}/usr/include/tg_owt/third_party/abseil-cpp"
+		append-libs '-ltg_owt'
+	else
+		append-cppflags '-DTGVOIP_NO_DSP'
+	fi
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libtgvoip/metadata.xml b/media-libs/libtgvoip/metadata.xml
index 12ff7670bc20..0837c875ba4e 100644
--- a/media-libs/libtgvoip/metadata.xml
+++ b/media-libs/libtgvoip/metadata.xml
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="dsp">Enable signal processing (echo cancellation, noise suppression, and automatic gain control)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">telegramdesktop/libtgvoip</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index b409f06a86f4..b9c33904861e 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -2,4 +2,4 @@ AUX opus-1.3.1-libdir-macro.patch 359 BLAKE2B 901a1f09417bb962b3268a1d9a85cfc356
 AUX opus-1.3.1-macro-wstrict-prototypes.patch 469 BLAKE2B a68a9506ee1d3c08f0106f9270e6d4132f15b23434f844a9b33b8326590687d6ecaaa91b21cbc921b03f0aa5d2bfcd004a276099c19fe25ded6dc25b28093f50 SHA512 9467be13f0c0c9fcc1026830d206738871a97b2005ad540c5286112c0921051f995e475ebf4e1701b2fce7dfb2c8dfedd2a7bb1d54dfb7b623433ae98b71a9ca
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
 EBUILD opus-1.3.1-r4.ebuild 1396 BLAKE2B 61734d61d0f4a2cc973821e3ebfcda2ed0d9ac96a4550512b71408472408eddbbbe5fd0027434a151388d06b14845270d102dbf72c1116b928b400e6bbc1d099 SHA512 31e110ab734cfbd63d364f3891421ff44188be244b7f5a29f3c941259bb945032b1a9617290b9b7eaec142118cf77d34443258eaae05bec09afc441c2f630ed3
-MISC metadata.xml 464 BLAKE2B af27614c44aeb6d0d0eb053566be211c7997afe134138f7331276e406ad981e7e72303ae6ea9ad01d1a5772d6bce373d03f2996f4a126ce5414fd27626f90593 SHA512 e8d7151b3c61c6cdc6630f743237622bbb57128d1ae507b0ecee718a075f41133f68975ac805f2e886446508a73c158071ea0552a33c5dcd1ef434929f878c90
+MISC metadata.xml 538 BLAKE2B d65f695f3bf53cb827c9fbfc621cb58f3465e77f74f3bb3c436fc8741161798b6f7dc3381a07e21f7f1e5310104ed89179c64d9ab30f2102c76ef6ee73ad9ebc SHA512 0e84eba3a3711486a9569e7d38b0fe7cd11aa0d68c123f3304b6b698394dff4e48f4270624793cdc17a16a3ac8c9f921ae50bcbb30b920916b4bad9ae60c7117
diff --git a/media-libs/opus/metadata.xml b/media-libs/opus/metadata.xml
index 73c305ccb455..ead8947401fe 100644
--- a/media-libs/opus/metadata.xml
+++ b/media-libs/opus/metadata.xml
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="custom-modes">Enable non-Opus modes, e.g. 44.1 kHz and 2^n frames</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">xiph/opus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index 4f2efcf4c59f..02aecdef3f3b 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -1,4 +1,4 @@
 AUX opusfile-0.12-configure-clang16.patch 2946 BLAKE2B 7eab443d03a08136e55329c87e5f084724c205f6789db5747f40318153fbcc4d413024fac6abb5441dbfcca3ece893b82714e0d5ec6d2cced9f94fbbd944c7e4 SHA512 2e7a2c9594f0eda9ed9486e621c932660cd2b86694e4fb5c166da05fd90949a7e74d627ee49ffb516525bf0d5fcfeb2407834d9163da0b46f0c9625362c2f550
 DIST opusfile-0.12.tar.gz 471354 BLAKE2B d54d9b8ed011c018dc6de77afab524d2e47ba6cca69b911efacf361b41f3b59a31424cb15a778db14166815ba5e2352f33f8aa7987c30e5e14339c652558d18d SHA512 e25e6968a3183ac0628ce1000840fd6f9f636e92ba984d6a72b76fb2a98ec632d2de4c66a8e4c05ef30655c2a4a13ab35f89606fa7d79a54cfa8506543ca57af
 EBUILD opusfile-0.12-r1.ebuild 1056 BLAKE2B 2d4a35979ae24d22e1da89c75ee98da5bae1c0001338260df48c73a16e17aeeb266b23cd7ea0dd6438643e01122301aed2a12e0df705a5c8cfb427d80c78cacf SHA512 83a04a2eb58be732d1d841f52b92452faff257e5e2850b5838bd1f0c09553a31a55289c362b2df9fea9777a953578de04f739f6665ce52a02f8b0072e315b159
-MISC metadata.xml 575 BLAKE2B 2e91403f82dd5a8a772db511f2473ae4d7ae318163107d0ff6a9710e62521cd510a129eae38cd1afabbcc88af225b0a3035382c3130a838dac0f6850be255389 SHA512 6d15ee03dcdfc53a581d70e43a0884b0c4a52de9691fcacd9bc7ad80967c775d3f8f7636e112b4893964d6dea3be02bfbb825bc467003dd8de1bc987485e9a4c
+MISC metadata.xml 653 BLAKE2B 67076fdf6a18be5b1ebce27ebc0679580105aff3654d11f4369e9d23d13b2ea25feac8e763ffac7a149dd882839c18bcf57dec4f7a4fa47813dc1a1caa85207a SHA512 1d983d7ac52639f15c220cbe6b02e49f829425301dab86e8c68e5f85a674b823bb194c67195ccb45c48022a1a56f0772d206819ddf5dc0b21e235c4df1336660
diff --git a/media-libs/opusfile/metadata.xml b/media-libs/opusfile/metadata.xml
index cd6bdabd900a..c035863804f5 100644
--- a/media-libs/opusfile/metadata.xml
+++ b/media-libs/opusfile/metadata.xml
@@ -14,4 +14,7 @@
 		<flag name="float">Enable floating point arithmetic operations</flag>
 		<flag name="http">Enable http connections</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">xiph/opusfile</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 270c6ec71afa..70c87c3a926b 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1,4 +1,4 @@
 AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d41823ca073fb6b8edc1d35dee7b90ec79d52ef08affb0a1cb88b577e0fa3bc62844ded3c4e3235c268e31a0121a6 SHA512 71e6934f104d12bfb7bfb19812ff868dc22a323e2fbd7a480c270650a14842dd03e53e11853e7ddaa9469239a538d0bf09469770fd30f23601406011fe626ffd
 DIST speex-1.2.1.tar.gz 1043278 BLAKE2B 60afa7eb9ff87ebb1b69e2716b7fa6727b49f6c06ed6eb6fe81236c65dc4128769618dd1f4df31af56a00e9b766c4050c1b3e415c8f972d64d1fb9e7a537a650 SHA512 52e00300df82e1c7fb527b245af02b99a1f37faef74d004b7cd981052f1aa22a412cb18f5c7a5618df4c958f727c97eb7385beec99d68548d5b02e76192d4e0a
 EBUILD speex-1.2.1.ebuild 1664 BLAKE2B 7fd6ef7778cb2b96f9da0ce34d3fbab570e57f03e606aed1779884b724de01ccaf799c39a1a9017525a2a856764f25f9c2b6965581ebbf996f31e32b1417b561 SHA512 b9c35a29156f67212da7ccf4079086535c94f38aae9294ce967c1451def1ed129b2a74fb3d8863d1ddad3baab351d8ec065f71fc60d1e3c48a65b904d6c67494
-MISC metadata.xml 496 BLAKE2B 596366a2be9ae01438cc46b116d3a280c1498270c1f06ce64f76a38e84f068f210d87bb87a447b3f4cbb7d3783c2d8d60ade5e487e5900ee04b98de70272b6b5 SHA512 bf5453fc3eeeaa740965f864e5d8f13aa969b6111b47ee1f2d382158457c996e9979fadb08ba6c3ea96257c2ad8b954fbb1ece0f8b7b70b4bb4f12c9aa1cf84b
+MISC metadata.xml 548 BLAKE2B 20ca971e89b8e1b610855fd5c4b05bafbc4b4cfd8e36e7a28f77b5555f01ee6e3f0b971b57accd8faa00c2ff60c9af12648a55b29878917354e5e9fbc6de9b5f SHA512 ef4cb05574ab0bb73081c67a50c866b6cc6b8f20a6de5cb6511eb3881804980dd57eb71a6e0fe5607c4898e593c762e63e91304afde8b3118bfd8bb69943b2a1
diff --git a/media-libs/speex/metadata.xml b/media-libs/speex/metadata.xml
index ea423248499b..ac2564db25cb 100644
--- a/media-libs/speex/metadata.xml
+++ b/media-libs/speex/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpe">cpe:/a:xiph:speex</remote-id>
+    <remote-id type="github">xiph/speex</remote-id>
   </upstream>
   <use>
     <flag name="utils">Enables speex commandline utilities (speexenc, speexdec).</flag>
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 2b4f4c6bcf90..74131c5fe138 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -1,4 +1,4 @@
 AUX speexdsp-1.2.0-configure.patch 1092 BLAKE2B a4629cb00d1920133db30cf1cbdaade58fe69176515c75f140f9ae9060d3111f8d88b65ce67f3bd6c7d86f60db25d15997182865e6a528a8e20603f3edb6544c SHA512 0c6f1b8ae83e98c8899649e3f108ccaad89286db317e5c3f19bd0d78f71839b92b10125ba09b640453d299b3343bfaec128ae72daff72f37f95cbf38652980dd
 DIST speexdsp-1.2.1.tar.gz 922584 BLAKE2B 9105967eaee3ea8fcba2df1739d92a520407e086d3f4645763d8c7f26adff4f6c46b653e873b3e5ca04fce2ee5f765f8f7a242172d7cc4873fe15c3295a5913b SHA512 41b5f37b48db5cb8c5a0f6437a4a8266d2627a5b7c1088de8549fe0bf0bb3105b7df8024fe207eef194096e0726ea73e2b53e0a4293d8db8e133baa0f8a3bad3
 EBUILD speexdsp-1.2.1.ebuild 1342 BLAKE2B fe5a38d929d743abfa8dd09f82a954505d98377d71ddfeae5902e0aca126a33806684cc448faf73ae32c10a60ca967a231fd35e7de8ee4f7a66569f1a002cacb SHA512 681fe95d850e2dfe133a080bc3689fafe34eb3cf3e0a1c2fd9d842a1f54d2b91e3a3c0354b394c7fff2dcc62cecf5324368735b5d35f643c1be141f4f7e4d2ef
-MISC metadata.xml 343 BLAKE2B 374a2c5ab50a02673ee9929021f54bb82b932188b88a36cc023cf263647299ebb0a279c2cc723e2c3d4f27dba635b6090a1c7675ba3792bc4a22706a5c97406f SHA512 d0c180268fe692dd8d97debafc8495e0837459ad2845993aa22c675d3777a4aa64d15fba1d2e4674a81a324ee52c1bda751d2c4a5a1547cd56ab5bc0375da8c3
+MISC metadata.xml 398 BLAKE2B 12544559ee0bf709e2c92c2906d11a7e95251b0b6d2fc58ed1ba272856bb79dc2c1d2fadaac6cbaa3707ab5d63c55ae1c9ee024fc87f68f32f04ee8a7846812d SHA512 dab0c15f39dd1edda54478e970bff9ed98313538d31aeaf77bb73b9f13f8b129de7a7bd29152d04231623b9c615cb3a70ab0b7d917eddf86dad09d6e796a2a74
diff --git a/media-libs/speexdsp/metadata.xml b/media-libs/speexdsp/metadata.xml
index 22bc3526ff34..9e72cfbd99d1 100644
--- a/media-libs/speexdsp/metadata.xml
+++ b/media-libs/speexdsp/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpe">cpe:/a:xiph:speex</remote-id>
+    <remote-id type="github">xiph/speexdsp</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index fba3d2237ce4..e78f8e139b73 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -4,9 +4,12 @@ AUX tg_owt-0_pre20220209-gcc-12-cstddef.patch 741 BLAKE2B d644e354e5f4c6dd714bc8
 AUX tg_owt-0_pre20220209-gcc-12-cstdint.patch 1361 BLAKE2B 06587d98836d335a9edf9fa276cd660e29d2080186ddcd724ae4e82a5a69e6e57684575f6de77f3c026696f3383695a61f97ac6184b1983e99a4ba27533d8c70 SHA512 06d2cd5c6f2a360f0c46a7b91d045dcf582d0eb5efb93304d1377e78beff38dac545b406afd5a52e1a9e0725e9d6b1181984a39c1bead12870267c51afb6b884
 AUX tg_owt-0_pre20220507-allow-disabling-X11.patch 4470 BLAKE2B 65498236c2d315ec313bc89b6b5390bba9a378f4dee7bc9dccbe1b0184262aba0c308d7248c69262c900bf963d898feb47662a882e73fcdfc0c1f69b89c5601a SHA512 32cdb00633be55e573d5830d1e3b351e8cc99b209f4de5c23cf49a9dd94cedfa1227f8d44bc1ac73029391eecbb1cab59d718f2fa4939eeb0f31c62b7f649d54
 AUX tg_owt-0_pre20220507-unbundle-crc32c.patch 1933 BLAKE2B 1aaae7a32aec615f70cff3e6abea1e8398df778b92adfb20bfc4bdc211491d0da2bec81c8f1cf730a32407a07b762e3bc3fc9ead75fce7fe050d23f7ad658763 SHA512 a8fd7e0ac746b4bf8203eef14e1f6771dccd644466412f40517c2fb1af048ffe34033a910531720cfb478c9d4a8e80b571ae0084d01cf52b8046290eccc9d5da
+DIST libyuv-00950840d1c9bcbb3eb6ebc5aac5793e71166c8b.tar.bz2 426626 BLAKE2B efae062f124e3711bab9db232e5f956f09683d6743f54407bf89eeda1bb6ffbc9b82fc250bd709f06b94c28bc8bbb239a28262a002e7b7a2044f31c1432304bb SHA512 bfe2ad76c911986727d0c8b6ee85028fea382fad1eaebbff77a116f848388417719acaea11506936e8160d8dfa46f27a9a3d544b3db356e4c58aa81f493a6912
 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
 DIST tg_owt-0_pre20220209.tar.gz 16501237 BLAKE2B fb04aca8803645cc107a7e7fbab8d6020ad91f487ece0445aba29dd1127270e8b3a33d51bb35cfc916168df78cbdc98987610b39fd2cf7b86821b4f9733783c9 SHA512 0a35ce3379887b115117188aa8dce44bf89e23ad6f9fab7320a1cd55cdd534bae4c240778a37cb9588cd6acea1e7a83c22c113d608f7bfd5272ee22bb2773af3
 DIST tg_owt-0_pre20220507.tar.gz 15799740 BLAKE2B f12f3ecdfb0c7cfdae12af4734ddf22da4d95fd991b8a8ba17515f9d5c22a2f12b81967c0af15ac150c99129701c50c9384ea0e0240bf2366e176c833b14f7db SHA512 6902c65a1be0bcf300f08c274109ed53cdf92b7aff35915045c3989899fc2584cce3fe9df0e8ac29e708fcc575453fe5a6affaea85787f9c4fcc3bcde3b85711
+DIST tg_owt-0_pre20230105.tar.gz 13822416 BLAKE2B 05004dafaefd748d836f3508d3800bcb15d0bc9894b83340746e85763bff4b77d3dd1fb732eeaf86324b9afbec69be49b172ae7f70d959a7a65ce01b64fb6205 SHA512 70b4ada620cf19acf981abcefcbac1609fe04c51deef0332e288d59c4e7efe98625817c641b92967b4f37217f94e49aa0fc296fcfbb214c08cb63030b1427f54
 EBUILD tg_owt-0_pre20220209.ebuild 3499 BLAKE2B dbdfe128deb5963ec2033a79471541424aeaf7513ed06c86b325d384b25b22293de9648e394649f71783db44b806e15e9bd56e57b44629dd6853f7810ac50d17 SHA512 5a18db66356512cc10a3f2bd5772c7be62ddcbe6dd8cebb69112f4e4bfecf96e4250ffc9d3b339707f2e6a04d3937183c3a8d833ad0c3afebd5b6871c844c937
 EBUILD tg_owt-0_pre20220507.ebuild 3699 BLAKE2B 891e724403693876aebd5767504eb63a5a6744b7094ebd343c57d74c387f3f56511b20ad01c66e386202fb1fbc147dbfb308d0f4adb29feddc0de32be457570d SHA512 74e84bf4bc69a3ea93b2dd8594e6600aa0c2ae87ef88f07920067973fe6252d71bf13f36f96a45a369a5d2155622425d49f2e15167b8e2b8dd7d9313f6c5ae95
-MISC metadata.xml 410 BLAKE2B 4bb73f9210c791887bf87b9d6476c339ed077d8a9e2cca19a7c96fdd6634dd7217cd96e196dd52f112f79ae88b320651fa91ed7f3b13a7db1a5ae6fb4fa2f1ad SHA512 ee72d3f004691ec17c5c5b95e5c602757a4679d7eb92d31afb1394adf34b758829ea2d1fb049d25a7db24247331e58c22ccb322421fe956ec843c65f7ddc612e
+EBUILD tg_owt-0_pre20230105.ebuild 3615 BLAKE2B 70ccfe3258be19e6e14f504adf0fa117bd295ebd555e16ab7b374878303ed881341162390f7cdf7ee3c026b073a50d7ba64a851c7939a59870066b1396971070 SHA512 e11f328b448fab5acd4082ae24d9dc8674f0651be3f8ec9cbee9c90bcfd16f0a9cc615304c860d76b94d060e740602ff6d20df3339f2f04860dd85db09cd1f5b
+MISC metadata.xml 493 BLAKE2B ce75939609c6fdef8bce490ca81ba5a011c0a44746e9d813651c2dad5e29e66cc529789b90a61e484c1b13c4d51f0a6cc18988bc7992f9a68e532b6bec9906f2 SHA512 d7aa16d810350f42fb07d47a020363fa77f2a2bab07bd78b49f22afd1ddffc51bf0b55b9ac84ebd208dfc85779494144a75f33e209032c0db15567eb8ba4ebf1
diff --git a/media-libs/tg_owt/metadata.xml b/media-libs/tg_owt/metadata.xml
index 76591833456c..4dd0b956cc49 100644
--- a/media-libs/tg_owt/metadata.xml
+++ b/media-libs/tg_owt/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">desktop-app/tg_owt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/tg_owt/tg_owt-0_pre20230105.ebuild b/media-libs/tg_owt/tg_owt-0_pre20230105.ebuild
new file mode 100644
index 000000000000..d7a92a7d199d
--- /dev/null
+++ b/media-libs/tg_owt/tg_owt-0_pre20230105.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="WebRTC build for Telegram"
+HOMEPAGE="https://github.com/desktop-app/tg_owt"
+
+TG_OWT_COMMIT="5098730b9eb6173f0b52068fe2555b7c1015123a"
+LIBYUV_COMMIT="00950840d1c9bcbb3eb6ebc5aac5793e71166c8b"
+SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/chromiumsrc/libyuv/-/archive/${LIBYUV_COMMIT}/libyuv-${LIBYUV_COMMIT}.tar.bz2"
+S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
+# Upstream libyuv: https://chromium.googlesource.com/libyuv/libyuv
+
+LICENSE="BSD"
+SLOT="0/${PV##*pre}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="screencast +X"
+
+# This package's USE flags may change the ABI and require a rebuild of
+#  dependent pacakges. As such, one should make sure to depend on
+#  media-libs/tg_owt[x=,y=,z=] for any package that uses this.
+# Furthermore, the -DNDEBUG preprocessor flag should be defined by any
+#  dependent package, failure to do so will change the ABI in the header files.
+
+# Bundled libs:
+# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it)
+# - libsrtp (project uses private APIs)
+# - pffft (no stable versioning, patched)
+RDEPEND="
+	>=dev-cpp/abseil-cpp-20220623.1:=
+	dev-libs/openssl:=
+	dev-libs/protobuf:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libvpx-1.10.0:=
+	media-libs/openh264:=
+	media-libs/opus
+	media-video/ffmpeg:=
+	dev-libs/crc32c
+	screencast? (
+		dev-libs/glib:2
+		media-video/pipewire:=
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrender
+		x11-libs/libXrandr
+		x11-libs/libXtst
+	)
+"
+DEPEND="${RDEPEND}
+	screencast? (
+		media-libs/libglvnd
+		media-libs/mesa
+		x11-libs/libdrm
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	unpack "libyuv-${LIBYUV_COMMIT}.tar.bz2"
+	mv -T "libyuv-${LIBYUV_COMMIT}" "${S}/src/third_party/libyuv" || die
+}
+
+src_prepare() {
+	# libopenh264 has GENERATED files with yasm that aren't excluded by
+	# EXCLUDE_FROM_ALL, and I have no clue how to avoid this.
+	# These source files aren't used with system-openh264, anyway.
+	sed -i '/include(cmake\/libopenh264.cmake)/d' CMakeLists.txt || die
+
+	# The sources for these aren't available, avoid needing them
+	sed -e '/include(cmake\/libcrc32c.cmake)/d' \
+		-e '/include(cmake\/libabsl.cmake)/d' -i CMakeLists.txt || die
+
+	# "lol" said the scorpion, "lmao"
+	sed -i '/if (BUILD_SHARED_LIBS)/{n;n;s/WARNING/DEBUG/}' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
+	# See https://bugs.gentoo.org/754012
+	# EAPI 8 still wipes this flag.
+	append-cppflags '-DNDEBUG'
+
+	local mycmakeargs=(
+		-DTG_OWT_USE_X11=$(usex X)
+		-DTG_OWT_USE_PIPEWIRE=$(usex screencast)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# Save about 15MB of useless headers
+	rm -r "${ED}/usr/include/tg_owt/rtc_base/third_party" || die
+	rm -r "${ED}/usr/include/tg_owt/common_audio/third_party" || die
+	rm -r "${ED}/usr/include/tg_owt/modules/third_party" || die
+	rm -r "${ED}/usr/include/tg_owt/third_party" || die
+
+	# Install a few headers anyway, as required by net-im/telegram-desktop...
+	local headers=(
+		third_party/libyuv/include
+		rtc_base/third_party/sigslot
+		rtc_base/third_party/base64
+	)
+	for dir in "${headers[@]}"; do
+		pushd "${S}/src/${dir}" > /dev/null || die
+		find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/${dir}/{}" \; || die
+		popd > /dev/null || die
+	done
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ca6edbf6b30b..0ff2a1cc4db7 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 7a51c2d1454c..05cb4fff53e1 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,7 +1,7 @@
 AUX mixxx-2.3.0-cmake.patch 556 BLAKE2B 2757a1c72f4ad052aacd17fba1934a106c34971ac3fb0af2b3a65ebc0eacdcc9809949697aaba6166ae45ab1876a4cc6e6759eb90317efff73b8ab629b506078 SHA512 277fe726ad2d656f97a7350bf6e32bc77b93fb5d6ccddf5bacb7cfa35a9e78dd772b9823097b672ce6a0a4ef8d62222629a375b77ed6cd4e3d201593833d6252
 AUX mixxx-2.3.0-docs.patch 626 BLAKE2B 73eca9849d69112edd254bd28329b360c31434eb1a4bcb626ca9fcfc0b00dee2c9f9d81d83302fbe0718be9e5a47a1748835013f20398eeb4e50c5e81b78a172 SHA512 2de279b48463d214ef7c9da58c58fb10d0fb300afe80b01e1981f4df15a5f7da1079b53ca1422dc0d69da8a367fe4693ba002a351e57f95fa1b24d5ec7fb12a4
 AUX mixxx-2.3.1-benchmark_compile_fix.patch 220 BLAKE2B 28c5a7fe5e6e465bd7d9445e741d366341fadcb8d142961cf25d6b57aabcc453f74cbb0d3f63b01df5e65e7151a9e59545c50b52e732234ae6a734eb171cef82 SHA512 d301a87760a0162a9e09e08dd544183219776c61d2810d75c37d39a9ac9fcf8a329681e53ca922864ccafeb98231cbeea565db2196e56bf62417a09b40bae4b8
-AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
+AUX mixxx-9999-docs.patch 695 BLAKE2B 5f639550ff8aca7f7aeed8d4d6dfd44e2b0eb8c3cc3f5c6578ff802dfd4c11fa8a9fdf3f820ec8e4fdb1449abcc50673a06b4dac74ba4916b6111e8117474002 SHA512 cd34b4faeb939a1d802936b9b4f740f252ba572926815726f1957df6cc07a362ae03d9772484188dfc0ebcc942808c06ef2c9bab8df6164de4b2b65a447d9f92
 DIST mixxx-2.3.3.tar.gz 41011867 BLAKE2B 1b3d863341afbdce86c61c4689494a334a689d02aaf5a700aa74d3291843f028d77ef7d62e545d05377ffb1f9a5077529c3a77a2b4a5e8ce20823728a8fe8d80 SHA512 6bd3809802f2f66af7d840db6ce006d7e46a824cf460ea9ae1bcff81f17483debd2ef47fd68d0da82671afaf01b6c3bc2522e02b41d992e08bc98f4d3d68120f
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 0572da067016d6fd1a0e955cfa9daad319e633357532bad1143333a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c SHA512 965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76 SHA512 648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
@@ -28,5 +28,5 @@ DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd145
 DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
 EBUILD mixxx-2.3.3-r1.ebuild 3857 BLAKE2B bcb72472fb83ecbfcc8e1552adcb6e52cfe6406c5b430a14b564b48a4119e64f6180bc6e029abfc0fc1190235ad1c43558143b46f78319121770a23c3760220f SHA512 195025c6f4e47db5557a487eae23a629049cae97f4c299d1b86c106fd5b79c140951f5669ef9416261ccb2546962f3e662a12078cf180dbf154b388db30a4a5f
 EBUILD mixxx-2.3.9999.ebuild 3766 BLAKE2B 7188e4a554e4120b63d2bddb7a0e5be07f8f75b3980486ba3d65d449d125b66b33c2cbd018d7a09f1f1e41afccaa70cc3e4e25b26ad1f867d8d8f91bb9f9fdd2 SHA512 0fcd3127613bf0318175967ea623a195664038111b9f8b50f80dd440507f97cff9af3fe8f38702a278fd1bd89f1e6a814eee50bc69d9144d1403df2e1919692f
-EBUILD mixxx-9999.ebuild 2827 BLAKE2B 310a0b021e0deca700bded2e489280a9fa371699c037b5a7abae509a0f791d9946f6f3f2cc1b3b177e5c10077f0096c23bde7321f37713b32b2007680154883c SHA512 1a1810be97e4689439291e7255874d2b6b523539226a183453b57aa77bec028a5a0108b538b482f6f3407ce2bfb15d3b5a744a0a3d00950d3fa25678d01f4283
+EBUILD mixxx-9999.ebuild 2909 BLAKE2B 50a8c6fcf6a5157b199db56c87141e5d6873e2d787f644be29c0ee6e1a68c8fa283aad587a7487844a1e49b85c0f2307070a8d64e83c0dce1831c708438d7736 SHA512 c3f36b618e14ab9d99c89ce1a5ce7d6eb880276b099840bae7707595fc785fa91921f7e39bb1df701b0f7f2429bfa0494bff62a2ca137d059a8911b68e595605
 MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8
diff --git a/media-sound/mixxx/files/mixxx-9999-docs.patch b/media-sound/mixxx/files/mixxx-9999-docs.patch
index d1de4e6e9443..0ac74959df2e 100644
--- a/media-sound/mixxx/files/mixxx-9999-docs.patch
+++ b/media-sound/mixxx/files/mixxx-9999-docs.patch
@@ -1,19 +1,27 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cc5b3a7ba..63f18bfda4 100644
+index e35d8dd4e1..798179955c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1142,15 +1142,6 @@ install(
+@@ -1504,23 +1504,6 @@ install(
      "${MIXXX_INSTALL_LICENSEDIR}"
  )
- 
+
 -# Documentation
 -install(
 -  FILES
--    "${CMAKE_CURRENT_SOURCE_DIR}/README"
--    "${CMAKE_CURRENT_SOURCE_DIR}/Mixxx-Manual.pdf"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Keyboard-Shortcuts.pdf"
 -  DESTINATION
 -    "${MIXXX_INSTALL_DOCDIR}"
 -)
+-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf")
+-  install(
+-    FILES
+-      "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf"
+-    DESTINATION
+-      "${MIXXX_INSTALL_DOCDIR}"
+-  )
+-endif()
 -
  # Additional Linux-only files
  if(UNIX AND NOT APPLE)
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 5348bd3d18a5..d6ba056d0789 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -75,7 +75,8 @@ RDEPEND="
 	wavpack? ( media-sound/wavpack )
 	"
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-cpp/ms-gsl"
 BDEPEND="virtual/pkgconfig
 	dev-qt/qttest:5
 	dev-qt/qtxmlpatterns:5"
@@ -105,6 +106,8 @@ src_configure() {
 		-DWAVPACK="$(usex wavpack on off)"
 		-DQTKEYCHAIN="$(usex qtkeychain on off)"
 		-DKEYFINDER="$(usex keyfinder on off)"
+		-DDOWNLOAD_MANUAL=OFF
+		-DBUILD_SHARED_LIBS=OFF
 	)
 
 	if [[ "${PV}" == 9999 ]] ; then
@@ -125,7 +128,7 @@ src_install() {
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
 
 	if use doc ; then
-		dodoc README Mixxx-Manual.pdf
+		dodoc README res/Mixxx-Keyboard-Shortcuts.pdf
 	fi
 }
 
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 6e283b9d402e..fec625cbad0c 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index bf2668a9eac7..560983226615 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -12,7 +12,6 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2452 BLAK
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch 505 BLAKE2B d92ab5c7604b9c04296ea82d3c5b093a900bb9345289539262e5d057bf21d003ce1fdfce7e6f57b8dad3cb62c3e604ada6e9bd596a3673afbbced338230ba638 SHA512 71bc5511bc0fcb9d55e893300066f7e755da5bad04f74e0ba103e622cac6ebf99d1fa7b1ca9f08d2b5169d305a4bee6a7782cb14304352ca108d126931851a5b
 AUX aegisub-9999-git.patch 1602 BLAKE2B ae40661da657c303eaaefc8b2d850e810ca506b60eb023bb34b6fe9839205dec15c7f781ab0e886f52e3c1d721338bf9bd9ec29814c65f236c8d5b99156a8a45 SHA512 7e4c1be034543b887b9ee6b84e686c2f1c26e6138a9aee997a0eab2dd5256a918c4ccfda41b0cc71a88fc0856f1726cee413e16fa4aef260faacb0803e01732d
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
-EBUILD aegisub-3.2.2_p20160518-r104.ebuild 4225 BLAKE2B 2cda2b96b73e67fdb2891e198720bb21fa8968f0be833731033778360d120311eeb17d42c4df7967e547a99a598c3b7c1f65fe35530005c8a2584eff676f453d SHA512 2109821673748c026bf3316718c10e866ea77f0d27ff392d02d38e0ed64cc2cafecc841b57f659512232d66bab136f47e815edd56bc6d969b99fa535e63c7fac
 EBUILD aegisub-3.2.2_p20160518-r105.ebuild 4277 BLAKE2B a0f15d4785fe42e9da2b4d76066130d0df1e08f230c1a1651496ca437fefb453d9765089b9131b1b0de965ccda32a12fe1cb1a97347b7d3be1c20488632c111b SHA512 f990a74d8a767584482eea686eeebf24e8cb5116b59313a346b9cbe56fe7f0bc2fbc79b3d9526d85f064bd4cb93eaf5344c500c21138a7dd971a3c6f61bbdfc3
 EBUILD aegisub-9999.ebuild 2861 BLAKE2B d9f0a07dc04e1b220e3346ad27480ce9c2854ddcc25a73c30e9eba8bc4a6507ef7e37bea5db70defbab336a6ffaa634f2bb0a82338eada2af5263ca7898caf7b SHA512 c2031bcd77f9980f7eade7548cc2821220fe4a42f91b5b0ddc76e67c2e6b77db794a8068372e6dee92458fbd4b2bda79940c45ca72ec7d3558c72f1bfa4de9ad
 MISC metadata.xml 490 BLAKE2B 1f9546d336e50825e1490d8f0b54a21c076ec000427f0c319781e702ec0a58966bd4193e26c0c7cc4e677bea67a865a9a2f040fd4f58356d8e5539c5c7592665 SHA512 7717dcf3bbe125775a8a93682cde4477294649cbd6d01dcccc132b51880d7a58a61314134cb83f7ffd43e104f4818d9d27c1b90685f988ebe78ecdd9156db9eb
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r104.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r104.ebuild
deleted file mode 100644
index a3011cbdbd9c..000000000000
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r104.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-LUA_REQ_USE="lua52compat"
-
-WX_GTK_VER=3.0
-PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW"
-COMMIT_ID="b118fe7e7a5c37540e2f0aa75af105e272bad234"
-
-inherit autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
-SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
-RESTRICT="test"
-
-# aegisub bundles luabins (https://github.com/agladysh/luabins).
-# Unfortunately, luabins upstream is practically dead since 2010.
-# Thus unbundling luabins isn't worth the effort.
-RDEPEND="${LUA_DEPS}
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	media-libs/ffmpegsource:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libass:=[fontconfig]
-	sys-libs/zlib
-	virtual/libiconv
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( >=sci-libs/fftw-3.3:= )
-	openal? ( media-libs/openal )
-	portaudio? ( =media-libs/portaudio-19* )
-	pulseaudio? ( media-sound/pulseaudio )
-	spell? ( app-text/hunspell:= )
-	uchardet? ( app-i18n/uchardet )
-"
-DEPEND="${RDEPEND}"
-# luarocks is only used as a command-line tool so there is no need to enforce
-# LUA_SINGLE_USEDEP on it. On the other hand, this means we must use version
-# bounds in order to make sure we use a version migrated to Lua eclasses.
-BDEPEND="dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		>=dev-cpp/gtest-1.8.1
-		>=dev-lua/luarocks-3.4.0-r100
-		$(lua_gen_cond_dep '
-			dev-lua/busted[${LUA_USEDEP}]
-		')
-	)
-"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	|| ( alsa openal oss portaudio pulseaudio )"
-
-PATCHES=(
-	"${FILESDIR}/${PV}/${P}-fix-system-luajit-build.patch"
-	"${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch"
-	"${FILESDIR}/${PV}/${P}-support-system-gtest.patch"
-	"${FILESDIR}/${PV}/${P}-fix-icu59-build.patch"
-	"${FILESDIR}/${PV}/${P}-fix-icu62-build.patch"
-	"${FILESDIR}/${PV}/${P}-fix-boost170-build.patch"
-	"${FILESDIR}/${PV}/${P}-fix-makefile-for-make4.3.patch"
-	"${FILESDIR}/${PV}/${P}-tests_luarocks_lua_version.patch"
-	"${FILESDIR}/${PV}/${P}-avoid-conveying-positional-parameters-to-source-builtin.patch"
-	"${FILESDIR}/${PV}/${P}-luaL_Reg-not-luaL_reg.patch"
-	"${FILESDIR}/${PV}/${P}-ffmpegsource-2.40-compat2.patch"
-)
-
-aegisub_check_compiler() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
-	fi
-}
-
-pkg_pretend() {
-	aegisub_check_compiler
-}
-
-pkg_setup() {
-	aegisub_check_compiler
-	lua-single_pkg_setup
-}
-
-src_prepare() {
-	default_src_prepare
-
-	# Remove tests that require unavailable uuid Lua module.
-	rm automation/tests/modules/lfs.moon || die
-
-	remove_locale() {
-		rm "po/${1}.po" || die
-	}
-
-	plocale_find_changes 'po' '' '.po'
-	plocale_for_each_disabled_locale remove_locale
-
-	# See http://devel.aegisub.org/ticket/1914
-	config_rpath_update "${S}"/config.rpath
-
-	eautoreconf
-
-	cat <<- EOF > build/git_version.h || die
-		#define BUILD_GIT_VERSION_NUMBER 8897
-		#define BUILD_GIT_VERSION_STRING "${PV}"
-		#define TAGGED_RELEASE 0
-	EOF
-}
-
-src_configure() {
-	# Prevent access violations from OpenAL detection. See Gentoo bug 508184.
-	use openal && export agi_cv_with_openal="yes"
-
-	setup-wxwidgets
-	local myeconfargs=(
-		--disable-update-checker
-		--with-ffms2
-		--with-system-luajit
-		$(use_enable debug)
-		$(use_with alsa)
-		$(use_with fftw fftw3)
-		$(use_with openal)
-		$(use_with oss)
-		$(use_with portaudio)
-		$(use_with pulseaudio libpulse)
-		$(use_with spell hunspell)
-		$(use_with uchardet)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake WITH_SYSTEM_GTEST=$(usex test)
-}
-
-src_test() {
-	emake test-automation
-	emake test-libaegisub
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index 051d6cabae4c..1da017f57822 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -172,4 +172,4 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST y4m-0.7.0.crate 12045 BLAKE2B 4f48eb7ad5be2486e0f723b9beb9109cd1b38a0d0c5ac4a64411fce0bd9371d45496e5e0e839d15e7d1616b3888cfc1a0fc1ca364e65ac508306cad9a4ed44a7 SHA512 b85b0dd6df46c9bf125eee3e51ea39545ea1c794a2a097bba0aa31c682532ed3a9ba141745c61915fff13535fc5fff5a490d7c9e731c75bb5ce38a702075467e
 EBUILD rav1e-0.5.1.ebuild 4668 BLAKE2B 27648c7de7fb068c737801bd6096ab59212a868ff820b550a922948160dc1bd095924d0e1c6962f9d1c28717c25a2e966ff7c4fc9ca463a1123d486f34ea7ee0 SHA512 bb22f83b6ae402f430a154bf222f3960a65c8835f9c4951e30af7a59cc02d1cb4e01fb426f8f7d0063dec1f6c4453e7021461b51f3cc6df15965493c5765db50
 EBUILD rav1e-9999.ebuild 1558 BLAKE2B a75dfb8dec609725680577af97afa90ac736b01e4727ae3c61aec82e418e1f46b3f673fbdf1f4305b64c13a5bf87efa2d62433a759a3ba4e0b9902dfecbf8204 SHA512 eaea1e348b278fc6137639e6a09f79cf4e953281638ec4f233c9b6a7092b5a0bedc7a81adf437b6cbba35518095cbe6fb5bfe36f28ba6022cd186a5690896e84
-MISC metadata.xml 397 BLAKE2B 9109c6b5b08a402a5c7f47b6b845cd16bd86b88d6dc62fffe1c1ecdca2cda46231c46e909991d2459a104bfb74e3f3b31a29eb602a475826ab4d4dde6c8f164d SHA512 cc332a67aa7c85336448ef28de278c45a51159ea48d8446fa562781cd76b30964107a74836e003c72756f66e0e094124d72a495b4381d93572b53b17a5c66a87
+MISC metadata.xml 476 BLAKE2B b2997e03c74032da0513d9fcc5c5a4974e246d39bc3cb02ea49dac6fa7002ed8c6034456aa0db6cf2c8533bbddd43f500509969d78de8cb1e25d0f404c7eecc3 SHA512 81afad35f0aec236cf49bdac48c80c5572fb3acaed566cd590dd12f0d35157a4eb1717f4fc6b9e1cabd5a5735b0fd095eef24d4eabcb1d116949b71d809d2079
diff --git a/media-video/rav1e/metadata.xml b/media-video/rav1e/metadata.xml
index 54e8815f09e4..23d811f8888c 100644
--- a/media-video/rav1e/metadata.xml
+++ b/media-video/rav1e/metadata.xml
@@ -10,4 +10,7 @@
   <use>
     <flag name="capi">Build the C-API library and header file</flag>
   </use>
+  <upstream>
+    <remote-id type="github">xiph/rav1e</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3b81586c4f62..8d80c0482a34 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 06f00606f869..a70f9b5f54e6 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 22 Jan 2023 23:09:38 +0000
+Mon, 23 Jan 2023 05:39:41 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 9a45c38aff7f..02bb27676102 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-22T23:09:43Z
+TIMESTAMP 2023-01-23T05:39:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPNwjdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPOHaBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA3VBAAkX6ETyMbL5oJ5Jt4hE8FIRNzwe82uwE0Ivo6pGRwDibaRgp2nHi3nGjk
-kOBHXtUdKrxzXCGtRbAvDpatlq1cD4R6vaSL1of9V597d6NUDnVqst3RP2SEdgvJ
-LqKJMNQ0EGZG86WFxMpHlv4zCMWjrMR773tvyDDAvabHJ2vH6Whatly5ZYNW3poN
-a6Se1j51aUR+x+RJ79tzbC6LfTLZnRfTxQFUVF8KJbZsEHEXStvWJkBq/+uQSacZ
-qBGzfKs+e50Usb7BkGcVE8vaqom6BZvzzRcA/SqdZHgLZbEar/DZpgDFMLseh9xU
-e7RkQ5dP0h2xxBhYCw0G5wT+yTbQbsA+pRO1pQANcFwMDcd+3Rz29bGrR6WspsXm
-DKmpl8lSBf7yV1ZM4SWqCi2SJUIPTu8jFT5//lMSxSIN5OuaaFmXZOFK0cqqpVak
-WWvCSZVfkNJOyvzt4CuZVD0U6C/tb1j/mJ3StLhZhcBlrm45fZ6ZSCIVBnRUw4pD
-OQwBO76hRh712oEy9ptL1W6GZGZyUfuKLJiMz88vfBga+K3al/2GFocyiashGHZq
-HOpiE64Sy0xwFRH5XsajGoN5oUY1vWl+v59VM+R0GIirH3eHX2BIHvkFDx6ElNMk
-ELPYaKymZ4cj4nPUQksp0H0RbuKfb1fvEXGRfygapdzn6i4LTec=
-=jNSI
+klBDvw/+ORI5cWgX5voh+LLfmHKLVF+IikkY7jQ4+gNdILeYluTp9ArQEDlDDZMS
+jwmfSJEPpMV0zZHtqMcxxKWiq7Icd1y4so4relqAchzPd4hqhz9wFCXELWhBB0RK
+oa8h5O8fbSNWSZsH4pV1TA0FVFo/3a70TxURxRu+1GmP4ZO8t43mg5rToq6GIYci
+4fjsdolyY+Brznvd6JWeUudqzl+xfWNZ/eTQI/bQEXmmXvRe3wiIWw+ROxPYTBEK
+8JjmROkwGPjk1Zyoo2ITVw+NClrgKlvqTRSZ91wfPrsIo6An+ANotPyAJDQRqOdx
++tWgw6bOYdugfzqC2ZWpwlF+Zq8zMeEoxRz/Na66sE+yUzqQlCSoDrqNRGfLPcnw
+O3/KVI7zjYLsT4MM7ItpRlmO53k+UTCVGmdpRfhdTxFF87+VvTbPkkMnGtffbzNm
+Z8I8JE8RpNGarOvVY1W6Or2biOU6O9tT/3kdVudyz2YR+F7qYFTcIVFpRXeh5o/r
+SE7tjgM4jpmszYuChIAscGBiDfOqqCiG2d0X8L9ByP24DxcmisMGRNwPJGk5vfc1
+pFEqbXDOiwuHKKCx8FwPZwQ6AR4ezC9qKDaHvYcd+kHDFLUfK7q1Gfrdfxn52+3a
+sXtEtWCPp9+V6ZUTp8nmT3j8OvVvntdNllG/oW8ncSrti2s9XtQ=
+=3N8l
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c6f5d65ee4fd..a70f9b5f54e6 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 22 Jan 2023 23:09:39 +0000
+Mon, 23 Jan 2023 05:39:41 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 681eb06125fe..330cee9f5ff5 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index df921f2bda8d..4ae782010e90 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/gedit-44.2 b/metadata/md5-cache/app-editors/gedit-44.2
new file mode 100644
index 000000000000..45f67fd4bb52
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gedit-44.2
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/vala:0.56 ) app-text/docbook-xml-dtd:4.1.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1 ) dev-util/itstool >=sys-devel/gettext-0.18 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.70:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=gui-libs/amtk-5.6:= >=gui-libs/tepl-6.4:= >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/gobject-introspection-1.54:= >=app-text/gspell-0.2.5:0= python? ( 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/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_11(-)] dev-libs/libpeas[python,python_single_target_python3_11(-)] ) ) >=x11-libs/gtksourceview-4.0.2:4[introspection,vala]
+DESCRIPTION=A text editor for the GNOME desktop
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-single-r1 vala xdg
+IUSE=+python gtk-doc python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.70:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=gui-libs/amtk-5.6:= >=gui-libs/tepl-6.4:= >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/gobject-introspection-1.54:= >=app-text/gspell-0.2.5:0= python? ( 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/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_11(-)] dev-libs/libpeas[python,python_single_target_python3_11(-)] ) ) >=x11-libs/gtksourceview-4.0.2:4[introspection,vala] x11-themes/adwaita-icon-theme gnome-base/gsettings-desktop-schemas gnome-base/gvfs
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gedit/44/gedit-44.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=16f06090b9d52954f4193cf43b91ff89
diff --git a/metadata/md5-cache/app-editors/gedit-plugins-44.1 b/metadata/md5-cache/app-editors/gedit-plugins-44.1
new file mode 100644
index 000000000000..88fa441abeca
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gedit-plugins-44.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxml2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/libpeas-1.14.1[gtk] >=app-editors/gedit-44.0 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] ) python_single_target_python3_9? ( app-editors/gedit[python,python_single_target_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] >=dev-python/dbus-python-0.82[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[python,python_single_target_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] >=dev-python/dbus-python-0.82[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-editors/gedit[python,python_single_target_python3_11(-)] dev-libs/libpeas[python,python_single_target_python3_11(-)] >=dev-python/dbus-python-0.82[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+DESCRIPTION=Collection of extra plugins for the gedit Text Editor
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ThirdPartyPlugins
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-single-r1 vala xdg
+IUSE=charmap git +python terminal vala python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/libpeas-1.14.1[gtk] >=app-editors/gedit-44.0 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] ) python_single_target_python3_9? ( app-editors/gedit[python,python_single_target_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] >=dev-python/dbus-python-0.82[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[python,python_single_target_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] >=dev-python/dbus-python-0.82[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-editors/gedit[python,python_single_target_python3_11(-)] dev-libs/libpeas[python,python_single_target_python3_11(-)] >=dev-python/dbus-python-0.82[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) terminal? ( python )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gedit-plugins/44/gedit-plugins-44.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=27e9856c2b3815928babbca23459f729
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 1f07a68d23ea..52d9d9bb22f0 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.54 b/metadata/md5-cache/app-office/gnumeric-1.12.54
new file mode 100644
index 000000000000..2ff14d3de5e3
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.54
@@ -0,0 +1,18 @@
+BDEPEND=app-text/docbook-xml-dtd:4.5 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.51:0.10[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg(+)] introspection? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] )
+DESCRIPTION=The GNOME Spreadsheet
+EAPI=8
+HOMEPAGE=http://www.gnumeric.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools gnome.org python-r1 xdg
+IUSE=+introspection libgda perl python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.51:0.10[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg(+)] introspection? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] )
+REQUIRED_USE=introspection? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.54.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=293f6eccac9a32921ea0a73f55f2ddb5
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 924b244838fe..31f272d0869c 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/zathura-0.5.2-r3 b/metadata/md5-cache/app-text/zathura-0.5.2-r4
index 7b36225d6ebf..9b6b37a28d96 100644
--- a/metadata/md5-cache/app-text/zathura-0.5.2-r3
+++ b/metadata/md5-cache/app-text/zathura-0.5.2-r4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.5
 SRC_URI=https://github.com/pwmt/zathura/archive/0.5.2.tar.gz -> zathura-0.5.2.tar.gz https://dev.gentoo.org/~slashbeast/distfiles/zathura/zathura-0.5.2-manpages.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=af258b59d973b66173d2b4fe426472b7
+_md5_=8f871679e7d8b1a62c5ad592aeaa92a2
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index bd2f29e70e46..2609f0e87564 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.3.2-r1 b/metadata/md5-cache/dev-cpp/muParser-2.3.2-r1
deleted file mode 100644
index 98914cbc3e3f..000000000000
--- a/metadata/md5-cache/dev-cpp/muParser-2.3.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for parsing mathematical expressions
-EAPI=8
-HOMEPAGE=https://beltoforion.de/en/muparser/
-INHERIT=cmake
-IUSE=doc openmp test
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/beltoforion/muparser/archive/v2.3.2.tar.gz -> muParser-2.3.2.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1dfafd7dd6142f53656e051ca776cc18
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.3.3-r1 b/metadata/md5-cache/dev-cpp/muParser-2.3.3-r1
deleted file mode 100644
index 1d56fe351f2e..000000000000
--- a/metadata/md5-cache/dev-cpp/muParser-2.3.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for parsing mathematical expressions
-EAPI=8
-HOMEPAGE=https://beltoforion.de/en/muparser/
-INHERIT=cmake
-IUSE=doc openmp test wchar
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/beltoforion/muparser/archive/refs/tags/v2.3.3-1.tar.gz -> muParser-2.3.3.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=712a15f5e8d9816b0f7a924eb27a1932
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.3.3 b/metadata/md5-cache/dev-cpp/muParser-2.3.3-r2
index caccd9963c78..aa7e00f09275 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.3.3
+++ b/metadata/md5-cache/dev-cpp/muParser-2.3.3-r2
@@ -1,9 +1,9 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install prepare pretend setup test
 DESCRIPTION=Library for parsing mathematical expressions
 EAPI=8
 HOMEPAGE=https://beltoforion.de/en/muparser/
-INHERIT=cmake
+INHERIT=cmake toolchain-funcs
 IUSE=doc openmp test
 KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beltoforion/muparser/archive/refs/tags/v2.3.3-1.tar.gz -> muParser-2.3.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c54e0d1ce81bbbde157395e94c3ecc82
+_md5_=5048eb07df7560dfffa069cbf3fe24f3
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.3.4 b/metadata/md5-cache/dev-cpp/muParser-2.3.4-r1
index 66ba0386da95..0aa50731726b 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.3.4
+++ b/metadata/md5-cache/dev-cpp/muParser-2.3.4-r1
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install prepare pretend setup test
 DESCRIPTION=Library for parsing mathematical expressions
 EAPI=8
 HOMEPAGE=https://beltoforion.de/en/muparser/
-INHERIT=cmake
-IUSE=doc openmp test wchar
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+INHERIT=cmake toolchain-funcs
+IUSE=doc openmp test
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beltoforion/muparser/archive/refs/tags/v2.3.4.tar.gz -> muParser-2.3.4.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3cea33dff314a202fa377c53cdf7a33d
+_md5_=797d7496191aea7817948efbba35ec24
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 9eeb5ab78892..a1da0c31377b 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/openjdk-11.0.15_p10-r1 b/metadata/md5-cache/dev-java/openjdk-11.0.15_p10-r1
deleted file mode 100644
index a3458a6e55cb..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-11.0.15_p10-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11= ) system-bootstrap? ( || ( dev-java/openjdk-bin:11[gentoo-vm(+)] dev-java/openjdk:11[gentoo-vm(+)] ) ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.org
-INHERIT=eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
-SLOT=11
-SRC_URI=https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-11.0.15-ga.tar.gz -> openjdk-11.0.15_p10.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.14_p9-riscv.tar.xz ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3945156c3a00d5bd33a4117d7f452202
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.16.1_p1 b/metadata/md5-cache/dev-java/openjdk-11.0.16.1_p1
deleted file mode 100644
index b482a7f9ca34..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-11.0.16.1_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11= ) system-bootstrap? ( || ( dev-java/openjdk-bin:11[gentoo-vm(+)] dev-java/openjdk:11[gentoo-vm(+)] ) ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.org
-INHERIT=eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
-SLOT=11
-SRC_URI=https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-11.0.16.1-ga.tar.gz -> openjdk-11.0.16.1_p1.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.14_p9-riscv.tar.xz ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f16d70b3500a87234ad6036ec2070b7f
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.17_p8 b/metadata/md5-cache/dev-java/openjdk-11.0.17_p8
deleted file mode 100644
index 3458be8222be..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-11.0.17_p8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11= ) system-bootstrap? ( || ( dev-java/openjdk-bin:11[gentoo-vm(+)] dev-java/openjdk:11[gentoo-vm(+)] ) ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.org
-INHERIT=eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
-SLOT=11
-SRC_URI=https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-11.0.17-ga.tar.gz -> openjdk-11.0.17_p8.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.14_p9-riscv.tar.xz ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f16d70b3500a87234ad6036ec2070b7f
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.3_p7-r1 b/metadata/md5-cache/dev-java/openjdk-17.0.3_p7-r1
deleted file mode 100644
index 18bd773dc26a..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-17.0.3_p7-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:17= ) system-bootstrap? ( || ( dev-java/openjdk-bin:17 dev-java/openjdk:17 ) ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.java.net
-INHERIT=check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa big-endian cups debug doc examples +gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
-SLOT=17
-SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.3+7.tar.gz -> openjdk-17.0.3_p7.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-riscv.patch.xz )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0863b177dfa250bf8fa55a6f32205507
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.4.1_p1 b/metadata/md5-cache/dev-java/openjdk-17.0.4.1_p1
deleted file mode 100644
index 73e7a52c634a..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-17.0.4.1_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:17= ) system-bootstrap? ( || ( dev-java/openjdk-bin:17 dev-java/openjdk:17 ) ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.org
-INHERIT=check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
-SLOT=17
-SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.4.1+1.tar.gz -> openjdk-17.0.4.1_p1.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-riscv.patch.xz )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f881d61bdd0a0f684859bd2811b6609d
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.5_p8 b/metadata/md5-cache/dev-java/openjdk-17.0.5_p8
deleted file mode 100644
index 6eebf39a93fc..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-17.0.5_p8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:17= ) system-bootstrap? ( || ( dev-java/openjdk-bin:17 dev-java/openjdk:17 ) ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.org
-INHERIT=check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
-SLOT=17
-SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.5-ga.tar.gz -> openjdk-17.0.5_p8.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f7fb325c92750b4a7b89f8bca831d9c7
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.6_p10 b/metadata/md5-cache/dev-java/openjdk-17.0.6_p10
index 0fa9246271b2..a7f058f3effa 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.6_p10
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.6_p10
@@ -13,4 +13,4 @@ REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=17
 SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.6-ga.tar.gz -> openjdk-17.0.6_p10.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f171c264e40f946b4809707b0a28650c
+_md5_=9e0ba09a034d21000d83a914874c7592
diff --git a/metadata/md5-cache/dev-java/openjdk-8.332_p09 b/metadata/md5-cache/dev-java/openjdk-8.332_p09
deleted file mode 100644
index fe6f008bed8b..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-8.332_p09
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/unzip
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.org
-INHERIT=check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=GPL-2
-PDEPEND=javafx? ( dev-java/openjfx:8 )
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-SLOT=8
-SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u332-ga.tar.gz -> openjdk-8.332_p09.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d2c9a37c583014ccfc57ed9e8da972cb
diff --git a/metadata/md5-cache/dev-java/openjdk-8.345_p01 b/metadata/md5-cache/dev-java/openjdk-8.345_p01
deleted file mode 100644
index 4a870d742b05..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-8.345_p01
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/unzip
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.org
-INHERIT=check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=javafx? ( dev-java/openjfx:8 )
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-SLOT=8
-SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u345-ga.tar.gz -> openjdk-8.345_p01.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dcb707dd2e0a2810f74efc6e51c9eedd
diff --git a/metadata/md5-cache/dev-java/openjdk-8.352_p08 b/metadata/md5-cache/dev-java/openjdk-8.352_p08
deleted file mode 100644
index 5fdf1777d982..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-8.352_p08
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/unzip
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 dev-java/icedtea:8 ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=7
-HOMEPAGE=https://openjdk.org
-INHERIT=check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-IUSE=alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=javafx? ( dev-java/openjfx:8 )
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
-SLOT=8
-SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u352-ga.tar.gz -> openjdk-8.352_p08.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dcb707dd2e0a2810f74efc6e51c9eedd
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.15_p10 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.15_p10
deleted file mode 100644
index d0001be29364..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.15_p10
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
-EAPI=8
-HOMEPAGE=https://adoptopenjdk.net
-IDEPEND=app-eselect/eselect-java
-INHERIT=java-vm-2
-IUSE=alsa cups +gentoo-vm headless-awt selinux
-KEYWORDS=amd64
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) dev-java/java-config app-eselect/eselect-java
-RESTRICT=preserve-libs splitdebug
-SLOT=11
-SRC_URI=amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jre_x64_linux_hotspot_11.0.15_10.tar.gz )
-_eclasses_=java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1678346bb0d87eefac76103ae33d8e8c
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.3_p7 b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.3_p7
deleted file mode 100644
index 54f2742a443a..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.3_p7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
-EAPI=8
-HOMEPAGE=https://adoptopenjdk.net
-IDEPEND=app-eselect/eselect-java
-INHERIT=java-vm-2
-IUSE=alsa cups +gentoo-vm headless-awt selinux
-KEYWORDS=amd64
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) dev-java/java-config app-eselect/eselect-java
-RESTRICT=preserve-libs splitdebug
-SLOT=17
-SRC_URI=amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3+7/OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz )
-_eclasses_=java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1678346bb0d87eefac76103ae33d8e8c
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p09 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p09
deleted file mode 100644
index 7e0cc354e3de..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p09
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-java/java-config app-eselect/eselect-java
-DESCRIPTION=Prebuilt Java JRE binaries provided by Eclipse Temurin
-EAPI=8
-HOMEPAGE=https://adoptium.net
-IDEPEND=app-eselect/eselect-java
-INHERIT=java-vm-2
-IUSE=alsa cups headless-awt selinux
-KEYWORDS=amd64
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) dev-java/java-config app-eselect/eselect-java
-RESTRICT=preserve-libs splitdebug
-SLOT=8
-SRC_URI=amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u332-b09/OpenJDK8U-jre_x64_linux_hotspot_8u332b09.tar.gz )
-_eclasses_=java-vm-2	5dd4303f0b659986f096e65e566b9701	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=08f8743e7eba2c2c9d5ca5bd87b1d761
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index b7c39076c24e..6e6ad76c288b 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/astyle-3.0.1-r1 b/metadata/md5-cache/dev-util/astyle-3.0.1-r1
deleted file mode 100644
index 5d73d106ff63..000000000000
--- a/metadata/md5-cache/dev-util/astyle-3.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Artistic Style is a re-indenter and reformatter for C++, C and Java source code
-EAPI=6
-HOMEPAGE=http://astyle.sourceforge.net/
-INHERIT=flag-o-matic toolchain-funcs versionator java-pkg-opt-2
-IUSE=examples java static-libs java
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/3.0
-SRC_URI=mirror://sourceforge/astyle/astyle_3.0.1_linux.tar.gz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=957e66bbb6a01144991a2f7562aa2c37
diff --git a/metadata/md5-cache/dev-util/astyle-3.1-r2 b/metadata/md5-cache/dev-util/astyle-3.1-r2
index 87101900fe31..1359f531232f 100644
--- a/metadata/md5-cache/dev-util/astyle-3.1-r2
+++ b/metadata/md5-cache/dev-util/astyle-3.1-r2
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Artistic Style is a re-indenter and reformatter for C++, C and Java source code
-EAPI=6
+EAPI=8
 HOMEPAGE=http://astyle.sourceforge.net/
-INHERIT=flag-o-matic toolchain-funcs versionator java-pkg-opt-2
+INHERIT=flag-o-matic toolchain-funcs java-pkg-opt-2
 IUSE=examples java static-libs java
 KEYWORDS=amd64 arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/3.1
 SRC_URI=mirror://sourceforge/astyle/astyle_3.1_linux.tar.gz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=75de508268d01e960c260aa758f6a1a5
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=366e1a6b4349f5ecc9d9c4571441e106
diff --git a/metadata/md5-cache/dev-util/cloc-1.96 b/metadata/md5-cache/dev-util/cloc-1.96
new file mode 100644
index 000000000000..01b7df682359
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cloc-1.96
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/perl
+DESCRIPTION=Count Lines of Code
+EAPI=8
+HOMEPAGE=https://github.com/AlDanial/cloc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl dev-perl/Algorithm-Diff dev-perl/Parallel-ForkManager dev-perl/Regexp-Common virtual/perl-Digest-MD5 virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=https://github.com/AlDanial/cloc/archive/refs/tags/v1.96.tar.gz -> cloc-1.96.tar.gz
+_md5_=66b073ddb5c146d5521e71a9a6166424
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.9.3 b/metadata/md5-cache/dev-util/pkgconf-1.8.1
index 29e7cb46b492..7c1e3f4d54ea 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.9.3
+++ b/metadata/md5-cache/dev-util/pkgconf-1.8.1
@@ -5,10 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitea.treehouse.systems/ariadne/pkgconf
 INHERIT=multilib multilib-minimal
 IUSE=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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
 RDEPEND=!dev-util/pkgconfig
 RESTRICT=!test? ( test )
-SLOT=0/4
-SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.9.3.tar.xz
+SLOT=0/3
+SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.8.1.tar.xz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=fcfa49d3497fa9a19509ee066a38e56f
+_md5_=a7a04a40564abcc9246016d5be1653b2
diff --git a/metadata/md5-cache/dev-util/radare2-5.7.4 b/metadata/md5-cache/dev-util/radare2-5.7.4
deleted file mode 100644
index ac36da968b9f..000000000000
--- a/metadata/md5-cache/dev-util/radare2-5.7.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libzip:= dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( dev-libs/openssl:0= ) dev-util/gperf
-DESCRIPTION=unix-like reverse engineering framework and commandline tools
-EAPI=8
-HOMEPAGE=https://www.radare.org
-INHERIT=bash-completion-r1 toolchain-funcs
-IUSE=ssl test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libzip:= dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( dev-libs/openssl:0= )
-RESTRICT=fetch !test? ( test )
-SLOT=0
-SRC_URI=mirror+https://github.com/radareorg/radare2/archive/5.7.4.tar.gz -> radare2-5.7.4.tar.gz mirror+https://github.com/radareorg/vector35-arch-arm64/archive/fddb6d0fb0489c4e797a61b1553ac0d771fbf657.tar.gz -> radare2-5.7.4-vector35-arm64.tar.gz mirror+https://github.com/radareorg/vector35-arch-armv7/archive/dde39f69ffea19fc37e681874b12cb4707bc4f30.tar.gz -> radare2-5.7.4-vector35-armv7.tar.gz test? ( https://github.com/radareorg/radare2-testbins/archive/2fdb78f7f754b3aea90377588d45b774ccb41086.tar.gz -> radare2-testbins-2fdb78f7f754b3aea90377588d45b774ccb41086.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=772e7e890852989d956d4b1cb526440a
diff --git a/metadata/md5-cache/dev-util/radare2-5.7.6 b/metadata/md5-cache/dev-util/radare2-5.7.6
deleted file mode 100644
index 45ba7c6561e0..000000000000
--- a/metadata/md5-cache/dev-util/radare2-5.7.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libzip:= dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( dev-libs/openssl:0= ) dev-util/gperf
-DESCRIPTION=unix-like reverse engineering framework and commandline tools
-EAPI=8
-HOMEPAGE=https://www.radare.org
-INHERIT=bash-completion-r1 toolchain-funcs
-IUSE=ssl test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libzip:= dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( dev-libs/openssl:0= )
-RESTRICT=fetch !test? ( test )
-SLOT=0
-SRC_URI=mirror+https://github.com/radareorg/radare2/archive/5.7.6.tar.gz -> radare2-5.7.6.tar.gz mirror+https://github.com/radareorg/vector35-arch-arm64/archive/9ab2b0bedde459dc86e079718333de4a63bbbacb.tar.gz -> radare2-5.7.6-vector35-arm64.tar.gz mirror+https://github.com/radareorg/vector35-arch-armv7/archive/dde39f69ffea19fc37e681874b12cb4707bc4f30.tar.gz -> radare2-5.7.6-vector35-armv7.tar.gz test? ( https://github.com/radareorg/radare2-testbins/archive/602471f72caa60d6ece43c3fa483c43decf7052c.tar.gz -> radare2-testbins-602471f72caa60d6ece43c3fa483c43decf7052c.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c22a0e08e61fda73647db8361e17e562
diff --git a/metadata/md5-cache/dev-util/radare2-5.7.8 b/metadata/md5-cache/dev-util/radare2-5.7.8
deleted file mode 100644
index 97264d5fe060..000000000000
--- a/metadata/md5-cache/dev-util/radare2-5.7.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libzip:= dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( dev-libs/openssl:0= ) dev-util/gperf
-DESCRIPTION=unix-like reverse engineering framework and commandline tools
-EAPI=8
-HOMEPAGE=https://www.radare.org
-INHERIT=bash-completion-r1 toolchain-funcs
-IUSE=ssl test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libzip:= dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( dev-libs/openssl:0= )
-RESTRICT=fetch !test? ( test )
-SLOT=0
-SRC_URI=mirror+https://github.com/radareorg/radare2/archive/5.7.8.tar.gz -> radare2-5.7.8.tar.gz mirror+https://github.com/radareorg/vector35-arch-arm64/archive/9ab2b0bedde459dc86e079718333de4a63bbbacb.tar.gz -> radare2-5.7.8-vector35-arm64.tar.gz mirror+https://github.com/radareorg/vector35-arch-armv7/archive/dde39f69ffea19fc37e681874b12cb4707bc4f30.tar.gz -> radare2-5.7.8-vector35-armv7.tar.gz test? ( https://github.com/radareorg/radare2-testbins/archive/602471f72caa60d6ece43c3fa483c43decf7052c.tar.gz -> radare2-testbins-602471f72caa60d6ece43c3fa483c43decf7052c.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c22a0e08e61fda73647db8361e17e562
diff --git a/metadata/md5-cache/dev-util/radare2-5.8.2 b/metadata/md5-cache/dev-util/radare2-5.8.2
new file mode 100644
index 000000000000..a924c0c008b6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/radare2-5.8.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/libzip:= dev-libs/xxhash sys-apps/file sys-libs/zlib ssl? ( dev-libs/openssl:0= ) dev-util/gperf
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=8
+HOMEPAGE=https://www.radare.org
+INHERIT=bash-completion-r1 toolchain-funcs
+IUSE=ssl test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libzip:= dev-libs/xxhash sys-apps/file sys-libs/zlib ssl? ( dev-libs/openssl:0= )
+RESTRICT=fetch !test? ( test )
+SLOT=0
+SRC_URI=mirror+https://github.com/radareorg/radare2/archive/5.8.2.tar.gz -> radare2-5.8.2.tar.gz mirror+https://github.com/radareorg/vector35-arch-arm64/archive/c9e7242972837ac11fc94db05fabcb801a8269c9.tar.gz -> radare2-5.8.2-vector35-arm64.tar.gz mirror+https://github.com/radareorg/vector35-arch-armv7/archive/f270a6cc99644cb8e76055b6fa632b25abd26024.tar.gz -> radare2-5.8.2-vector35-armv7.tar.gz mirror+https://codeload.github.com/capstone-engine/capstone/tar.gz/4.0.2 -> radare2-5.8.2-capstone-4.0.2.tar.gz test? ( https://github.com/radareorg/radare2-testbins/archive/1f0ea409f2af83fc4d0b685855de9d3b0f9eee41.tar.gz -> radare2-testbins-1f0ea409f2af83fc4d0b685855de9d3b0f9eee41.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=ffbf1c60b39a4ce8f7d30f59facfcf3c
diff --git a/metadata/md5-cache/dev-util/valgrind-3.18.1 b/metadata/md5-cache/dev-util/valgrind-3.18.1
deleted file mode 100644
index d777b31ea754..000000000000
--- a/metadata/md5-cache/dev-util/valgrind-3.18.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=mpi? ( virtual/mpi )
-DESCRIPTION=An open-source memory debugger for GNU/Linux
-EAPI=7
-HOMEPAGE=https://www.valgrind.org
-INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils
-IUSE=mpi
-KEYWORDS=-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.18.1.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=49c4d96dceeba189bcef0b59ed280c07
diff --git a/metadata/md5-cache/dev-util/valgrind-3.19.0 b/metadata/md5-cache/dev-util/valgrind-3.19.0
index 5e637cbf3dbd..f2f556954f52 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.19.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.19.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.valgrind.org
 INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils
 IUSE=mpi
-KEYWORDS=-* amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.19.0.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=39c9f26860c5f501ca895c60c14e04a4
+_md5_=65c0eb156b3b16301f559860a813932c
diff --git a/metadata/md5-cache/dev-util/valgrind-3.20.0 b/metadata/md5-cache/dev-util/valgrind-3.20.0
index 4cb53131d09e..2c45b8cfd0e2 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.20.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.20.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.valgrind.org
 INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils
 IUSE=mpi
-KEYWORDS=-* amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=bb93ad4c2db1fed83bd0dd64de023562
+_md5_=ac99986bdca1fdc127d4cdc4a3eb6ef6
diff --git a/metadata/md5-cache/dev-util/valgrind-3.20.0-r2 b/metadata/md5-cache/dev-util/valgrind-3.20.0-r2
new file mode 100644
index 000000000000..570d6941dbdb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/valgrind-3.20.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=mpi? ( virtual/mpi )
+DESCRIPTION=An open-source memory debugger for GNU/Linux
+EAPI=8
+HOMEPAGE=https://www.valgrind.org
+INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils
+IUSE=mpi
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0
+SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=1aeab444372eb652a20be009eb793934
diff --git a/metadata/md5-cache/dev-util/valgrind-9999 b/metadata/md5-cache/dev-util/valgrind-9999
index 15b585c07f53..7929f3bd8a3c 100644
--- a/metadata/md5-cache/dev-util/valgrind-9999
+++ b/metadata/md5-cache/dev-util/valgrind-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1d1e380e665631b4f3a6315b8ce3a3d9
+_md5_=b52dd3017d7e95a2eebc59ea7ddd0705
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index e2f6a2e132db..53ea490f6eca 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/s25rttr-0.9.5 b/metadata/md5-cache/games-strategy/s25rttr-0.9.5
index bdb63c2a1229..5bf1fb6f02d1 100644
--- a/metadata/md5-cache/games-strategy/s25rttr-0.9.5
+++ b/metadata/md5-cache/games-strategy/s25rttr-0.9.5
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Return-To-The-Roots/s25client/releases/download/v0.9.5/s25client_src_v0.9.5.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=445d42db39f71fa27e6d1f4a89051062
+_md5_=4bd77057c3f25ad326075f772ae37ca8
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index d595f1e4c8bf..ddacb8d0599d 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.16.0 b/metadata/md5-cache/gnome-extra/gnome-commander-1.16.0
new file mode 100644
index 000000000000..a3f1ce1f396a
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.16.0
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-text/yelp-tools ) dev-util/glib-utils dev-util/gtk-doc-am sys-devel/flex >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=doc? ( gnome-extra/yelp ) >=dev-libs/glib-2.70.0:2 >=x11-libs/gtk+-2.24.0:2 exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12:= ) pdf? ( >=app-text/poppler-0.18 ) samba? ( gnome-base/gvfs[samba] ) taglib? ( >=media-libs/taglib-1.4 ) unique? ( >=dev-libs/libunique-0.9.3:1 ) test? ( >=dev-cpp/gtest-1.7.0 )
+DESCRIPTION=A graphical, full featured, twin-panel file manager
+EAPI=8
+HOMEPAGE=https://gcmd.github.io/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2 meson optfeature
+IUSE=doc exif gsf pdf samba taglib test +unique
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=doc? ( gnome-extra/yelp ) >=dev-libs/glib-2.70.0:2 >=x11-libs/gtk+-2.24.0:2 exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12:= ) pdf? ( >=app-text/poppler-0.18 ) samba? ( gnome-base/gvfs[samba] ) taglib? ( >=media-libs/taglib-1.4 ) unique? ( >=dev-libs/libunique-0.9.3:1 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.16/gnome-commander-1.16.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0889053ae71303a847685bf25b155dc2
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 810838dc8440..92155177d427 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20221208 b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20221208
new file mode 100644
index 000000000000..83589e6769b3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20221208
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/openssl:= media-libs/opus alsa? ( media-libs/alsa-lib ) dsp? ( media-libs/tg_owt:= ) pulseaudio? ( media-sound/pulseaudio )
+DESCRIPTION=VoIP library for Telegram clients
+EAPI=8
+HOMEPAGE=https://github.com/telegramdesktop/libtgvoip
+INHERIT=flag-o-matic autotools
+IUSE=+dsp +alsa pulseaudio
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+LICENSE=Unlicense
+RDEPEND=dev-libs/openssl:= media-libs/opus alsa? ( media-libs/alsa-lib ) dsp? ( media-libs/tg_owt:= ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=|| ( alsa pulseaudio )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/libtgvoip/archive/0ffe2e51bfe14b533b860002f1c2e87e5f8c00c0.tar.gz -> libtgvoip-2.4.4_p20221208.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6d0fbc4d6f283ac0218465db7ef9e8d4
diff --git a/metadata/md5-cache/media-libs/tg_owt-0_pre20230105 b/metadata/md5-cache/media-libs/tg_owt-0_pre20230105
new file mode 100644
index 000000000000..4e70cf859a65
--- /dev/null
+++ b/metadata/md5-cache/media-libs/tg_owt-0_pre20230105
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-cpp/abseil-cpp-20220623.1:= dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= dev-libs/crc32c screencast? ( dev-libs/glib:2 media-video/pipewire:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst ) screencast? ( media-libs/libglvnd media-libs/mesa x11-libs/libdrm )
+DESCRIPTION=WebRTC build for Telegram
+EAPI=8
+HOMEPAGE=https://github.com/desktop-app/tg_owt
+INHERIT=cmake flag-o-matic
+IUSE=screencast +X
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+LICENSE=BSD
+RDEPEND=>=dev-cpp/abseil-cpp-20220623.1:= dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= dev-libs/crc32c screencast? ( dev-libs/glib:2 media-video/pipewire:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst )
+SLOT=0/20230105
+SRC_URI=https://github.com/desktop-app/tg_owt/archive/5098730b9eb6173f0b52068fe2555b7c1015123a.tar.gz -> tg_owt-0_pre20230105.tar.gz https://gitlab.com/chromiumsrc/libyuv/-/archive/00950840d1c9bcbb3eb6ebc5aac5793e71166c8b/libyuv-00950840d1c9bcbb3eb6ebc5aac5793e71166c8b.tar.bz2
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2cdf6b23c5503b725965550ebe26c8de
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 6c1e23fb0ed8..c7faf7f5a6ef 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/mixxx-9999 b/metadata/md5-cache/media-sound/mixxx-9999
index 0478508ab8bf..d9849dd5454b 100644
--- a/metadata/md5-cache/media-sound/mixxx-9999
+++ b/metadata/md5-cache/media-sound/mixxx-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) shout? ( >=media-libs/libshout-2.4.5 ) wavpack? ( media-sound/wavpack )
+DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) shout? ( >=media-libs/libshout-2.4.5 ) wavpack? ( media-sound/wavpack ) dev-cpp/ms-gsl
 DESCRIPTION=Advanced Digital DJ tool based on Qt
 EAPI=8
 HOMEPAGE=https://www.mixxx.org/
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) shout? ( >=media-libs/libshout-2.4.5 ) wavpack? ( media-sound/wavpack )
 SLOT=0
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a390c860550514ae51324f3e370ccf09
+_md5_=3529436429eb28c2dc44085687aeca96
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 97105f24d16c..e89a148559fd 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r104 b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r104
deleted file mode 100644
index b2d384f99257..000000000000
--- a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r104
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig test? ( lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wxGTK:3.0[X,opengl,debug?] dev-libs/boost:=[icu,nls] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet ) >=dev-cpp/gtest-1.8.1 >=dev-lua/luarocks-3.4.0-r100 lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure postinst postrm prepare pretend setup test unpack
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wxGTK:3.0[X,opengl,debug?] dev-libs/boost:=[icu,nls] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
-DESCRIPTION=Advanced subtitle editor
-EAPI=7
-HOMEPAGE=http://www.aegisub.org/ https://github.com/Aegisub/Aegisub
-INHERIT=autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot
-IUSE=+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet +lua_single_target_luajit
-KEYWORDS=amd64 x86
-LICENSE=BSD MIT
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wxGTK:3.0[X,opengl,debug?] dev-libs/boost:=[icu,nls] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
-REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( alsa openal oss portaudio pulseaudio )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Aegisub/Aegisub/archive/b118fe7e7a5c37540e2f0aa75af105e272bad234.tar.gz -> aegisub-3.2.2_p20160518.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	950fbaec7deeba41b5bcc0572cca99b9	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4146e310b47319fde50b0005327a9038
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index b42165d10e50..92a10d515930 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/telegram-desktop-4.3.4-r2 b/metadata/md5-cache/net-im/telegram-desktop-4.5.3
index 0b68cef9793d..45a5797c654b 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-4.3.4-r2
+++ b/metadata/md5-cache/net-im/telegram-desktop-4.5.3
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) >=dev-util/cmake-3.16 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/glib:2 dev-libs/libdispatch dev-libs/libsigc++:2 dev-libs/openssl:= dev-libs/xxhash media-libs/fontconfig:= media-libs/libjpeg-turbo:= ~media-libs/libtgvoip-2.4.4_p20220503 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20220507:=[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] virtual/opengl dbus? ( dev-cpp/glibmm:2.68 ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] kde-frameworks/kcoreaddons:= ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] dev-qt/qtimageformats:6 dev-qt/qtsvg:6 wayland? ( dev-qt/qtwayland:6 ) qt6-imageformats? ( media-libs/libavif:= media-libs/libheif:= media-libs/libjxl ) ) X? ( x11-libs/libxcb:= x11-libs/xcb-util-keysyms ) dev-cpp/range-v3 dev-cpp/ms-gsl
+DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/glib:2 dev-libs/libdispatch dev-libs/libsigc++:2 dev-libs/openssl:= dev-libs/xxhash media-libs/fontconfig:= media-libs/libjpeg-turbo:= ~media-libs/libtgvoip-2.4.4_p20221208 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20230105:=[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] virtual/opengl dbus? ( dev-cpp/glibmm:2.68 ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] kde-frameworks/kcoreaddons:= ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] dev-qt/qtimageformats:6 dev-qt/qtsvg:6 wayland? ( dev-qt/qtwayland:6 ) qt6-imageformats? ( media-libs/libavif:= media-libs/libheif:= media-libs/libjxl ) ) X? ( x11-libs/libxcb:= x11-libs/xcb-util-keysyms ) dev-cpp/range-v3 dev-cpp/ms-gsl
 DESCRIPTION=Official desktop client for Telegram
 EAPI=8
 HOMEPAGE=https://desktop.telegram.org
@@ -9,9 +9,9 @@ INHERIT=xdg cmake python-any-r1 optfeature flag-o-matic
 IUSE=+dbus enchant +fonts +hunspell +jemalloc screencast +spell qt6 qt6-imageformats wayland +X
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
 LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
-RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/glib:2 dev-libs/libdispatch dev-libs/libsigc++:2 dev-libs/openssl:= dev-libs/xxhash media-libs/fontconfig:= media-libs/libjpeg-turbo:= ~media-libs/libtgvoip-2.4.4_p20220503 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20220507:=[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] virtual/opengl dbus? ( dev-cpp/glibmm:2.68 ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] kde-frameworks/kcoreaddons:= ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] dev-qt/qtimageformats:6 dev-qt/qtsvg:6 wayland? ( dev-qt/qtwayland:6 ) qt6-imageformats? ( media-libs/libavif:= media-libs/libheif:= media-libs/libjxl ) ) X? ( x11-libs/libxcb:= x11-libs/xcb-util-keysyms )
+RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/glib:2 dev-libs/libdispatch dev-libs/libsigc++:2 dev-libs/openssl:= dev-libs/xxhash media-libs/fontconfig:= media-libs/libjpeg-turbo:= ~media-libs/libtgvoip-2.4.4_p20221208 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20230105:=[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] virtual/opengl dbus? ( dev-cpp/glibmm:2.68 ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] kde-frameworks/kcoreaddons:= ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] dev-qt/qtimageformats:6 dev-qt/qtsvg:6 wayland? ( dev-qt/qtwayland:6 ) qt6-imageformats? ( media-libs/libavif:= media-libs/libheif:= media-libs/libjxl ) ) X? ( x11-libs/libxcb:= x11-libs/xcb-util-keysyms )
 REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) qt6-imageformats? ( qt6 )
 SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v4.3.4/tdesktop-4.3.4-full.tar.gz
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v4.5.3/tdesktop-4.5.3-full.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a3a362578db1fcb4423faad9ef71d31b
+_md5_=184b927d92922602219ec3f64193562e
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 31755bc40219..170acddae4c6 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/ergo-2.11.1 b/metadata/md5-cache/net-irc/ergo-2.11.1
new file mode 100644
index 000000000000..59926c676a31
--- /dev/null
+++ b/metadata/md5-cache/net-irc/ergo-2.11.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=A modern IRC server written in Go
+EAPI=8
+HOMEPAGE=https://ergo.chat/ https://github.com/ergochat/ergo
+INHERIT=go-module systemd
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0
+RDEPEND=acct-user/oragono acct-group/oragono
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/ergochat/ergo/archive/v2.11.1.tar.gz -> ergo-2.11.1.tar.gz
+_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=082ff1353347e52170ba78a23a204f10
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 5a5d4a2b02ea..0e17e9184034 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/sstp-client-1.0.18 b/metadata/md5-cache/net-misc/sstp-client-1.0.18
new file mode 100644
index 000000000000..206be1d1294e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sstp-client-1.0.18
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/libevent:= dev-libs/openssl:= net-dialup/ppp:=
+DESCRIPTION=A client implementation of Secure Socket Tunneling Protocol (SSTP)
+EAPI=8
+HOMEPAGE=http://sstp-client.sourceforge.net/
+INHERIT=autotools linux-info
+IUSE=static
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=dev-libs/libevent:= dev-libs/openssl:= net-dialup/ppp:= acct-group/sstpc acct-user/sstpc
+SLOT=0
+SRC_URI=mirror://sourceforge/sstp-client/sstp-client-1.0.18.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=14e912aa5cd7819ab91fc0ab632e9180
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 16163dcddc26..fb59e89f10c6 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/litecoind-0.18.1-r1 b/metadata/md5-cache/net-p2p/litecoind-0.18.1-r1
index e84cf0135c79..25c203ce49f6 100644
--- a/metadata/md5-cache/net-p2p/litecoind-0.18.1-r1
+++ b/metadata/md5-cache/net-p2p/litecoind-0.18.1-r1
@@ -12,4 +12,4 @@ RDEPEND=acct-group/litecoin acct-user/litecoin dev-libs/boost:= <dev-libs/leveld
 SLOT=0
 SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.18.1.tar.gz -> litecoin-0.18.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=491f54410dbebe30483bef865fadc6ea
+_md5_=1ae9073ffa3cc45ee20d743b0e290d1f
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 7ccccae20a63..c11c153840eb 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.683.0 b/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.683.0
deleted file mode 100644
index 645f24376744..000000000000
--- a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.683.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare test unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Mathematics software for geometry
-EAPI=7
-HOMEPAGE=https://www.geogebra.org
-INHERIT=desktop prefix xdg
-KEYWORDS=~amd64 ~ppc64
-LICENSE=Geogebra CC-BY-NC-SA-3.0 GPL-3 Apache-2.0 BSD-2 BSD BSD-4 colt EPL-1.0 icu LGPL-2.1 LGPL-2.1+ MIT W3C || ( GPL-2 CDDL )
-RDEPEND=dev-java/java-config || ( dev-java/openjdk:8[javafx] dev-java/openjdk:11[javafx] ) !sci-mathematics/geogebra
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-683-0.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	prefix	eab3c99d77fe00506c109c8a736186f7	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4043c58ee5d9408ca58fde9d60502ce9
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 992fad6eaab6..003a6ac96a8d 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.8 b/metadata/md5-cache/sys-apps/logwatch-7.8
new file mode 100644
index 000000000000..ee72f9b567ea
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/logwatch-7.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Analyzes and Reports on system logs
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/logwatch/
+INHERIT=tmpfiles
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo virtual/cron virtual/mta virtual/mailx virtual/tmpfiles
+SLOT=0
+SRC_URI=mirror://sourceforge/logwatch/logwatch-7.8/logwatch-7.8.tar.gz
+_eclasses_=tmpfiles	216aa76c3a6fcb5d893c23a0de86048f
+_md5_=e0b8354b9ca52173fdc401426fdd7729
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 6a18d4c93a59..c3e5e69d913f 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/spindown-0.4.0-r5 b/metadata/md5-cache/sys-block/spindown-0.4.0-r5
index aa7d06b70455..7bd551d35360 100644
--- a/metadata/md5-cache/sys-block/spindown-0.4.0-r5
+++ b/metadata/md5-cache/sys-block/spindown-0.4.0-r5
@@ -1,10 +1,12 @@
-DEFINED_PHASES=compile install postinst prepare
+DEFINED_PHASES=compile install postinst
 DESCRIPTION=Spindown is a daemon that can spin down idle disks
-EAPI=6
+EAPI=8
 HOMEPAGE=https://code.google.com/p/spindown
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=sys-apps/sg3_utils
 SLOT=0
 SRC_URI=https://spindown.googlecode.com/files/spindown-0.4.0.tar.gz
-_md5_=4ad6e4473dc0f061dfdae69c45515962
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=d546dab4ffe0f22912c1caa5718f0c38
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index e065216917fa..29b69e0f5668 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221222 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221222
deleted file mode 100644
index 16500bc5d4ae..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221222
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20221222/gcc-10-20221222.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1dca774cddeb50baf2629f66689b1337
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230119 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230119-r1
index 136be9717469..7fd8bc587b1b 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230119
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230119-r1
@@ -6,11 +6,12 @@ EAPI=8
 HOMEPAGE=https://gcc.gnu.org/
 INHERIT=toolchain
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20230119/gcc-10-20230119.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20230119/gcc-10-20230119.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=95c900478c5b799f28e16759681c4faf
+_md5_=381c97a8d67560b64f6eec66dbdfc53c
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.0 b/metadata/md5-cache/sys-devel/gcc-11.3.0
deleted file mode 100644
index e1996cc97647..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.3.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=11
-SRC_URI=mirror://gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-7.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3916b606704dea8b357a8c7149cd53b7
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221223 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221223
deleted file mode 100644
index 50425abda600..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221223
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20221223/gcc-11-20221223.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=8fc30f19d6ed444955f7e934e1ce9c5d
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230120 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230120-r1
index 65ef7d86a097..4bef17a875b1 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230120
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230120-r1
@@ -6,11 +6,12 @@ EAPI=8
 HOMEPAGE=https://gcc.gnu.org/
 INHERIT=toolchain
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20230120/gcc-11-20230120.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-6.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-1.tar.xz
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20230120/gcc-11-20230120.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-7.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-1.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a80af34ef7e17e0a781482caf71bd013
+_md5_=04fa024affe41b45873a8cf56c6eec8b
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221231 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221231
deleted file mode 100644
index 7ecebd52725b..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221231
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=12
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20221231/gcc-12-20221231.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-8.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6960a72377f64192615335f582a35937
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230121 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230121-r1
index c115c89f8f32..be030a776d10 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230121
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230121-r1
@@ -6,11 +6,12 @@ EAPI=8
 HOMEPAGE=https://gcc.gnu.org/
 INHERIT=toolchain
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=12
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20230121/gcc-12-20230121.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-9.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20230121/gcc-12-20230121.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-10.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6bce4c4474a47698d06cae5f7573bac8
+_md5_=165fdecb77e5085cacdee01fa546f29f
diff --git a/metadata/md5-cache/sys-devel/gcc-13.1.9999 b/metadata/md5-cache/sys-devel/gcc-13.0.1.9999
index fc7aedd17afb..fc7aedd17afb 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.1.9999
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.1.9999
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20230115 b/metadata/md5-cache/sys-devel/gcc-13.0.1_pre20230122
index e59bb45edd8d..9f3841e9faea 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20230115
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.1_pre20230122
@@ -12,6 +12,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=13
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20230115/gcc-13-20230115.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.1.0-patches-5.tar.xz
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20230122/gcc-13-20230122.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.1.0-patches-5.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=f22aa6622807db9877782261b967d1d5
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index a2a43ddddbd5..3d607640695e 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.10.3-r1 b/metadata/md5-cache/sys-fs/cryfs-0.10.3-r1
index 10a300c65d68..7a964a875ddb 100644
--- a/metadata/md5-cache/sys-fs/cryfs-0.10.3-r1
+++ b/metadata/md5-cache/sys-fs/cryfs-0.10.3-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cryfs/cryfs/releases/download/0.10.3/cryfs-0.10.3.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6eb8f93d0e4bd702f7af4e38e391580e
+_md5_=e83fdd9a797d88fec0f9abb90d14370b
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index cb54ff09e11b..04474cf5a84f 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/pkgcraft-0.0.4 b/metadata/md5-cache/sys-libs/pkgcraft-0.0.4
index 9b3e448b7332..f21db176308a 100644
--- a/metadata/md5-cache/sys-libs/pkgcraft-0.0.4
+++ b/metadata/md5-cache/sys-libs/pkgcraft-0.0.4
@@ -1,9 +1,9 @@
-BDEPEND=dev-util/cargo-c >=virtual/rust-1.65 >=virtual/rust-1.53
+BDEPEND=dev-util/cargo-c sys-devel/clang >=virtual/rust-1.65 >=virtual/rust-1.53
 DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=C library for pkgcraft
 EAPI=8
 HOMEPAGE=https://pkgcraft.github.io/
-INHERIT=edo cargo
+INHERIT=edo cargo toolchain-funcs
 IUSE=test debug
 KEYWORDS=~amd64
 LICENSE=BSD-1 Apache-2.0 BSD GPL-3+ ISC MIT Unicode-DFS-2016
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.0.4
 SRC_URI=https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/annotate-snippets/0.6.1/download -> annotate-snippets-0.6.1.crate https://crates.io/api/v1/crates/async-trait/0.1.62/download -> async-trait-0.1.62.crate https://crates.io/api/v1/crates/async_once/0.2.6/download -> async_once-0.2.6.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/autotools/0.2.5/download -> autotools-0.2.5.crate https://crates.io/api/v1/crates/bindgen/0.63.0/download -> bindgen-0.63.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cached/0.42.0/download -> cached-0.42.0.crate https://crates.io/api/v1/crates/cached_proc_macro/0.16.0/download -> cached_proc_macro-0.16.0.crate https://crates.io/api/v1/crates/cached_proc_macro_types/0.1.0/download -> cached_proc_macro_types-0.1.0.crate https://crates.io/api/v1/crates/camino/1.1.2/download -> camino-1.1.2.crate https://crates.io/api/v1/crates/cc/1.0.78/download -> cc-1.0.78.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chic/1.2.2/download -> chic-1.2.2.crate https://crates.io/api/v1/crates/clang-sys/1.4.0/download -> clang-sys-1.4.0.crate https://crates.io/api/v1/crates/clap/4.1.1/download -> clap-4.1.1.crate https://crates.io/api/v1/crates/clap_derive/4.1.0/download -> clap_derive-4.1.0.crate https://crates.io/api/v1/crates/clap_lex/0.3.1/download -> clap_lex-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/ctor/0.1.26/download -> ctor-0.1.26.crate https://crates.io/api/v1/crates/darling/0.14.2/download -> darling-0.14.2.crate https://crates.io/api/v1/crates/darling_core/0.14.2/download -> darling_core-0.14.2.crate https://crates.io/api/v1/crates/darling_macro/0.14.2/download -> darling_macro-0.14.2.crate https://crates.io/api/v1/crates/dlv-list/0.3.0/download -> dlv-list-0.3.0.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/enum-as-inner/0.5.1/download -> enum-as-inner-0.5.1.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/filetime/0.2.19/download -> filetime-0.2.19.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/futures/0.3.25/download -> futures-0.3.25.crate https://crates.io/api/v1/crates/futures-channel/0.3.25/download -> futures-channel-0.3.25.crate https://crates.io/api/v1/crates/futures-core/0.3.25/download -> futures-core-0.3.25.crate https://crates.io/api/v1/crates/futures-executor/0.3.25/download -> futures-executor-0.3.25.crate https://crates.io/api/v1/crates/futures-io/0.3.25/download -> futures-io-0.3.25.crate https://crates.io/api/v1/crates/futures-macro/0.3.25/download -> futures-macro-0.3.25.crate https://crates.io/api/v1/crates/futures-sink/0.3.25/download -> futures-sink-0.3.25.crate https://crates.io/api/v1/crates/futures-task/0.3.25/download -> futures-task-0.3.25.crate https://crates.io/api/v1/crates/futures-util/0.3.25/download -> futures-util-0.3.25.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hashbrown/0.13.2/download -> hashbrown-0.13.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/indoc/1.0.8/download -> indoc-1.0.8.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/is-terminal/0.4.2/download -> is-terminal-0.4.2.crate https://crates.io/api/v1/crates/is_executable/1.0.1/download -> is_executable-1.0.1.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/libloading/0.7.4/download -> libloading-0.7.4.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.7.1/download -> memoffset-0.7.1.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/nix/0.26.2/download -> nix-0.26.2.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/ordered-multimap/0.4.3/download -> ordered-multimap-0.4.3.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/peg/0.8.1/download -> peg-0.8.1.crate https://crates.io/api/v1/crates/peg-macros/0.8.1/download -> peg-macros-0.8.1.crate https://crates.io/api/v1/crates/peg-runtime/0.8.1/download -> peg-runtime-0.8.1.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkgcraft/0.0.4/download -> pkgcraft-0.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.50/download -> proc-macro2-1.0.50.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/roxmltree/0.17.0/download -> roxmltree-0.17.0.crate https://crates.io/api/v1/crates/rust-ini/0.18.0/download -> rust-ini-0.18.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustix/0.36.7/download -> rustix-0.36.7.crate https://crates.io/api/v1/crates/rustversion/1.0.11/download -> rustversion-1.0.11.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scallop/0.0.3/download -> scallop-0.0.3.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_with/2.2.0/download -> serde_with-2.2.0.crate https://crates.io/api/v1/crates/serde_with_macros/2.2.0/download -> serde_with_macros-2.2.0.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.24.1/download -> strum-0.24.1.crate https://crates.io/api/v1/crates/strum_macros/0.24.3/download -> strum_macros-0.24.3.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/sys-info/0.9.1/download -> sys-info-0.9.1.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/tokio/1.24.2/download -> tokio-1.24.2.crate https://crates.io/api/v1/crates/tokio-macros/1.8.2/download -> tokio-macros-1.8.2.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.23/download -> tracing-attributes-0.1.23.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tracing-log/0.1.3/download -> tracing-log-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.16/download -> tracing-subscriber-0.3.16.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/which/4.4.0/download -> which-4.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/xmlparser/0.13.5/download -> xmlparser-0.13.5.crate https://crates.io/api/v1/crates/pkgcraft-c/0.0.4/download -> pkgcraft-c-0.0.4.crate
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7bd47663744d5802d613815906181c13
+_md5_=2fb83cc35d4583263f7e962e29a52ca7
diff --git a/metadata/md5-cache/sys-libs/pkgcraft-9999 b/metadata/md5-cache/sys-libs/pkgcraft-9999
index d8bff2abed1f..8d121180e235 100644
--- a/metadata/md5-cache/sys-libs/pkgcraft-9999
+++ b/metadata/md5-cache/sys-libs/pkgcraft-9999
@@ -1,13 +1,13 @@
-BDEPEND=test? ( dev-util/cargo-nextest ) dev-util/cargo-c >=virtual/rust-1.65 >=virtual/rust-1.53 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-util/cargo-nextest ) dev-util/cargo-c sys-devel/clang >=virtual/rust-1.65 >=virtual/rust-1.53 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=C library for pkgcraft
 EAPI=8
 HOMEPAGE=https://pkgcraft.github.io/
-INHERIT=edo cargo git-r3
+INHERIT=edo cargo toolchain-funcs git-r3
 IUSE=test debug
 LICENSE=BSD-1 Apache-2.0 BSD GPL-3+ ISC MIT Unicode-DFS-2016
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7bd47663744d5802d613815906181c13
+_md5_=2fb83cc35d4583263f7e962e29a52ca7
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 437fe4184a9b..106100c92369 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/lsof-4.98.0 b/metadata/md5-cache/sys-process/lsof-4.98.0
new file mode 100644
index 000000000000..08d5d5163497
--- /dev/null
+++ b/metadata/md5-cache/sys-process/lsof-4.98.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/groff rpc? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure postinst
+DEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
+DESCRIPTION=Lists open files for running Unix processes
+EAPI=8
+HOMEPAGE=https://github.com/lsof-org/lsof
+INHERIT=flag-o-matic
+IUSE=rpc selinux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=lsof
+RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/lsof-org/lsof/releases/download/4.98.0/lsof-4.98.0.tar.gz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=62f6719337e6dbcf8cba4e41ffb33fcd
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index d6478c2cea11..528105737820 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.54 b/metadata/md5-cache/x11-libs/goffice-0.10.54
new file mode 100644
index 000000000000..29822096ccb3
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.54
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35 virtual/perl-Compress-Raw-Zlib virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/pkgconfig app-arch/xz-utils >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg(+)] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
+DESCRIPTION=A library of document-centric objects and utilities
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/goffice/
+INHERIT=gnome.org libtool
+IUSE=+introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg(+)] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
+SLOT=0.10
+SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.54.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=92e518cc46832b9e1d97675f44dfe57e
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 398de97a80c1..e40a6a963808 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-22T23:09:43Z
+TIMESTAMP 2023-01-23T05:39:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPNwjdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPOHaBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA3fw/+PJv/oj1pOQRCHKOyWilXOeA/pl70uRcNI5DQb8BJOZHtTG8nRQhLOMlY
-bl/W6mOzX6WLuceztl2YYk6BGqnDLgZ/tIXdXFfxDcFigDBueenr0NCRFyEQzk2a
-r41lvwMKlOfSEmtHvm3/EXrCalJ7IYqH4bv9TBXSyPHGmd9LvDTrAzRI3r2blFZ3
-eyX/3ih8g2AI88CPnRi7uXsgNkKQfp58ep4ocR/1QvfbOFY/eoyr+2HJ8CwmKDFp
-kJxd3jfP1nLWIoRKnXuTaAVtTaiygckKpRVY61H+u3WKPENG/RmML0njJDlS1tpn
-aDsS7pkciTrM/6SnIs3luBpmscumHeUN0CYlpDXXEsmhmJ/Zots77nW9aN3WJc6W
-whJsUewzINA7zbMbsutd0iBW+/72zugHqEwKBkKJ3zB7p6S1yM/HUxUZt7BFZgNj
-HVtnYry8/s21peHq5afMmgDNl9xzqTS+kWqrsfsnydZxdfJZazXZl/Qlbyip6LS1
-yCSKMuhy3w3lp++LfyUwt8YjvX8tk/NyXK/Bge18mwc+HnT1onE7fy/5yIcwp1j1
-YlsXmyWfpDKjgB0t6Zjbs3BVEkMy1HoHm3TRcWIcHIUJYWU4RPz71Qf8T2x9+qJO
-IrbXIiM8isu89nBXXk//bi30qis3EUG3MFTM2LIO4Qpoc4YdyQ0=
-=W0sc
+klD4cQ/+Kn0n/wflHAjxbfEz9RueWB2+FWgSodVYddoeGkJCYvwvWf2aAot1kLL8
+3cKRtznh8v+xyQMfIQvv+hYXxTnM65Lu40mtGsgdCF0YgS541pDOUJEeO4eXlgXq
+acopM1kYKA5zNP6iFFfC3ZVFxgtwhGPYSWbTJxxL0jtG8bDwqAAzE91wS2/brIc3
+iEPrEGGIIdx99heA88UL1UMPbG50F2NMMNHeMwMlAcmmHWiB1Ehyrss9WTmiJH/v
+FthafXqV/08/7cZ1kVsvZ4TqBNTR1ffyR8dbbDdn5ZjQx0nAaNaXGaqQq8O3+c8Y
+OAfnvdLGSQh/cOo9d+HfCyT3gXtYWgxidPD0+Bses2jS0Wd/qV4Gv1IOL8EH9jCz
+q6ju4BjSArPwR2uSBiX0LzpA1V/R5rXlUu4bpTxjatapq/TJH1Bug8o07i1t5ZxZ
+MjYpNtKwJObkyCHqYy28gZpvGJNPQ8QXZNB836n6eFe2GYn5FCky3lnw27BD/6LB
+fGwIj5soMCcNc5QTBgoFRjaAKhXQT509hZzUVHYGMUUDPNIfhcZ8AiPmjgkeBmfv
+76MyHEDYY2LZ+1yCP78o4SXlsod1nHqy//UKvCi+j/8FcD/giSTh4CovpJjLAh0S
+adRXPHKV3k4Ek6ujFzYQQT7aezcPhUFz2VK1oiYNTZCyXzwJWj4=
+=rcg8
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c6f5d65ee4fd..de217335ec4c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 22 Jan 2023 23:09:39 +0000
+Mon, 23 Jan 2023 05:39:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index bafb34afdf73..e63d647a5abc 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jan 22 11:09:38 PM UTC 2023
+Mon Jan 23 05:39:41 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a1d16136db38..eb103fdabc35 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 22 Jan 2023 23:15:01 +0000
+Mon, 23 Jan 2023 05:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2d9766fd5362..b0fbf210a2aa 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-47cb57f6dc1a37a7ac309c030efa4fca308ad144 1674424563 2023-01-22T21:56:03+00:00
+2f3d6bc71763977f07e1389bc530c32400b36650 1674448439 2023-01-23T04:33:59+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2fbfdd68cd6f..3d664d4a96f6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1674429001 Sun 22 Jan 2023 11:10:01 PM UTC
+1674452401 Mon 23 Jan 2023 05:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 06f00606f869..a70f9b5f54e6 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 22 Jan 2023 23:09:38 +0000
+Mon, 23 Jan 2023 05:39:41 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index a881a709a2c0..35a2ca9dfe13 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 2e2171bf7585..9453e72985c1 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -5,14 +5,12 @@ AUX tdesktop-3.6.0-support-ffmpeg5.patch 3142 BLAKE2B f05816a8b26c3061c88b8814ad
 AUX tdesktop-3.6.1-fix-kwayland-5.93.patch 1835 BLAKE2B dbc414e1543be96faff179288eb4bcc4acdfbe280ae51da11d254054adcc00f4c1387cdc9a24e026e06612d55765a1689b4bfc6381349b75053c4156a0cff71f SHA512 82855396f367f3669a34246a031626bba158d5361ec39e728c2d33f0d5b9ff5196c38a33551614848b5d439e25bbe45eb3795eaf7ca7442f5f27ab0bdeb0e72e
 AUX tdesktop-3.6.1-fix-use-after-free.patch 1627 BLAKE2B 867dde2d1d8d6535e2305f841fe97477bd08c37e96684196563f9ce6dbfb12c7b2941ddc3e00182126e24ec08e1692ec201006d2c46548fcbf2f9bae09dca532 SHA512 e52369b6aee6c772bef56b73cf4656813614694af714eb83432ffbe7a2234dde4be9888e927c1304350c5c31a0a9cf37a53ea41df2e9b47a00de6dc4433a1c1b
 AUX tdesktop-4.2.4-jemalloc-only-telegram.patch 1309 BLAKE2B c6ed3e2cfcce9540e367fb90fcaacab81fa6dbb150be7207634facfef77361b830175e4e5e2781d884f101833fde022f496b7c39702d97990de4d16585b5c33d SHA512 83d8c3eaafc2947fbe3555d9acf5c78ad07e89009b89f05908dc5cd088652063766c297e4b726ee69423b15804faf79f52815405b09bba554538e664a99ce0e7
-AUX tdesktop-4.3.4-fix-disabling-spellcheck.patch 1460 BLAKE2B 68c0b8aede6404ec02072fa869f31b982a9fa445dfab77cb0cf185b263cc975f43c9288b4a1ca81d96bef718706ce357f7480244ce4b371d13f08d3bcd02bfa5 SHA512 10ccec4a69668cf068841c78134bc31102e334c49fcf750aac6d2c5ac2e81127954c88a923c4917ca1c18af2c1d8ff20c238bee369deef2e0a2b961439646adb
-AUX tdesktop-4.3.4-qt5-incompatibility-1.patch 1603 BLAKE2B b7ff625e874298617df39f5865577215708ed9cecb18cce736d78a85b3e48808c41b004bb243a5bbf692339c9929563a0e33028c8467d0eaca0c8aaae1eef06d SHA512 7eb6477b84fe5bd36cfc9e51dd014ea1425cb0b0e817a8a50d3d8055a57b062a221aabac43fc7a3588c75df5615966aedfb9405add54de339f3b80de1a45496a
 AUX tdesktop-4.3.4-qt5-incompatibility-2.patch 1325 BLAKE2B 0a74bb545024dbd4df62d52a7603f7a3b28b827940900f4338d6c05ac148ddaf2dcb6cefb8ff3905c737e7e330b896e493334f1dd114341d6818b1aec6e8469a SHA512 254acfe8b8cec69df629759f025ff1c979f609b0fa591a4137c96e9e726782049e4b6a799755b9e50ffffe6d0a26ca3211d4c12e28c7bacd07605b028235e474
 AUX tdesktop-4.4.1-fix-dupe-main-decl.patch 853 BLAKE2B 6a3ce346467a3b6450674a77157f3fa45d9e1991160ce33e9cc58292a8441310468943225d5d5b2ba5e5c23feaba544d52f19c964130a8e8c724a99392072abe SHA512 edaad94a901181f0bca4a64b4ab2277a247073005b351156df02532dfff470a4060e6b709197da0778b5484d39a4c1bc1f75e9df068872d68209dd47eca9ac54
 DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba
-DIST tdesktop-4.3.4-full.tar.gz 50030732 BLAKE2B 68d9001128cca6e8a68d991e77a20f9764af9a634c37d792e92f7e77b0446b6d16ec1342f9e7ce7e0c49464f385f795164f9d176d65a74fc64fc072eae33d263 SHA512 415e0d60508317ef6d07e1f8aa2d974b166925f19349106cc543e487dd5bef8d1ff0548fb815682c6c4bb3bf762c08fcb1c7073f2c7ad305ae885b7979c70f88
 DIST tdesktop-4.4.1-full.tar.gz 50077498 BLAKE2B 6196c474c0771197c56b386bbfd67e4a014569cb8bd9676990e323005f06cb6938aad0c0dd00fd74cab9fca1ac50c7bf7227f34aa39ae598b4f003199fa8cd00 SHA512 91038f0a615ef7ae1050cbfa614041a3d6a45fdbd26d120ef98cca3c31377612c3bb1e80f9aff58c4853a1726bf2cfb427f752a4f88a796f05b381516c981563
+DIST tdesktop-4.5.3-full.tar.gz 63718129 BLAKE2B 85492ad92ea2643dd5e74c831609a4f7be9671648d2b542c24f415dbb19b66521ccecb2a545eadfbf9fa7f934d35d32de085b5b8403dce54bed0b85c54ea98fe SHA512 58a9c5d096e236090347388e1ed480527f841045a80771079dc0c3e35e12ce8ac11753987e87bb57870d9bd8488fc6a4734114648ecec7823d8544744b06c6b1
 EBUILD telegram-desktop-3.6.1-r1.ebuild 4888 BLAKE2B f1bbc2c255a6ccd94d31b55a24685ea4f0504cb8836a1ecdc6bfa010332b3dea4907aca8d6559adb969bb1578c060b9c4d7bb3094e0e3e916a3c24ee210bf380 SHA512 738c62ebc81fd7660e31cd1d4ae251e7b8ff05f6c31c26cdd1de302adfb36463e6159dbe0135493e62aecbe0131adf4b44dd33f2831e737edf495165c9cbdb02
-EBUILD telegram-desktop-4.3.4-r2.ebuild 6831 BLAKE2B bd924193f1e7726fbc9a1fee7b269d349779b38672baeac84448f56e1ef85b9784699da0c08a6b27ab88100d022ac89fd1e46a966577a24c3c022a75d0f8408e SHA512 d3e7f3f995279323c28c3f4b6604d59280fb24d87353c6169468388ed01b565c469617fb1b79edf98cbd3ad63b69380529756afd1683fbd6d6cdf722c95984f5
 EBUILD telegram-desktop-4.4.1.ebuild 6663 BLAKE2B 2052b75ff309abefcee5bcdc09fb44eefe23590f4364b0ef43818b290ae67eb3df5fef4ecefbbb5b488921e71bbfa9b9185a964aa5aca03ff0529daddd136e38 SHA512 eb90ddcb2eeae86810fb384d648f9e0c01098495c8051e6de5d5caff13ae180a73bd519885c751f23235c2c79932e3d9da7cc14d44f77a3e8a4360fe56186556
+EBUILD telegram-desktop-4.5.3.ebuild 6606 BLAKE2B dace4440f9c9c27afe7295d3414f63f457d75eeb730cb2438ad1d2a76d6061b73cee57ee964460946fed6946f10fc5f1e84f29bd612554f311b615de776feb2a SHA512 dada58163e4f6f0163ab50f090f40887a3d4bb55d386112d368518cb8e4a297c43190b70eae5b0efcca5012cdb35a05ba58bcad74a1427c7887657e7248b41ee
 MISC metadata.xml 1111 BLAKE2B da28403273bdd0e3055f45070a419b8cc65867ec406f3bb19f048e465604a88426d3857e4b7d696ccfd8405713d7a587d0dec5fde8cb264df59f246045584282 SHA512 2fc1a41ad4dfd78d1e02ef5d0ff2fa391cf2950bf6645038a61f0ad48803ad505917ed4a787f0397d529c1ed07d78c0bfd425f6fb9a9876f5a015f573769d38d
diff --git a/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch b/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch
deleted file mode 100644
index 9529370cdbae..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix building without spellcheck
-
-Upcoming changes to tdesktop include language recognition, which is a bit of a
-doozy, and as is tradition, "unusual" compilation flags go untested.
-
-Regular builds would always return false here, anyway, as linux isn't a
-priority with these things.
-
-/var/tmp/portage/net-im/telegram-desktop-4.3.4/work/tdesktop-4.3.4-full/Telegram/SourceFiles/boxes/translate_box.cpp:18:10: fatal error: spellcheck/platform/platform_language.h: No such file or directory
-   18 | #include "spellcheck/platform/platform_language.h"
-      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-compilation terminated.
-
---- tdesktop-4.3.4-full.orig/Telegram/SourceFiles/boxes/translate_box.cpp
-+++ tdesktop-4.3.4-full/Telegram/SourceFiles/boxes/translate_box.cpp
-@@ -15,7 +15,9 @@
- #include "main/main_session.h"
- #include "mtproto/sender.h"
- #include "settings/settings_common.h"
-+#ifndef TDESKTOP_DISABLE_SPELLCHECK
- #include "spellcheck/platform/platform_language.h"
-+#endif
- #include "ui/effects/loading_element.h"
- #include "ui/layers/generic_box.h"
- #include "ui/widgets/buttons.h"
-@@ -331,6 +333,7 @@
- 	if (!hasLetters) {
- 		return true;
- 	}
-+#ifndef TDESKTOP_DISABLE_SPELLCHECK
- 	const auto result = Platform::Language::Recognize(text);
- 	if (result.unknown) {
- 		return false;
-@@ -343,6 +346,9 @@
- 		? QLocale::English
- 		: settingsLang;
- 	return (result.locale.language() == skip);
-+#else
-+    return false;
-+#endif
- }
- 
- } // namespace Ui
diff --git a/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch b/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch
deleted file mode 100644
index 3229b5be54c8..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Disable portal-related event loop with qt5
-
-QEventLoop::ApplicationExec is undocumented, but only present in qt6, so I have
-no idea if the functionality can be preserved in qt5. Upstream code indicates
-that not using it at all is safe, and unlikely to cause problems in
-distribution packaging.
-
-Yet another reminder that qt5 is dying.
-
-/var/tmp/portage/net-im/telegram-desktop-4.3.4/work/tdesktop-4.3.4-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp: In lambda function:
-/var/tmp/portage/net-im/telegram-desktop-4.3.4/work/tdesktop-4.3.4-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp:294:55: error: ‘ApplicationExec’ is not a member of ‘QEventLoop’
-  294 |                                 loop.exec(QEventLoop::ApplicationExec);
-      |                                                       ^~~~~~~~~~~~~~~
-
---- tdesktop-4.3.4-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-+++ tdesktop-4.3.4-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-@@ -229,6 +229,7 @@
- 	}
- }
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
- void LaunchGApplication() {
- 	const auto connection = [] {
- 		try {
-@@ -401,6 +402,7 @@
- 		});
- 	}
- }
-+#endif // QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
- 
- bool GenerateDesktopFile(
- 		const QString &targetPath,
-@@ -862,7 +864,9 @@
- 	LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
- 
- #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
- 	LaunchGApplication();
-+#endif // QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
- #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
- }
- 
diff --git a/net-im/telegram-desktop/telegram-desktop-4.3.4-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.5.3.ebuild
index 40f6917f6999..099ce3718db4 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.3.4-r2.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.5.3.ebuild
@@ -41,11 +41,11 @@ RDEPEND="
 	dev-libs/xxhash
 	media-libs/fontconfig:=
 	media-libs/libjpeg-turbo:=
-	~media-libs/libtgvoip-2.4.4_p20220503
+	~media-libs/libtgvoip-2.4.4_p20221208
 	media-libs/openal
 	media-libs/opus:=
 	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20220507:=[screencast=,X=]
+	~media-libs/tg_owt-0_pre20230105:=[screencast=,X=]
 	media-video/ffmpeg:=[opus]
 	sys-libs/zlib:=[minizip]
 	virtual/opengl
@@ -88,10 +88,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch"
-	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
-	"${FILESDIR}/tdesktop-4.3.4-fix-disabling-spellcheck.patch"
-	"${FILESDIR}/tdesktop-4.3.4-qt5-incompatibility-1.patch"
-	"${FILESDIR}/tdesktop-4.3.4-qt5-incompatibility-2.patch"
 	"${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch"
 )
 
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 22657264ddaf..c7c1f3fb1f34 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 43dbf98d1c49..3c3e60e84e10 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,5 +1,7 @@
 DIST ergo-2.10.0.tar.gz 3256716 BLAKE2B 72f1d6464ee434508b9944a9923435cda01e97c8b542c7c77c74562309a6b9ed727b5ae7c444f6e95517482fd87f34623d477e14c1dfbe323a7d81ace5c3e111 SHA512 952ef22b28d8de0814f04ece55b8ff88f405f184d8ecfce45c4af63e8c53153786d0b685f9bfff7cdb53ad369914f07069436f43b5ab65816bb7410b02f34bf8
 DIST ergo-2.11.0.tar.gz 3264162 BLAKE2B af5020469b7a7d7194cdf4e3f82ded906b811d754fac08bdfc0f8379b907069b92260701dd2e919a196b2ab655a32f9b9e3a21bfc8d363790d49cf32473a6c60 SHA512 ccdbc391e280ab25efd45752b84223213aceb3f3045307209da7a02b3b09df571242ad92d11786693fc208427a2d1ca0a3d6d470404cfb83b0acf40ca343441d
+DIST ergo-2.11.1.tar.gz 3264192 BLAKE2B 9a207fc808277275c43c4c70aec748efe0a5d3a21f4be195885b7058798df8b0d47b52a6b52708f3e04c5aa79faec2fd3f41a0da625fd55fff45a3b12cdb90ba SHA512 9808ecc28dc25e60b942bc74f8fbe4f07b7fda0641c3dd6fc681214e7e2b5fed7fa61f85e2ac0de3c08dc91a54f571e2741ab1b2f6597a2b53405211f327ad81
 EBUILD ergo-2.10.0-r1.ebuild 1501 BLAKE2B 28049bdd16691767da3476ab136e98d98652a1cc5658b70853a2815ead9157e122a14ee1834a206f27b076d4d760ac62a6417202848de06bb6913dadb084287d SHA512 d482a6994db06fa9375dbe2dc5ccdd426624073a3925632329abb498464c4c7d3b48948d9e4848dd91e819d24e4712edb662a27435754e053ec7e28c98af4f4b
 EBUILD ergo-2.11.0.ebuild 1565 BLAKE2B a82affb7986894a7429e06881dfcf2331b7d938d968272d331e082b79460d3f7762ebe30f686225fc891c687fc552f3d7982b80be41a2efaccbf60e999976b7d SHA512 af8844c6990271dde6f9c050fe790f67bbcdb4ed0727437352ce246826c2bf91bfbf84514de72b33f44546524cd7b2cf99af2f260ab71eb8d09e3a35c9399522
+EBUILD ergo-2.11.1.ebuild 1565 BLAKE2B e017d1375a3b37ef0a50ece2692e8162a5b2570b84f0862065de26b49462c54dcb40eb634cfba0011b62e6a4255e6ff0ab015b363d7070bd1c6afcd1cf7e8c8b SHA512 51bcd9c2ae544ac9a8577f9a18bd56e476c25e1e0ca6928ce341881b9d86858b7949eaf3931a53a5f5799edcb16e4e701664048fc3ec575992325d17d9c4057e
 MISC metadata.xml 320 BLAKE2B 3bff5defc5150caa0cae2776e69f9070d1896c9cab8e5e0fc1afb94606a1c0e0d3ab951b4ea1076929221bcfd0576540f1b1768c1f9d3ad68161d9540c6785e3 SHA512 b634cbc9628c66cfc5b2983a6da5b2322bfb5c755893e1c15aab203f6e94b15ea5be2494b0370e8b7fd4950d0d1059e60939bd945620aa0548ef665263a5672a
diff --git a/net-irc/ergo/ergo-2.11.1.ebuild b/net-irc/ergo/ergo-2.11.1.ebuild
new file mode 100644
index 000000000000..39327ace6602
--- /dev/null
+++ b/net-irc/ergo/ergo-2.11.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="A modern IRC server written in Go"
+HOMEPAGE="https://ergo.chat/ https://github.com/ergochat/ergo"
+SRC_URI="https://github.com/ergochat/ergo/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P/_/-}
+
+LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+# We may even want to package irctest in future?
+
+RDEPEND="acct-user/oragono
+	acct-group/oragono"
+
+DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
+
+src_prepare() {
+	default
+
+	sed -i -e 's:ERGO_USERNAME="ergo":ERGO_USERNAME="oragono":' distrib/openrc/ergo.confd || die
+
+	# Minor fiddling with paths
+	sed -i \
+		-e 's:/home/ergo/ergo:/usr/bin/ergo:' \
+		-e 's:/home/ergo:/var/lib/ergo:' \
+		-e 's:/var/lib/ergo/ircd.yaml:/etc/ergo/ircd.yaml:' \
+		-e 's:User=ergo:User=oragono:' \
+		distrib/systemd/ergo.service || die
+}
+
+src_compile() {
+	ego build .
+}
+
+src_install() {
+	einstalldocs
+
+	dobin ergo
+
+	insinto /etc/ergo
+	doins default.yaml
+
+	newinitd distrib/openrc/ergo.initd ergo
+	newconfd distrib/openrc/ergo.confd ergo
+
+	keepdir /var/lib/ergo
+	fowners oragono:oragono /var/lib/ergo
+
+	insinto /var/lib/ergo
+	doins -r languages/
+
+	systemd_dounit distrib/systemd/ergo.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "Please copy the example config in ${EROOT}/etc/ergo:"
+		elog "e.g. cp ${EROOT}/etc/ergo/default.yaml ${EROOT}/etc/ergo/ircd.yaml"
+	fi
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 4caef771e8cf..abccf8e38752 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index e5da56a7f42c..3b2f813cae86 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -1,6 +1,9 @@
 AUX sstp-client-1.0.12-fix-example.patch 417 BLAKE2B 5f91dd2ee3e3ccc089712a2efd26dd05c91aed7a787e4240a7e10a8e81f1f74d732299731500033551331e23d8927fa9519f52214c6e8949bbd3f8f6c558dfa7 SHA512 a7bef85e7be5a90a0820317d6aa87ab6e26f97caea9e47c6e678fdc8cd1c25b1a8f11c9e2ccb93f99950da39076253b435156edd4b7dfbb606db2fe58eef66e2
 AUX sstp-client-1.0.12-remove-network-test.patch 313 BLAKE2B 80857c01cfdb8a4b919729d5316ec78a9d6d4de4092afb615bbd731557e033b55d400a3fa8c0fac83a2732e3cc8212c0c16a067bfb01041d2ab2f0fc3c233847 SHA512 00d1b0ad75aa75417cf87210802c48164a715eddd7a1f53e8956e524387eb170078471d67fab32e3b25990b1b44fa415b153bf22fdf8b3c90385627c8f0075e4
 AUX sstp-client-1.0.17-fix-bashism-configure.ac.patch 1054 BLAKE2B 6c73460707247ec49d639d993b45f9dc6fc96df9cf2c8946bd222a305f4e818016ccfaf3d13985eccd0020bebcf8a22f2fff22964d97aadd8018c5b9b5d234fa SHA512 8aa8417ef1ae6df46fcf7328a979d75983ecf6c279dd972651bd0faec372a3ee952e4c6b3dd3318ea463a2a080a17f60303d637cf2e5c7d8b31069051eef35c7
+AUX sstp-client-1.0.18-includes.patch 1286 BLAKE2B 51d8ba85abbef0ac8d3b9eb8e2b76db8111f3f57eaee1fbcec1c736e3f00717929c57c74ae99f911607b5cf929d129c38e283a4ea57df748a941ab36a65e7393 SHA512 782eff5caed5cdbd88c74d0ce53dae76f57726c0f9da5c09e446e3ac5669c60688b98d79d1884a57205af819528f0d5c6c7b13b73f8b9fec5c34d2574c7e1cea
 DIST sstp-client-1.0.17.tar.gz 482831 BLAKE2B d19c752b3f061401f89eb46bd52091e3ab0a3c931c6646a55c1ee0e6dd7e9c501fba14b7c870a2514cb72fb0fd1d8bc89538562d4d99b9d58a081e0917734f5d SHA512 eff18eb894b2c96d46315b5ac7530fe50e8dd6e6c29ea946cd0e7c05c56416e85088fc65650fb77c05e3a747cb0b4e3575af5457515d240161027910abae9775
+DIST sstp-client-1.0.18.tar.gz 477886 BLAKE2B 3a2929a5245a703c36b9bf6c17b7f65d911446a8a44b95894fd990ccf5ad01a98e4b5e843681e4643ff4b28a57de359a98ef42f9bb378d52c6829297970399b6 SHA512 e0dd0fe57b65c2001737222159e58b11177a8f1cb64564e520fad2199c0581d0550a00f49c921be74039dec59062233b4716f8b624a0e4cb48bdf8df9272f93c
 EBUILD sstp-client-1.0.17.ebuild 1399 BLAKE2B 567713b732fe24367ff18d27fa0a81180e34314833d7892040783da1e499a10129d4917224e42cd3738cbefacd03bb56e6baf630f8a9dd91c80ea9f1dbd80555 SHA512 e71d4fc2992050366596ca05c3be2b902adb27a0d0c5c171c8b3386a3528c3c26f926394acac3295e23345cd6db63a23d0f31319f53c5ec5b3d6d4af9a7bb7fb
+EBUILD sstp-client-1.0.18.ebuild 1385 BLAKE2B aabc8572c3ec8540b1c671c936389096d05712e13e762114000aa541bf003494b5a271b839330fa93deeef4c221e53b032fb695cabbfea64fd1f25f6010cc36a SHA512 f20b5d6c1e560376af32a6990a9c9b70baab177865cf0f8a53593bc497d8aa1a1f85d9fbce5d27c63c104e859bf9105587b1a422149b8433ecd904c92d568342
 MISC metadata.xml 308 BLAKE2B 3a472844a5dc30193440521d7cba758d6c78b10528e9aee2d76491a526c94bc410376b9db50062de890819b553e5db25c6b596fa6e28432d1095153f3c498573 SHA512 75461a9b457611c5b72de5d80f75969cb63987c6b8e771d3c10b321c00c51fd1bbd06ad6e30c1d9e8a8867320191fd7213ee80cd5adbee35f44226e227a4109c
diff --git a/net-misc/sstp-client/files/sstp-client-1.0.18-includes.patch b/net-misc/sstp-client/files/sstp-client-1.0.18-includes.patch
new file mode 100644
index 000000000000..3a768f50e889
--- /dev/null
+++ b/net-misc/sstp-client/files/sstp-client-1.0.18-includes.patch
@@ -0,0 +1,42 @@
+https://gitlab.com/eivnaes/sstp-client/-/merge_requests/4
+
+From 1d822cca1c4e5b4db91bcbabe29bf43c05449af7 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 23 Jan 2023 02:26:28 +0000
+Subject: [PATCH 1/2] libsstp-log: add missing <time.h> include
+
+Needed for time_t. Fixes build w/ GCC 12 on musl.
+
+Bug: https://bugs.gentoo.org/854858
+--- a/src/libsstp-log/sstp-log-private.h
++++ b/src/libsstp-log/sstp-log-private.h
+@@ -24,6 +24,7 @@
+ #ifndef __SSTP_LOG_PRIVATE_H__
+ #define __SSTP_LOG_PRIVATE_H__
+ 
++#include <time.h>
+ 
+ /*! Keep attributes aligned to a 32-bit boundary */
+ #define LOG_ALIGN32(n)  \
+
+From 835c6226aaccb4c39a8c50dec5d3afd87315fddd Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 23 Jan 2023 02:28:18 +0000
+Subject: [PATCH 2/2] pppd-plugin: workaround broken pppd.h header for memcpy
+
+ppp's pppd.h defines a BCOPY macro which expands to memcpy but doesn't
+include <string.h> which provides it. Include it in pppd-plugin instead
+to workaround it, as it'll be a while before we can assume the system ppp
+is fixed.
+
+Bug: https://bugs.gentoo.org/870865
+--- a/src/pppd-plugin/sstp-mppe.c
++++ b/src/pppd-plugin/sstp-mppe.c
+@@ -24,6 +24,7 @@
+ 
+ #include <config.h>
+ 
++#include <string.h>
+ #include <pppd/pppd.h>
+ #include <sstp-mppe.h>
+ 
diff --git a/net-misc/sstp-client/sstp-client-1.0.18.ebuild b/net-misc/sstp-client/sstp-client-1.0.18.ebuild
new file mode 100644
index 000000000000..d11d4f1ace70
--- /dev/null
+++ b/net-misc/sstp-client/sstp-client-1.0.18.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)"
+HOMEPAGE="http://sstp-client.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static"
+
+DEPEND="dev-libs/libevent:=
+	dev-libs/openssl:=
+	net-dialup/ppp:="
+RDEPEND="${DEPEND}
+	acct-group/sstpc
+	acct-user/sstpc"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~NETFILTER_NETLINK"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.12-remove-network-test.patch"
+	"${FILESDIR}/${PN}-1.0.12-fix-example.patch"
+
+	"${FILESDIR}/${PN}-1.0.18-includes.patch"
+)
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local PPPD_VER="$(best_version net-dialup/ppp)"
+	# Reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER#*/*-}
+	# Main version without beta/pre/patch/revision
+	PPPD_VER=${PPPD_VER%%[_-]*}
+
+	local myeconfargs=(
+		--enable-ppp-plugin
+		--enable-group=sstpc
+		--enable-user=sstpc
+		--with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}"
+		--with-runtime-dir="/run/sstpc"
+		$(use_enable static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 1a71232a5da6..de56cb430078 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/litecoind/Manifest b/net-p2p/litecoind/Manifest
index 1040195c0882..8b5a954e2a54 100644
--- a/net-p2p/litecoind/Manifest
+++ b/net-p2p/litecoind/Manifest
@@ -2,8 +2,9 @@ AUX litecoin.conf 80 BLAKE2B be9f776453fce1081dfa95fd844089d51e8212731d7bb460256
 AUX litecoin.confd 245 BLAKE2B b8fa90e547b9582564797bd52cf291fc858f2eacdff41f667d54bde62912b9923a413a9cf2d94c5a5509ea20c23059123a51c88e4cdf4934a09997d5bea92b14 SHA512 57de4657db4f0a3873b6aac700bc78fe8ecdfacdc0acb3fee13866389fc02b7100f4e7252ceb19f76e03d1ca9353008a9ccf40fc48a1a612c6b8fa4a35bae150
 AUX litecoin.initd-r1 833 BLAKE2B 449c88e648272e0093f17f88ac8b6465858ad8f5dec9b469d3fcb14de95bf9f4c2a1fd6feeb4a0015e1ab915a612e97a1b35a50f960cf26bc3e93f6166d1beb4 SHA512 fb594b480734934476c1ed465d0277b0144a760ad3031134cb4496a55812e2fdec9863801316b429a0f2b808fa5ab32b8e1c3010fa0905d822fbf1af776174fb
 AUX litecoin.service 879 BLAKE2B 4a4b270adf486e0563ba16537323776223e275ed2e19cd076eec7a277d907e36f5a466782382b01b8ecc509a9beea4914e277a2f7a5ac3dff0bbbe9a4a445e47 SHA512 f05009fdf4c38d78867588d84a6031d6bed81ad74c08d97a8fae16706f04ce61926dbde775183e0219a33e3a84e5fdad92acaab62e15156f3d07c15677e0f148
+AUX litecoind-0.18.1-gcc12.patch 467 BLAKE2B 5df8e865dbd79bff2e5b6330477f27eb4a57b01afc40f3853d01f522ff6c27f29c46ef36f3f1f044ce399aa5f8a21a252bb2343de7e8265eae1da156bc03eb20 SHA512 8d3c7f1df5d05c0db8f8339cc495157a3941e72750f400b2375f3206f68743193ff06afef477a934ee7d914e90b88bb083bd6b76f9fedea5735589f9b29708d2
 AUX litecoind-0.18.1-system-leveldb.patch 1009 BLAKE2B 6d6b3ef44d1e0af47b1b171d7d0b600c6f24ffd213265583bcec8f99b87c6effdabb1a8de31170a9ffe85e12c3f79d67373ddcde10fb9e71593840c18f96475a SHA512 c51a22af818b4ba1c9eb657161c2edfc94b3ec1c5cb346d208d6adb28bc4dff5d689533d9db2915c744c10ee595be8e846caf4b919a1b9886810ca9258c3fc99
 AUX litecoind.logrotate 113 BLAKE2B 01ca87d1a52061ff95baba8f5c570747b962c7836e5fbe3bed62292afc8b1ddcd7eb550441a3966e84290e2ee2c37acd73ed58b753434723292a28ec17883f22 SHA512 eaa9f462be8dc755b675e4d5cb3ad271e3b1053edfa06df7862fa887160c849c768d2a268a7c8b52d1cfc834c186780b71435ee65475ea6c6692c18bded48dec
 DIST litecoin-0.18.1.tar.gz 5122629 BLAKE2B c6cb220bb893518eaf04e1b4b825dc0318103c955da6f262ef13fc9d925b7bae1bb0407a701a04a17bb3040c613b666e6de3331d443046e9d83aec4ed559e02e SHA512 59605cc0c4fd67c128bad0e2cabcc7b6bda1ebf5b23b7fcaee9fa69e86a4349598feba413f0ad42aef9338a42b0d6f8c04306634bd543856a2e7a203aa717f40
-EBUILD litecoind-0.18.1-r1.ebuild 2168 BLAKE2B cb3fc729635a8e8b4af9c4456160db4bc520493964b0a1ab9d7f5115c923cf4cc2d3bef28269c35e879f74d384612106271c7f0d5cfe6df462478832cde0674f SHA512 c36e632169c87bfff2503c6fcb1e360643b213dda4eb5494aee8351f0468099b8351f4f682005694baaed405c5d57e39586c72a9894e94b2301c290379189890
+EBUILD litecoind-0.18.1-r1.ebuild 2201 BLAKE2B 0b210086e05f63ec975f92650237901b82c7b19c36f4a97edfbde0d57ecdf261249ca51084ce3aaf049c3e7ee092eb207ea94215f84989798b9492283137d218 SHA512 2697ddb8b3e172f5834d4f44f3e3c05e9354b4601c237c02c412644f0924b9ad7c756bcb0d2ab14ff0457553a2d12b144405bc3584b87b240383fcb88b00d377
 MISC metadata.xml 324 BLAKE2B 96c5086a4d91f422bf352d191671209ea03937d0abd19aaf03f6b605e56370da229a84aecb3fdbaa028082c88e3084cf46329dc004cba4e060c9916e35e60617 SHA512 9bd81b7cdaac5b3a7826768c7eae061b426827acefd6a821964131b929e05903dea243d2e5942da91f8a0aa32bbed0d948c3ce1e1467512b29f84621468021a8
diff --git a/net-p2p/litecoind/files/litecoind-0.18.1-gcc12.patch b/net-p2p/litecoind/files/litecoind-0.18.1-gcc12.patch
new file mode 100644
index 000000000000..12bc5c7b2b1d
--- /dev/null
+++ b/net-p2p/litecoind/files/litecoind-0.18.1-gcc12.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/888605
+--- a/src/bench/block_assemble.cpp
++++ b/src/bench/block_assemble.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include <list>
+ #include <vector>
++#include <array>
+ 
+ static std::shared_ptr<CBlock> PrepareBlock(const CScript& coinbase_scriptPubKey)
+ {
+--- a/src/net_processing.cpp
++++ b/src/net_processing.cpp
+@@ -29,6 +29,7 @@
+ #include <util/system.h>
+ #include <util/moneystr.h>
+ #include <util/strencodings.h>
++#include <array>
+ 
+ #include <memory>
+ 
+
diff --git a/net-p2p/litecoind/litecoind-0.18.1-r1.ebuild b/net-p2p/litecoind/litecoind-0.18.1-r1.ebuild
index 7dd0e1ddb9f3..23dcc99ddf88 100644
--- a/net-p2p/litecoind/litecoind-0.18.1-r1.ebuild
+++ b/net-p2p/litecoind/litecoind-0.18.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,10 @@ RDEPEND="
 	upnp? ( net-libs/miniupnpc:= )"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-system-leveldb.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-system-leveldb.patch
+	"${FILESDIR}"/${P}-gcc12.patch
+)
 
 src_prepare() {
 	default
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index be724af59ef8..67f94e0b3a86 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 1ca955dea263..1da0c19018eb 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -16,7 +16,12 @@ dev-libs/intel-compute-runtime
 
 # Sam James <sam@gentoo.org> (2022-12-17)
 # Segfaults when building on musl, bug #885501
->=sys-devel/gcc-12.2.1_p20221203:12
+=sys-devel/gcc-10.4.1_p20221208:10
+=sys-devel/gcc-10.4.1_p20221222:10
+=sys-devel/gcc-11.3.1_p20221209:11
+=sys-devel/gcc-11.3.1_p20221223:11
+=sys-devel/gcc-12.2.1_p20221231:12
+=sys-devel/gcc-12.2.1_p20230121:12
 
 # Andrey Grozin <grozin@gentoo.org> (2022-12-01)
 # These packages depend on dev-lisp/sbcl unconditionally
diff --git a/profiles/package.mask b/profiles/package.mask
index 8688bdca8494..2630b81a20bf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2023-01-23)
+# Please upgrade to >=app-eselect/eselect-wxwidgets-20230114-r1 as -r0 may
+# lead to build failures.
+=app-eselect/eselect-wxwidgets-20230114
+
 # Michał Górny <mgorny@gentoo.org> (2023-01-21)
 # Packages that are incompatible with ffmpeg-5.
 #
@@ -851,19 +856,11 @@ dev-cpp/sourcetrail
 # bug #885075, https://github.com/libarchive/libarchive/issues/1766
 =app-arch/libarchive-3.6.2
 
-# Sam James <sam@gentoo.org> (2022-12-09)
-# mpc.h breaks compilation of reverse dependencies, reported upstream to ML
-=dev-libs/mpc-1.3.0
-
 # Michał Górny <mgorny@gentoo.org> (2022-12-08)
 # Seems to break some logic in pkg_resources.  Masked for the time being
 # to prevent breakage.
 >=dev-python/packaging-22.0
 
-# Sam James <sam@gentoo.org> (2022-12-06)
-# Broke C++ reverse dependencies. Please upgrade to 1.1.0-r1. See bug #884369.
-=x11-libs/libICE-1.1.0
-
 # Stephan Hartmann <sultan@gentoo.org> (2023-01-15)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
@@ -875,11 +872,6 @@ dev-cpp/sourcetrail
 # Bug #883559
 =net-p2p/qbittorrent-4.5.0
 
-# David Seifert <soap@gentoo.org> (2022-11-27)
-# Broke API for C++, causes massive carnage for consumers.
-# Bug #883223.
-~dev-libs/glib-2.74.2
-
 # Matt Turner <mattst88@gentoo.org> (2022-11-16)
 # Packages or their dependencies have not been ported to libsoup:3.0, while
 # other non-slotted dependencies have been.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 84d499d7798c..816405d0d15c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1291,7 +1291,6 @@ dev-cpp/libjson-rpc-cpp:http-server - Build support for HTTP server using net-li
 dev-cpp/libjson-rpc-cpp:redis-client - Build support for Redis client using dev-libs/hiredis
 dev-cpp/libjson-rpc-cpp:redis-server - Build support for Redis server using dev-libs/hiredis
 dev-cpp/libjson-rpc-cpp:stubgen - Build header stub code generator (needed for development and when pregenerated headers are not bundled)
-dev-cpp/muParser:wchar - Add support for wide character (wchar_t)
 dev-cpp/opentelemetry-cpp:jaeger - Include the jaeger exporter
 dev-cpp/opentelemetry-cpp:prometheus - include the Prometheus Client in the SDK
 dev-cpp/sdbus-c++:systemd - Use external libsystemd instead of statically-linked build
@@ -1635,7 +1634,6 @@ dev-java/jaxen:dom4j - Includes org.jaxen.dom4j package
 dev-java/jaxen:jdom - Includes org.jaxen.jdom package
 dev-java/jaxen:xom - Includes org.jaxen.xom package
 dev-java/miglayout:swt - Add support for the SWT toolkit.
-dev-java/openjdk:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/openjdk:headless-awt - Don't install the X backend for AWT, needed by some GUIs
 dev-java/openjdk:javafx - Import OpenJFX modules at build time, via dev-java/openjfx
 dev-java/openjdk:jbootstrap - Build OpenJDK twice, the second time using the result of the first
@@ -1645,7 +1643,6 @@ dev-java/openjdk:systemtap - Enable SystemTAP/DTrace tracing
 dev-java/openjdk-bin:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/openjdk-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
 dev-java/openjdk-bin:source - Install JVM sources
-dev-java/openjdk-jre-bin:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/openjdk-jre-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
 dev-java/openjfx:media - Compile media module, based on gstreamer-minimal (does not pull gstreamer)
 dev-java/openjfx:source - Install JavaFX sources
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index bd3081b7baa4..bbab7a075c8a 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/geogebra-bin/Manifest b/sci-mathematics/geogebra-bin/Manifest
index 24a0f4ce8a2a..b36dd1d16592 100644
--- a/sci-mathematics/geogebra-bin/Manifest
+++ b/sci-mathematics/geogebra-bin/Manifest
@@ -1,7 +1,5 @@
 AUX geogebra.sh 954 BLAKE2B 6345f6f0103f326a3d0acc56d9c794c0f269613916b221e690bb4065be9597a9b0c77b1caa370d144548b6f24bf96995f2c2b6ca70d2da16d296e0639feecc2b SHA512 f44c7250af9c991fb78b96d97d0324084f97e54c2b64c680fc82a71ddba1cb5c89c76276eaa0b3bd966ace4d90f4336b3cc3c3c5603294b2314d6d82916c70e0
-DIST GeoGebra-Linux-Portable-5-0-683-0.tar.bz2 131095393 BLAKE2B bef756bec904e40e06823de7121deb9755bd3523040018a826dcd78e5e8563095f7e4b16a90cad34e14d04628706c1d5a56856d389bd8d599d5588d875ff9b11 SHA512 a55e05bbb7acb6f4512ae3163312fd19095f32b9a3beed09ff12e8af2389dae2bb916af816aa50ee6645f4eb4b78936f3bc497312dc9446d8e1464830cd7b717
 DIST GeoGebra-Linux-Portable-5-0-752-0.tar.bz2 131020013 BLAKE2B f29b301d163daf9af62a4230ff3170eca2b61c20a2b41f851af4571db03487a0fd87cc178fad83d83c5268d9c22a1e47529b80f3067debc846c158bff4f78d1b SHA512 0c4fa07cdbccf0b7529726e1ee921bd6a461645a27012ac4b2e3140f3a4b068f2a9c929e1136a1c10cd510c8acbc5b1f38b735d9386d357b52b41f0a37e93acf
 DIST Geogebra.svg 522 BLAKE2B 8c11d037bd8af7af571abc2bba0a8610f0ed5c1cea46fdc47a40d0176e5ea3b7ad4700601a3094b1aa15012f769883c7f5cb60a70f4ed400df57e3b0610271e9 SHA512 a54fedd530d1c803e14d6f44ab7341d9f1ae17fb6b6496bd21788ad1b88b0977d574db6de199e9168543a03dff73ab19e3c50793ec91750ff5fff4a4b7af408d
-EBUILD geogebra-bin-5.0.683.0.ebuild 1193 BLAKE2B 87a68d4d73c8fd6153ed9524b8e064bce707ea555993c314a86edfc4d115f2b79cdcdc757db5e7b4f3b5041eea178b45135e3ac2ea64f7a434e35ed12efd7bc3 SHA512 eb6989f97ee0743c4801c487650bfc7cf5b6fd9b588145af15e69c3f8b6a2dd81b08ffd9f6901456088a3512880861619125e376478f7514270819161126098c
 EBUILD geogebra-bin-5.0.752.0.ebuild 1198 BLAKE2B 6b06d42f01cdeea124c3ac07bc92fe61b8024c496c71a26a877f948a4ec3aa7e3184ea37a8a4077f9158f956fd95e809f3eeba099cae4d408aed79a93f578171 SHA512 b114997b3a52357d3fd98bab49ba2fbdecb49e7961dc71e51a131d97a975b6461c676f072a729ef3e553a73de2551a69e7624a631db855f686f0ff8b4fdfb739
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild b/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild
deleted file mode 100644
index 5b2e1ae220d4..000000000000
--- a/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop prefix xdg
-
-MY_PV="${PV//./-}"
-
-DESCRIPTION="Mathematics software for geometry"
-HOMEPAGE="https://www.geogebra.org"
-SRC_URI="https://download.geogebra.org/installers/$(ver_cut 1-2)/GeoGebra-Linux-Portable-${MY_PV}.tar.bz2
-	https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg"
-
-LICENSE="Geogebra CC-BY-NC-SA-3.0 GPL-3 Apache-2.0 BSD-2 BSD BSD-4 colt EPL-1.0 icu LGPL-2.1 LGPL-2.1+ MIT W3C || ( GPL-2 CDDL )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE=""
-
-RDEPEND="
-	dev-java/java-config
-	|| (
-		dev-java/openjdk:8[javafx]
-		dev-java/openjdk:11[javafx]
-	)
-	!sci-mathematics/geogebra
-"
-
-# no tests
-RESTRICT="test"
-
-src_unpack() {
-	default
-	mv -v GeoGebra-Linux-Portable-* "${P}" || die
-	rm -rf "${P}/jre"* || die
-	rm -f "${P}/geogebra-portable" || die
-}
-
-src_prepare() {
-	eapply_user
-}
-
-src_install() {
-	insinto /opt
-	doins -r geogebra
-	newbin "$(prefixify_ro "${FILESDIR}"/geogebra.sh)" geogebra
-
-	fperms 0755 /opt/geogebra/geogebra
-	doicon "${DISTDIR}/Geogebra.svg"
-	make_desktop_entry geogebra Geogebra Geogebra Science
-}
-
-src_test() {
-	ewarn "package has no tests"
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4ccdd583e4af..e9c2de389bea 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 1aeafde46fc1..aeae70e019ee 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,6 +1,8 @@
 AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 DIST logwatch-7.7.tar.gz 498214 BLAKE2B 8978930fe844bde372f68038f295cc62ca61f1c2b10d18f545ddcc713cb72cd01520ff0ea0869f2dff96846431a6dd9a04da1bc79817ccb590b0235f96e934da SHA512 5224013c548e60248ef2de8aeabc760d046374f54035e7e5e00bba0c6e6777eb5e7fcfd05a9f029d3d34e9d3fb8a243ed99b417961b21895cc14b881f1ad3dd4
+DIST logwatch-7.8.tar.gz 496093 BLAKE2B 35480a22077e43b70d15a00cc0a3a8297c1e57c465d6fffe7a9a68a9b4fb14ef62c1d2bcae8a4ab2d70af16451b8f0b5dba8aec29beae1012501a118915edd92 SHA512 470b45e5838014986292c65b7e95e7922fb5364d0d375d413f710968523273372e049774a25aab58a685bf0cfe999c8ffa0c2280fc29aa83b1603256659511d9
 EBUILD logwatch-7.7.ebuild 2405 BLAKE2B 3955dd13d7d123f453e0c426aeaeb7e0a27d982e907f598ae621b31bbf5fa5710a86d995bddb18a8932eb5e6d2f4cfaa69f964903dfef86ee58a322ea51e3b12 SHA512 5b888b1fca220786a73bd524df55997c5c05e798877fb3951287895b393c845b1503924a9ac5fd652bf9c48d6fd7919bbd4d1110a9d89d17e787f904ca61e7df
+EBUILD logwatch-7.8.ebuild 2413 BLAKE2B 94d02845444e44874b90d7f8bd21131cc754f5b84a90f4581c0d1dfcba041fad463ef2516ac5e1750f15cc2da237de2f41024011bb321115419aac311ae97ae6 SHA512 8038461b668f1d3ddd5908d866db147d350699fbc26333e8716b8efc4ec145e33656668c34536f2341348ed92dfb0b9bf8486a532daf7ac31850dc3177fbc980
 EBUILD logwatch-9999.ebuild 2413 BLAKE2B f846a4b0f713e757baaacc811b97ad37456b58b255ab616b8debbaafbc9ed754a214f71fc1f8da0c86aff2df3b70b199e0f28322a359a2514028e4782fd31ee3 SHA512 a59f67d27700d7fc8e6910e846bbb975dacd92098f5f3752ac8c6c7e7968a0fe40dce3267f69c7e853b0e3bcbedf92105f2faf137ec6308c302a261821c4d38e
 MISC metadata.xml 329 BLAKE2B ae6bfb6282dd2f5ddc01959eb57e894cc12a69de5fea771439d9b2a95110754fd7c35db97ee238865cfb81333800dcdcfb42654d12572e16cde12c7212a505c5 SHA512 a523f269535d7e0272f2d66b903319197f52477dbf40b32729eff93b5788f9c8b8756a4750128f894b4ab0d05b9effbac5d350e5ae2ab68474ef4fa39022710a
diff --git a/sys-apps/logwatch/logwatch-7.8.ebuild b/sys-apps/logwatch/logwatch-7.8.ebuild
new file mode 100644
index 000000000000..3147899cb63c
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.8.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tmpfiles
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="https://sourceforge.net/projects/logwatch/"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/Date-Manip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo
+	virtual/cron
+	virtual/mta
+	virtual/mailx
+"
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	# logwatch.pl requires cache dir (bug #607668)
+	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else (bug #100243)
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+
+	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+	tmpfiles_process ${PN}.conf
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 456d0e9274c5..b154f40cca74 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/spindown/Manifest b/sys-block/spindown/Manifest
index 72c594991afc..0d80405a3984 100644
--- a/sys-block/spindown/Manifest
+++ b/sys-block/spindown/Manifest
@@ -1,6 +1,8 @@
 AUX spindown-0.4.0-CFLAGS-LDFLAGS.patch 1877 BLAKE2B 397a96234aa0c8a7d437b05dafcec92b4e341c5dd6df324ac7ca036102cf825f119c16323767dd93440a42a5c0f7cba189a7427518efb5232a59a24cb9ee45f8 SHA512 75b12fd3c4789b78260318da117f43a7439aa94b21cb5fe8403bad9045dab8725b1913023bbff704f3379eee37fd3726e0e28b8674bd42f3df3c61caadffd30e
+AUX spindown-0.4.0-Makefile.patch 2020 BLAKE2B 1799242bf4297b9bb73369455c9a275b2406391d4603cd19319e1af51b073fff95fb427ebfceadb25c5b54037d1770440e82b7b75d493d49be2bba06b66b3276 SHA512 bd25ac5b5e5ced591c57fc8b2b903232f816c80a6e220ec58f94c127f8b81ccc5f8b52f3cf59850ae3e9b66e1aec7ba2deccdfa2ec973a3e4c9d851b83b6e74b
+AUX spindown-0.4.0-musl-time-include.patch 186 BLAKE2B cbba240d473597232bf9cc64a5083ae76e9783c045f0846de2de1a75efe2d5c58a8faf307d6fead1321fd7f75b3716cae8d6730c1094e46049477038159107e5 SHA512 34a2b27e45a1a71b57ecb95e0cec2528495085e3acfa001fbce7409a22dcaea4182d88a4d721f9dced559a847913137a26638c692cc2dd8767f473d64c9d17a8
 AUX spindownd.confd-r1 270 BLAKE2B 9adc5d9b170125a5243ae23150a91750b91ee283ca9d2e95b7fed950f7e83373cd2f25389c9a2ef858c441e9b47a37c8c8f526d68889a50a17a4ecf816681f84 SHA512 64c7d820e3f3eda3f7fa9e18fdcbd0677338245c14e071f75531c96b679997c06346749975ef6060eec7bca5af569f2e0700457e3ca690d98b705b0ec4ba38ad
 AUX spindownd.initd-r1 1510 BLAKE2B e4755c4975cb602a86108e994d66c570991af34dabf2967f2188368e45a089bfe6dfebba43740817c68e5465791eda5a1ec6f64f23036148f6dcdaff502d97b1 SHA512 318aff8a054a150ffe22e120f02e33773cad3efe247500303e2c528c9ddcc43f0dc71c89909cf2bd883789eadfa3d16abe741c03402bbb06d16cfb790cafebe8
 DIST spindown-0.4.0.tar.gz 36837 BLAKE2B 9d394aa3706092c791dc7be214af68f0a3990f4d447cd89c7fc8cba2e253a3075b539b12dc6c2e44278db190a3936bf238a4414a3465f334cb5fe8f63859edde SHA512 12cfd63c2f2c1fe6c3082f824fea925e236a39ff68ef217178fc9798f1e0e1ef8aa9863f9c2c0babfa29ef7e21290d10914beefd2284ff73a2bb786ad4bc24dc
-EBUILD spindown-0.4.0-r5.ebuild 1004 BLAKE2B 08afec54a45ced35901ec40dfa52cbfbe3d7c4d76bb3dd3f869218bc7e1c197abeb0d691dcb8d3103ddc401b26a639a426f59b5f036e6bf98b4065b26694f636 SHA512 4d59eb20e7d65c328ce9d0a3886be169d64274c596b8932baed0868a72702a69414aa6440e3975b7236979f91416363a8dadbe9f2e32823b5c08557178434a68
+EBUILD spindown-0.4.0-r5.ebuild 1079 BLAKE2B 5164885e1c47963a9856af54691dc607fde0624d311777d63f9a95ba0fafc978604885d01403440b248cc4887e93ae0e435563786fc44ae8b71434b9a3645ffb SHA512 4a7bfab9df2c1ac127af82003c03fa495aa31d5846f09db3942c001dc710d748abb36d5570de0cb3e3521ede1560099f99818bcb92a252decd8bf6376b20b550
 MISC metadata.xml 246 BLAKE2B 4a64d43a48825660b055ff5a2f1bbe23e331e6ef17a0c65a9712384588d32d4b44876654b38ea1c9d1e7ce89bf96253ed12cfdc583c331e3becefc9c42b1b9ab SHA512 1d669922816e6f42c90d256384f31a080feb19a7fba9b1ecfe5326d60b2d27422e4700f232a142bed5dc77ad08528a9e448349e564235ea35efe2febe4949e0a
diff --git a/sys-block/spindown/files/spindown-0.4.0-Makefile.patch b/sys-block/spindown/files/spindown-0.4.0-Makefile.patch
new file mode 100644
index 000000000000..60bfdb25616f
--- /dev/null
+++ b/sys-block/spindown/files/spindown-0.4.0-Makefile.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,8 +3,8 @@ ETCDIR = $(DESTDIR)/etc
+ VERSION = 0.4.0
+ OBJS = main.o diskset.o disk.o spindown.o iniparser.o dictionary.o log.o spindownd.o\
+         exceptions.o
+-CC = g++
+-CFLAGS +=
++CXX ?= c++
++CXXFLAGS +=
+ LDFLAGS +=
+ SRC = src/
+ INPARSER = $(SRC)ininiparser3.0b/
+@@ -61,31 +61,31 @@ dist:
+ 	rm -d -r -f $(SRCDIR)
+ 
+ spindownd: $(OBJS)
+-	g++ $(CFLAGS) $(LDFLAGS) -o spindownd $(OBJS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o spindownd $(OBJS)
+ 
+ main.o: $(SRC)main.cpp $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)main.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)main.cpp
+ 
+ diskset.o: $(SRC)diskset.cpp $(SRC)diskset.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)diskset.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)diskset.cpp
+ 
+ disk.o: $(SRC)disk.cpp $(SRC)disk.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)disk.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)disk.cpp
+ 
+ spindown.o: $(SRC)spindown.cpp $(SRC)spindown.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)spindown.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)spindown.cpp
+ 
+ spindownd.o: $(SRC)spindownd.cpp $(SRC)spindownd.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)spindownd.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)spindownd.cpp
+ 
+ log.o: $(SRC)log.cpp $(SRC)log.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)log.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)log.cpp
+ 
+ exceptions.o: $(SRC)exceptions.cpp $(SRC)exceptions.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)exceptions.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)exceptions.cpp
+ 
+ iniparser.o: $(INPARSER)iniparser.c
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(INPARSER)iniparser.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(INPARSER)iniparser.c
+ 
+ dictionary.o: $(INPARSER)dictionary.c
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(INPARSER)dictionary.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(INPARSER)dictionary.c
diff --git a/sys-block/spindown/files/spindown-0.4.0-musl-time-include.patch b/sys-block/spindown/files/spindown-0.4.0-musl-time-include.patch
new file mode 100644
index 000000000000..8b42b5e41c9d
--- /dev/null
+++ b/sys-block/spindown/files/spindown-0.4.0-musl-time-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/863074
+--- a/src/disk.h
++++ b/src/disk.h
+@@ -30,6 +30,7 @@
+ 
+ #include "ininiparser3.0b/iniparser.h"
+ 
++#include <ctime>
+ #include <string>
+ using std::string;
+ 
diff --git a/sys-block/spindown/spindown-0.4.0-r5.ebuild b/sys-block/spindown/spindown-0.4.0-r5.ebuild
index ecc1c975e4cc..8d80fdb10e54 100644
--- a/sys-block/spindown/spindown-0.4.0-r5.ebuild
+++ b/sys-block/spindown/spindown-0.4.0-r5.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
+inherit toolchain-funcs
 
 DESCRIPTION="Spindown is a daemon that can spin down idle disks"
 HOMEPAGE="https://code.google.com/p/spindown"
@@ -10,33 +12,33 @@ SRC_URI="https://spindown.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-apps/sg3_utils"
+RDEPEND="sys-apps/sg3_utils"
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-CFLAGS-LDFLAGS.patch
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-CFLAGS-LDFLAGS.patch
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-musl-time-include.patch
+)
 
 src_compile() {
-	emake
+	emake CXX="$(tc-getCXX)"
 }
 
 src_install() {
 	insinto /etc
 	newins spindown.conf.example spindown.conf
+
 	newinitd "${FILESDIR}"/spindownd.initd-r1 spindownd
 	newconfd "${FILESDIR}"/spindownd.confd-r1 spindownd
+
 	dosbin spindownd
 	dodoc CHANGELOG README TODO spindown.conf.example
 }
 
 pkg_postinst() {
 	elog "Before starting spindownd the first time"
-	elog "you should modify /etc/spindown.conf"
+	elog "you should modify ${EROOT}/etc/spindown.conf"
 	elog
 	elog "To start spindownd by default"
 	elog "you should add it to the default runlevel:"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 5b598c7d18b9..dcf43bf977e3 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 0187e043b630..130e29a76ce3 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,35 +1,27 @@
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20221208.tar.xz 72098912 BLAKE2B 8167b3d91fb95c727caa3a76d8bd6d70e0d0bd79eda72305f3005c9f7163dcd425c75386ba55b2d71644ecf83d998a4bccb6fd265bb615dcdd104f27cadb8e76 SHA512 5e49159d86300eaa4c2f34fb3537b5f257931e861a1a1217dbabcfcd5ef9da224d4a6023aaf8d24c8893ecd204ec0cd6e96349ae0dd445d62d92ebb041aeb054
-DIST gcc-10-20221222.tar.xz 72112292 BLAKE2B fad78a6bc00e23909fa4c441592e61311709efa770ec713c44923f6f088c1185c52022cb9fa2e13185e644b655b16f7b4f4247e93bc82925ae44b2580feab8dd SHA512 34ecb5def4152e69c6b2a5fcd111c244447f6c53ed4359516923331af4634e67b803635ec770f24fc7dc12a571918d523fdf4f23d13e7aec927a05f8c5b83090
 DIST gcc-10-20230119.tar.xz 72112952 BLAKE2B 6e28cba9f6ff5c9f9231828bb400c82b8658a4f9c0166c28a6a12d71728d4460904152a8c84bbeff88c06b7f9378937b7b61bf4a871a10c56bd005170dc5fde2 SHA512 6cbb567ef1da1b6fa65892b6e71c3b7cd37e0c483e049720ea1987d444a0e7b4eb15d1e99f4e35995acdce560a811a779574eeba52bb252c61325accedd6a5c5
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
 DIST gcc-10.5.0-musl-patches-1.tar.xz 3816 BLAKE2B 5995f934a40665d877342853fde8b414eed8770c72e6b11b295b7e7b3c9d38d7407dff63b5751f4449f6fa842c02e87f156cc868e7436a8313f7c8514242d255 SHA512 b93cc54cd7b78fdc487df7c449b03bbfd10094e45f3f8eef20cd69f27a68a14817fe662a2ec119b384eea2dad0491b70f838d010457e386700030b76457afad6
 DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5544b369720e8c54fc59375e591ebd0a429b7e81a2a3df86bd2eaf19e4b8148bf2e1b0c8410de3944d4801ce412016b2 SHA512 5855aa23ee0b262c20a1b6fd2d4a947180c079dc00e0fa675043edceee0c822eec0dc752f5fcb281b70c04e50c6fcaf6c5d5160ab15d3f0c51fa030eb2d79d26
-DIST gcc-10.5.0-patches-3.tar.xz 17292 BLAKE2B 403b3955756c060fa00cdc55c29cdad58cf0ce449af7a75aabf4ddecc9043cffe5f1d6fe77bec00a59de2040e207fabb390f9c603748926821d189be53f4000d SHA512 f5a192f42222d02ab765e8b284dfbd999e69db8a7d6a2e5f1f378a16ba3f0b26f35bbad3b3a9e6e9e30c6734b76d8b69d80b802593cbe4d671f14cc16db30c8e
+DIST gcc-10.5.0-patches-4.tar.xz 17880 BLAKE2B f368b741fd42199c85b770ec45a5232d27295cf7796163251f24fa963f2264c473e161bb34e66b43c4b227e41859d540a66331111392478b280b289d359806c6 SHA512 94f7fbd1b4672f0378c85ac3a96f7954cd22bd7cc1013c32519bbe1cae0ebb5183e14469c61dfc9d931b8d1c261f2ead1c4b47278104d1b5189a0c787aabc40e
 DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3
-DIST gcc-11-20221223.tar.xz 76237128 BLAKE2B 4d50d3a296bae501dd4287ca7c877304a60b1a6d444b96598ff2e018f4cf540896c675c11a99cc127acfbe7e3af38d603f6b80b7049d9e525420eaee7c0f81e4 SHA512 efbb26ce3b8a5ffcc36ad84f797b638c1d8d0a1fe61e3d9bd984c0dbce0a887d1384f8644d71f4b25b22ae2c67fedcbc4282780a2b834a47a318ed558fd9e0ed
 DIST gcc-11-20230120.tar.xz 76201244 BLAKE2B 07bc819dad3e2ee3747f09f43fd73a4263f06274362728174b32d9ead52ea95c25ea6a192397378b9b4c4f958285d97488d28e425c26129d23f143b1a8668fbc SHA512 81f71aeb706b4ccb89e2af5201770fd72cc3190b9b5eac0b5a25a522626b9c4015a2e5d13e4bd1360ac0f7f1be27df51fc530c15ce3c3d782f39f34d5c58803e
-DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334
-DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d
-DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
 DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac
 DIST gcc-11.4.0-musl-patches-1.tar.xz 4320 BLAKE2B 9f59aef44243b6d63bd9c4639b413523e74784dc0da931a9f1be75d2091f7e99c530b32b567315972a88816d6b30d2c404465a2f28138ba2cc894914d7a123fb SHA512 c174623bf40fb0cab53d1ca82fa7e0b05f0114c61c839e316dfff7678d202b850d4d5011432cf6fa40c54e563e28381e9a9f80667d9428b3f272ba8391c6ac84
 DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9
-DIST gcc-11.4.0-patches-5.tar.xz 15136 BLAKE2B 202bc321d1a75a543bcbb54ddd7aae2a6d81764b1ae752e95bbcb7b1e68cbac33e2066a1c935c705fc7cea6603e93a6dcb3041645131a5e76c986242a8613908 SHA512 96ec2dec4e663d739fa7b80e63df32aa6d72c193e124bc93580cc1c0f9b8d3578dee3faf0e765b766cc6bb46136958a4b0e7095962d73b6e2a8066b8be558a5c
-DIST gcc-11.4.0-patches-6.tar.xz 14160 BLAKE2B b1c4348fe0ac1fa18f33b4079f81d68d23e6ab4a1ca9fd0a148e21ac7c0c899159fc27e2330635b8d7b6bca1838edb9d8c7b5e4513c21ebc18e2962c97ea88fe SHA512 6c688b01fb07a0f971831ff0ecb795228853e0debb06f7f16b44254136235f4a02b55fb96b72204821a93660e1bb6c52e1b11a161cbb6511358b7f5d1c209cf7
+DIST gcc-11.4.0-patches-7.tar.xz 14416 BLAKE2B 3ebf62cba04cac8830a93a99d11c21347c38891db3a81493a10e02e8b7af0c86389ffbede50672dfe1189a77a67b832f8f97a1d95d43eff11db131a143b1d03d SHA512 41e2ed1ccf6d3631accccdab057877c79c99eb1b3c32f9d35628bca6c633c4f8dadb1d7f93bed2e4d7ff9f36cc9e46ea00f0e57e8af64b2e5f4b3b01285c6da3
 DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df
-DIST gcc-12-20221231.tar.xz 79647424 BLAKE2B 8e75adb993eedf38059ced571d2df160aa3a11ab855bbbba6be7ea8ad630ec0cdf470e432d6d80b794c1b326aca63cf0b8b673fb9c89330f52e5418e2aab8d43 SHA512 76fc6bd5b1e7711e4f2f7c391bc057a3c64db193af11cd2edb7bde5a638134aaac37012da75b90aea30da04b69565276f377266318471b4d123252cf3e5f5852
 DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a894e9efdc64625bb13045c7bd549a7bab59dfb4052d45d594d4484801ab5b18cf3f3d6277be54eaec24a53abd439c SHA512 b6c2486916418a64fab64c3655329bc18ca93ee4eca240e8779bd6d8280124fcd07b1aa8eff979fd317656646ecdba9353107887338354d8bd2c1f68c1609349
 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
+DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c
 DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfbecec016727a50ac0f4767b37a2ab9df39e0828abb07f1e429619cc102808f81af8422fef0265415c287d303d9d97fc0 SHA512 1808a05e98094577099d115ff5f3e136e3fc8f39fbe35c5183fd7775383f94439212e5e4174ab8d0ae8c0874e227ff84a958ffdfa1c99c9a8306a9842d126ef9
-DIST gcc-12.2.0-patches-8.tar.xz 14656 BLAKE2B 25f00289699e8e3417c5e4a7d424cdbb140304fb764e8d1fee2e259b4231987c8b53cdbdeba761899a0256b764f7cfd6b4e691fcf44634b59b9dac9ab8a49cdc SHA512 dca2983a72d6c95c3cfe8e1c43195c9aff2a9c5c012851c1b30e51f4384be9b08e761ca589e4941528c89e522d1f11bc6964c8584d7761a889f47e302a3d2b5d
-DIST gcc-12.2.0-patches-9.tar.xz 13636 BLAKE2B fcbd3dc5adeb7425d028001bd21ede21ae5596a48f4cfbeabed3fb657b27edf19bbe502f0388c284ffc87d03714f9e0ba4bc9c8008814c6362ed56b8165d403b SHA512 09581aba97a18008739d70dc6dbfdacd0c82acce6e175c879b50b81c7575c6e056cd9f2a73e7d6231ea5a6f72c248eca3d818996188ec34cdf7137e9f263fc01
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
-DIST gcc-13-20230115.tar.xz 82853256 BLAKE2B 249119bccf25cdded9dd0ff98e1ceac8d68251b721c3ceb89191e8b455996129f311ef45b03d003d5b5bfddc0ca09cc7084a0b10a3248a7740c0b18be6733260 SHA512 f6a131749096a8cbd3aa2b8dbbbf41c55f256ecc079966a8c3efbc23fe39d5510c8952b405b16c8462107262808c2088a1cbb705b01e68bb29d75da39beb1a4a
+DIST gcc-13-20230122.tar.xz 82869800 BLAKE2B fff4bee436910ba587640600a95c2a89ddec415e12f629c941c8b27d28202c62b39dac2ca0b5d82d9fb4ca271310b178e89202f488f5ef4a7fbc63cd3ecfd7d7 SHA512 a24c0acedc81f72104fe13aba7403ee8920949089971aad5a296de7b46b8969d82b77df92bfd4ef2537b2e5c2010b72d3a33e3bf35ff734d9c49a7a1746026b5
 DIST gcc-13.1.0-patches-5.tar.xz 11404 BLAKE2B 5ba2b4002e917750757a28fa4c7ff6ff7090c35f28eb984aee6ad7fc0ac80c88a9d08e1d4d9efa98e6bd3f06e89df47b10b51f8294bb7d2ef0d1ac3fd2a1a963 SHA512 6864738794237bd7430c612404dd4b84e275362cb5abd081284a91e5b24c1b0aa97d90b9543168c72147be146887219715325d52ae2920912d9c4e17e7224aa3
 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
@@ -37,21 +29,17 @@ DIST gcc-9.5.0-patches-1.tar.xz 13772 BLAKE2B 2e2e84a28a729cd271a23716ff3fe08b72
 DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f732c6d3f2b14d9382750b40c4f14b5d3051225b81f936ef8297b0ba8cb5439512e961dae5815d3bee2b0bfdb SHA512 cdd144ce4f747e051480410afc8506c90a57cb45da89071ddae377b1453bca3014422455ade9fe4563ebe51f4b6348cbc0c61905a9b8801cd597d51ad0ec62b3
 EBUILD gcc-10.4.0.ebuild 1445 BLAKE2B 05518ec2cdf0180f4db63dcab413097ca777381b496d6b7b7cebc0bf2b04395d14b74daa398ea2e2d916df4f6034357cfc740939e0fb346bbea71a8a09603fbb SHA512 8fd4642dd974006efe35f6d45ebfda66fe5dac0d4e2371804ede5d94e6e820b95cedac08c11de766c0c711bef7c55900cdaeaffe889691f7acd7470c32e7e3b4
 EBUILD gcc-10.4.1_p20221208.ebuild 1446 BLAKE2B 81b537066cd4a53c08b2bb6d037f8981e70f31fd9563dda1d825057e186f6d206e9a283fcde619cbaf323ef3bdff45a1bd84a530c2275c7e28204716bd0b012b SHA512 6e790aa4d4dfbfb77374a75c9f8ef72c6c14610c7f4778822d8fd16520350969345574104aa28f5656d1fc2ef0d6ab6b2177e12fb2ea1c62bd6e7975fc0d8c64
-EBUILD gcc-10.4.1_p20221222.ebuild 1453 BLAKE2B d173e10d77d8cc68c4bc2ba3874f8c3d2a0741c62efc17568bfcf06e0a0f0d3443662ef6551c9604c925b5e8d733f67ef5e1d25857b785d76b068007aea55a17 SHA512 8339e204e3646ee3b450a0c0463334ab372a22476195b43559948b35c74ad47b81723562345b4807bcacd93374bd63ba841fabb4aa5e25f9434dcf8b4c10d0b7
-EBUILD gcc-10.4.1_p20230119.ebuild 1456 BLAKE2B 61f843bd3fe85040d31d7654adc84e0e90bd04344c023820e84fb127b449cd94fd7a54b2a81b892f466ffd8cfb884aeeea0e2af88c051a2e8fad733b3cf13e07 SHA512 cc4e8da8ed5bebbd4a42835f723b6710b2ee13e8e245513e871e2540082f1c63721328c0f3628287bb15b30eae0cff6f2a43fed70723e39d2f603f542d812925
+EBUILD gcc-10.4.1_p20230119-r1.ebuild 1452 BLAKE2B aa59ba53aaf08c3c89b85147e1053b908272ca94806590b83758b8cf7ff1bd85f41de3ea5e6e1effa4c8a1ec2a0e2ebbd3ec1f26b1bf6e7f41e905c1c5079082 SHA512 82c714400e999748ac82df976ced74020a8e7659f0d9f3c486984e36ab3ca0a21173fa522eb6a4e7128fc9598046a6109669c9f103760e7688a4f60ad1059e61
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
-EBUILD gcc-11.3.0.ebuild 659 BLAKE2B 310352b879c732515ce63983db79b32bf7c8c200a650627a14b5284fceea9a7e7f3e545044a8c00ccc44cd760b18123542bd233242cb3ebc48ef422439c8e430 SHA512 44c89a7782e5e37c5ef61c50d5aa6d07c09f19bada293ed657d7062837a5a9be9483fda0b1845ee794f42031ea098a1b88d439f7be202f4276f77748ff45815e
 EBUILD gcc-11.3.1_p20221209.ebuild 1286 BLAKE2B 5bb5bb1dfa617deb42fd1194fd51172e7865f6890bf430d2269ce0a5c27854b494e2ef2a997371dafd6328b2c59656718201ad0dae946911d18ddfae01ad9904 SHA512 d8242777dd4aec49d56319b7da0423a3d39a906cc78650e733db27a3021603fe7043cfd5f2e5497847ca64f7439ebaca20b01a2fb7264d790748d300d87377ab
-EBUILD gcc-11.3.1_p20221223.ebuild 1294 BLAKE2B c6aa11e60a7cd0d5906fb0ef055b53583472fb17a5715f8f3450ce13cad83ae9f04cb42f10b41b8905532e0538b78e36d6fca8d56bf1550ee2f20b03cef0f4d1 SHA512 62e61d7502d140012879dadee28dc8140215b43a5bb24b4e59fce1cf697b5bf4d1433b887f8958d77c92abd3c7f06a2d4a90ae93bfc9baf1640b0d048132b872
-EBUILD gcc-11.3.1_p20230120.ebuild 1297 BLAKE2B e3dc918277a3511ed09a4c5ea22dd1c68be08ec1b043ce589e82466596016480add5d2ca25dc7ada98bf28c94d0df81645e38d83558d8e16df0c32bfb4a6909b SHA512 93d7ced5f7bae8cd8e1f7d1edd53f9276510e516e597336749b3f4af9b2a30162fa9afb72ae85fde9e808c249e057d3b5e39279bfa44cfc7250d143ecb67b652
+EBUILD gcc-11.3.1_p20230120-r1.ebuild 1293 BLAKE2B ca17e237503475f75a6622ab9d2a519170791a65525ed86e3acd20acfdf35e776951c12f8e37a0e9e4422ba57ed98f150b76a4387f177447ca263b5ed49c1b63 SHA512 2a751b6ec32692261691f31dd587748d5c74a88c73b843e0e90d6e36677877bf361229f92d75a513937d43657143a545a2cb4554e9881a87ea07c07b3b267769
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
 EBUILD gcc-12.2.1_p20221126.ebuild 1434 BLAKE2B c82a53ce99f8086c28b24382978b2c34b083bdfb01ccbcb893b56b210ffef770c1e534fc134835ded4362f32f447b5fc82dc75e7055ca9554bcd194e8b166225 SHA512 2cf47d4df36a26f96a7700e390766397520a4598037b7dfe5b4770a4b43fd6efce4f2c13b730c75ba014fb31465f4cc08a399aea7eb62eb46e9b11f8ecbfdfdc
-EBUILD gcc-12.2.1_p20221231.ebuild 1434 BLAKE2B 47136fbf5ba5e3bfbb4a631dbd7e71472a4760b598396c8e21c1505e257c7eb9f3459e90311152df1878203cda659d8cbb542036b6ba2940ff90d15351b37201 SHA512 4ded3e25cfce0aba6e6408a8e0d9bca82dd3ae33d274c4ec3bfe8bb41f9e9e92cb4b849e72859751de33de35433a398b378b5af5c78c0e1577c4cdd3e5720711
-EBUILD gcc-12.2.1_p20230121.ebuild 1437 BLAKE2B 54d8427e57068f8ff2dd62cceab6896ae9f0c19b4a94ae0808f1ac4d29493bf90ace7e28473d8f35fc1e06f06bba259ad33f0976b691d704a1988d4f3bf3e85c SHA512 057be3c83bd2c17451d0a27011cb9addd2b6efca62edfcea25325c95de6efc32535147db1279cefcdd9d68ad6be0f8bd44af3dd68e81f66f480ae2240ac4eeea
+EBUILD gcc-12.2.1_p20230121-r1.ebuild 1434 BLAKE2B 8f16737b665395c9f216fca5547b7265132aa46e71fe6c10e505a48eaca8e60625a29017dfb8f74bfa421b4a9cbedc94bfaaa70cb161bc913eb9e3bb49ebe867 SHA512 7d361fc7043bae894238c833c9cb67c1c6c2d33c35ff85e828afffc468be40b8288f01a4149eba46051313a9b965ada0962030abca5201319be6db8558cdc190
 EBUILD gcc-12.3.9999.ebuild 1545 BLAKE2B 78fdc4a7b20d22bba137cba00e49d2249c5616bf1c4cf619162da1d98c750fb3da71fbb1cd4e136624cc4e0a112547e6c4c29992aa58ab12507917c7d728831a SHA512 f3562696a79035e64b8e79cee720fe24c7041bf922d79e5cff1ae864a533997995465d0871bfc4f87f6d5a66e7f8ac02c490792554a0628ae30d96a061ef9279
-EBUILD gcc-13.0.0_pre20230115.ebuild 1286 BLAKE2B 613958f9d883c696a477fe6d25782dfc6ae9c37af2169c370912eed43e7f21fd33ac2b5640b5cac0cf5ec964efca42ef3d0d1d36c3a372296f45e88c79a51bf5 SHA512 c7e0a73749cc56c95d60d8ed9326cb48d968e1ecb0905b3af6c0024d75e0ee8cbefc5c5ab2fbae6aac32348c51d41cfcaf470180b05243e3a55dd0c46f58f0ab
-EBUILD gcc-13.1.9999.ebuild 1252 BLAKE2B e8feaecedb676e0ddce69ec0e7fc5e944d8df870ba897a2e495781a0a860c972b013667ffc3b83a2e4da97cd1e8ce69b93fb3d212d5cd9af2fc8e5e3d799f3d1 SHA512 ba91dd930efdbd01f57a95f70e5e9e12fa9e7e1254d574239ecdf0b54d20515ede1df6dffa9772ef590c128fe852e378ae7e2c56d2f8f88db344675b7cc7ab45
+EBUILD gcc-13.0.1.9999.ebuild 1252 BLAKE2B e8feaecedb676e0ddce69ec0e7fc5e944d8df870ba897a2e495781a0a860c972b013667ffc3b83a2e4da97cd1e8ce69b93fb3d212d5cd9af2fc8e5e3d799f3d1 SHA512 ba91dd930efdbd01f57a95f70e5e9e12fa9e7e1254d574239ecdf0b54d20515ede1df6dffa9772ef590c128fe852e378ae7e2c56d2f8f88db344675b7cc7ab45
+EBUILD gcc-13.0.1_pre20230122.ebuild 1286 BLAKE2B 613958f9d883c696a477fe6d25782dfc6ae9c37af2169c370912eed43e7f21fd33ac2b5640b5cac0cf5ec964efca42ef3d0d1d36c3a372296f45e88c79a51bf5 SHA512 c7e0a73749cc56c95d60d8ed9326cb48d968e1ecb0905b3af6c0024d75e0ee8cbefc5c5ab2fbae6aac32348c51d41cfcaf470180b05243e3a55dd0c46f58f0ab
 EBUILD gcc-8.5.0-r1.ebuild 473 BLAKE2B 40d3b651d0aed62ceb1df973f1f7e2b6ce419df22da63e49d335fcd0bf7b349d1e7be40dc16e80fe143222d48ac6139d35bf47558d83c30aab4b25dba6fcf6cb SHA512 b88761a3495a1eab0de5321c9230c77cd621ae545d3be49a13273cfcd8e94cc21dbb062bfdebb64dc5bfe1ddd600ee8fb60df6fd7709a7be90915b7e99a8db29
 EBUILD gcc-9.5.0.ebuild 844 BLAKE2B 7bee440ddb624d5489ebaa9be899c530bdf7d9563453a9abf45e60d1f3ed66a78535cb9227e66e93524071fbca447786e2133ea316b5b2b55366e2599c587be6 SHA512 4b578a481eb06ff5b445bbd81cf18d4d63ec2d65230e33f95377f270b391bde02c2083a1b46b43838bd115be7d75c3957258f72fb5e7d89ba79185d08195b9ec
 MISC metadata.xml 2675 BLAKE2B 71118d3d0fa3110e555c735d0e98a7790fd70b47fce637ef5e550b7e2e9eff24b008f758dcd2af5503113a44639461ad33ac7004b64fdb30d2ba1014a031d586 SHA512 0e5724c9e90e53859992ab17f4fa202d027f620015c15c1560fb2069d6c75b1ee9405358308e6df0aa5f0da21aded5fb74e79ba18ed803a39fbb3922f6664505
diff --git a/sys-devel/gcc/gcc-10.4.1_p20221222.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230119-r1.ebuild
index bbed5b020bcb..2d7951f9c20b 100644
--- a/sys-devel/gcc/gcc-10.4.1_p20221222.ebuild
+++ b/sys-devel/gcc/gcc-10.4.1_p20230119-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
 #TOOLCHAIN_GCC_RC=1
 PATCH_GCC_VER="10.5.0"
-PATCH_VER="3"
+PATCH_VER="4"
 MUSL_VER="1"
 MUSL_GCC_VER="10.5.0"
 
@@ -36,7 +36,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230119.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230119.ebuild
deleted file mode 100644
index 8cb4ccaa5b91..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20230119.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="3"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-11.3.0.ebuild b/sys-devel/gcc/gcc-11.3.0.ebuild
deleted file mode 100644
index f5993968500a..000000000000
--- a/sys-devel/gcc/gcc-11.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-TOOLCHAIN_PATCH_DEV="sam"
-TOOLCHAIN_PATCH_SUFFIX="xz"
-PATCH_VER="7"
-PATCH_GCC_VER="11.3.0"
-MUSL_VER="1"
-MUSL_GCC_VER="11.3.0"
-
-inherit toolchain
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
diff --git a/sys-devel/gcc/gcc-11.3.1_p20221223.ebuild b/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild
index f353c58a4ec6..9c37d622eb9b 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20221223.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20230120-r1.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=8
 
 TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="5"
+PATCH_VER="7"
 PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
+MUSL_VER="1"
 MUSL_GCC_VER="11.4.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then
@@ -28,7 +28,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 # Technically only if USE=hardened *too* right now, but no point in complicating it further.
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230120.ebuild b/sys-devel/gcc/gcc-11.3.1_p20230120.ebuild
deleted file mode 100644
index 0eb8f03a6d5b..000000000000
--- a/sys-devel/gcc/gcc-11.3.1_p20230120.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="6"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="1"
-MUSL_GCC_VER="11.4.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.2.1_p20221231.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
index 85b3b5eaeecb..1d9c09da858a 100644
--- a/sys-devel/gcc/gcc-12.2.1_p20221231.ebuild
+++ b/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="8"
+PATCH_VER="10"
 PATCH_GCC_VER="12.2.0"
 MUSL_VER="1"
 MUSL_GCC_VER="12.2.0"
@@ -35,7 +35,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 # Technically only if USE=hardened *too* right now, but no point in complicating it further.
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230121.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230121.ebuild
deleted file mode 100644
index 7579ee96e4f5..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20230121.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="9"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
-MUSL_GCC_VER="12.2.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-13.1.9999.ebuild b/sys-devel/gcc/gcc-13.0.1.9999.ebuild
index ca9d13f5ddf7..ca9d13f5ddf7 100644
--- a/sys-devel/gcc/gcc-13.1.9999.ebuild
+++ b/sys-devel/gcc/gcc-13.0.1.9999.ebuild
diff --git a/sys-devel/gcc/gcc-13.0.0_pre20230115.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230122.ebuild
index 41e7410862f1..41e7410862f1 100644
--- a/sys-devel/gcc/gcc-13.0.0_pre20230115.ebuild
+++ b/sys-devel/gcc/gcc-13.0.1_pre20230122.ebuild
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index bf6273106f69..2871dfcbee25 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 5bc901d73fc1..b22f66ca21d2 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,6 +2,7 @@ AUX cryfs-0.10.2-install-targets.patch 1337 BLAKE2B e2e1e4157a41ebe26ae459e0d680
 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
 AUX cryfs-0.10.3-fix-build-with-boost-1-77.patch 639 BLAKE2B c03de4feed91e4182bcc9e68c294b15bf5715f06e38e21ced9e27a0bb96f9cb4546ec2eca5b0ae106724e797cbe0f734fb311bd13361248043f590e5a2c61c8f SHA512 e67f0dd1c0b08c062db75ff354124cc2f346efd0141439af78c9ade1019937af91ccd5c5c06ade89889d9b2a9ac5d01afbcec33a22ec454120918329a9ee60e2
 AUX cryfs-0.10.3-gcc11.patch 14590 BLAKE2B c6541d1e211c9ae503ee83be18dd2283f2ac5785f5a975fcd155b02759f6180eb96b8673d98c71e20c101ac4afa4ceaab4c6ece14c6605e32f5c020f260568bc SHA512 4fa2817c9f10df4e371deb7fb4acc423dd8260277216cf959ace47d64bebe394db71c79cd72098c6b11ac27b88d98eab8b5cde5af5095a63d57dc88d7dea7085
+AUX cryfs-0.10.3-gcc13.patch 258 BLAKE2B ca97032f8545c83ba717efc12a3563a8efa8353c478fe600cb94480fc0d358bad0482432283f9192824ba3c444bafba7f9b94109ec20007a687c6fb52303ecf2 SHA512 aaf0dd6698c833598b212c07e6c954d245f20da23a3edc967b0615504d83ea18994e446cf29cd3b5c08590f25bf8c9d4115e164f8ea0472a17ab897793fa2dc1
 DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87
-EBUILD cryfs-0.10.3-r1.ebuild 2319 BLAKE2B 155af86adca5b8654b6afa05f9aaaa8c1d0afeabb61a07ce5cbe1e229b8dbe282965b2fdba6fe4ad9944c1cd37c47305d388cd038d7a1c89df4b5dd16c63534b SHA512 e4319663c36f0482ec8c579acda0b4eb9afa546a60c487760f6aab3a3703bb0e9c412c3072741c1200042d58e3d4ca82d7ad34f7cfbf6fd97cc58012aae5747d
-MISC metadata.xml 416 BLAKE2B b741d80131fbeac4c8659847bc206aad10c2ade82bb63bf1233542b0d9d6a2a0d3aee2b09aad9d7ef0f5dfb0ef1f9d065ae51c0884ef9a89479fcb99df912650 SHA512 4d38d4f4d0f5870d4cf6b1f86fbafe7327b6b799c8fe32d37fcd00d47b3d02f39f4725aa1bd205d2e141fa287427fb1a8f47206c25d2b8973135b6cd44735395
+EBUILD cryfs-0.10.3-r1.ebuild 2359 BLAKE2B de8b731faeac8fe574fff1c401e5d72eee8cd406500f8e94e6819664ddd7f6fa8ef84c264fc4c87dc74d330c7d9ccdb1f322c0bd45a446257059d9a67dd0c237 SHA512 c7d9d6e395c82f7ea30870ccd3c6543513ae0dcd1642dd3e600b8dd81ad1ee27ea5602cd1a117763dc0462d41fda0942e75c8c038bc33bd9f5233b6eba4047e1
+MISC metadata.xml 496 BLAKE2B 409cff030d8c45472ea6baa2abdcf736fda7d1229b7fc69e7a9280d05fe4b0ca29cb7be9836b862d940af3035cb9f02791407bcd1e176b1ea69dc2038542bc13 SHA512 9308ee717a85ac37a7264269d364ec60eac713bbfbc771019364d6b9ada5691d03d05e34981670e839f4d9a9b5b65268970e18645ab3ccce5cf4f501fe2d147a
diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
index 6416dfd23725..e3ce120c5ff7 100644
--- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	# TODO upstream:
 	"${FILESDIR}/${PN}-0.10.2-unbundle-libs.patch"
 	"${FILESDIR}/${PN}-0.10.2-install-targets.patch"
+	"${FILESDIR}/${PN}-0.10.3-gcc13.patch"
 	# From upstream
 	"${FILESDIR}/${PN}-0.10.3-gcc11.patch"
 	"${FILESDIR}/${PN}-0.10.3-fix-build-with-boost-1-77.patch"
diff --git a/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch b/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch
new file mode 100644
index 000000000000..33b6e95d1cea
--- /dev/null
+++ b/sys-fs/cryfs/files/cryfs-0.10.3-gcc13.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/890847
+--- a/src/cpp-utils/thread/LeftRight.h
++++ b/src/cpp-utils/thread/LeftRight.h
+@@ -2,6 +2,7 @@
+ #include <functional>
+ #include <mutex>
+ #include <thread>
++#include <stdexcept>
+ #include <cpp-utils/macros.h>
+ #include <array>
+ 
diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml
index 29cb5df7d609..dce6d653fddc 100644
--- a/sys-fs/cryfs/metadata.xml
+++ b/sys-fs/cryfs/metadata.xml
@@ -9,4 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">cryfs/cryfs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index fe8099614ccb..be67937893c4 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/pkgcraft/Manifest b/sys-libs/pkgcraft/Manifest
index 147c2ea87eb3..74a155dfaf21 100644
--- a/sys-libs/pkgcraft/Manifest
+++ b/sys-libs/pkgcraft/Manifest
@@ -142,6 +142,6 @@ DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54e
 DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
 DIST xmlparser-0.13.5.crate 26225 BLAKE2B 7e97faac189914311db8a1b83861daba2e80dbc8313a5e4acc6e7e7e05ba9235f9d0963c3fb510c62b0ba6922c76b4c8dfe6a0ca4dcf1c8afe6ff94f4c9515d8 SHA512 349ebd1945a2b8804a8c6004e45b859cc0a0925c6ce0ca24a7dcddf08622f00f4ca7daa5f9f2e0da2932f630773f83aba8270bba14f4999b1c00306cfead35ee
-EBUILD pkgcraft-0.0.4.ebuild 4432 BLAKE2B 2faab97a996f0bf9312f3c7cfec1e55edfe6fe1d639590cb53219c586aadf64284d25aec28dcca8b83b5c0042ee11b05b37fe5816e282460916638e75ac6893e SHA512 35349983575412894705b2f9fc31af3808900675120722a14fe66cccc7a126c6826680fbd6219f8a95c17a5a13ff9bb3583be3987f0beb578d30aae951b6a552
-EBUILD pkgcraft-9999.ebuild 4432 BLAKE2B 2faab97a996f0bf9312f3c7cfec1e55edfe6fe1d639590cb53219c586aadf64284d25aec28dcca8b83b5c0042ee11b05b37fe5816e282460916638e75ac6893e SHA512 35349983575412894705b2f9fc31af3808900675120722a14fe66cccc7a126c6826680fbd6219f8a95c17a5a13ff9bb3583be3987f0beb578d30aae951b6a552
+EBUILD pkgcraft-0.0.4.ebuild 4510 BLAKE2B 83301459b3babfdef64a677ea5e8e71524b74ab50b5d04101bed89708d03850664e71cd51d78b7c02240c219579bbac5d1c642572d9d677b3073b45464f95fc9 SHA512 6815a5702bda325cccca9124278b24d804abad52c5d174dabd6381aec719f2877a125eabcb0c75e4413fded37e27f68dc4039eed7736dfdc03fa3c1bd31561f5
+EBUILD pkgcraft-9999.ebuild 4510 BLAKE2B 83301459b3babfdef64a677ea5e8e71524b74ab50b5d04101bed89708d03850664e71cd51d78b7c02240c219579bbac5d1c642572d9d677b3073b45464f95fc9 SHA512 6815a5702bda325cccca9124278b24d804abad52c5d174dabd6381aec719f2877a125eabcb0c75e4413fded37e27f68dc4039eed7736dfdc03fa3c1bd31561f5
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-libs/pkgcraft/pkgcraft-0.0.4.ebuild b/sys-libs/pkgcraft/pkgcraft-0.0.4.ebuild
index 2258d3c3746b..01fb4c382240 100644
--- a/sys-libs/pkgcraft/pkgcraft-0.0.4.ebuild
+++ b/sys-libs/pkgcraft/pkgcraft-0.0.4.ebuild
@@ -152,7 +152,7 @@ CRATES+="
 	pkgcraft-c-${PV}
 "
 
-inherit edo cargo
+inherit edo cargo toolchain-funcs
 
 DESCRIPTION="C library for pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -178,10 +178,10 @@ SLOT="0/${PV}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-# TODO: drop cargo-nextest, it's mostly used for testing the other crates, not
-# pkgcraft-c.
+# clang needed for bindgen
 BDEPEND+="
 	dev-util/cargo-c
+	sys-devel/clang
 	>=virtual/rust-1.65
 "
 
@@ -203,6 +203,10 @@ src_compile() {
 		--libdir="/usr/$(get_libdir)"
 	)
 
+	# For scallop building bash
+	tc-export AR CC
+
+	# Can pass -vv if need more output from e.g. scallop configure
 	edo cargo cbuild "${cargoargs[@]}"
 }
 
diff --git a/sys-libs/pkgcraft/pkgcraft-9999.ebuild b/sys-libs/pkgcraft/pkgcraft-9999.ebuild
index 2258d3c3746b..01fb4c382240 100644
--- a/sys-libs/pkgcraft/pkgcraft-9999.ebuild
+++ b/sys-libs/pkgcraft/pkgcraft-9999.ebuild
@@ -152,7 +152,7 @@ CRATES+="
 	pkgcraft-c-${PV}
 "
 
-inherit edo cargo
+inherit edo cargo toolchain-funcs
 
 DESCRIPTION="C library for pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -178,10 +178,10 @@ SLOT="0/${PV}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-# TODO: drop cargo-nextest, it's mostly used for testing the other crates, not
-# pkgcraft-c.
+# clang needed for bindgen
 BDEPEND+="
 	dev-util/cargo-c
+	sys-devel/clang
 	>=virtual/rust-1.65
 "
 
@@ -203,6 +203,10 @@ src_compile() {
 		--libdir="/usr/$(get_libdir)"
 	)
 
+	# For scallop building bash
+	tc-export AR CC
+
+	# Can pass -vv if need more output from e.g. scallop configure
 	edo cargo cbuild "${cargoargs[@]}"
 }
 
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index f5087a9595a0..2743cd54354e 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index 89b8d95017c8..71d31db98746 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -2,7 +2,9 @@ AUX lsof-4.85-cross.patch 1061 BLAKE2B 730a02dfcd433bb6d46d3fecd87aa0913800408d6
 DIST lsof-4.96.3.tar.gz 1342843 BLAKE2B 79e276d0db5138c356cc8bfa32e6f991ce8860644eb5d02f49ba04ce08076232f0fb8b10e143ee135205de5c64bd053d7bf021e48d666b65ffc01c0a47b76116 SHA512 ad17a73590ffb154a13b8b5de8ada738ce343fcc833012b2a5e9b3bda587785b09ae8bf090a99fba8e84b788c2a6d61eaa7359f939bfa68d2423e604801e2a98
 DIST lsof-4.96.4.tar.gz 1342514 BLAKE2B c420e2f928ffa8148a62298ba7176f860b15f9e78f4c2dc299162614a1d9b94a85c42ee93ef5e92b8a99f1c67e496cf2c848874b844c22c287aab53bfe211c58 SHA512 06f8005e1eb72324c1fd603d8b8287a61ad6fdec182e9da833991a8915aaa69c416af1564d3b1087cb08b3504ef9b15cdffec7051605e89d945d6750ec8da985
 DIST lsof-4.97.0.tar.gz 1130140 BLAKE2B 0034550ebbd41da66d7fef8d8f8ae148faa1f59ec086d2803ba406aeeff15f461c2dd8d9309724b61647164a66588f31027b972fd14c54a7f10432b0f0bbb46f SHA512 7ac81c26374305d8fd3b114fb697f093f289367a3f2577d9bc3f671fef1ee477c97ec670382fb0e7fee4ac4eb75120ef3b0d9356d5c4c39f4c00af324e436287
+DIST lsof-4.98.0.tar.gz 734232 BLAKE2B 2f4ba4d179e8061e5bcff7dda4a0981616530bd5577fc73904e2699e6e982efee9e4270d3f2d3c68751d73cb98bfed0fd49d4c6bd967d15b4e06dcb72494d024 SHA512 6fde12497ce9cbba698be624b45e8392d551626c3e46b50ec23e661b322438ef7162dbac0d06829d56f074c7d934fa1ca98aa50ee1487125c93bebfe8eb2a2e8
 EBUILD lsof-4.96.3.ebuild 3441 BLAKE2B 6f1c98be9514dec88a67904d3160350e5041ed0eeb889a4760db8e50075eb18ae0c82c2a663645dff82235016be9a4c6034806d47aba58e7fb5f4877c0817862 SHA512 30843e2cd5c42c44cfae7aed82f2ef64b7d764275b3b24dc2086e65018afd2d686223b992c40d6cc6162827e93d02da51e8785387fe02e567f1f9f3349564739
 EBUILD lsof-4.96.4.ebuild 3407 BLAKE2B 8ce8bad393d76ebc7fef2e0d6cce9e500c46693929a44a0abcb584ea56742df704c11ca4b35af07850598db29200897887d195316612e0e74baf756c91b7db19 SHA512 32bb0f5f8513875f62570f70842ccc0fe0983f09525b198993f1df34643201ae7f277218085576bf4df5d40b292f3bbd28cdf6290c6eae141ae758f37b73efa1
 EBUILD lsof-4.97.0.ebuild 1492 BLAKE2B 1eb038e84900e424203db1591beb2fac8f884f92133c9f4854e718cfd6aabcd7a4a303023c1c212e91a773f3670a118a8c019c74e05c58ef32ebbae987b12ea3 SHA512 6d5371d3d7bee32b40f48ccb3d17b2f48ef23913d514bb90ce005bc84a2ffea754c9e15c79a4b348369ea39157822331e351830687358c5e834e629c8665ed9a
+EBUILD lsof-4.98.0.ebuild 1329 BLAKE2B b0dc74e5afe08929d615447d292c2fd6b16e08cafd02e200390bc705835e3199962d79d523483a16d9d39a28a857de93ce6e5675a08a3019d47ce597816c5762 SHA512 c1feab9822395e41c5328c6884e12a680935a5d08ece6d17f16f1550ccc06f679e2cbc357369897cc8ccf5362f3373bcfe8e8ff16180606beab06b1502d3005b
 MISC metadata.xml 474 BLAKE2B d3c6368abc4d7656f3e2b136ffb651465fe7a65d65cb355b675b055ee6aa118d13d08ef224bd31fd17017d2ac3669b35a12dbd85f5375268bd48c099557c6eb1 SHA512 b7f98a413e6eb9fd787725e27c966586fea085ecbde22c84fd01e4fe5582e2e0d2ca18d1cce786d8e979d08e0fbdfed338c22d122d84544c1fc848b61573adfc
diff --git a/sys-process/lsof/lsof-4.98.0.ebuild b/sys-process/lsof/lsof-4.98.0.ebuild
new file mode 100644
index 000000000000..96cc4bd44ecc
--- /dev/null
+++ b/sys-process/lsof/lsof-4.98.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+MY_P="${P/-/_}"
+DESCRIPTION="Lists open files for running Unix processes"
+HOMEPAGE="https://github.com/lsof-org/lsof"
+SRC_URI="https://github.com/lsof-org/lsof/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="lsof"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="rpc selinux"
+
+RDEPEND="
+	rpc? ( net-libs/libtirpc )
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/groff
+	rpc? ( virtual/pkgconfig )
+"
+
+# Needs fixing first for sandbox
+RESTRICT="test"
+
+src_configure() {
+	export ac_cv_header_selinux_selinux_h=$(usex selinux)
+
+	[[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
+
+	local myeconfargs=(
+		$(use_with rpc libtirpc)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake DEBUG="" all
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		einfo "Note: to use lsof on Solaris you need read permissions on"
+		einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
+	elif [[ ${CHOST} == *-aix* ]] ; then
+		einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and"
+		einfo "/dev/kmem, i.e. you need to be root, or to be in the group system"
+	fi
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index ec2d47732e34..33276e1cb3ee 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 67d9bf7f7327..22a0d16beb24 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,3 +1,5 @@
 DIST goffice-0.10.53.tar.xz 2442336 BLAKE2B 8fda50c5d9f8223c082ea9f03334313b051bce47d18b3879c2d8a7c2bbce753f468b5135f0a3c49c54b8a695ee6f1dc355dc806c92e77f41f2d0c64b2bc30bf0 SHA512 cd2d0f49f803cb2f01b3a690bfbe3ea4be5c09e00e8ef643055f56c16549529b7c2c098b87286062d3a5048c1f64d600f74082f53710d8ed8cbb34cb6829dafd
+DIST goffice-0.10.54.tar.xz 2443132 BLAKE2B 83ded093730e214b0d20563789ce13aa959d14fd0911068898afcfe7eaa61f1d42a9aa0e97124a7df585474a290414f077d0fbcfc916e7b41726c56215f16fa6 SHA512 d2c23b211bf5d7148a72e6f76629590418e776f789b763fd234f9008e7e8138e6e4077e2c5ecaf6893b944ee1725899aa89544342b0a8bdf3efde4833ca53304
 EBUILD goffice-0.10.53-r1.ebuild 1428 BLAKE2B 25a9851a86248219966c86c39b6b781868879fc79386b3d126d56162cfeeb72accf14dfcbfc32f5e278e01c6be0f29d57ba33f974e5f07f66cf925084316b051 SHA512 99f9bd0341288b95362beb57a0e11af51b5a0eab68e633f3f93e822c42025d9b80d9a307084439002a5e7fed3850a82b21498444c4bcf96164495b76d70aadce
+EBUILD goffice-0.10.54.ebuild 1430 BLAKE2B 8521930d2d1baa96b9751429f37bc70d8bb840c178b75746343405e9ad2e44413af528afabcaf37b794e060209e0a74581d30c4f5f95a23c6f8cca0b7a98a4dd SHA512 54035db69e6cc2cae4ea57aa1415cfde89e4933350ecf7cc3a10e56b369116111be6c462e9dd629f732af308ef62c46be03282a902ec8ada83471ad7895d6525
 MISC metadata.xml 653 BLAKE2B 5dcfe5914dc4466682862c4171d1d54f8547a8bab5794bf1e95c709e84d52e4aced8c7376674d85937d424766205f317de0de199595fbca15c817b6c3c4a3b25 SHA512 49d62e1f37f3d50f9e3d9ad50c69da19289cf1aac03afdfaa2f472c77e9277c76d81f59b26f2a84ce42e690341a3a26854814f0ca125b4f05a55670cc260e715
diff --git a/x11-libs/goffice/goffice-0.10.54.ebuild b/x11-libs/goffice/goffice-0.10.54.ebuild
new file mode 100644
index 000000000000..9e1f7c7809f9
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.54.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org libtool
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# FIXME: add lasem to tree
+RDEPEND="
+	>=app-text/libspectre-0.2.6:=
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libxml2-2.4.12:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.22:2
+	>=gnome-extra/libgsf-1.14.24:=[introspection?]
+	>=x11-libs/cairo-1.10:=[svg(+)]
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/gtk+-3.20:3
+	>=x11-libs/pango-1.24:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	introspection? (
+		>=dev-libs/gobject-introspection-1:=
+		>=gnome-extra/libgsf-1.14.23:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35
+	virtual/perl-Compress-Raw-Zlib
+	virtual/perl-Getopt-Long
+	virtual/perl-IO-Compress
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--without-lasem \
+		--with-gtk \
+		--with-config-backend=gsettings \
+		$(use_enable introspection)
+}
+
+src_install() {
+	default
+	dodoc MAINTAINERS
+
+	find "${ED}" -name '*.la' -delete || die
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-01-23 06:54:34 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-23 06:54:34 +0000
commit	9a1d1c6b10a4640cea10e7040ed173cf593f4cab (patch)
tree	10b7aaa9608311a4b8a7561c6a8da3003ebb061d
parent	defbebad0d311b0ce0694b17989a9f26cf000250 (diff)