gentoo auto-resync : 05:02:2023 - 15:17:02

189 files changed, 1452 insertions, 1352 deletions

diff --git a/Manifest b/Manifest
index 8e709bf60e3b..b9d1ab03e801 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29462 BLAKE2B f56c77ce9a6e6cbbc957f4d9639f8e312a734e7a337a73b8e2a6a825aab5e02b75ad44c8b593d230e9485dbabb41f96df68de52366fd77bbd3aebae5b0bf0f1d SHA512 2333e4652f1595d84c554caa8181d074292946ae4432ed65248ff6557e15d96dd72da97b832be06a6fde8da8bbc2366070887ed8858f4ce6bc439a26f5ca25c6
-TIMESTAMP 2023-02-05T08:39:47Z
+MANIFEST Manifest.files.gz 29464 BLAKE2B ebd72433a88a8a00dacf163ee5f24a00aa8f0cec894b5263ff2dd8374d60d798cf61300de048be181a0406dfff77099b0e5a4dbda91dfaede90ecce04536263a SHA512 1271cd69db0381165d16ff80ed711257e9cc5176ba56d2f5edcc9f0e8ef8d5ff39fede5248b12e14b22a815e7612da266f89cafd03456116d83375f7083f1b25
+TIMESTAMP 2023-02-05T14:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPfa1NfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPfv61fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAqxw//QwmX7qG9pszCSo4BFCE5IQwHxrgLdtEvYFJUewgHVcKgRhuoJYJDpISc
-7Z/5GLFugpUqwBPt4Pe+t+iWP0ExnlhkWfzWg+jtPc2bU/1Mlcv49jaP8XciyrTS
-VagHWMc/W8qSjmoSISEqO9aGTOgGE+CodLVdpDGW5Zn2NGoxWCb0fntnjJyWBjuS
-Q163TQ9e1AaobjFwgRo+Ozb69z/w5kh2Hy+lbwiXFKz8zchb4erqeEyRgkTH+fw1
-wU05DahzdoDDPFf/kP93Zv83hz+hxE9awqh2z6jJCdkdSHaQvICJjniAWAwfd0YQ
-l7KgbENCeOF8o9GoahFVbMLIaKOvfVKRa+C6b7ve/rmMky9I4nrwDMfHe/hGfeDJ
-F713bWE265fVv1BTid7R5q3DCti6M6f+0LwEwWoV1t6rbyC3u2wBZGs4KsasV/1I
-ZHJkiDX4OmFA/yADvQo4JkKBi7lMvo4aAy7FV1mkBJeJt8S6MyqdbQ2bSc8tgVxR
-MHfR7MBULVPAuseWxNYtpEGkebh0TxQvlVEJ1FSu+Qe73DHdNFdRFeZ1yVEMNE5h
-N4k15ct+aoM2vmR1eGfM4eeR5rU60+WDChLf2iY6jR9s71lpKLYo7hIfiUYyb7BY
-FJMNc52Sztxxz2r6WCJf8dxv5sTQXfvgKfVlXQv6GWQPhq7SXj8=
-=CGns
+klByMRAAkYlSFvbPlEr1boQT3QO7PPWsQ11sCoSC7gzQ1DgdYsojawKWr/QuUBLR
+NM6731Q5U90tj9lEA7jS7X71tByd78w1ko9hP7FekGTksbVqxIm3/AsN0dsenUn3
+E7h4oOFUSKRe+/km4kx9ie1NPkzzGaY8e3db/rAjMRU0tDyawHlARdZRwbE4W/Vr
+3+meHp7HOOVVpgP3UDt9JOVNpTiiMGTMQLltckrjHbn82rsYYGtF+Yk3h1PZIP1L
+/JkYPlVwxEButbspdA9w0T41Wdc3Xbo2MIymNmvTL+/qShIizkRvmjYru5Nc0oH+
+QMmQFCaIY5lWMt8t7yyeUqU89crIIl8P9XNCQ6Ik8PuGbmCJn3+H10UPW4Onn/b2
+PWABq7AmTa4t1JglUzhLzUsOc+jvHWsw/iQanPgDW6dWC1LsjuaYl0Tal6aUAvhd
+JaZ7EhhO6CP8iu3GQbcLFIrcri3TiKjzh1Z12shse9DuGtna5VIzFxVKR2aoK203
+lAZRZbobQFi1n/gu302neE+UcLqz5nksHaYUM3lol/73VRhPzPKMb2NlyIgU0y7z
+WTj6wuDZxiWsOwSjV2QyQqEKjAH9s1hwSXBMVHihhIJ2yQ6RWmVPY/l7G8vJezts
+UvUgKvyTLOzCNmBx8a/EqMK+yhGC+X6CpSf06oGn//cKeSpTTwo=
+=f07+
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8318a9860a07..c212b26ab903 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 309ad8b31f20..623b393e73be 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index c1400fac1ac1..7159e18aaf0c 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -2,11 +2,9 @@ AUX neovim-0.8.0-cmake-release-type.patch 1087 BLAKE2B a3cad7ee2803fe189200eea59
 AUX neovim-9999-cmake-darwin.patch 2938 BLAKE2B eea54402913fb3c1b2aa5b1acc1d307f2b43ed3fb18b489f8341becc281280417222c2996cb5e353a6fb0c42792184c65f670cae931eb08356dc0659e8fcd7e6 SHA512 cfa0719bf069dd1eca885df658b9722b7701a78afc9a498df4a1e868f8bb8e1eb3c5f990003901bd3ed20a29d73d644ff7438f024b43217b90f9a92f9e88bc2a
 AUX neovim-9999-cmake_lua_version.patch 433 BLAKE2B bf24bad4c0e0f7f902172e35771ff8d2fdadbaa14460b0757f0a3ae5e8be083da6149a7025c70cf5de3f6fb853dc2563d0b83891dabcf18a7745a699b6173e17 SHA512 245e5427a79d7ab3cbea66ee2b27aee5020ae9db2784f2aa3945773bbff629c721da1dc562b0142e9e870e159be888457893d253339cf2f5988c5c0e63ec4973
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.8.0.tar.gz 11387355 BLAKE2B 341f0fa10f0001324c87c26e7c0047334c25808901034f073945c3977dde4dda44b03869be1f530398d549f0b13dafae0eb82766464875ced2cd26621a0c5d88 SHA512 e9504e33df292043656b0ef064e465069c93d4be52bbe29ec33c111f3e00ed83647148d653e3f143e2243dac537eede6a9351990bd858ac20abc8edbc5249432
-DIST neovim-0.8.1.tar.gz 11387691 BLAKE2B fecdf430c854f36839332e1fd3b8fc4878a9d8a04adc83182d43a82047946de05f58c794b045678123a4f2ab820ec20e7f0fedb8f3bacc87071d27c1024f84db SHA512 b4059a8a0a3caedf15f4160f2342306f6f1d625f8f8499491efd6b4440e275de95a63aa857395f844cbc871432359f96abbca138f6278d1228366d6fb4c4f1a6
 DIST neovim-0.8.2.tar.gz 11401444 BLAKE2B 2b652e98fa68c64f547777396726b80c28493841f2ec5acc01ef5dd659f0babce0baf3d5575cec1d08dd924b1855b21f13b75d2de9d117fcc125b1ec7945376e SHA512 f6c9ad09618c9f8ebb4fe522f55fd3381cc4b6d079d912a0d2ef6ca5f48ed6c4c66805c14695469e2b3d2be2266a9b60e5fc698116cd655fd92ef0f4705fdbb2
-EBUILD neovim-0.8.0-r1.ebuild 3460 BLAKE2B f18a80495bb7c241656d61aea52628610b55804e967f38b2257d44a54e48f8d270463731c543529bde973d43dc89ca172a07ca73a195b966cf712dc8aae9fc0d SHA512 263962b8cca03ab83b7a8b3120adf1ef76a3f9b2445a71b940c33bae9fce260eb9a6a188e2e924edde010447328f31a01a4d182d2581c04ea3c8edbe7d75fd6d
-EBUILD neovim-0.8.1.ebuild 3461 BLAKE2B bfeddeff2247519b07d257859d998060e635abd6db97908e6966c1ccbe9b121070b68bef226b0c31bd8afb70c1cd19bb327ec15db7abb488de76c2df631b321a SHA512 b010aefb5b843dc90593bfcdfb476c1aaf56fcdff1b81ad1d877f463aa004d409753d2d19fc1eb2caf33a009336e86170f040e4912ed5eb7dcf4ed3fd88b0f00
+DIST neovim-0.8.3.tar.gz 11406282 BLAKE2B 67f4d4d1857e4c0416639dd0986f34b3842883ef48b68d90704472b40f1f064798f1f5f3c29e485f04ef8b2ed387132549442e86624b43f2ababff05bc477312 SHA512 0ecf60b564a323eb95eb2e67f7dc7e1c1e7bfc70b08466a66eb668d1b75a7362ca42901cd5a64fda22292375e2921ba61c299ac846f820ac146dc55426813eb8
 EBUILD neovim-0.8.2.ebuild 3342 BLAKE2B 09ea1bcb11aced98fa9e7aded0c212a0c0978316f3adc1a2119ec32d15d0d059ea05e11adc3cd064ea24928b48bf1ff2d26c77399391efe2327b9c7f016b2827 SHA512 63768f48d8cbd4e72f13410b68d9718337b60f36b193e408d981ae051e835be41a953a41ff6210cd0c188253ea7fb63ba9c9235ed1ebe331fe825bd97ecea4db
+EBUILD neovim-0.8.3.ebuild 3345 BLAKE2B d834d7fdca30070d16b1636ee129e5e733a58fdd701807da03e1f4f66c1512822e364d2ea099197fc19b7b2ac95297efa5f000f0576ae80de4b68c731b8e73a2 SHA512 8fd60aea8285e0d72786aeb3c39fc049b77912b62963bad2c577425818661d3a03862a442a8921d0df7ff5c184099cf3a95579199cdcb7fe0ddb21cce07a1705
 EBUILD neovim-9999.ebuild 3345 BLAKE2B 99383cf0fc60f7b3a26d5ecf0764c62ec0e915543527a946f5b87ee2b187331698f3cf121d9318d9dc5f3a323b75dc749331c8b43392f9dd631f768fa4754c43 SHA512 362e23b5dd98a03593ffabae9dc7174a6c7f5735a380548da529a71b723956443cf94f39d44eba6e8609684a73726096b67133e3c28fc9f45dd08be603857bd7
 MISC metadata.xml 795 BLAKE2B cd2ca0a1f0024ef58bf71ae5b8e50da205213b110f42b62cbcaa10ce6b1edd3fdc724afbb996f29aae52765e29a9342fd22b43b6de8c27b532bd5f094e14b160 SHA512 e36e72c448a6e430668e7a1fd45e9c83e8a396e6b23177fc61ce6e8e8996184b84f3d9f282a9faf5b3cbea845189578437f356f92414393b3cfeb2ea313d9644
diff --git a/app-editors/neovim/neovim-0.8.1.ebuild b/app-editors/neovim/neovim-0.8.1.ebuild
deleted file mode 100644
index d5cf82cfe04e..000000000000
--- a/app-editors/neovim/neovim-0.8.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# RelWithDebInfo sets -Og -g
-CMAKE_BUILD_TYPE=Release
-LUA_COMPAT=( lua5-{1..2} luajit )
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+lto +nvimpager test +tui"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-REQUIRED_USE="test? ( lua_single_target_luajit )"
-# TODO: Get tests running
-RESTRICT="!test? ( test ) test"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	>=dev-util/gperf-3.1
-	>=sys-devel/gettext-0.20.1
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
-# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
-DEPEND="${LUA_DEPS}
-	>=dev-lua/luv-1.44.2[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	>=dev-libs/libuv-1.44.2:=
-	>=dev-libs/libvterm-0.3
-	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.2:=
-	tui? (
-		>=dev-libs/libtermkey-0.22
-		>=dev-libs/unibilium-2.0.0:0=
-	)
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-BDEPEND="
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-	)
-"
-
-PATCHES=()
-
-if [[ ${PV} == 9999 ]]; then
-	PATCHES+=(
-		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
-		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
-	)
-else
-	PATCHES+=(
-		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
-		"${FILESDIR}/${PN}-0.8.0-cmake-release-type.patch"
-		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
-	)
-fi
-
-src_prepare() {
-	# Use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	# https://forums.gentoo.org/viewtopic-p-8750050.html
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Upstream default to LTO on non-debug builds
-	# Let's expose it as a USE flag because upstream
-	# have preferences for how we should use LTO
-	# if we want it on (not just -flto)
-	# ... but allow turning it off.
-	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
-	local mycmakeargs=(
-		-DENABLE_LTO=$(usex lto)
-		-DFEAT_TUI=$(usex tui)
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${ELUA}"
-		-DMIN_LOG_LEVEL=3
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.8.0-r1.ebuild b/app-editors/neovim/neovim-0.8.3.ebuild
index 04ef8a88991d..3b3878d8fc9c 100644
--- a/app-editors/neovim/neovim-0.8.0-r1.ebuild
+++ b/app-editors/neovim/neovim-0.8.3.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
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -68,18 +68,14 @@ BDEPEND="
 	)
 "
 
-PATCHES=()
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
+	"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+)
 
-if [[ ${PV} == 9999 ]]; then
-	PATCHES+=(
-		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
-		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
-	)
-else
+if [[ ${PV} != 9999 ]]; then
 	PATCHES+=(
-		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
 		"${FILESDIR}/${PN}-0.8.0-cmake-release-type.patch"
-		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
 	)
 fi
 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index e55db001b527..bdd8bafaca4b 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index 63594d92bdd5..04d4f0276d5b 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -1,3 +1,5 @@
 DIST homebank-5.5.4.tar.gz 3089097 BLAKE2B 3b73ca8a016a02c5050bed4d702cb2e71ed34182a2cc41a043e4af8053acc21df738bc91d564cb51b9e08aaa4b60156ea824a38ebd21eea00266f55951d23e59 SHA512 ae85fcc46ef8428a0dca865ec0b51532f4ada28a2515873f00802ac8894cc9ad1c93be64a587a5e119efe3c61436d7aabd1f90ee559af047ddf65c3b59bc066d
+DIST homebank-5.6.1.tar.gz 3357600 BLAKE2B 487ae9ea6c518a5cf53438a6095a29319dff9b1b77dd52fff6c9f1638eb9c86c34895697c6d9964493cbd62192eeba0220bd3d56a0cc64583d4eb2aa109bba1d SHA512 5d0b7c1a843e61d655cfe5dd3690cbe1f121baa695fd476c5322036458712faa038fcb8f6504378a856cd9181840f1cd1e485e2d8d26b729f93709a887b7b021
 EBUILD homebank-5.5.4.ebuild 888 BLAKE2B b1975b299a1924bbcec2ff5ee92c719dec42a1ff3ba2ef77a4b055de82ba1dde5c91a85a41ba660f893adb59b91c72bd79aab816b53444be5fa993d9bc83270d SHA512 4a5a607af4994893b4e766730360b8439ac8ee2e13f89e59e71ad95b64d22d360308f53df19fe945dc7b419ad8a710dd00ec5ceb3fc66a811a7b3f0e333fa16f
+EBUILD homebank-5.6.1.ebuild 783 BLAKE2B 2049250a121a67a68040ab8da212fc49b3f2a414d193fd957dc25fec27e0f66cf7dcf69c096848e3897ffb21761496e0eacd198ea7add974062d9d73d5c1bd93 SHA512 8b49458509409abfa36dc36630109885ae76b6b7975acc446f72eea6f29171cdd2a837b90b4b42b6b7b380650f45479083735c6765ccc6a5ac423b2aea3785ee
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-office/homebank/homebank-5.6.1.ebuild b/app-office/homebank/homebank-5.6.1.ebuild
new file mode 100644
index 000000000000..2e1c67a5408b
--- /dev/null
+++ b/app-office/homebank/homebank-5.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit xdg
+
+DESCRIPTION="Free, easy, personal accounting for everyone"
+HOMEPAGE="http://homebank.free.fr/index.php"
+SRC_URI="http://homebank.free.fr/public/sources/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+ofx"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.39:2
+	>=net-libs/libsoup-2.26:2.4
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	ofx? ( >=dev-libs/libofx-0.8.3:= )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND=">=dev-lang/perl-5.8.1
+	dev-perl/XML-Parser
+	>=dev-util/intltool-0.40.5
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_configure() {
+	econf $(use_with ofx)
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 4f1d7d36bb05..1e06e027f74b 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/rapidyaml/Manifest b/dev-cpp/rapidyaml/Manifest
index 9e93ad155a60..861302c30e69 100644
--- a/dev-cpp/rapidyaml/Manifest
+++ b/dev-cpp/rapidyaml/Manifest
@@ -2,14 +2,9 @@ AUX rapidyaml-0.3.0-libdir.patch 450 BLAKE2B 3058bfbeaa85a81396baf3048d32e7289b4
 AUX rapidyaml-0.3.0-system-gtest.patch 287 BLAKE2B 00569e1a19fb791bc0ba1c7a8b2b691db478f7e224a842e33c57d0f11d59275fac137e4a193261db7763e5d9a95b98cf17c2ae467bed29617a1f0c5b4544b607 SHA512 119827a88ccd82e8a78fb82593431f8fbb0efc3155043b9587d5909a7d0a944d01703d8f0a9179e6127c5484a292a94c761ca7f22069aa02f03c2a03ba730b8e
 AUX rapidyaml-0.3.0-tests-no-install.patch 315 BLAKE2B 653c4f80092950636f8ef2ce0f1a4dcb8b3af1af83928ac0f75be35fc6b69805f457370783ef64d577f1a1b1b5992eb252b82092f20d61e2add683b9841007cc SHA512 fcdf198dd628023919579661a09de04f8cc863520cb915069dc850124e2a4baf7304eaa1ac41edaa39cf6085afeb9b3feae4b41b3c7e9d7d4696f109a334c389
 AUX rapidyaml-0.4.0-no-download.patch 821 BLAKE2B 9b4122343ce2afdaffeffe7eaf9193395db2d7fc924e44cd75f735e697276501102d058ba95ced225993f0423b0bdef778c3fdfd95b59dcdcd718d96e6e2a4ae SHA512 4dd4c91704308d931a61f3841297d1f95986fc7bc9ab03d0c44583f061762b0af1240e6f6ad8784de2185c45fe09fb87bcc34f07bed655f13c80395ff6eaf121
-DIST c4fs-f78cbd86a77c976395c9834726a14a1bba059af0.tar.gz 22163 BLAKE2B c3ed63e9e92dbcba63faa415d4de56ce275fb3b493238235930c629362d75e08ca2f6ec2ad34fda12154544b9972e45b75c24c5a9c80d9d7a68febe6f6e462c8 SHA512 c25d1122851ef2d46b00a2fd5083313c742758530a0d5a9c0353ccd637fbe38228ef8fb45bc8addf9006cc7655dec4b4fc571af13dcedf75f19c551c5011e377
-DIST c4log-e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d.tar.gz 11985 BLAKE2B 15cc7c1bd9a1693e5419e4904e1cb30f297c7003e1480014f7782d35d0222cb000643901e6afffbe13bdbb61aa10aa4ce759c5333b327b81d3ade1e043283310 SHA512 93f4e8854cf3a5f00beb9a427004a360961caf47c53aaa817f5ca43f4cab7bad6333ba35aad24d1e7aecea75f9f3a8628527ccb0be241bdec25c5aebfb0be8e3
-DIST rapidyaml-0.4.1-src.tgz 910816 BLAKE2B b9ef92045009b1b38d9142b2856e747edf446261c2271ee580a3aa51a3b5a2b0dfbdbcd1da6c520697dff092e9918f273d77e3f1b1e1a6ee28305aac648e6b4e SHA512 99051f452d61262188cb824623dd950cf51e0db48f519e45e7ed1edf40f3445f73547f1fc0de6b5654a7a6986d48fd3659f72f2d46019af77349957ee14cdd79
 DIST rapidyaml-0.5.0-src.tgz 7273101 BLAKE2B b15033ae028c4704178dc4a017b5c1e858288d4713a2b96f5cfc19583e13b62031327f10ab045eec007e427eb7d71ba0e7dde2d743a81c3da0e20bc68aea47f5 SHA512 d7d65e759c466aa4cceed4d02d2c84284b205812be1de10495eef663a0b7d4adb7d8fe5f731f0f9ecba04d5d93cb1af760a83eb6d0630d25ee162f0c36b38e8a
 DIST rapidyaml-c4fs-0130061b804ae2af0d6cd5919275d552eb1f2414.tar.gz 22615 BLAKE2B b774723d35658ffb56b187428089bdf2b5bebd470d0be3122bd1f99248d2537d4b31649c5e8b133b2cb28e8ec97a428a325701830708238878da07426fe7853b SHA512 d18be64060779af1b19ccafbbf26bc6c437ff5ed074bef5919ebef55bb9ad36a7abb183a99a86bada0447b15b8386c991ac9ab975d63aab77c3a57801358bf96
 DIST rapidyaml-c4log-00066ad7f624556f066f3d60766a2c33aeb3c6f0.tar.gz 11978 BLAKE2B 554240c63114f1c0bd22295a39b683a59981f3e80352dce7aebe3af39dd6d1211c2c8df9f84f3f8c30775622e242a95c3a50572b30b557c269d3d9eb2ecca3de SHA512 9399e55e116b87b4ee4583e32c7a72bc3f7fd579fda69c515a5d0df5fc065246aaa1587ed937e7c6eb6df417810284496bb2eafa0879800cecbe17ecdbef5ae9
 DIST rapidyaml-yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946
-DIST yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946
-EBUILD rapidyaml-0.4.1.ebuild 2134 BLAKE2B cfa572f87cfa365f3cd82af229c4d34528fc6b1f1900e23a037558dfe0568ce00125a2fd2fc7082d7a0f6aa23c89e8a3dbc169daa4bf66d4831bc358dfefe6f7 SHA512 f4ce3a926b388dee778a0b83cfe1119487972736ee82fa02c9f827975ab0703b9825251e5ccdd0a50318a8c928d7578390eb6194082cf3d45eec9d02488d93ea
-EBUILD rapidyaml-0.5.0.ebuild 2141 BLAKE2B 551364ee687aa45e0f8a68df798a3549a2a83508973e66934c411a5906bc92dd038bd0da61fb2c430c6630f05907e02b0791b20733e8493caa81498ce52cd6a6 SHA512 d7550d84700ffccce13b3ed4ea2037cc015f85416f88ac9aff3628a667880aef9377c049f7c11744f1e6e399aa3e001b860c1ddc0dfd1cda8a8a8a2219df71fe
+EBUILD rapidyaml-0.5.0.ebuild 2236 BLAKE2B de36965bcac64e728d9d0ea6233b0e87faf181776fe5feda58106919e196fd8138b231e8f776617db2d521a2e335b0070f0a456e5219c1c6d4e97b599a51f879 SHA512 846dd5244a040708a4ac5b24710f6444d4ea8ef00cc8e16e68a8ef9aaf8b105ecbc3509b77668981dd5684e01cb26ce39254a26faaae83a25ca84dce23732b1f
 MISC metadata.xml 375 BLAKE2B ae9fc516e43fb6561964a17a58c9c2eefffeaa918a62c325c0b72847c60dad692c107f5ea27a2b6abbf93f73bc27f8a24a00f57dfcbf72bb0f6bd9a5344b6ea2 SHA512 263bb4123527bc4e48c2d9ccc4d797e943be1a5924dd8504c09f028728297c46d3e17e0716ea50a6a35fbfd3561043711ac554776a6c538543ae51ba11ab72a1
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
deleted file mode 100644
index 2ccb5362aec2..000000000000
--- a/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-# see *-no-download.patch
-C4FS_COMMIT="f78cbd86a77c976395c9834726a14a1bba059af0"
-C4LOG_COMMIT="e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d"
-YAMLTS_COMMIT="6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f"
-C4FS_P="c4fs-${C4FS_COMMIT}"
-C4LOG_P="c4log-${C4LOG_COMMIT}"
-YAMLTS_P="yaml-test-suite-${YAMLTS_COMMIT}"
-
-DESCRIPTION="Library to parse and emit YAML, and do it fast"
-HOMEPAGE="https://github.com/biojppm/rapidyaml/"
-SRC_URI="
-	https://github.com/biojppm/rapidyaml/releases/download/v${PV}/${P}-src.tgz
-	test? (
-		https://github.com/biojppm/c4fs/archive/${C4FS_COMMIT}.tar.gz -> ${C4FS_P}.tar.gz
-		https://github.com/biojppm/c4log/archive/${C4LOG_COMMIT}.tar.gz -> ${C4LOG_P}.tar.gz
-		https://github.com/yaml/yaml-test-suite/archive/${YAMLTS_COMMIT}.tar.gz -> ${YAMLTS_P}.tar.gz
-	)"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="MIT Boost-1.0 BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.0-libdir.patch
-	"${FILESDIR}"/${PN}-0.3.0-system-gtest.patch
-	"${FILESDIR}"/${PN}-0.4.0-no-download.patch
-)
-
-DOCS=( README.md ROADMAP.md changelog )
-
-src_prepare() {
-	if use test; then
-		mv ../${C4FS_P} ext/c4fs &&
-			rmdir ext/c4fs/ext/c4core &&
-			ln -s ../../c4core ext/c4fs/ext || die
-
-		mv ../${C4LOG_P} ext/c4log &&
-			rmdir ext/c4log/ext/c4core &&
-			ln -s ../../c4core ext/c4log/ext || die
-
-		mv ../${YAMLTS_P} ext/yaml-test-suite || die
-
-		PATCHES+=( "${FILESDIR}"/${PN}-0.3.0-tests-no-install.patch )
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGIT=false # don't call git nor fail if missing, not a repo
-		-DRYML_BUILD_API=no # TODO if a python consumer needs it
-		-DRYML_BUILD_TESTS=$(usex test)
-		-DRYML_DBG=$(usex debug)
-		-D_{ARCHIVE,LIBRARY}_INSTALL_DIR=$(get_libdir)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove shared private library that is statically linked
-	rm "${ED}"/usr/$(get_libdir)/libc4core.so* || die
-}
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild
index f1c6896c181b..84cf212c458f 100644
--- a/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild
+++ b/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild
@@ -69,6 +69,9 @@ src_configure() {
 		# TODO: enable this+tests, should(?) be easier to do with >=0.5.0 but
 		# still need looking into (please fill a bug if need this right away)
 		-DRYML_BUILD_API=no
+
+		# rapidyaml sets c++11, but >=gtest-1.13 wants >=c++14 (bug #893272)
+		-DC4_CXX_STANDARD=17
 	)
 
 	cmake_src_configure
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1b1b40246b76..7cd1f4ed53f3 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index 9e535b05691e..afdf39ed90e5 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -1,5 +1,3 @@
 DIST jackrabbit-2.10.1-src.zip 13437021 BLAKE2B 3542bbe5f7c8ab8feb585fecdaca028a4908eb664d01cb9fb32156c71756973671969b1141e796fbc165f7f6f305db25f74d36657e4d86dac6766e4d79b888dd SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9
-DIST jackrabbit-2.21.7-src.zip 13532529 BLAKE2B ea3ebf687e29b58e75840d6f5665da8abcb474dbaa353c0caf6a8d1cb1de6c6347830cbe0b6c91259fd496eeff834278874b64306da85a7e0c82ab71dd0b1c34 SHA512 254e151ed7e814ff8b4df985814ace12316a9dc56e87f4ba6236986ac2364936d3b15327f50ebc1b9fa7ac9bbed067924148436cc8ac31a7ef91d11faecb4678
 EBUILD jackrabbit-webdav-2.10.1-r3.ebuild 1338 BLAKE2B 9c0e4faa7969dbf8fb921c3f3906925f9db2bc25aedaabb8b50bf2e2330cc30576625042bbda6f9b6c7cb05f9ab488e4f00ebbe9beb3a86a49d2d36ca841bf18 SHA512 510c5cf5c93720e64a67ba3b88088429d1ff7ddbc44f616f061a388d6d6f4a2d63195fafefadc12db8f3dd8a9d262db07973f8525b0897cc835942693bef04ec
-EBUILD jackrabbit-webdav-2.21.7-r1.ebuild 2069 BLAKE2B 784996564d2181b4c3cb7b551f16f2a2fb03fdfdc06f860870ba2282959be84d517f2ed48f0d48de712d32a68509dee0a84f8cdaf20ed10ad2d7b5fe2a631a51 SHA512 39f1cbd79bfd4787640f0191685cddcdd722157212fbf586deba7c7884e52041e8292f20fe77a061899252812c1b8427020c43be6d4978f3cac952444aad3107
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
deleted file mode 100644
index 378c64394006..000000000000
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.halifax.rwth-aachen.de/gentoo/distfiles/3b/jackrabbit-2.21.7-src.zip --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jackrabbit-webdav-2.21.7.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.jackrabbit:jackrabbit-webdav:2.21.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Generic WebDAV Library"
-HOMEPAGE="https://jackrabbit.apache.org"
-SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.apache.httpcomponents:httpclient:4.5.13 -> >=dev-java/commons-httpclient-4.5.13:4
-# org.apache.httpcomponents:httpcore:4.4.14 -> >=dev-java/httpcore-4.4.14:0
-# org.slf4j:jcl-over-slf4j:1.7.30 -> !!!artifactId-not-found!!!
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
-	dev-java/httpcomponents-client:4
-	dev-java/httpcore:0
-	dev-java/osgi-annotation-versioning:0
-	dev-java/slf4j-api:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.osgi:org.osgi.annotation:6.0.0 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/osgi-annotation-versioning:0
-	java-virtuals/servlet-api:3.1"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/jackrabbit-${PV}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="httpcomponents-client-4,httpcore,osgi-annotation-versioning,servlet-api-3.1,slf4j-api"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=( "src/main/resources" "src/main/appended-resources" )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 04a734b9287f..82d05ee7d67d 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,3 +1,3 @@
 DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
-EBUILD javahelp-2.0.05_p20170719-r1.ebuild 1675 BLAKE2B 0c59fde199d25bdcb85ea6eab3b8c49ba18328bd07323262d19aaaee0ec7fe9b1203ddb807f4fc765e007873043081adf21940189c0d4c6cb34e53f70fd48251 SHA512 e873859d2f6bfbf531dd231bde326fbf151b1fba085c1156a497447456b837b82acb62b65bd99850124ab8044b2d848c650c48d5cf2c2456055f32f2c2b4478a
-MISC metadata.xml 625 BLAKE2B b63396d9a8f628c5965eb8eb15071f56456605ce28d247fc191ef808db0f14c464149d3d3bcee746d058addf3d9eed7d12ae59ac94a1d7b0ac4a45f75ccb8b68 SHA512 a1878d27bdb64c2d1ecf2c8107158f8852486d22a5473d852e7a993c63475be17cd13a47de1fd5b29cdcc72dacf09259473b253822c10cddbf2e8dfea8a1fa82
+EBUILD javahelp-2.0.05_p20170719-r2.ebuild 1671 BLAKE2B b888661cec8fb5809bad3659fd3350ffc915b27aa3d9291eed88f0a0194aa702358639c7546840a56b20664565bc9442748b25164bf8418b92cab82e2322dab7 SHA512 f5182e636d07e823fc4314fe077a539e86af3d7e265884b62b42dc176dc13d48924d9491a80dd0bcfcbee7f951f3db770880a14099c11f9fb52135fe515b9fe1
+MISC metadata.xml 705 BLAKE2B 99d50e7e4960fd92f1b9f34d830ee22246f88c5224beb09eb581fa10b128753985c991b22a002eb8cc6ecb599475d0d88a50cfeb76734a4d687fc3c34d88686b SHA512 c20f79d6b27ea89d68d8f9655804986827e4bb5fff86b525047d8b34cb1c30c051af76d732da63a38ee9b311e78fdaaa4e3e2fa1232cde0230b7e75f6af37b6f
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild
index d617465487ec..19a57920dc55 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
-CDEPEND="java-virtuals/servlet-api:2.4"
+CDEPEND="dev-java/tomcat-servlet-api:2.4"
 
 RDEPEND=">=virtual/jre-1.4
 	${CDEPEND}"
@@ -30,8 +30,8 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 _eant() {
 	local \
-		servlet_jar=$(java-pkg_getjar --virtual servlet-api-2.4 servlet-api.jar) \
-		jsp_jar=$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)
+		servlet_jar=$(java-pkg_getjar tomcat-servlet-api-2.4 servlet-api.jar) \
+		jsp_jar=$(java-pkg_getjar tomcat-servlet-api-2.4 jsp-api.jar)
 
 	eant \
 		-f javahelp_nbproject/build.xml \
diff --git a/dev-java/javahelp/metadata.xml b/dev-java/javahelp/metadata.xml
index 308f2cfd932c..1bce4ec84d8e 100644
--- a/dev-java/javahelp/metadata.xml
+++ b/dev-java/javahelp/metadata.xml
@@ -12,4 +12,7 @@
 		implementation of that specification. The JavaHelp system open source
 		project includes the source to the reference implementation.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">javaee/javahelp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index 79d67115a080..b1cf9319373a 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,8 +1,3 @@
-DIST resin-3.0.25-src.zip 10690692 BLAKE2B dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba SHA512 f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
 DIST resin-4.0.27-src.tar.gz 10291608 BLAKE2B f28833923dbc49e255d5be04bd568705da953476fd10554db727f14667e3120b7278494cf8c59e6b58f825c4f50be8e766b648d7347f71dfda6743e26b157468 SHA512 498de18818f8c1e47919db2415292492ba4879765ad01a5c1a44c4b88bad02267aea245d3225197a62574091ef163910fb0c0924e06d9c9e03e8067dd7aacf08
-DIST resin-4.0.46-src.tar.gz 32564716 BLAKE2B 6f600cb52ab6f56271a7f75832f300af56d1a2d3a868f5fda208271bd93838e31e49b5f843b668b36a237ced363dd551cf6e8d82fcd70e58c1857667b2b9646a SHA512 649b7204c18e7d3a2144130f07590f2d5af29f3b0567acddd4a8d83caebc45a9dea10a671edebd1ff32df304d7a9f1ce44b0b86fdc0ba353fe01b26d900bd368
-DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5 SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
-EBUILD resin-servlet-api-3.0.25-r1.ebuild 809 BLAKE2B 3abb178b156dff27a40a39ad9764b9ae1b13cef98b5bc87ec66455e4bffa386e2d787ee07bce268cc7993f3095502addec8684b3bf75e87d0eeb597d480ecc04 SHA512 14afa86b24af0a961600a50904f02cf2fca0b8d87456265e77868c749228140a481eab377ee229abd37c79886ddb31c44f2d799c6a8d6159eeee43982759bf63
 EBUILD resin-servlet-api-4.0.27-r2.ebuild 1060 BLAKE2B c31b4051fc5c63884b42fb8dd94e2e69eb4d203f2735306d3d3379ef9a3014479fc2e2e0fd9db6250c73c59fa3ac0422533004e8770c5f3f6bbb80d85fa7d5be SHA512 3ae168d7d78c5a9a20e9d0b0516ef4f02a1285301e9fc06953f97ab666d7a0b2e79ece901e5df48d67e7f1911691fa4e0b1f586bc8a3ccc59bb8141546316643
-EBUILD resin-servlet-api-4.0.46-r1.ebuild 1060 BLAKE2B 089c853ea094b32d92fdfd134870e23b0f10cc08d05b503fd89d45120a5b6e3045a03f4a4de97abae387a4f91aea5a615775549ff4d5fdcf7d4bdf4a76c14ae3 SHA512 7c46120c9b5dbc2ee9d2ba3f4c4174f834cc4f9a2d57ee02b6dca1eaaad833a650a6bfcc481425e482e6e0106b77facf32387c2527212ae9425716c025d366a0
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
deleted file mode 100644
index aacd27267893..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 2.4/JSP API 2.0 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="2.4"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/resin-${PV}"
-
-EANT_BUILD_TARGET="jsdk"
-EANT_DOC_TARGET=""
-
-PATCHES=(
-	"${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
-)
-
-src_prepare() {
-	default
-	mkdir lib || die
-}
-
-src_install() {
-	java-pkg_newjar "lib/jsdk-24.jar"
-	use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
-}
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
deleted file mode 100644
index 3bab35a2b31c..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="https://caucho.com"
-SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3.1"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_prepare() {
-	default
-	cd "${S}"
-	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
-	java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
-	java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
-	use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 48fa6f13405e..30097fbd44b4 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 6890d7e9160b..5d9525e39272 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -10,11 +10,15 @@ AUX erlang-25.1.2-c99.patch 2686 BLAKE2B ba1ae0682a4c66efef36ed82b1fb3ab14fdabc0
 DIST erlang-25.0.4.tar.gz 59812650 BLAKE2B cebba32e859ec4ff0868de506771449a6d5d053d50d8f4a2cf84f9bc90da1e14ae320420b3c33f6febd5977fd1ccff98b55d3ee1a0c4b90e674e912883cb0f29 SHA512 8d9d12496d55181c0d866bbd97576551d1d78232fe34b845e8efbfbd4e95ce8426e73221d8126d12453959cd8adc5e07f121aaa93f3a5696074b43c69291d363
 DIST erlang-25.1.1.tar.gz 59974226 BLAKE2B f28662860533c8946429607b8123c241d3646c2c0ab2165346512c2a1b331dbaf46d978bce17b8b792a0487ad96411c2245d273381e304437724335a353093dd SHA512 7e34eca772d29132dc907181ee9829ea58a47e622a9a65c0d4f66e79cb2e8f22a9f9e2edefad67ee6c151ee09027ed3927be65228780cdbe606a0abe59209243
 DIST erlang-25.1.2.tar.gz 59975596 BLAKE2B d86e90f121cc1252301b88ce3551a9f4085aa169238e8625dac5d86c13e832e7eec60286dc26cef773b8db484528e49983ad30cc353228cd2915bf96252c4a9d SHA512 a478799cb7df70a552043da55757b811e8b97182be15ab928e05b58537bb7bc4899aee406648767f538d8bd5c09e0a9d7e3655c99a8df0e6a0b77db83a720fb8
+DIST erlang-25.2.2.tar.gz 60014706 BLAKE2B 07727608699c264d24a6208c936694f084850651682a587b7f38b7ee2965850541dec3a3edf1e36f7571d2be4ed3b9eb89572a2591951b5e856ec64af3e38edf SHA512 e93f5b7079f9cf1e00528587a8fc96ed5b4a29b6b329a38e238341f79d98f20f811548875fbaf137fd64b38d5950989e885a2293680475a0b7198307eef1de4a
 DIST erlang_doc_html_25.0.tar.gz 37051192 BLAKE2B 2d79ccb3b850b199de0a7da83c6358b9f3cf63826aeddb54307640129c1f96689200895c3c3ec52f503362945e7c6083a7317cd4ea57dc7d6772844801843c74 SHA512 6ce8423705f86fb2cd403e9c51089d7b2569ba93498f9143b5dbac85eb10b403c4bc948f8a68e55c40116cdd9a93f050bb037f94fc3c8651175d9065d2c598be
 DIST erlang_doc_html_25.1.tar.gz 37197742 BLAKE2B 432e89471cfbf15ba35507f66958df559e38d5a4be1b4fe07e2abdaaacc1642dd9e55c2d67ce893fa108c38e25929cb58fb4de2474ec69273222b3ef0a7e0a5d SHA512 3e39f505030a3d0422b4a79f31a2af830eeff5076c3dddeafd336d0a91a4ac895a92a17cf5b4f6265d0a4b150c0548ecd0cc38174ce0488a5328e16307eaedc3
+DIST erlang_doc_html_25.2.tar.gz 37090722 BLAKE2B d2169d11266a2a252b9b4d6523275a8e31e059e5c2ded868992d657c311ca85ee5c6d25b22798a55c9d2c142dbbc9d65438ae3ce98a5607696e09e18e63bb845 SHA512 25356288c605aad8ae17f39a3c9c27f2afd0630b177a554193354a79c19b9ec3cfaeefedf89760ba90c6b86674e59fab9aee7278ff134522793dad39012b8780
 DIST erlang_doc_man_25.0.tar.gz 1711510 BLAKE2B 743efa8edbeeb99e37e227c1e5e3be1825a391007e1c220ba22163c528edda8941b1dca0951cc02aff016dda0d52f3a6ff4fdbbbe279ce067c7a1993997ce6b4 SHA512 c6b6490961228893253e11d5bb88cbd30ba2cb1c13819a85db6699b437f0327fb55962accb6b602a4ec5ffc423882205d05873b064fb3e4c52950a423706fb09
 DIST erlang_doc_man_25.1.tar.gz 1714586 BLAKE2B b37b03f60d662d02018515de5ca16b3891a32c5ebc1bd1cc72ac17aadd409c3c5084898f1605d4a8aa579ebce4b5a8f75a39fa90e5fc4d233b2f7e9b8121768d SHA512 4194779c8975234ad8f693bbe43c9eefd2d954ed7fec493493c4a6a9028b58fd55ce6479a113d863bd91ff4732b88c4b8cae3e3a16846add5c7af6616317f595
+DIST erlang_doc_man_25.2.tar.gz 1717206 BLAKE2B 26649d878b09e975949ddf1a981b345fd9cbdf8d3f35af5067c9273a60a7ec1c7216d63acc438dd59310560022c22b2ac7fbf4cd7b7947811ad8e1d185cf6b2f SHA512 939c6d61c360b71690e509f02f39061f0cfcb8c63c99a0255010503c89123aa59ccdd2cfdc1c055735f579e01c566083a48fe8cec5c467e447978fafda7a0aef
 EBUILD erlang-25.0.4-r1.ebuild 5017 BLAKE2B 0c78785a21f4e4e59a2718443f923b5a28bfa624bb4b1d041c7e02619e6f5f9fece80a211a5d3624de17c914732d60860bc87a4284631226b5342a266a465ab9 SHA512 926fa60cad6aa995bd316f60be1e3303793531cd3cd16328142be94ce1c2cd65ba30020febeec9d67a5f249355db122f31e6bc0a687c0a8a61193762b24a8bb1
 EBUILD erlang-25.1.1-r1.ebuild 4979 BLAKE2B 499d8465709c320d2dadb8d353853d3d5c1ce9c9626e500162a2716bbd742ad415e67b58441e95bf990e4eee572fccb833159d9e211cf830a7847b97aa0762cd SHA512 6ccadee9a1644526f67bdb2365ef9c2c17a3ff43260883276545a879e4fa291e21a21149db05e629eae2bcc9a003a109fa73d1c45727d522da577bc042ee5164
 EBUILD erlang-25.1.2-r1.ebuild 5093 BLAKE2B ca60425b273475adddc2b06abf667342e38a0d64a847580e4c87a2e5414e87bcb27b62f31e6286ed64df9d089a6bcdcf268cf14f550b192bff546294d09dd3a5 SHA512 36b7f36c31eb5a62ebaffa0b1ed27b67a02f1ec659915a00e7c950c491e3a30c0267ade81689c8ab591de06e9a0dde92c2027e279e919f59f1dfc2a6d1a2dd62
+EBUILD erlang-25.2.2.ebuild 5098 BLAKE2B 4507ac29eadb7faabe8f02e62f4c85494a5d1c587c277c16c4324db9bbed3acbc81da26b7c16a22cd7d484c4e836eb93daf8bcc2f086670d913018b01ce54407 SHA512 e449030c6d67c04a54b21da7b5fd3d5f56217e42fe8693afc30447c3cba9639a283306fc2766adc99273f24574515a43e11be7c20b2282436bc406eb60c2a9a5
 MISC metadata.xml 749 BLAKE2B 32f06b2fa8579a65cdf259a76df093da6e8d5c27497f8167d8288947076a11960606ad23567bb4984d6b24270965dbd7563b8c9ae08f8f69a8968ac102f32a8e SHA512 4dc1b01adfab93b5ea99876cbd7a4a9a39e66f6417b7e84a9341dab91f3d63fa903b69e4d827a656a709d4308f32ee0bd4a9594b87b3d3d05543249c847ca3c0
diff --git a/dev-lang/erlang/erlang-25.2.2.ebuild b/dev-lang/erlang/erlang-25.2.2.ebuild
new file mode 100644
index 000000000000..c3fa924e7389
--- /dev/null
+++ b/dev-lang/erlang/erlang-25.2.2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? ( >=dev-libs/openssl-0.9.7d:0= )
+	systemd? ( sys-apps/systemd )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-24.0.2-serial-configure.patch
+	"${FILESDIR}"/${PN}-25.1.2-c99.patch # Bug #882887
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	tc-export AR CPP CXX LD
+
+	# bug #797886: erlang's VM does unsafe casts for ints
+	# to pointers and back. This breaks on gcc-11 -flto.
+	append-flags -fno-strict-aliasing
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+
+		# don't search for static zlib
+		--with-ssl-zlib=no
+
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use doc ; then
+		emake docs DOC_TARGETS=chunks
+	fi
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		emake INSTALL_PREFIX="${D}" install-docs DOC_TARGETS=chunks
+
+		# Note: we explicitly install docs into:
+		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
+		# To maintain that layout we gather everything in 'html-docs'.
+		# See bug #684376.
+		mkdir html-docs || die
+		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init-r3 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+src_test() {
+	# Only run a subset of tests to test that everything was built
+	# successfully, otherwise we will be here for a long time.
+	emake kernel_test ARGS="-suite os_SUITE"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7c1266c06a49..7bce7d631a62 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libmemcached-awesome/Manifest b/dev-libs/libmemcached-awesome/Manifest
index 399746979604..151f978acc10 100644
--- a/dev-libs/libmemcached-awesome/Manifest
+++ b/dev-libs/libmemcached-awesome/Manifest
@@ -1,5 +1,5 @@
 DIST libmemcached-awesome-1.1.2.tar.gz 527675 BLAKE2B 436c3dcfed00a66459064a58a4d82e22f6f4a624a1f462949d2d3d8536b1342cbb7f0d5f883a86cce119dbcada4597c664609b7f9334bd321a5f1d314e5906b0 SHA512 3b9b6b1b09b39c845b5169841902d45e470f99af65765c9ae5d405d4eb1b6884e49831ccfb128df67beeda45eeed5e0f41ee475560cabcfa98e8196134182a53
 DIST libmemcached-awesome-1.1.3.tar.gz 527880 BLAKE2B b3d91b9eeb335b3fa7b910842b3c31326669aa9634ab6c87a3247bf8279037f5c2470b653fed851bf1708559af1a1edab52707c19eb6ea89ac6cb92424290d4a SHA512 99fb2ad32c05f8af769f5b30983b7c4244cd7ee027ccc8f893a957de4ffb12939959e2461c9acd20a8d21e0af824606e97d54465b7147337f40313c5eddf474b
 EBUILD libmemcached-awesome-1.1.2.ebuild 1073 BLAKE2B 25fd46a10be4fd0afc50789cdb4cf7d64b4f63e1f1677be4fd05c9ad5351f6e522c11dba805ce926b0fe5e1496a99c1cecf98327b051436263646abd4796a10d SHA512 72d718ead1fa5337153998f926e6a1c9f7ca544ca45772bb8296a00b1bf318ca755c3dd99ba8808cd04abf4bcf6ecee29133c8317739def5a0b6d2e20aa93d79
-EBUILD libmemcached-awesome-1.1.3.ebuild 1077 BLAKE2B 13fae4e6f3cbf937bb61ecfcd317a83b175f1a22d6e149c058ad318ec1a2986bd68744cff9c3496a3624a6dc7d2f9c4d1a8f07471e9930a7ae68ec66b25a4091 SHA512 63008df90367cb4cad81f8528544925e266a7e74650b312b611e87923235baac9e9c128054ff990aeae9558f8e47be841e703621645e4efe3215ae81947c9863
+EBUILD libmemcached-awesome-1.1.3-r1.ebuild 1106 BLAKE2B eb9896d3a0b5c82ef0ab102a6b8e8874d72fd202779ed6af62cba62cf80cacb16411196137c4dc09d65080cd8070c3dc04c8bc85fb034f977506eab806671c88 SHA512 6aafb33b4c2862208ed6e843b466308ae5c7924d9d0dfee5969f8b8c65ed85204ef226f2b8372556915ad6c6245194030ec7199a9f4a10efa2b0bbf941f89fb0
 MISC metadata.xml 632 BLAKE2B abbf2b34829dfd68688dfe74c7a14e788558ecbf1e738fddb9296f986925c4c3cb927fd30b2d4a2a38c54082271eaabf19963d1daf4ab1ea9a3a9d16f1f5b558 SHA512 f4095b8e6c92046ae23a793724237522c99734ab80c3dd71f58d9972e728ba27330d169eafc3294df6e2e0f9b57e7c8f70e8b5a51a3c532250965e8ae7b05e0c
diff --git a/dev-libs/libmemcached-awesome/libmemcached-awesome-1.1.3.ebuild b/dev-libs/libmemcached-awesome/libmemcached-awesome-1.1.3-r1.ebuild
index aa23fd0f9f65..f74a0725e90f 100644
--- a/dev-libs/libmemcached-awesome/libmemcached-awesome-1.1.3.ebuild
+++ b/dev-libs/libmemcached-awesome/libmemcached-awesome-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+libevent sasl test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="!dev-libs/libmemcached
+RDEPEND="!app-forensics/memdump
+	!dev-libs/libmemcached
 	libevent? ( dev-libs/libevent:= )
 	sasl? ( dev-libs/cyrus-sasl:2 )"
 DEPEND="${RDEPEND}
diff --git a/dev-libs/qcoro5/Manifest b/dev-libs/qcoro5/Manifest
index 25f50327a9c1..d4375d7e7a6a 100644
--- a/dev-libs/qcoro5/Manifest
+++ b/dev-libs/qcoro5/Manifest
@@ -1,5 +1,3 @@
-DIST qcoro5-0.6.0.tar.gz 122618 BLAKE2B 1fbd97d8b9897e9dc7408b2bf667064a3ec6326778c44472689e180af9eedc524236c5104b11a117fa8650f042a4ee3bd2b165e44385a829e8638c5e98d293a8 SHA512 e2e0219156a5ba693c935323c45c7414ce0f8d1773986ca63682812678e2b35146c76fa033ef791facfb57fa67fb96727df75ce6ecdae1e232be42f376973a8d
 DIST qcoro5-0.7.0.tar.gz 135419 BLAKE2B 8f593e76e960349090cea649848c6b3d422125f1bd292ec79026d0cdab7f7e7de77ec409d442c624efe2683a24dd7715ba108f400e154813b6b3da3eb0b8fc09 SHA512 cd49f957d30b63ee70080425c1ed8ffe05c09f7d5e3c6f043c2a9e66eee9a537c9bd6f12ea54fa9fa53871c5d6e5c4502e2c4a10c30eb3bf017505ba875838ba
-EBUILD qcoro5-0.6.0-r1.ebuild 1260 BLAKE2B 7e75016a4ae5baf2fa060e539cf3878ede1157c28359f519819e2a42c13cd6de013718b4afcf113a995a137d636a9c83662e92f88a9d421e1904b592409a4467 SHA512 246c31b2070c7c3d289c085d5d7bb686eb4d90532b6f1e5a843aa7bb24c5ba9775489dc41923ebcefeed613868be84d52b6b182c04797e868211ba344e701709
 EBUILD qcoro5-0.7.0.ebuild 1364 BLAKE2B e5a40a2aeedbd93580888a25c8f5c132a16c607ea3cfde1c5fa0370aba1122d3ea33e89edfb7d21bdb080d09b3dfb8ac38acb3e96c507944d21c4a703f8e118a SHA512 360d05819d51c5c18880196f844927b631de50b1f3dbfd7e0d8cf06fe56609c51366dd8cd24d6f9de07a0fd28ab0f610d4cab2afa5f438f4a80aa3cdbc738e70
 MISC metadata.xml 647 BLAKE2B 99bb798a9950348fa169dcd61f759a2e5f179a7ffe70037be3657e0d01174d75694878355baa40256293380511decd804e1a0ee5eaa136d7279b99c78be64269 SHA512 9936b38eba4cdd71221bd5eb370bf782d9aee4665d6be6784fe0ece893e0deaaff8aff978fce308264d956e813185dc16b4bd0b3a7b36ebdd674f5782e166585
diff --git a/dev-libs/qcoro5/qcoro5-0.6.0-r1.ebuild b/dev-libs/qcoro5/qcoro5-0.6.0-r1.ebuild
deleted file mode 100644
index 959cf76f3d08..000000000000
--- a/dev-libs/qcoro5/qcoro5-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/danvratil/${PN/5/}"
-else
-	SRC_URI="https://github.com/danvratil/${PN/5/}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P/5/}"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-fi
-
-DESCRIPTION="C++ Coroutine Library for Qt5"
-HOMEPAGE="https://qcoro.dvratil.cz/ https://github.com/danvratil/qcoro"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="dbus examples +network test websockets"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dbus? ( dev-qt/qtdbus:5 )
-	network? ( dev-qt/qtnetwork:5 )
-	websockets? ( dev-qt/qtwebsockets:5 )
-"
-DEPEND="${RDEPEND}
-	examples? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtwidgets:5
-	)
-	test? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qttest:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_VERSION=5
-		-DQCORO_BUILD_EXAMPLES=$(usex examples)
-		-DQCORO_WITH_QTDBUS=$(usex dbus)
-		-DQCORO_WITH_QTNETWORK=$(usex network)
-		-DBUILD_TESTING=$(usex test)
-		-DQCORO_WITH_QTWEBSOCKETS=$(usex websockets)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*
-	fi
-	cmake_src_install
-}
diff --git a/dev-libs/tree-sitter-typescript/Manifest b/dev-libs/tree-sitter-typescript/Manifest
index 981aea394fd6..b438c4364c52 100644
--- a/dev-libs/tree-sitter-typescript/Manifest
+++ b/dev-libs/tree-sitter-typescript/Manifest
@@ -1,3 +1,5 @@
 DIST tree-sitter-typescript-0.20.1.tar.gz 767713 BLAKE2B 25921ef20ec82bacf9858fd2bdca5d79f19ee132a48ad523ce4ea9d5141c2d314ec76d81a7d1751a6fab3651c3b3a2e0e2a469fc5168a5961310ee412e22ad4f SHA512 4d57308e84964bbf136868285141c4cd28ae0bbddef7973849679f8b8b85f00cd1bb5a4db7fd7b5cbd6a090b56193c8120bfd134358d33597a60a9145c694de0
+DIST tree-sitter-typescript-0.20.2.tar.gz 826705 BLAKE2B f51e56932676bb16d6439a0513f38cd5970afff47045d3e43ad804c1557c6f93c267934d1cd7804caded6d14b85fb88e6f7c21ea99bc23e99912e6f434d96510 SHA512 0ed78e515ffa3756800e1c3864540b761d734c34efeab4c5ab46ea96ae026bc09f7c6ef51eaa7275cc06ebdccc870961580da1930717d038265c0293fcf1784e
 EBUILD tree-sitter-typescript-0.20.1.ebuild 339 BLAKE2B 2e85a828b757db9a150980ac71aa8da12a31180344f145f66bddd2a69da709f3cc8c7e0e2c509d64e1ca5480ac9afc6f46cfdd2914091f1338cb083d87c36466 SHA512 ec25ddc8e69f09965106b9068788a71cc28f6cfc38434c54a6eaf38661b0a1f8c64fe74d212e47fe3f825ba909f689f13bf3fdb4646e95bae84093d87013d55a
+EBUILD tree-sitter-typescript-0.20.2.ebuild 340 BLAKE2B 5af6fb65cbe34064870d59df6560481423042a318b90dd786766631b2ae64fd3bc9f7bc37d90d3dd7656e090b0f9bbadbd52f6aef1ea57efdd39fc1919076e83 SHA512 d087eb6b50c71cf506d87f9f1dc5bb40e39d1a4955fe45114d19a9537738ea37f17d8cc689e938d61dec1b3c934435e1a1ceb41f3535c2b2ba85879a46892c45
 MISC metadata.xml 452 BLAKE2B 398c3e5901b36a7b49377e93dabce04d29f095eb6d0c5ddd5ebc29ad892121d2a4fce20bd4587737c7bc4f039aba0add3d01545993e0ae539ad9540d2832fbd9 SHA512 a9e3bee239e3abd86cd1bb00d318ef5e6529230b49ce0767e4b417e6abae0ee43637dbbacc27bce5e4f8f79d996aceea1ba0ed9afa1d3cc072f9bd502fcc0432
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild
new file mode 100644
index 000000000000..9d07624d1e03
--- /dev/null
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="TypeScript grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
+S="${WORKDIR}"/${PN}-${PV}/typescript/src
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a8e482a99a5d..de3ec75f7a62 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 1949fa672a82..7ecbba9c2b66 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -5,5 +5,5 @@ DIST setuptools-67.1.0-py3-none-any.whl 1082555 BLAKE2B 8c862d1568a71ccb5e3f10e3
 EBUILD ensurepip-setuptools-65.6.3.ebuild 619 BLAKE2B ee5b00332e47f02390ebd2878b96dac800f2fe11f5357af2dc70ce13d6acc7c878883b444cf023c44a9f6a392d6a057b37f6b617150162d28cefe5951986066d SHA512 6cc9cdd806a12658a32f6d19693251e8a3b859c7a866c3e33f444903ffe060d448ac49105f04303f07db7dd2775324ec051ffac00ef3dd668580fedd5eb844c9
 EBUILD ensurepip-setuptools-66.0.0.ebuild 632 BLAKE2B e4d6de1bcd50f374e95116aff733146c190447d6207a5fa9c5a4effc089a2be39f5f3882071cb8cdfb9ebf4a50a908c94e801ff016744693b004eb9b90a4a78c SHA512 6b104563158879308ae3d7a9fe98feff1deeba3347a7d2fcc3e3dafe3e544e63aad2237faaa7ba407d0c9fde1ab778582ebd98d0751f26292446ffb19fb3be73
 EBUILD ensurepip-setuptools-66.1.1.ebuild 546 BLAKE2B 82db18ad8196b8dbf7faf59be5b690baf619e50b7c3a924bb919980c3893852b16e6be007f0984c30e1f7e5ded22e5ff35bf92a69f0f5d481cd0951dcfbe8e59 SHA512 560af63b8f3ed9e8ea95a70b865690065f47dd5c5cd7e4e19ab6bd9011b1d3f0036a252ab05dabeefc615fbfd9b51c6e3f03dde1fde95d20d2d6f8e39c5cb799
-EBUILD ensurepip-setuptools-67.1.0.ebuild 632 BLAKE2B e4d6de1bcd50f374e95116aff733146c190447d6207a5fa9c5a4effc089a2be39f5f3882071cb8cdfb9ebf4a50a908c94e801ff016744693b004eb9b90a4a78c SHA512 6b104563158879308ae3d7a9fe98feff1deeba3347a7d2fcc3e3dafe3e544e63aad2237faaa7ba407d0c9fde1ab778582ebd98d0751f26292446ffb19fb3be73
+EBUILD ensurepip-setuptools-67.1.0.ebuild 546 BLAKE2B 82db18ad8196b8dbf7faf59be5b690baf619e50b7c3a924bb919980c3893852b16e6be007f0984c30e1f7e5ded22e5ff35bf92a69f0f5d481cd0951dcfbe8e59 SHA512 560af63b8f3ed9e8ea95a70b865690065f47dd5c5cd7e4e19ab6bd9011b1d3f0036a252ab05dabeefc615fbfd9b51c6e3f03dde1fde95d20d2d6f8e39c5cb799
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.1.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.1.0.ebuild
index 22682736bd2f..c13c3370cbbe 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.1.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.1.0.ebuild
@@ -3,14 +3,11 @@
 
 EAPI=8
 
-MY_PN=${PN#ensurepip-}
-WHL=${MY_PN}-${PV}-py3-none-any.whl
+inherit pypi
 
 DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
 HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
-"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
 S=${DISTDIR}
 
 LICENSE="MIT"
@@ -23,5 +20,5 @@ RDEPEND="
 
 src_install() {
 	insinto /usr/lib/python/ensurepip
-	doins "${WHL}"
+	doins "${A}"
 }
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index e0330afc4a17..1214d24cb0e1 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,4 +1,4 @@
 DIST execnet-1.9.0-pytest-7.2.patch 11177 BLAKE2B 6d6d0c76de606305ed0ca4f0f52d5ccc0cc3ab99d795ac2f4d39d3804cd5c0191f75704ee5eafcd135dc9854eef99a59dbd9cf57a8455b6b9cd45f2612fbcdba SHA512 ae16b3127545efe77a49392836a8940a053967e530a6288660a39edba9b35b448d0061ac7ac751c3be68de2cf5410655c2db55d344519f69db7c9ed4f7ca0003
 DIST execnet-1.9.0.tar.gz 173884 BLAKE2B 622a1f47365bdea97ba53aee908faf990ef847e3641ab0590073cdd6eac3413d1517f16e8e5b73b56884f02aebb3142691ecf6113e14f9c49c9b0fef3ee3247c SHA512 d425e7b6f3708efecb5dfa2c36a837cb55f2c32cf2ec0c1dc11cd1ca6ea614d119d04908b84dd5a3593c87db35e71fee202f843665c853ac3538479f60c83d60
-EBUILD execnet-1.9.0-r1.ebuild 1481 BLAKE2B b6c4ef04b6fea32500148169b2cc2420e9cb6280c0e240c795b3c6eb7bc5d63b3e8d4c009f370c3a5f902ab4af6c7d3ce2ffd95bd344b46df5e2a60122038471 SHA512 77ca7bca1ecd6a60fd835847a3ab4c5aed2102784cf55e78a1f4ecc3414f14fd4084d02674eff4b90f2c6874433aa10a05b0d4f08f4e46bf4a3b01e76e42e80f
+EBUILD execnet-1.9.0-r1.ebuild 1444 BLAKE2B 35bc17c6913ef55a9651514544aaf2755a1d235270e08be28e37f395e3b82c54209ca1b44197c5c2695357d307857e8fe4be31103d4cd5d04bfc5503b5392279 SHA512 63dcab1839746986f879a97e9e6df5e660b149f42a944eb6dacb61d5eb76976d7160028dc868967bf7e4ada23f825125a3adfcefd510a2df7698d72d5a745613
 MISC metadata.xml 442 BLAKE2B 4f920c4eee254e4fc68e6ac69344dc0da43058d9e2920d17dbe9c2e17bc2fc5eb5b9fe5f65d8edee0a91158c380f4c2635aa6ed01d726d1a332fc39bb567dd9b SHA512 3d4070a50e199f18305638a485c2e0031e88a662b8fbd9025bf76f84a8e3db0603a217a13b1ea50be724f9162b2eb1ef4a2722832a4769a785d40bc4e8f01dc0
diff --git a/dev-python/execnet/execnet-1.9.0-r1.ebuild b/dev-python/execnet/execnet-1.9.0-r1.ebuild
index fa09e14988f1..198204adb269 100644
--- a/dev-python/execnet/execnet-1.9.0-r1.ebuild
+++ b/dev-python/execnet/execnet-1.9.0-r1.ebuild
@@ -6,15 +6,14 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Rapid multi-Python deployment"
 HOMEPAGE="
 	https://codespeak.net/execnet/
 	https://pypi.org/project/execnet/
 "
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+SRC_URI+="
 	https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch
 		-> ${P}-pytest-7.2.patch
 "
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index cd6b2baf8a6c..c70ef2664f65 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,3 +1,5 @@
 DIST pyroute2-0.7.3.gh.tar.gz 484152 BLAKE2B 4f0cd0fc000c7bd3baffaa2ed25468bc28806fef2f9bc96e39606afe46e616d85865f497df6d1e3e4b2e5e3956b5fca22af273140bbb38954c6f0c0f86c386a6 SHA512 c8aeddaeaa014bcf8c4b831cb5b4080db5c99b582f3999fdbdd840b9448e032fbbf64ce5707ebc0795765138d8e89cde830efb2469c827ed8d4e63dd1beafe62
+DIST pyroute2-0.7.4.gh.tar.gz 493191 BLAKE2B 3587b391658e7ebf48637a0f03afa36213530d93954f6118ebf5a19fffebc9c22eb2ab9a5db90903dba3e502d91f3f2f7854575c515f314236bf2fe563295314 SHA512 1223bff64625915b11f5fabfe467a469ee33ad63c2daaaaaceaa9f4bf1acb812a93f2b6ff4c6e4d596cefafb1b309a0fed5b5853b44bff62a06cf806b1a681b6
 EBUILD pyroute2-0.7.3.ebuild 691 BLAKE2B 8ff20b9c4edf33dc3e5ba10947341042a1f656b6dfc094f9606c55b38ccdaa5976ea64baa9f3940372c9a911142d7613abb6222e110fbf642a61782cbfa536d3 SHA512 3beb4f3394bb3ba21bb9bac160cc789671579ca684a8d574b778d1764db6346807b080a3a348b7ca3e6d7a6ad180a347f7eb895b1f782b5c9154340cf218eb11
+EBUILD pyroute2-0.7.4.ebuild 693 BLAKE2B f0c8387ae1265729b5b1c18659261723c74a82fc2b25ee30a5d36b601f5825753d73559c077b8feb8549ee7d22e42a04bed32a548fcb3ef80c4567f78ad3d161 SHA512 9c8f23cd905fe0f42bad538fd2d9361e452784fc3edbfdd36cb0304a9926fd3531deaa0e255c1b17ba393e20e8351d34dfb88bb38c46b0807dc689388bb7014b
 MISC metadata.xml 547 BLAKE2B 1d256c8d9bb8cc039853ff12c15d7c2747822ff95e3ae7f3e7c1600498c7b886a341a03327992e3a7933592eba0094eec6fba519b0d9f2b2f0ece57eb515ea4a SHA512 e845b3e319e9d60b1dcbf9ab66681b886b0c517a5a72288aaf9ccb97d5018dc3b01b8d921b8a9fcd3538cec96e9a7e1c452a704c8c422ef6e6fa6069a7ae56ef
diff --git a/dev-python/pyroute2/pyroute2-0.7.4.ebuild b/dev-python/pyroute2/pyroute2-0.7.4.ebuild
new file mode 100644
index 000000000000..094f6662512b
--- /dev/null
+++ b/dev-python/pyroute2/pyroute2-0.7.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python netlink and Linux network configuration library"
+HOMEPAGE="https://github.com/svinota/pyroute2"
+
+SRC_URI="
+	https://github.com/svinota/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+# tests need root access
+RESTRICT="test"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 09600f13179c..9b27e2645272 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 6dd7fc9e8f05..224221cf38a9 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,7 +1,7 @@
-AUX qtcore-5.15.8-fix-crash-w-debug.patch 1427 BLAKE2B 3ef8d7e4fcd2969e6ce3931e0bd07fe7d410d18834bb2de7a760949dd4c822bb9942a4245d720a2736c4927ea536bc0a41efe3ac7e0913dd9b7ca35eb27d313b SHA512 dfdd1f30057498b0f3043faa84fda1239b17ecc02c3838a329cad46b157e91cb2cbbe488eeeebd761b0449e4c045e8a47e7354d081453bf6fe7f35a6989f30da
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
 DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
+DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 EBUILD qtcore-5.15.8-r1.ebuild 3070 BLAKE2B 610fccc1d08332b4ca2b1681906812fa1ca3b900ff487dfbd83fb4c0cafc5aa3accea3cd4450a3b7d46d261faf7fe7308a45642e73f84b37a9d16ea3af34afdb SHA512 d19b28d91138bfce589907ba79b67a0db2d3b248640050851017343f0400a1ccfeffa6f414d2849fc38c901893cad95c5bae0cd3e5eb22fa5f7ae94c252a10dc
-EBUILD qtcore-5.15.8-r2.ebuild 3194 BLAKE2B 92d43b2ce123f36845f69e2c45624d78cdc00d64d4c378ee62ee35bf576208550a710b4d6d11b59f58bc6a49255857a2c59a0fb16b54a1cd910218fa94b9cd15 SHA512 dd94327d908cab92e8b3b7f5bcaaac3a3a2aca6ceebda40e4d87fe0a088ec0fdcaba06aae2ada4791243fb710ed3f556468fcaf32dae68af7c1cd73394f36ee4
+EBUILD qtcore-5.15.8-r3.ebuild 3107 BLAKE2B 7855127e83de7642560f8dd89fa483f4cc4df667d82d5a34949502905144fd4b5b7e43c240930e0c0f427d105d9dbd0614d2c3381e28f5f8c2bfc52d9168640e SHA512 b45c52da1d9bf82d922ff7e030834dc8a2fdac3b3666ec558490f8c0ecd5083402d1d382d2731227c88503ce41c234f78b8024082f9871b203b71f1d4f22b951
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch b/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
deleted file mode 100644
index 74f5ed5c4886..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0c0b34badb8a56f5c0d7d43c3847508774c8e553 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Mon, 2 Jan 2023 12:38:02 +0100
-Subject: [PATCH] correctly set up ref counting in
- QThreadPool::tryStart(std::function)
-
-this function was inconsistent with the QThreadPool::tryStart(QRunnable)
-overload, where ref counting does get set up correctly. the lack of ref
-counting setup would later cause trouble because we assert the ref
-counting state all over QThreadPool. to prevent failed assertions we
-correctly set up ref counting now.
-
-this change is not applicable to Qt6 because the ref counting has
-already been removed there:
-https://github.com/qt/qtbase/commit/ecfda98d1f91c6a7da0d89826558d856cd88e670
-
-BUG: 449688
----
- src/corelib/thread/qthreadpool.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp
-index 40cc646519..8aa06a4c8f 100644
---- a/src/corelib/thread/qthreadpool.cpp
-+++ b/src/corelib/thread/qthreadpool.cpp
-@@ -602,8 +602,12 @@ bool QThreadPool::tryStart(std::function<void()> functionToRun)
-         return false;
- 
-     QRunnable *runnable = QRunnable::create(std::move(functionToRun));
-+    Q_ASSERT(runnable->ref == 0);
-+    ++runnable->ref;
-     if (d->tryStart(runnable))
-         return true;
-+    --runnable->ref;
-+    Q_ASSERT(runnable->ref == 0);
-     delete runnable;
-     return false;
- }
--- 
-GitLab
-
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
index 5817a2b70616..7e19031cbe35 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=3
+	QT5_KDEPATCHSET_REV=5
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
@@ -43,8 +43,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 	!:xml
 )
 
-PATCHES=( "${FILESDIR}/${P}-fix-crash-w-debug.patch" ) # bug 889160, pending upstream
-
 pkg_pretend() {
 	use kernel_linux || return
 	get_running_version
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 344f667722f7..5c7708b220ff 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,7 +1,7 @@
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
 DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
-DIST qtbase-5.15.8-gentoo-kde-4.tar.xz 789072 BLAKE2B bc781da32e7ad917fcbe3ec6fbf1ad17b5128f994e96f38590305b792b288b5c63ba8f71740bb2bb84bbf62386d154aa643cf162d0c5804a626f6c57682d7713 SHA512 1a65c40a82a2ae8cdfcb06ed6d0267f7c6257ed6e0637e17c8ca342702834d19c8ee12c02128754f41c7c4744e44cbc647982b2f8f215e36401b0eb47334a9bd
+DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 EBUILD qtgui-5.15.8-r1.ebuild 3836 BLAKE2B a5216fc2e7a1ee2c146a89c79de2ea69f1300025740ba34fd076da437416c0e4a6b761e4e85699ec60b9a266482147b79f8e0874acf064af6685998b62b45072 SHA512 54409e756b9362237bc50b40f73d00da5b3d859002036ffb32ab59de9f29c05349300b1a386313738c7a99c6336fab1d920e714c93e94aad67d3de45ac2a84e3
-EBUILD qtgui-5.15.8-r2.ebuild 3842 BLAKE2B 504ec9c9caff125035fab7cd8f45eeaae1e9d881cb127728742a778a87f15ef652bd2877f7e0ec330696aa2afb065cdb2550c49d99d47092d1977f3b0a17e492 SHA512 71d67bf48cfdb5863fecf451a8361d1edb425fde98ae459044d4732ace99e5717b695269fc613886ad63e0e2e2575f508213d25e4e9340774dd231dd1ebfefa9
+EBUILD qtgui-5.15.8-r3.ebuild 3842 BLAKE2B b13a7f63898005d3759ae61407392853d64650502716bf72e4a308fb2523548574ed138a9cfd93eaf1959738793785869b43bd6931cf755c5e3863cb44d0df0a SHA512 643421d9486a4f887dc09ebf90a569d25e28d6e4d3a0c18bed8db3b29624870f75a12eededd2a5448d63462f032d75402c3382b6842e1b19a7d06ec9d989e2ec
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.8-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild
index c7b0d5ead51a..f2af77c15d55 100644
--- a/dev-qt/qtgui/qtgui-5.15.8-r2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=4
+	QT5_KDEPATCHSET_REV=5
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 15c5dedb5bcb..6b26bcab5d17 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,7 @@
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
 DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
-DIST qtbase-5.15.8-gentoo-kde-4.tar.xz 789072 BLAKE2B bc781da32e7ad917fcbe3ec6fbf1ad17b5128f994e96f38590305b792b288b5c63ba8f71740bb2bb84bbf62386d154aa643cf162d0c5804a626f6c57682d7713 SHA512 1a65c40a82a2ae8cdfcb06ed6d0267f7c6257ed6e0637e17c8ca342702834d19c8ee12c02128754f41c7c4744e44cbc647982b2f8f215e36401b0eb47334a9bd
+DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtwidgets-5.15.8-r1.ebuild 1206 BLAKE2B 073672cf8e9da7c0f092397468c0e41a0a364bb9f8312359510e9fdc4df1ea396c2aae8641d77fe6922ebdc02c576a335c1f2c508d5f179bb11662bfe5f11c41 SHA512 e5e3918e84147aa1488053f51990cec089b2b02740e2272c1ffc8272ddfbebe7d549a4ac69c62c858036eb8651195b7d3b75ecef087b7882e032ebb9e22a15a4
+EBUILD qtwidgets-5.15.8-r2.ebuild 1206 BLAKE2B 6437af15f1a3793cdf1fa64be23baf416b49d0b2239f69aa0a058845c009156e5108621edc8a65e2be270c5f1cd6650760248c8008b6db568a0d2c43ca590a7b SHA512 eb22969ca1164ad0664397c00d13d444d7cabe6cbe91a73f10bf7821d0a9a3e1bc79a84f5c86f6c2ed2f0ad097bc5b7f776ad697ce6b027ff546d47004d0287e
 EBUILD qtwidgets-5.15.8.ebuild 1200 BLAKE2B 2bc1142dc7261140c06366e41c370464735ec597938eb5fe82176546733e14ab7f8b413ed7f2d3315d2b69d7d9e3b6d3741139ca684b8705a0fce71feca290b2 SHA512 ffa0a95e59423a680a9a4a7761c5bd391ef84b1ca718203175185185f3bde56516acaad6f852280ff8f06590f1ba6a7f3d94537014c84a50fdcd5868a203463d
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
index fbbc45ae8079..c6c374f18d5e 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=4
+	QT5_KDEPATCHSET_REV=5
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b8dc6022d186..33d512f69012 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/async-io/Manifest b/dev-ruby/async-io/Manifest
index f062b7e5ce18..d5e9876a5f51 100644
--- a/dev-ruby/async-io/Manifest
+++ b/dev-ruby/async-io/Manifest
@@ -1,5 +1,7 @@
 DIST async-io-1.34.0.tar.gz 34147 BLAKE2B 85cb79423bcbcc45e7c3f703d5ce7866522e66c55f866a0545369b65eda9c8a4b5637eaeeb7e17a5a8ee7256c6a991871dbb96244e4647fa19f8f027fad37961 SHA512 d35389ebfb748ea1c44f4a7ea7707511e32d40e98ae3fd7e8a5b22fdbb5f8f5a00933ec48346e2ed44c679ee6121a6fdf980c8ee6a1da609fb7571abb703aa02
 DIST async-io-1.34.1.tar.gz 34163 BLAKE2B 782131de9b652d2b9e622dd6026835df2089936ea97f360e3edd7425a4b9180cfd6dadbdd1c5537a06f0cda152a04aedd2fc983dc4559271c41f9ac5496bff94 SHA512 0a1e643d3879eed4e2ed2b347429a00a68b6c5dd8b63c66ab67218dfc4a00066499158fb84c4ae9f1848b5347a8d64728d16c84c6740348cfcae6c1cb82554b0
+DIST async-io-1.34.3.tar.gz 34178 BLAKE2B 0af09d723682f6818e63e43a356539c098c37f5ea2ee72638e8aa1af888def845f412eb5ebc6a0fd4b51d76a03ba66b78cb70d09336ef50cd68bcd6ba7c50002 SHA512 2523ae6aa4590672e2fd6a4755cde30fe3cc54a98bf8d75d7eba0b9ec052fad232f4feaf4d6e948421b152695cc2217c4173e2475c9ce5859e4230d1078d0444
 EBUILD async-io-1.34.0.ebuild 966 BLAKE2B d4087c8de853d808ef282982ea7b4486c74027fd8530e728604334ade10d7242534ba681c34d5f4f4256b9bdc70e0646afc20db2cc2816f85ea816016e323915 SHA512 4b6e01fc8213afecd7a6b0b86a335fcf506f050594d7367c4855cd0fd6d58de0f70f31844f5ae940939b19b52da942cb5f6ab3a02272f4984bddc032bc98acb5
 EBUILD async-io-1.34.1.ebuild 951 BLAKE2B 5bf5b3107602f3ecd59eea7e31b583e27a2acc0a86624c51a2b4fd58a7fe76f3caa05cf173a7cc622c8b738bc12c56a3733c8c08fc9667ba0601caf4e9a3a597 SHA512 33993a4c10b84bf2d4d49bd0881e674aa7514adb200744d212bd7075e039cab4c5ead797193c9420632ae4f9cc09a095c0072fee62e6e12a1867669ae3c80b60
+EBUILD async-io-1.34.3.ebuild 956 BLAKE2B c7702c2105096fface57f8507a5f1b97b717439ca89e6e032d70391cba60e7ff7af23ed0e4a1ef16b3086b784cd069fe33faf461e8800dcf7135c25bd6871c0e SHA512 6fddd70e22e606dadab83c359aed1b33ac2f86541f3b34ef1bd6ba804f40730e0a3f81970d4f28adf189987f48970d98012f5365dde893a148adb4ac528c9157
 MISC metadata.xml 344 BLAKE2B 7fb67688ba60d30637605ba7a2020cb328e18ffebd9fd6fed09114cc14596836b0dcc4d1590fd3755952baa52c258bdb9a935c47b1a4ef4f2d5e545e931d40fe SHA512 6ea960fe1feb969df78e66ae985b6ac95faa09a248d694aaa47876634f84a09a3807effc2b4289d35dbeaee3793c2c73276fd0f8b87375ab99e813085edd12af
diff --git a/dev-ruby/async-io/async-io-1.34.3.ebuild b/dev-ruby/async-io/async-io-1.34.3.ebuild
new file mode 100644
index 000000000000..affbb723ae03
--- /dev/null
+++ b/dev-ruby/async-io/async-io-1.34.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRA_DOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides support for asynchonous TCP, UDP, UNIX and SSL sockets"
+HOMEPAGE="https://github.com/socketry/async-io"
+SRC_URI="https://github.com/socketry/async-io/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/async"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/async-container-0.15:0
+	>=dev-ruby/async-rspec-1.10:1
+	dev-ruby/rack-test
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid test dependency on covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 3ee05fa9e733..07773d756d12 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/pypi.eclass b/eclass/pypi.eclass
index 12ce5d4ace15..e11999fc7e9c 100644
--- a/eclass/pypi.eclass
+++ b/eclass/pypi.eclass
@@ -39,20 +39,22 @@ SRC_URI="
 "
 
 # @FUNCTION: pypi_sdist_url
-# @USAGE: <project> [<version> [<suffix>]]
+# @USAGE: [<project> [<version> [<suffix>]]]
 # @DESCRIPTION:
 # Output the URL to PyPI sdist for specified project/version tuple.
 #
+# If <package> is unspecified, it defaults to ${PN}.
+#
 # If <version> is unspecified, it defaults to ${PV}.
 #
 # If <format> is unspecified, it defaults to ".tar.gz".  Another valid
 # value is ".zip" (please remember to add a BDEPEND on app-arch/unzip).
 pypi_sdist_url() {
-	if ! has "${#}" {1..3}; then
+	if [[ ${#} -gt 3 ]]; then
 		die "Usage: ${FUNCNAME} <project> [<version> [<suffix>]]"
 	fi
 
-	local project=${1}
+	local project=${1-"${PN}"}
 	local version=${2-"${PV}"}
 	local suffix=${3-.tar.gz}
 	printf "https://files.pythonhosted.org/packages/source/%s" \
@@ -60,10 +62,12 @@ pypi_sdist_url() {
 }
 
 # @FUNCTION: pypi_wheel_name
-# @USAGE: <project> [<version> [<python-tag> [<abi-platform-tag>]]]
+# @USAGE: [<project> [<version> [<python-tag> [<abi-platform-tag>]]]]
 # @DESCRIPTION:
 # Output the wheel filename for the specified project/version tuple.
 #
+# If <package> is unspecified, it defaults to ${PN}.
+#
 # If <version> is unspecified, it defaults to ${PV}.
 #
 # If <python-tag> is unspecified, it defaults to "py3".  It can also be
@@ -73,11 +77,11 @@ pypi_sdist_url() {
 # You need to specify the correct value for non-pure wheels,
 # e.g. "abi3-linux_x86_64".
 pypi_wheel_name() {
-	if ! has "${#}" {1..4}; then
+	if [[ ${#} -gt 4 ]]; then
 		die "Usage: ${FUNCNAME} <project> [<version> [<python-tag> [<abi-platform-tag>]]]"
 	fi
 
-	local project=${1}
+	local project=${1-"${PN}"}
 	local version=${2-"${PV}"}
 	local pytag=${3-py3}
 	local abitag=${4-none-any}
@@ -85,10 +89,12 @@ pypi_wheel_name() {
 }
 
 # @FUNCTION: pypi_wheel_url
-# @USAGE: <project> [<version> [<python-tag> [<abi-platform-tag>]]]
+# @USAGE: [<project> [<version> [<python-tag> [<abi-platform-tag>]]]]
 # @DESCRIPTION:
 # Output the URL to PyPI wheel for specified project/version tuple.
 #
+# If <package> is unspecified, it defaults to ${PN}.
+#
 # If <version> is unspecified, it defaults to ${PV}.
 #
 # If <python-tag> is unspecified, it defaults to "py3".  It can also be
@@ -103,11 +109,11 @@ pypi_wheel_name() {
 # operator to rename it or call unzip directly.  Remember to BDEPEND
 # on app-arch/unzip.
 pypi_wheel_url() {
-	if ! has "${#}" {1..4}; then
+	if [[ ${#} -gt 4 ]]; then
 		die "Usage: ${FUNCNAME} <project> [<version> [<python-tag> [<abi-platform-tag>]]]"
 	fi
 
-	local project=${1}
+	local project=${1-"${PN}"}
 	local version=${2-"${PV}"}
 	local pytag=${3-py3}
 	printf "https://files.pythonhosted.org/packages/%s" \
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 3bb356593e84..e81f5e415a7e 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 9895f37f6e1b..3b8d04301ab3 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,3 +1,5 @@
 DIST naev-0.10.3-source.tar.xz 444825304 BLAKE2B ec38f7a9786041cc00cf5a515a7e33f8a8fe17b8de6550f896c546f5463d9764f0e287ccea48a0831c6247de31509fc50893ae2ce49711ffe69909f705b0a75a SHA512 7491c61bae446aa98f3847be8719cf822955d3cd0a1b01e4a0d55d49a58628ec07f4872140b3fc77b6c1a928da9d4c8b112a2814ae3ce7edfcc98841f6812a59
+DIST naev-0.10.4-source.tar.xz 444932700 BLAKE2B 998eec9fbcc8dfd16cf8513fdb3c845fa1d509caf7fbe1e6f70b1f5c08cbf142bba3c0303858286c51450dccc329a3950ee146e5f5a383de66f8ae37bc6f7546 SHA512 bd0167ebc43db77237cd833f77d2620f24eba46cab21295568ece6a6dbf4db904fab3849d019308487545d1cbed3aa409fb867946adfdf3113d79f93acc07935
 EBUILD naev-0.10.3.ebuild 2329 BLAKE2B 42787d457c5e08d801a8ec71c67e4edd1a1eafdcfc3b978bb64253204390dffe40b322dcff00030475a75b28666e29ee0c1d14a8903d9e1d507bec1449be2218 SHA512 2dbb10a455dd901e81e853a0d6f4a4aa60aec85e7c8570081c194f5c2c5e116f7e9a7def179607f26d005e7de950b93b285fdf1cd8a52d688e9966a6dc9bbd4e
+EBUILD naev-0.10.4.ebuild 2329 BLAKE2B 42787d457c5e08d801a8ec71c67e4edd1a1eafdcfc3b978bb64253204390dffe40b322dcff00030475a75b28666e29ee0c1d14a8903d9e1d507bec1449be2218 SHA512 2dbb10a455dd901e81e853a0d6f4a4aa60aec85e7c8570081c194f5c2c5e116f7e9a7def179607f26d005e7de950b93b285fdf1cd8a52d688e9966a6dc9bbd4e
 MISC metadata.xml 328 BLAKE2B 2c831943c7eee723e5c707906bcec96e97abd71e5d6fc3256010cca9626aebe95ecd7dca316a9567fe41186f0a656a434d774f83f088f414a95b3aba425c23b9 SHA512 426ac4b34b6cb45db05f5a7768a15947f67f5e90cda1bafa817320988aeb96ade18d774b2aa5e92d12c1fd1fd7a4964ac1bbdacbca6655325ccccc6a9405dfa4
diff --git a/games-strategy/naev/naev-0.10.4.ebuild b/games-strategy/naev/naev-0.10.4.ebuild
new file mode 100644
index 000000000000..49ade5da0d5e
--- /dev/null
+++ b/games-strategy/naev/naev-0.10.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{9..11} )
+inherit lua-single meson python-any-r1 virtualx xdg
+
+DESCRIPTION="2D space trading and combat game, in a similar vein to Escape Velocity"
+HOMEPAGE="https://naev.org/"
+SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.xz"
+
+LICENSE="
+	GPL-3+
+	Apache-2.0 BSD BSD-2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0
+	CC-BY-SA-4.0 CC0-1.0 GPL-2+ MIT OFL-1.1 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# dlopen: libglvnd
+RDEPEND="
+	${LUA_DEPS}
+	dev-games/physfs
+	dev-libs/libpcre2:=
+	dev-libs/libunibreak:=
+	dev-libs/libxml2
+	media-libs/freetype:2
+	media-libs/libglvnd
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl2-image[png,webp]
+	net-libs/enet:1.3=
+	sci-libs/cholmod
+	sci-libs/cxsparse
+	sci-libs/openblas
+	sci-libs/suitesparse
+	sci-mathematics/glpk:=
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-games/physfs[zip]
+		media-libs/libsdl2[X]
+		media-libs/mesa[llvm]
+	)"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/gettext
+	doc? (
+		app-doc/doxygen
+		dev-lua/ldoc
+		media-gfx/graphviz
+	)
+	test? ( x11-base/xorg-server[-minimal] )"
+
+python_check_deps() {
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# use eclass' generated lua.pc first rather than as fallback
+	sed -i "s/'lua51'/'lua'/" meson.build || die
+
+	# don't probe OpenGL for tests (avoids sandbox violations, bug #829369),
+	# mesa[llvm] should ensure software rendering will work
+	sed -i "/subdir('glcheck')/d" test/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc docs_c)
+		$(meson_feature doc docs_lua)
+		$(meson_feature lua_single_target_luajit luajit)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	local DOCS=( CHANGELOG Readme.md )
+	meson_src_install
+
+	if use doc; then
+		dodir /usr/share/doc/${PF}/html
+		mv "${ED}"/usr/{doc/naev/{c,lua},share/doc/${PF}/html} || die
+		rm -r "${ED}"/usr/doc || die
+	fi
+
+	rm -r "${ED}"/usr/share/doc/naev || die
+}
diff --git a/java-virtuals/Manifest.gz b/java-virtuals/Manifest.gz
index c0978ce609b9..210418f30eae 100644
--- a/java-virtuals/Manifest.gz
+++ b/java-virtuals/Manifest.gz
diff --git a/java-virtuals/servlet-api/Manifest b/java-virtuals/servlet-api/Manifest
index 7d9057919ea5..a3ef190fa593 100644
--- a/java-virtuals/servlet-api/Manifest
+++ b/java-virtuals/servlet-api/Manifest
@@ -1,4 +1,2 @@
-EBUILD servlet-api-2.4-r1.ebuild 517 BLAKE2B b33f5346772f75da3b39155c0a7f894bdd548e467bea328a731c2f29dadf3777d6785a24a6dca7229ebd7350dddb09876e6da5edd0eabe9df4831c8f594a8ce3 SHA512 282840241eeda00511453efc64a3acfe1ca8552234b0727a71fa98d181e39ac49a506b9c591f9a4b375b7d8ead7cb30d386d9b9c3cac5e08775850ad5bd10ca7
 EBUILD servlet-api-3.0-r3.ebuild 485 BLAKE2B c5cbbf5dd4c334eb96782fd9e6d0e4f2b0eef97610ce4205c99c17d9ace9004b01cd28e1104d3c808d0e75a1fac2d0f17dc37c14f2e5b0add0e9f7303c978d5b SHA512 0e8f623416d893fc9f78270e2b171c553942f54e0230f6ffb27fd19c91ac544bee0120e6218d3dcc488939041a639822325b8fe3ccd26fef3aeffa0b27a6f2ed
-EBUILD servlet-api-3.1-r2.ebuild 472 BLAKE2B bbc29977dab9d6a4f1142ca4e3bcff32c1eef9eadca6fd730fbae2846389b5c886fdcff4696db79b9a8f4ee5f86c709633fa281b50ae964258268aa6f09bbbc6 SHA512 25ab016d7826ddd22242a9877f40c7040f25080ad65ceae6662d0a76d42718440d095e11a788ea0d71df78289b100b19d5764fa37c90dc64b6b6f079f905f9f6
 MISC metadata.xml 380 BLAKE2B 6ef98eb776a396476590b98bfb1cc5175c667fa8b61f817f7abfaaba1357fd84ac8db354b6581f4652cb22568c350a50480bd7207b07764bdbbddab241192160 SHA512 57696fb31e0136f6b79db369053a43ec31722fce0a2b0834eb6172b95dbe6cca0cc61320e4242c3d673ff23901f1b2dcc5dd24060c39ebb5d0c9f545801fa986
diff --git a/java-virtuals/servlet-api/servlet-api-2.4-r1.ebuild b/java-virtuals/servlet-api/servlet-api-2.4-r1.ebuild
deleted file mode 100644
index 6ceb79df2db2..000000000000
--- a/java-virtuals/servlet-api/servlet-api-2.4-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for servlet api"
-HOMEPAGE="https://jcp.org/en/jsr/detail?id=340"
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="|| (
-		dev-java/tomcat-servlet-api:${SLOT}
-		dev-java/resin-servlet-api:${SLOT}
-	)"
-DEPEND=""
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-3.1-r2.ebuild b/java-virtuals/servlet-api/servlet-api-3.1-r2.ebuild
deleted file mode 100644
index 3ffd164566c1..000000000000
--- a/java-virtuals/servlet-api/servlet-api-3.1-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for servlet api"
-HOMEPAGE="https://jcp.org/en/jsr/detail?id=340"
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND="|| (
-		dev-java/tomcat-servlet-api:${SLOT}
-		dev-java/resin-servlet-api:${SLOT}
-	)"
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index edda466e5e8c..ce690452dac8 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index fa88775faa92..16ef2f818274 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-5.102.0.tar.xz 65604 BLAKE2B 54227d38aa0b9107dbf1ff290f0194b5dbe945cbfe75c83b1a77f4790d70e97a7b24e19928760086d8bd90fead6ce7fb54140402242633efdab064e080323562 SHA512 03e600f7fcbd51e7f20bc49abd16eb6ef71901e54595ffb42fec69b54348a6b5b91db299249ee2eae2e12f1b54499a662dad45322e9f1450e29f6e33e3729822
 DIST kdav-5.99.0.tar.xz 65644 BLAKE2B 02224b746ea62665371b07d8524054afc26d14590425d78e63ffeda25642caaa3d99a98e1e3638e8806bd127e427c5d74cefce46f658e6b0471908b1db86a901 SHA512 347aa552517d3453d297a9b3400f722e7fe1b0ab9f4dd41e6e814458c18d3e02671e17277ce14a52e23825d653a04b4b2eba4a20f05b700326a2cd610181f137
-EBUILD kdav-5.102.0.ebuild 768 BLAKE2B 6fb1292d3db15e210121642e16b80c1960dedf54f3d3186acb344b159ecd01000c3573d3e25bc1403a1ea0489397df128e6d0f98f99e2535b714027ca2dac799 SHA512 57a45d1b9da37bd67172abe8005c9a8f68225ff68466ba7184f233b5abfd8602e1466809149d784599cbc8fd08faa6128aace27938cfd1445b44e407f8409a8f
+EBUILD kdav-5.102.0.ebuild 858 BLAKE2B 9544d3af4f036e08fc55471dae91bbfb1682dad75bc09812caf2a8f16290d65a2fdce2e58d6f128353d487642cf3922873e5e4c5eabb31a89ffd3135d8f62123 SHA512 4c3470ca1ae947e3acc42701c778e71d0102bf2c3a70c260efd02eed1caff87e86fb1cb5b02f8506584857c62c32823e690a7fc3747ae9713fc4ffdd1317444b
 EBUILD kdav-5.99.0.ebuild 776 BLAKE2B 8f32b6d0b87904fe6b361d67b88e3b5aa07f83046d4b6a832cb1b38f977c3405d8ffd83976865a4d2a49dc2aeac7082060a91450a1cef6233e937526df730d97 SHA512 0942c37afc6bc51a723aa556e65e125c6ccab28f20a021771fcbcb17d923b708e76f13038ded73989fcf6ea74e70d594a09ebc045452181034e95195bddd2d77
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdav/kdav-5.102.0.ebuild b/kde-frameworks/kdav/kdav-5.102.0.ebuild
index 31e11e45f94f..a5c022220855 100644
--- a/kde-frameworks/kdav/kdav-5.102.0.ebuild
+++ b/kde-frameworks/kdav/kdav-5.102.0.ebuild
@@ -27,8 +27,9 @@ DEPEND="${RDEPEND}"
 src_test() {
 	# bug 616808 - DavItemFetchJobTest requires D-Bus
 	# bug 653602 - DavItemsListJobTest mimetypes unsupported
+	# bug 765061 - kdav-davcollectionsmultifetchjobtest
 	local myctestargs=(
-		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
+		-E "(kdav-davitemfetchjob|kdav-davitemslistjob|kdav-davcollectionsmultifetchjobtest)"
 	)
 	ecm_src_test
 }
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 8e45ac3d276d..aa074db3af13 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -2,6 +2,5 @@ AUX kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch 1224 BLAKE2B f487
 DIST kded-5.102.0.tar.xz 40968 BLAKE2B d7bf8ac8e5def70dce42afa4050bd1a0ecb5a6354b58ca16eee5cc8ea0ee368c0125e290643318b288cc18db102925bf5a77664b7f23e8e234205d3d95e488a5 SHA512 971eca90bca7218c0637a62740aaefa2bb3fb68a2941bd8c25bf65b79e07b69cdf1d629733b2511382b6fab2cd112f194ef09939d8043e96d9242d4253eb1e83
 DIST kded-5.99.0.tar.xz 40800 BLAKE2B 847c242751204487745c5693c94e5bd851dc741a659a8c6cdffbdb0e0351e68809d62ff6ad63816cd99ac20829ae69d92246a360cd55e1c2d0ed0059610439fc SHA512 7e2fc9528dcf95b252a1921d141c984bdbe05f7cae780eefad3f1f768c738e0873588242ebc8f9c7a710b8c5badb521dbd80b9cff89abfcfcf9689ac284ae913
 EBUILD kded-5.102.0-r1.ebuild 963 BLAKE2B cf8661e7c9568f7f93584b5a723123aae734126da44feb9cfbde30485c1ebd38fc89feddfdcd0612e05b3e4edf362e8edb5cf99a79cefa2038f00748bbedeeab SHA512 4fa0c799ffe2a99beb798dcdb37399a37d58d0f4bcc59977686e522e8a5b74f341d1b21c648849ea62d67dce3801d96e1db85ddfcffed35e2cc06b66d70a64b4
-EBUILD kded-5.102.0.ebuild 867 BLAKE2B 130775388d4089876e90b56efa7ba7c00e564cd5fa089e2732bb961103ca0b249d1ac385ffd4ae9c7ff839dcaf19861a20513eb485d110a3834e65642a944b2a SHA512 fa9e7da3abb8fda4d09f3746fc67b29297b8156e06abc95c38853f66fc64810db3b0baf6d848d5de5d430ec19184ba3ded1f766bb669ebe0232124120271b649
 EBUILD kded-5.99.0.ebuild 860 BLAKE2B 9a7add79a2c20a085c453c806813e898f780f4f6c894d44bb5f373ee18e2c41282a4859fb49a775eeb7817089759a6fb7f469756d24e9b0d87d17c70b36bf17f SHA512 6462b8efe3d5be79821d635ce94270280adbaf168bfa75e2a1943c42839eaa51b9622c659f106bb8640adf08e680a394de1de4cd31ae0ef5b7c5844fd55f8eae
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kded/kded-5.102.0.ebuild b/kde-frameworks/kded/kded-5.102.0.ebuild
deleted file mode 100644
index a94d97c31a4f..000000000000
--- a/kde-frameworks/kded/kded-5.102.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Central daemon of KDE workspaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="+man"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5[dbus]
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kinit-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 09c6c67be85a..6b6514e47f7b 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -2,6 +2,5 @@ AUX kguiaddons-5.102.0-fix-waylandclipboard.patch 2260 BLAKE2B b048b54bd280309e5
 DIST kguiaddons-5.102.0.tar.xz 78104 BLAKE2B 59f1e0718790fec770af182a2bd2c0770d708e022e3637bb1986fc7950377f27fcd36a39db7b80f33f502ac41140c4c581d50e1adacd09af814e5b03f1a3977c SHA512 933cc5dae575567b9f568ee778e90614c369ff6b3432b083b4c2fb94cca957b698050a3a4bebe4de11d70fc7b2484022977a77093a2d671002eacbde0921b565
 DIST kguiaddons-5.99.0.tar.xz 74324 BLAKE2B 9111bbad7d92ee73da6aa606246802937183986b8346cdc5b74d1115b0cd31255bd2eb379bbe2ddba6146edb607f96c735a85abf6b4831384587bf2df6b00749 SHA512 a47a9b4d642d33a4ed9cccc351fcdc317cc41482b5a10bc9a38500f6c20ba9c0afc88f864c63e5c916d205cb685b4d653f001c4f4719a86e7bc4670acbf9f108
 EBUILD kguiaddons-5.102.0-r1.ebuild 1078 BLAKE2B 095eca830c2b31d7d38afe4a87a6000496a5661f91ea7d5637e50b372052346441b7e63d01e65185d977da5b82a9ba24c7b8d6b562fc6b7f1b109a6719ae219d SHA512 f346c80b9739e72d0c8233664d1850ac5faa1e8dcf15fe10d5316757684bc8fb026d20859d973676508a93eaebba22899682249963a75cfb387086b17cd8aef8
-EBUILD kguiaddons-5.102.0.ebuild 1002 BLAKE2B 662ae41f5d7da92b40d61327bf3f8fbbdf69b90906f19837f6d92ce676aa2803ebf8d9f0d45efcddb85c93965a36d8277fa549f4faeff72f593843ccb4847a43 SHA512 6f7df88a7fea3f8280fa728fb9b0d4cd1cc21ff71ffe14a1f1cc69d295abc98722cc180fb9857385ecf95000c90ebe02b0f61e170a7404765ceb7229aac4582d
 EBUILD kguiaddons-5.99.0.ebuild 928 BLAKE2B 1e66ee806beb05532f8289352cd8879f113e9e9f0952a0ab85ac2f19a36f5bbf195071bf88b3b35222f6d99afc61b012752e7da3f8e9edb40bf0df27a1b52815 SHA512 ef749031a2fe2a9dfaa11b6e3ce9c2c674e59b69166dcbb64bd1b2ae8bad7b88dcc6a4f11b492e77421421ff14419323555d3fd00f3a9d20e96e498ff2c3ad6b
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.102.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.102.0.ebuild
deleted file mode 100644
index 0bc0ffc751b5..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.102.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_NONGUI="false"
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="dbus wayland X"
-
-# slot op: includes qpa/qplatformnativeinterface.h
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	wayland? (
-		dev-libs/wayland
-		>=dev-qt/qtgui-${QTMIN}:5=[wayland]
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 )
-	X? ( x11-libs/libxcb )
-"
-BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_WAYLAND=$(usex wayland)
-		-DWITH_X11=$(usex X)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index c1ffd2309510..25af08891122 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -3,6 +3,5 @@ AUX kio-5.99.0-fix-webdav-fileloss.patch 888 BLAKE2B 431a7bb41f1fd2b7156c0162d1f
 DIST kio-5.102.0.tar.xz 3769416 BLAKE2B 432acbd7844539e7c2617ea5743449b7da4377235485644ab9066919ee7c4746388deb116ee6664c52bcefa35c54bda3dfcc6f2f58a03a1638fe6173e5a99330 SHA512 29f46ace3a902a24c3a266413b291eac43bcfc5da76dfbc927f3d0e36c3902f0abf195b0cd97fd163a62b85a3d0bbb006dc73bc0fc43a88e47f72e7991536dc4
 DIST kio-5.99.0.tar.xz 3407180 BLAKE2B 2014bb1e2ae020dbe47dd0964e003814fabde5cf14cbb74b05f5703ffc5fea2e6f22f26ae2a9cfc3806043d4618115ed14b9b60ab38bf9d5acb7ca8b2d5c2e06 SHA512 b18e6c79913b8da0f800bbf58433069531a6c79d711876c46785d88c79f6a45503d69dcd0fee958f727c7dd394f398c951b660e47f77e8372f3be75367ad9014
 EBUILD kio-5.102.0-r1.ebuild 2438 BLAKE2B ebce5f543f5558af2914258d109fcb3da294b9b340040501f044b46d41778f159d3ad3c682e2732fb3f064ede26f434c0fa52fa9b9476aa71b9f6ecd0db6dd6c SHA512 6173e73c57eb7fbc37ce297f0f7dd593303ad43623b548455958a8a33742292484de53b90b0927ef0024dc17df5e9d3c0837ab1476cdc671bc699bfcec5fa817
-EBUILD kio-5.102.0.ebuild 2351 BLAKE2B fb8e8e70388c230b4e8dd4ef120e4d0db85bab0abcb7f71bc16c162d504d67e55596d414077cd5b8e20be613fb4fda011d8b21a2c590522a47a9b932bc122433 SHA512 2310005d9057152d596313c98f1a8dc42eb032819eaca467e68d85ec6eea5e178cbd42010245dfb31212c38e250d7d9a7e26916000fc8113c26e163e1632530e
 EBUILD kio-5.99.0-r1.ebuild 2419 BLAKE2B f684ab14c5cb15a9574ee798a295cb75796a08e8ccce6f65e1094fe9aee693c8320e4dd2f8a2a0168377fe0ecbb4d0aa5678535aaa19245759a8569595cb6e1e SHA512 c9ef38562e41444d884b1d010d216a49345963b84537f00c85e489b6e4eab49bf3b592a849409173bc24d44f0ea217e0737add40b9524961adee271f0b6d2e75
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/kio-5.102.0.ebuild b/kde-frameworks/kio/kio-5.102.0.ebuild
deleted file mode 100644
index 9b1e05fe0544..000000000000
--- a/kde-frameworks/kio/kio-5.102.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# tests hang
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kbookmarks-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
-	kerberos? ( virtual/krb5 )
-	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	test? ( sys-libs/zlib )
-"
-PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
-		$(cmake_use_find_package acl ACL)
-		$(cmake_use_find_package handbook KF5DocTools)
-		$(cmake_use_find_package kerberos GSSAPI)
-		$(cmake_use_find_package kwallet KF5Wallet)
-		-DWITH_X11=$(usex X)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_desktop_database_update
-}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 5a86180fd26a..788f3a852967 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -3,6 +3,5 @@ AUX kirigami-5.102.0-fix-title-delegate-elision-glitch-2.patch 3536 BLAKE2B c938
 DIST kirigami2-5.102.0.tar.xz 371140 BLAKE2B 827f7a82f2a0b8c98516718aef5556d7f072d9fe2aa82115fbf5445d9cf19de8957c929a70f4c329ec0a4c1424d6bc926e028d4d19909c88997b80c791506108 SHA512 dee0dfbe8f4d7cc329707510f5ab4beef436de4887978b790bdd98ef001e3241768c9edcdfe39204b5c53997bdf7779457f7293b923282acd27a1dea4c1d911c
 DIST kirigami2-5.99.0.tar.xz 365032 BLAKE2B 45d7691e2a5eba7a60c133436a8187c1af1d132d06e516057160b99769a2db5acd7d1b14425a6b4e28bf4f84b388a9e890c58c67ed0577e067db00af7ac00f1c SHA512 ca7fdd861483f22e7c028b65c0daed9756556053fd3db43e2fa991643a9f38ebec3e2840d9bc04f4caa81c50757a16c96609300aa7c85361a23267eff7985533
 EBUILD kirigami-5.102.0-r1.ebuild 1305 BLAKE2B 5305a08d489ef1a1331fe4b6c80635805c9609d5ac2f45f414f10228b72016306c6858a79bd3f48d5d66dcc7e2b9faae8fa4d5bc1e32eb6ddac88bcc79a78bd3 SHA512 844d23d3c4a1bc63457773978e9d537e3833573c041669af1ee97940ac30801cc0bdf88d5bc8ec4ef1562cacaf6b2cc3a4ed2daa50e3c2b35c18da7d93ad2c15
-EBUILD kirigami-5.102.0.ebuild 1227 BLAKE2B 649d51a9a91c0816c1ef4fd0507ad69b57cc6e227e1fee498d5d911b373fe208cc5b4be17756958b1c8d4b949dced295ddceb164fbf83e34a3eee2eb8e1ce4e0 SHA512 045f4caa93f67e444fe79dbb8cf54241b267d1265cfce7aa2f14b18e60f5a22a3087baf5464d1c8d29fc0ef20a6460a5e8c4928ba0cb6bfb710eb77eb0419336
 EBUILD kirigami-5.99.0.ebuild 998 BLAKE2B 527ae1e81dce244f53dff19e2c6aaae053781fecf519c9e2204d3fd15ccd936709707afb798ef28dbf1c382c1196e662977f053d2a26ae85c20716c54991b666 SHA512 56dcdf0c9bb3a46249011b2ab2183ff5b37d33476a37b0185083fc6acf23bccf9c88b759dfaeb2adf76011148deb033ea4c14ab3e8c3480b5d2ed60a0ec71c72
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kirigami/kirigami-5.102.0.ebuild b/kde-frameworks/kirigami/kirigami-5.102.0.ebuild
deleted file mode 100644
index b728e7fee012..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.102.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-KDE_ORG_NAME="${PN}2"
-QTMIN=5.15.5
-inherit ecm frameworks.kde.org toolchain-funcs
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="+openmp"
-
-# requires package to already be installed
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-		$(cmake_use_find_package openmp OpenMP)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 7f9cc8aab546..949433a8e15b 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -2,6 +2,5 @@ AUX knewstuff-5.102.0-fix-crash-in-QQuickQuestionListener.patch 1518 BLAKE2B 3c6
 DIST knewstuff-5.102.0.tar.xz 3406384 BLAKE2B 3c2ba49a86b2954865db706466b07c94cc2f0b5fd10084f35285ae44ebff9e4a8dc5d968292a13699cefde229386b7dda27eea70a13fdf1c45736361e8a9dce7 SHA512 2ec0b6a8be814267a3b97fa50eb2789d5e78741e67ecd82a9ea095075338814a7d4d31623a6b9f809c129eba6b85f55e5fc6d05d43307859eb1e3420620962b0
 DIST knewstuff-5.99.0.tar.xz 1162232 BLAKE2B 011389695ac5138e434b38a764b398b820167d117fb90b08e3b776055714c82b67ea833b4bad32352ed90aaf46396e048f9bf8f770b6548b90b92f9b23c6632c SHA512 bc2bbd3185b12b1651b812ce1b1bb975cafd29615a6c147fa72f7641e65792b14c52eceb3f571a8928f3e3bdee702188a118a2697768c2565ce14f88aff86059
 EBUILD knewstuff-5.102.0-r1.ebuild 1407 BLAKE2B 2b6c24bc1db485cda5aac51dddb82a0e5a7a65f02f92d16a0fb11c9cfc8495442f8adced3cb0a8772dcb77931427002ea23a104d0cc17e55f7519108f664023d SHA512 d63daca97f8464e455d50bad41cbb88f3fccc3c3e9ebc740136d387f84fcdeaaafb329e67e48133cbe7099eb0c42f707a70facc975780d0856806d5d09a57ad0
-EBUILD knewstuff-5.102.0.ebuild 1316 BLAKE2B a01899ef8f13a23217a3790cfd5a5adc688734062ffcb422c62cb9ee4794a373db429723b03e1bb441a38b23ba5a00f346af5a7323c000934132da3c6b3a5089 SHA512 d6736b9cdc6e435d0d302bd5ecad6255d0676940028d21e3f9b182083f1dc32b0d3f9304d69312d414732b47c9e5affa3f5ba234456936014349ca7ba5a7d5bb
 EBUILD knewstuff-5.99.0.ebuild 1287 BLAKE2B f2f903bebdc7b8f07690f2284b2e730eda25a8d7ff2d14e9f6bef25b9838c8342ab970b9091792a747f10706541fc0e2ddf301657e2139d96e05e812413ef395 SHA512 bc6747cf6aab3fd59b860db14d6684d612fabdc094e1d6e8ae8b6ff1bb5816685c85fa5ccefd7ee7d8929e415cd8be3a6677631aca8b03c27869fb9d64d63138
 MISC metadata.xml 676 BLAKE2B 708e2ec870917092478d1d1c3154f7c2d412876ed2f1863c367a627c368e74e1302c5581be2ee3a147a577e0960ab4ce88d334fb0c19addcb502e71013e3c1b1 SHA512 44b7adbb024316af56842afd8d33b36b680fd0b8d64c7f8046fd90f3d0c4a21a1e7f99c598ad05a185106b52b15c39467e1066aa4c593bde0ba06a23d8ab235a
diff --git a/kde-frameworks/knewstuff/knewstuff-5.102.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.102.0.ebuild
deleted file mode 100644
index 45bd3becb0f7..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.102.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="opds"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/attica-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package opds KF5Syndication)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 84d132ce16a3..31ebf2e6c644 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -2,8 +2,6 @@ AUX plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch 1911
 AUX plasma-5.102.0-fix-flicker-on-fade-animation.patch 2092 BLAKE2B 73e7958fa8c61e8a0fca590642283f46e0655bd6da7f90a350c862e98046cbc14e3fe0c3e53079f7ad8df1e3872b21e032d13b0e40041ffc78f7261158bf27bc SHA512 3d57a2b8bff651950c946aaafbf606f814e0469ac75569a187bd71fa6afd4a0e487a944219247525a0323afe2c36d40c2d1ad99e41ceb0588da91f43d034e9df
 DIST plasma-framework-5.102.0.tar.xz 3305096 BLAKE2B 225bb5a2d3cc5e0631defa59bafaeef49e6b1c4cf650d19d4b15cd270ec47ab2a613d4e3689bdea8d6cee19ed26aff78cb5c24a1ef0c8245fac4b80fa2a2147d SHA512 0db243ad6425c1f543149f4d939b7787cc20af526d4e81246debf7910b05a318cf18822ab0518d70dbb2641ad5853359a4e23104138f131c3a4073237c56d4b1
 DIST plasma-framework-5.99.0.tar.xz 3141664 BLAKE2B b37534440bc1f3d8f5fc13b6b62527c1bdde4b5d5d1c88530c49da2be221c9f55afac832cd8db61eb1bb91328145bc9b4c9e7b227b1ce740b10fa1bbefd3d2ef SHA512 bcf4f33facb20b542a90f5216fc0c5778d4de51d6a0ae86abdd5a22d7d1bfd7156dfd7a7d6cdad524b8f98596a75aa064fcbb295a36161ce288d4be4f42c5abb
-EBUILD plasma-5.102.0-r1.ebuild 1945 BLAKE2B 3108cbd3ea42e08678c6aabc3eebcb84a5a547aaf995d3de52e5cf3394a4aa7f75cd54f665f04b85538b82d8fe93ec84f444de8ad2b38f9e2d3b4a699295758a SHA512 7cf34b6f753f4c6bfe80389969796eeb8c6ab57042c585da1e8d1229ed8e4401ea994e5a909f7c9ff78d0431d24ae06b9672895a4cdfdb5f6c64d6d8152e65dc
-EBUILD plasma-5.102.0-r2.ebuild 2038 BLAKE2B 977118fa8d1333a54270eeaeebca8ec629988d8ebe2b3c9c6af72d0735e649a5b1de8e8730e43f6afa6632920a2d6b2c3f1568db78255d4762050c356814f616 SHA512 c63154c59c32b7b2298032802cc6e2f9318e1b7d99975faa05a11bb3c026cf4b21f7d044b69003d451c2f43b913a41bfc8aad98e26c9a7bfd80fa167b24d9236
 EBUILD plasma-5.102.0-r3.ebuild 2141 BLAKE2B c7272f3c79a1db628aa993392adcfa7be3b88019acf8e4960efdd89216df822b9af8f60143fb549afae503b8f780c465c9f7721013bf50af92b41eb64501d400 SHA512 425ef710eb0735b49ba8d33c8fb335220ecf4011df382a362713858b225766507b140365e941fb74a0ad2d9f89bee705924796a8daa00bc526eaa3e4b5f4eccc
 EBUILD plasma-5.99.0.ebuild 1926 BLAKE2B f241e720ae257014353cc38da113054dee7165a535a4e38d4c116c9f3a3680308f16d286ce4e76f28d50e56e3acbbb0c26d410f21449d9e88b32624ca30c83bf SHA512 7400aa7e239e3f9855850cb534f5bb6e173326cd2c2c7f05f66435c9bf96afcb3fa61d5e86d3a387c45b0ed75a8b438e7b895fd3e0c9b86b0fefe705c1c236a6
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/plasma-5.102.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.102.0-r1.ebuild
deleted file mode 100644
index d664114eab21..000000000000
--- a/kde-frameworks/plasma/plasma-5.102.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="gles2-only man wayland"
-
-RESTRICT="test"
-
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5[qml]
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	x11-libs/libX11
-	x11-libs/libxcb
-	!gles2-only? ( media-libs/libglvnd[X] )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/libglvnd
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild
deleted file mode 100644
index 19a29410133d..000000000000
--- a/kde-frameworks/plasma/plasma-5.102.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="gles2-only man wayland"
-
-RESTRICT="test"
-
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5[qml]
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	x11-libs/libX11
-	x11-libs/libxcb
-	!gles2-only? ( media-libs/libglvnd[X] )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/libglvnd
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=( "${FILESDIR}/${P}-fix-flicker-on-fade-animation.patch" ) # KDE-bug 463061, 463685
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 0931e36aa035..5f55cf937a23 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index f85645aa02a0..2013831d78d2 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,9 +1,9 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-510.tar.gz 40813887 BLAKE2B 84ecc40897e0aa324005d05146ea1ac439e9576a376ab40641a948ddeb2a58b7f171a0b9c00f69bd34b218e195c8b77c505992c0b51372454bc3c8208f1ef485 SHA512 998cdd09bcbb8bf3ba611754f5237d5a743e89988bf3259ae7187ac8730e6183b433622c25fef400c0efdc9fd38dcbfa171e70da5be953557983d08f15c8b21e
-DIST hydrus-511.tar.gz 40821597 BLAKE2B 15bff5bf7427ddef3a3700a883d0afe83090844c2052c41b1c4bfc13bce1f0052d48cc452d7e779c8b42a9a0d68901d27e750673ca2414c209db1c1fcd67a427 SHA512 d48d8e31b4eab80db917ebe6fe5ece719644e1b06ec8ca063a20044b39ad695b90c00340850be42c69ee163ab8866c0925c90752c74fdfbf40643dc02658b813
-EBUILD hydrus-510.ebuild 4547 BLAKE2B 99069804b75ef0efae630d91e7ed502a738a6d5c4c96ab4579be1721b750f735a8469f460018118d93a5df07ee5984570d6be93fb2f030805ac8f42e335432e7 SHA512 f0b9a90b433e5deb934f3172dd1f85e8df3c8b43ebec78457b75a9eb622f918428ffe5fcec5fd592229c31566ab5ca30b175ab1db65e5fba978f33120af74312
-EBUILD hydrus-511.ebuild 4547 BLAKE2B 99069804b75ef0efae630d91e7ed502a738a6d5c4c96ab4579be1721b750f735a8469f460018118d93a5df07ee5984570d6be93fb2f030805ac8f42e335432e7 SHA512 f0b9a90b433e5deb934f3172dd1f85e8df3c8b43ebec78457b75a9eb622f918428ffe5fcec5fd592229c31566ab5ca30b175ab1db65e5fba978f33120af74312
+DIST hydrus-512.tar.gz 40799009 BLAKE2B 9e362f3df5d85e2321c5701af22ef6772795f815f3d1e1826f92a73c5704ba391dc9a7679fc3919219f952d5853a79daf346d9d040e35c90b0c912ff15cd86cd SHA512 01b22cef4766be606553b7827ae5dd8d65d6e1457f8553cf88c45d593c73edc7ca9b181181b9eaf1f5ff8a25f6b6ea9d7d364dff7553439a54d9851a488368ae
+DIST hydrus-513.tar.gz 40808152 BLAKE2B e54555ac7aa992d6c7a7d30a60a344e1faeaf24f7a6e00f9fabcce9cec05b02044bd980f7b5db344563c5ca1ada38e4d85bd064f6b6429eeae32017c2496e534 SHA512 c31e8ef4beb3b88111516bb615b9cae689b4bd1ebb835b1d57915dfb761d5b9413c39cc58352e3a13e3efd3423f312696380160453249884ea8cb980c674235e
+EBUILD hydrus-512.ebuild 4504 BLAKE2B c8660a2692d3537ea6cbc336b7b1b565fab71b02c600e32c59988e8bc30fe62d8b8e54f07c70ee382ece1f0faaf9093c6f74161553f3d344aba1ee81e2bcca5a SHA512 36a37a1ec4646142ece09d2113dab26c1e78d6c584d3e30a6d0351673dd7888c34c46124f56110fddacaddfc2c0ec364b357c70d30d68b68e0ace60885507bd5
+EBUILD hydrus-513.ebuild 4504 BLAKE2B c8660a2692d3537ea6cbc336b7b1b565fab71b02c600e32c59988e8bc30fe62d8b8e54f07c70ee382ece1f0faaf9093c6f74161553f3d344aba1ee81e2bcca5a SHA512 36a37a1ec4646142ece09d2113dab26c1e78d6c584d3e30a6d0351673dd7888c34c46124f56110fddacaddfc2c0ec364b357c70d30d68b68e0ace60885507bd5
 EBUILD hydrus-9999.ebuild 4547 BLAKE2B 99069804b75ef0efae630d91e7ed502a738a6d5c4c96ab4579be1721b750f735a8469f460018118d93a5df07ee5984570d6be93fb2f030805ac8f42e335432e7 SHA512 f0b9a90b433e5deb934f3172dd1f85e8df3c8b43ebec78457b75a9eb622f918428ffe5fcec5fd592229c31566ab5ca30b175ab1db65e5fba978f33120af74312
 MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb
diff --git a/media-gfx/hydrus/hydrus-510.ebuild b/media-gfx/hydrus/hydrus-512.ebuild
index e447f565f37b..6036cc0f1d38 100644
--- a/media-gfx/hydrus/hydrus-510.ebuild
+++ b/media-gfx/hydrus/hydrus-512.ebuild
@@ -58,7 +58,6 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
-		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/media-gfx/hydrus/hydrus-511.ebuild b/media-gfx/hydrus/hydrus-513.ebuild
index e447f565f37b..6036cc0f1d38 100644
--- a/media-gfx/hydrus/hydrus-511.ebuild
+++ b/media-gfx/hydrus/hydrus-513.ebuild
@@ -58,7 +58,6 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
-		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 28197b74ac0f..4a3aa8244d3b 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -3,7 +3,9 @@ AUX librecad-2.1.3-gcc-9.patch 8494 BLAKE2B 85f7cfd7822d27c4b76b6cc9b71f9667b912
 AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25
 AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
+DIST librecad-2.2.0.tar.gz 13837301 BLAKE2B ede9181b6805455d10773b70a8262ffb5a1c48f353dbfd1b80f705ba3194be700e9a486cdf528c4e8015b327a75a29c81b832186024d48229a6cc5fd9ca2dc12 SHA512 df33eac311b5232d6fc0480be1b1c9d257a33ba22f9b7897af4c1761978c87c07a962ae3ea37e8728661a788152157fc621aae65d60d44ae37b2028919cc96a2
 DIST librecad-gentoo-CVE-patches-2.1.3.tar.gz 11687 BLAKE2B 4676fa60033e6d0ace35bbebfae569366a50ec46c2dc5b90bace9564e1f6c2020f733f63981788b6f5288fb0c57760215e7b35f294656c21787ebdefa8447fa0 SHA512 b485b41ab1d6eb61750c11a9b327fc70d28cd0cf689b3cd815b4982d3d800737f402522d9c3d416f1e43422166e7de4f97055de238cc2fe80cc45f11fa3377e6
 EBUILD librecad-2.1.3-r7.ebuild 2879 BLAKE2B 4b9da167e4db48da0c8a41bf43c3d5fcadabea9f57a82270fec85b18da2dd6823d60be0eea3bd4bad7f4324599c47fd4b020276f3a4a28f7be5a2d13004a5f8a SHA512 3ed191982b167c0cabdd28e5ab7702784e0da508f358a066507bde711cb5917c885de435985ea0636e96d1f94586f76c007607a7ec1e1f90cb14646724988546
+EBUILD librecad-2.2.0.ebuild 2357 BLAKE2B 0e40d676e00f57fc51f89f1cc2a649a409fd7ca7c9903b9733f7e747bdae375dfb505fd7c7c36f8d1227678eeaf32dd2a61eb6363dfd5bb7f6f846ba91e7a671 SHA512 a43a699b38783f04983ab8d7e766b2d8587e0445be845e27d268bdb0351367e12e9ce250bffddb3edc8c036b144fbc483347c119a01a02702d8045a0bef07904
 EBUILD librecad-9999.ebuild 2357 BLAKE2B f1b84cd8486d81b2a11216448be1e7c36d8d4347bfe09297a472b31278fa9e7aeeb4d9f325ed234ac05a0ae6065280efd159b7847195bd868d0991f6101f6c04 SHA512 ca46b07e00004e93ff1fcc2be9ea55049fa92154ce26eca11d033476d66b401653106dfe0fd835e07421d67d651a9af27a9cc505a440f85b43d3ba0c76d17d40
 MISC metadata.xml 333 BLAKE2B 2790ea3fb043f1d8393fd715b4669edab3229e1de59e27cc70f3fd3cc13f83964ad1dc6a5534af981111b4ba1a2c7d29501015459e300905574fbc59fce88ee2 SHA512 bf932b64f53780d10e7e64845f4d50f1726f9d57e4625cb94ed2dcc761a0d7f409731b9e9cd1475880b283b43d7b0b979493b984cb243f09954a38f39baac5b9
diff --git a/media-gfx/librecad/librecad-2.2.0.ebuild b/media-gfx/librecad/librecad-2.2.0.ebuild
new file mode 100644
index 000000000000..6764913d807a
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.2.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve et eu fi fr gl hi hu id_ID it ja ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sv ta tr uk zh_cn zh_tw"
+
+inherit desktop edo plocale qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="https://www.librecad.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/LibreCAD-${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc tools"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/freetype:2
+"
+DEPEND="${RDEPEND}
+	dev-qt/qthelp:5
+	dev-qt/qtxml:5
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+
+src_prepare() {
+	default
+
+	# Stock script doesn't work correctly on gentoo (see bug #847394)
+	# and also it compiles all translations regardles of selected locales.
+	# To avoid this just comment out locale building and do it manually
+	sed -i -e '/LRELEASE/s!^!# !' scripts/postprocess-unix.sh || die
+
+	plocale_find_changes 'librecad/ts' 'librecad_' '.ts'
+}
+
+src_configure() {
+	eqmake5 -r
+}
+
+src_compile() {
+	default
+
+	build_locale() {
+		local lrelease="$(qt5_get_bindir)/lrelease"
+		edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \
+			-qm "unix/resources/qm/librecad_${1}.qm"
+		edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \
+			-qm "unix/resources/qm/plugins_${1}.qm"
+	}
+
+	plocale_for_each_locale build_locale
+	# We want the en locale to be always present. Otherwise it could
+	# be impossible to select the English command set which is quite crucial.
+	has en $(plocale_get_locales) || build_locale en
+}
+
+src_install() {
+	dobin unix/librecad
+	use tools && dobin unix/ttf2lff
+	insinto /usr/share/${PN}
+	doins -r unix/resources/*
+	use doc && docinto html && dodoc -r librecad/support/doc/*
+	insinto /usr/share/metainfo
+	doins unix/appdata/org.librecad.librecad.appdata.xml
+	doicon librecad/res/main/${PN}.png
+	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3f9f477e538a..3639780cce1b 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 96d40904ebf3..6afb299698e0 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -2,11 +2,12 @@ AUX assimp-5.2.2-disable-failing-tests.patch 1889 BLAKE2B 7f1f72ca6851dbe07d2493
 AUX assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch 855 BLAKE2B a6f526719d65b8aeb3c8ec1333973bd273589f7a1bb03a6838331740fd1961d63d121bf07636918dd221ba9af3a32a600c3fed3f0dd3135c7e37655d5bfa1fba SHA512 2103864934bd4a3469b419536da4604839b3b1a1b412612dd5a631f578d7c54538e7c97ca612e28425e5f1dd0ce71c11117165f1cbcb5f3604113ae4be259734
 AUX assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch 5956 BLAKE2B 68efeb940358df092250a30233c137c625e8b50575323d3120e09f393ff71f3d5411f3447693ab952ab9d782df5e542bd74c601f63c27efd494c27ab7fce6791 SHA512 6f5272dde69888417deba00b49b325e58f42bc385633e2be5cf922d75a7b83d8337bccd1f39c60741deb850bd59d1209ab9404fd6ed84472552352d50cde804d
 AUX assimp-5.2.4-update-version.patch 932 BLAKE2B 641c1c745b385acf83ddbc2c3e1d21b40b43a68934bbb637aba3a61b626668c423c6bc81d4e2a94cf602a24d9a6fef89b96fe56696c925b88531c059f7240f1a SHA512 68e14391feecac4fc8ae91cedd9a902d593d3d964e7827fd9661277bd39c5de64f97a832247cfb5cd807a75d07016820caad75e70e6e04a7714ba3422206013a
+AUX assimp-5.2.5-disable-collada-tests.patch 798 BLAKE2B 302c2ea2a1152f7bcf71d82378991a2a7259e1a4d81808499b163156ddec2351f441fa7db17886977b1e51c10ba7db70ea68d4cdfcfd2dccea9d0cc06082f429 SHA512 36164420838a5bb21c11dbc3955158b07d561e2da944017a6ce65fd9eab399ddcaddeaa3031727d977a283c2af4dbfec611507251e6a91f6ad475d5ef3763a08
 AUX assimp-5.2.5-disable-failing-tests.patch 3612 BLAKE2B 08dd1585e0d5ea37f5b52a88d364f48865f3b8032eba3cbd875047b7a07a5d9df658631cb5649dc6688112a9ec8809d9dfe75959711b0238b78ed01a5bc2eeb9 SHA512 cef65009eaf04cef82c22d86273dc63a30ae32ecf352b9ce9bfc61ecd9b9c67415d4162a02ffad5337d3d2af4f594b6f4387ad68fb4b4c78500d7ea1a3d42b82
 AUX assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch 5237 BLAKE2B 04f0cf86616afcf0e050ae9d8caf956b389362a667a370a1bfc523b428990e09481c92946cf252c04259d69b1718087aa24c65e645f19a86339fd1d4f359a505 SHA512 76fa57de33bb93722d9c83af7c706a99a3a9e76f1136b63edc7ba4036fd75ada9d7d6df2060563f56963a6ec971023944d6701319bb1c810fd2803fb4fb4afc7
 AUX assimp-5.2.5-fix-version.patch 881 BLAKE2B dd859c3437ea89b35a463e3aef64868f49a7c5d157d86b1c618bc15390b67950d9b40ae8717db0d21d7048b177c1ba61f6f871919cdf49e5576fc5be46553cd5 SHA512 9e1515624bc8f9d4eaa0c5d103b386e5cca12817b26e7002af7b0dd412e744fb1296e513371b9f3b0f87e566c9ca9b1b68e216a7f0e5a2ed11096d89b2fab0ae
 DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf
 DIST assimp-5.2.5.tar.gz 49543936 BLAKE2B 77e0eecd1307646211a86244a371e24401dffd03dceb569acdd63751cdb38bd169c8b12c942efd2e77b5f541653f2775739150b9fe352b8c903dcc4fe7bccca8 SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb
 EBUILD assimp-5.2.4-r1.ebuild 1372 BLAKE2B d8b3b36c33040a4db2bf2e1496a4fc1fec68be1cb8bf6e39db36753da297c88d5d1ac6d638697bfe8ad0a526c4bf8aa275eec28b8b03d16499dd952e766f3780 SHA512 8a6880e26604ed4c74818ad15140b44346dfc5b0983a7c410d33fd78ab1380448ae36292266f7c54e5bf635aaf4fa284f63fb9b677571d74c9d76e9efabee727
-EBUILD assimp-5.2.5.ebuild 1395 BLAKE2B c4ffdbf1abccc4e5e789a465a8c3e36b8dfa101574edc779c7e1831c206606e2c91d1634a24bea1566911f4969e8e24d9902d69cb5bd68fbb0c130d2a3f72047 SHA512 208b23561b3cd251d013d2c0f53deaccee2128eaf66951bae9b2c5ccf7b88bae0c69bb73d9e04622aaace28daedaef8fcc8f98645c9cae79fb9f77871169c85f
+EBUILD assimp-5.2.5-r1.ebuild 1584 BLAKE2B adb3ea569e77f431cac5145dcc6218b76827c08df0b5b923ae185b3d219dbbcec79a1f80217a7795495aca59762f8ce8a1776bb05fa6d03b1a2dd7c9042e274c SHA512 46d1e05e88289811fa298e0a3e6dc4e21f005f8fc40b25f7bfec2870e80c081fc10ddc2b82e82d0234d5b169d9d7f57ffeaed158f9a642a53b3419d7ae166b74
 MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a
diff --git a/media-libs/assimp/assimp-5.2.5.ebuild b/media-libs/assimp/assimp-5.2.5-r1.ebuild
index d002d8d91eaf..83391bc9adf2 100644
--- a/media-libs/assimp/assimp-5.2.5.ebuild
+++ b/media-libs/assimp/assimp-5.2.5-r1.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.2.5-fix-version.patch
 	"${FILESDIR}"/${PN}-5.2.5-disable-failing-tests.patch
+	"${FILESDIR}"/${PN}-5.2.5-disable-collada-tests.patch
 )
 
 DOCS=( CodeConventions.md Readme.md )
@@ -55,6 +56,9 @@ src_configure() {
 		-DASSIMP_IGNORE_GIT_HASH=ON
 		-DASSIMP_UBSAN=OFF
 		-DASSIMP_WARNINGS_AS_ERRORS=OFF
+		# bug #891787, intentionally not in alphabetic ordering
+		-DASSIMP_BUILD_COLLADA_IMPORTER=OFF
+		-DASSIMP_BUILD_COLLADA_EXPORTER=OFF
 	)
 
 	if use samples; then
diff --git a/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch b/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch
new file mode 100644
index 000000000000..971578f0016f
--- /dev/null
+++ b/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch
@@ -0,0 +1,28 @@
+From 3bd65679f7db2ec95abb22fef7a30a15dcc1c297 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 23 Jan 2023 19:54:23 +0100
+Subject: [PATCH] disable collada tests
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -63,7 +63,6 @@ SET( COMMON
+   unit/utSimd.cpp
+   unit/utIOSystem.cpp
+   unit/utIOStreamBuffer.cpp
+-  unit/utIssues.cpp
+   unit/utAnim.cpp
+   unit/AssimpAPITest.cpp
+   unit/AssimpAPITest_aiMatrix3x3.cpp
+@@ -137,8 +136,6 @@ SET( IMPORTERS
+   unit/utBlendImportMaterials.cpp
+   unit/utBlenderWork.cpp
+   unit/utBVHImportExport.cpp
+-  unit/utColladaExport.cpp
+-  unit/utColladaImportExport.cpp
+   unit/utCSMImportExport.cpp
+   unit/utB3DImportExport.cpp
+   #unit/utM3DImportExport.cpp
+-- 
+2.39.1
+
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 84b027a7f0c4..c6a09cb49bc5 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1,5 @@
 DIST openal-soft-1.22.2.tar.bz2 606151 BLAKE2B 78cb5ad38635908a59850aeb511223fd6a28f7699294836cbbfdd09cbfd9016250d68b26115131a7cb4af5d5d0a4d2cbd52813d813f78a045b797c5fb601bc7a SHA512 2271968955d55746caf514b6d4304d09d5e552d5640552e2503186ef36bc872a836804ebf79ffbda663931bd13d4e2ce53e0c46cc4faf4134bdb3c08983a5e47
+DIST openal-soft-1.23.0.tar.bz2 692978 BLAKE2B 2f661da32e96bc5a3cdedc850f7ddf23c25475df4fa932b079f668101ea19ef3d33b0dac405231ef790d1cf6e979107c3c3fcd8364c503f19691231af970757a SHA512 5c10ccd3cf0c05b9331f9b0da8913a9ffd0f9fc4464192b4b6a12ee1ddaab123ae5a719ead837f7701b129d7faecec1aaf91aabc4c58ee10932c9d716d128071
 EBUILD openal-1.22.2-r1.ebuild 2886 BLAKE2B 8bc5a8d16a33fc76f694dd5f9d50c1836c9c51d6f6b96f6405d4ff4918f634a6652c0a865e3e07299e378a032e6352c1585d1c32c36a10828b6b0a601f1894cd SHA512 cbd70a84cb30627827180ee7fd639419208a4ad72ebd4d3698c1ab60dfcfc916a4bd29e40b19e05af08aa8edfcdf106e4462c998bdb6ffc5d0feba7a383752d7
+EBUILD openal-1.23.0.ebuild 2884 BLAKE2B 027eac76962852b81e8e16682d385857db88441b325db1df46437d0079577b59879886d74561f9e9f17e1fd7b99ea6eff7a449c15db229ab164549cd12f3fb3a SHA512 44300c50503061e4edbe3633fbcf31ab689f32faa30ac2496220152f9cb04239579dc167745d2ccdc0ade078d9c5434f75a5324615181c00b13bb41c4a0dc222
 MISC metadata.xml 538 BLAKE2B 4b9dc398e2edd4930ade6cffbe1e39776bc3a0a1aa5ea2fa4753d8756517f7d2efc3e22ce31eef1f79dee9dc1d1f5c4ca945f1d5b54a7ffac081173f8bb6ffc1 SHA512 9e817af11955ef748ea11979a1da99c046ca4f45f812f1555f9dcd0606ca16e8d027de9588d792170faf81a42a091cc8d5edffff1d12d99128f08f688f685462
diff --git a/media-libs/openal/openal-1.23.0.ebuild b/media-libs/openal/openal-1.23.0.ebuild
new file mode 100644
index 000000000000..587f7b664b0f
--- /dev/null
+++ b/media-libs/openal/openal-1.23.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# False positives because of REQUIRE vs BACKEND options() (conditionally set)
+# See bug #809314
+CMAKE_WARN_UNUSED_CLI=no
+inherit cmake-multilib
+
+MY_P="${PN}-soft-${PV}"
+
+DESCRIPTION="A software implementation of the OpenAL 3D audio API"
+HOMEPAGE="https://www.openal-soft.org/"
+SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
+
+# See https://github.com/kcat/openal-soft/blob/e0097c18b82d5da37248c4823fde48b6e0002cdd/BSD-3Clause
+# Some components are under BSD
+LICENSE="LGPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="
+	alsa coreaudio debug jack oss pipewire portaudio pulseaudio sdl sndio qt5
+	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
+	cpu_flags_arm_neon
+"
+
+# PipeWire:
+# - See bug #863200 for PipeWire minimum version
+# - PW is in DEPEND although not linked against because we need configure to
+# find it anyway, but no :=.
+RDEPEND="
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	pipewire? ( media-video/pipewire[${MULTILIB_USEDEP}] )
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	oss? ( virtual/os-headers )
+"
+
+DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# See bug #809314 for getting both options for backends
+		-DALSOFT_{BACKEND,REQUIRE}_ALSA=$(usex alsa)
+		-DALSOFT_{BACKEND,REQUIRE}_COREAUDIO=$(usex coreaudio)
+		-DALSOFT_{BACKEND,REQUIRE}_JACK=$(usex jack)
+		-DALSOFT_{BACKEND,REQUIRE}_OSS=$(usex oss)
+		-DALSOFT_{BACKEND,REQUIRE}_PIPEWIRE=$(usex pipewire)
+		-DALSOFT_{BACKEND,REQUIRE}_PORTAUDIO=$(usex portaudio)
+		-DALSOFT_{BACKEND,REQUIRE}_PULSEAUDIO=$(usex pulseaudio)
+		-DALSOFT_{BACKEND,REQUIRE}_SDL2=$(usex sdl)
+		-DALSOFT_{BACKEND,REQUIRE}_SNDIO=$(usex sndio)
+
+		-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
+		-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
+		 # EXAMPLES=OFF to avoid FFmpeg dependency, bug #481670
+		-DALSOFT_EXAMPLES=OFF
+	)
+
+	# Avoid unused variable warnings, bug #738240
+	if use amd64 || use x86 ; then
+		mycmakeargs+=(
+			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
+			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
+			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		)
+	elif use arm || use arm64 ; then
+		mycmakeargs+=(
+			-DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 875278c81e09..6b4b89b9098c 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 412aadfb139f..a2d3c4478185 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 05 Feb 2023 08:39:42 +0000
+Sun, 05 Feb 2023 14:39:37 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index f5153f199107..cfd81121dc76 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-02-05T08:39:46Z
+TIMESTAMP 2023-02-05T14:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPfa1JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPfv61fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBK5hAArzBcG5mDTspy+76QdXr7iF9MNyiXxuFALrQkPlE2MevmFPhABg4j0XLr
-qwbtP7/zWMfby3cO8gNdu/q4NQPsXKjcpiLVR3v9w4NJ5lkYssWgWTKbjLNKYkWm
-+ioROlEvEdz84xmDalZ0WaAqE4dw38+BoEM/jrUHHS5CqqiPYtQu6AncoSdD7FyR
-zufCDlN+PAiHZ/I8yz1EoYPi5m9Rc5QTazbXxv5t+4rRTPa0xIsSAsxt/5M2+g17
-K/MyGZIlXoEfFwSlFpB+0G+AaUq9bpvuPyDg9doSWCZkgK64BIDi82FLa4Bo+jf8
-h5o+EsBdrT0Lrt6QY/6vVOrlnuubt4HHnYxWWl2M3BSTKwBgc/6v7jZWFqoURDUI
-+OT2NRTCaCB+e/LasnE1MzRDVFCjtZefsKYjiuC3pd+rPcA0oe0dyTSQpffBeXBt
-vc08W9XN6ixfaIp3J69KMAkbhURasGQ+j5seIK8Hg71DWtsSd3KplWdKwBHWEy9u
-r9K7MU+p/vGG6zlWU2M2t7kHo6MhGczL2aIOHRywGSYzcVT2KeUxDKSlWAhneXLO
-pb0FyB95OI+TCilZgu/MAsJRme3bif0sbjWnrTqmlvrVUQ3WHj5X6XCGhalVkRDt
-Jzx+NefHUHB312OonuSVZliYSB716BOnZqk0P2IzliFk6Z3AHG0=
-=OdzD
+klBCOBAApTjFhJm4oVg7moM5TwEMdKqY4MmUdnMZV4J4y8LlnDe5aHiBdx6XQBD8
+o74XRGjYSMJ1WFq11SYqh8ha7XQwJl3Yr0TEzxGQFrgKDuNR9gAUSTJ/0i0/UgEV
+4n46lvvMo2jHlyql1GBTtZggzsyHTC2hQtFwiS6kk/aHr0m9zltgC4TCdaZnzzAt
+8djBvarbQw9FKxKWhMDJqsnNgJGmNHClNwxSJOVOYO88mOj2gjakFXwIjQ50SbYm
+iBuHkbtp5HWfZS7SZf59c4gVV0y/33Z7TIllJcEHSzvYSoWgIz3imWVhxNX9yGX4
+c1dTmlN5nBdXUSqJ55nrwpX0ar6ImpJs2hZVmYtIQTVj2IXkQReakvaVyvzUeDZr
+zydr0sGgXy4rSegGQfkEsT1Ivu/CeNqBz/hy3CRnHnasjPw+Snrh2kNNZHDI0bNy
+DWG4/Iv7nNwUz10N/Cel2QR22E0vobbWL/YSwYnraO62uLt7d9PmFW/Acm3MGo5B
+bFxcTd2UO47GYXCsvU8v8eX7ar/CePxQMkP1yhh/RpJyoIFX8GJ0Trur7zW0FmGx
+RSWuw6FJ34IKPxbQkzT0uBuZWpaWbV0TdkoaPO8X3WXJqHykbOsab/NX8wjQPszI
+4uU7GjeyrKBmZy/p+cV99rlgbxO/bZJd/kR24bbgw1o2M2P98Ys=
+=tYWc
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 412aadfb139f..a2d3c4478185 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 05 Feb 2023 08:39:42 +0000
+Sun, 05 Feb 2023 14:39:37 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0efaef6eb0e0..e77a9937cb7b 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 7db18629684d..87b037dc5166 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/neovim-0.8.1 b/metadata/md5-cache/app-editors/neovim-0.8.1
deleted file mode 100644
index 051f16015a10..000000000000
--- a/metadata/md5-cache/app-editors/neovim-0.8.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=test? ( lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-lua/luv-1.44.2[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) >=dev-libs/libuv-1.44.2:= >=dev-libs/libvterm-0.3 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.2:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= )
-DESCRIPTION=Vim-fork focused on extensibility and agility
-EAPI=8
-HOMEPAGE=https://neovim.io
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake lua-single optfeature xdg
-IUSE=+lto +nvimpager test +tui lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~x64-macos
-LICENSE=Apache-2.0 vim
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-lua/luv-1.44.2[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) >=dev-libs/libuv-1.44.2:= >=dev-libs/libvterm-0.3 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.2:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
-REQUIRED_USE=test? ( lua_single_target_luajit )
-RESTRICT=!test? ( test ) test
-SLOT=0
-SRC_URI=https://github.com/neovim/neovim/archive/v0.8.1.tar.gz -> neovim-0.8.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=93a6d3e129c45e78a9e19aed79261fbb
diff --git a/metadata/md5-cache/app-editors/neovim-0.8.0-r1 b/metadata/md5-cache/app-editors/neovim-0.8.3
index 112e0aaecc99..21702b1cc73a 100644
--- a/metadata/md5-cache/app-editors/neovim-0.8.0-r1
+++ b/metadata/md5-cache/app-editors/neovim-0.8.3
@@ -7,12 +7,12 @@ HOMEPAGE=https://neovim.io
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake lua-single optfeature xdg
 IUSE=+lto +nvimpager test +tui lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=amd64 ~arm arm64 ~riscv x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
 LICENSE=Apache-2.0 vim
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-lua/luv-1.44.2[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) >=dev-libs/libuv-1.44.2:= >=dev-libs/libvterm-0.3 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.20.2:= tui? ( >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
 REQUIRED_USE=test? ( lua_single_target_luajit )
 RESTRICT=!test? ( test ) test
 SLOT=0
-SRC_URI=https://github.com/neovim/neovim/archive/v0.8.0.tar.gz -> neovim-0.8.0.tar.gz
+SRC_URI=https://github.com/neovim/neovim/archive/v0.8.3.tar.gz -> neovim-0.8.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9fdd1b2cda43ea9a184d1b2cc657b9e1
+_md5_=3aedcb696ee9ee93939be7b28849b533
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 426268221e71..82a50895a30c 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/homebank-5.6.1 b/metadata/md5-cache/app-office/homebank-5.6.1
new file mode 100644
index 000000000000..44346b9f8583
--- /dev/null
+++ b/metadata/md5-cache/app-office/homebank-5.6.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5.8.1 dev-perl/XML-Parser >=dev-util/intltool-0.40.5 sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm preinst
+DEPEND=>=dev-libs/glib-2.39:2 >=net-libs/libsoup-2.26:2.4 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3:= ) x11-base/xorg-proto
+DESCRIPTION=Free, easy, personal accounting for everyone
+EAPI=8
+HOMEPAGE=http://homebank.free.fr/index.php
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=xdg
+IUSE=+ofx
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.39:2 >=net-libs/libsoup-2.26:2.4 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3:= )
+SLOT=0
+SRC_URI=http://homebank.free.fr/public/sources/homebank-5.6.1.tar.gz
+_eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=425ea589b82b4443c152e184182d7732
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 9a04cadfa6a9..6c28f6c47be1 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/rapidyaml-0.4.1 b/metadata/md5-cache/dev-cpp/rapidyaml-0.4.1
deleted file mode 100644
index ec612f52a88e..000000000000
--- a/metadata/md5-cache/dev-cpp/rapidyaml-0.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest )
-DESCRIPTION=Library to parse and emit YAML, and do it fast
-EAPI=8
-HOMEPAGE=https://github.com/biojppm/rapidyaml/
-INHERIT=cmake
-IUSE=debug test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=MIT Boost-1.0 BSD
-RESTRICT=!test? ( test )
-SLOT=0/0.4.1
-SRC_URI=https://github.com/biojppm/rapidyaml/releases/download/v0.4.1/rapidyaml-0.4.1-src.tgz test? ( https://github.com/biojppm/c4fs/archive/f78cbd86a77c976395c9834726a14a1bba059af0.tar.gz -> c4fs-f78cbd86a77c976395c9834726a14a1bba059af0.tar.gz https://github.com/biojppm/c4log/archive/e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d.tar.gz -> c4log-e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d.tar.gz https://github.com/yaml/yaml-test-suite/archive/6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz -> yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cc0c07afd69b4e9c7b25ecac603290e9
diff --git a/metadata/md5-cache/dev-cpp/rapidyaml-0.5.0 b/metadata/md5-cache/dev-cpp/rapidyaml-0.5.0
index 910e843b6a69..5f6cef08ac2e 100644
--- a/metadata/md5-cache/dev-cpp/rapidyaml-0.5.0
+++ b/metadata/md5-cache/dev-cpp/rapidyaml-0.5.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://github.com/biojppm/rapidyaml/releases/download/v0.5.0/rapidyaml-0.5.0-src.tgz test? ( https://github.com/biojppm/c4fs/archive/0130061b804ae2af0d6cd5919275d552eb1f2414.tar.gz -> rapidyaml-c4fs-0130061b804ae2af0d6cd5919275d552eb1f2414.tar.gz https://github.com/biojppm/c4log/archive/00066ad7f624556f066f3d60766a2c33aeb3c6f0.tar.gz -> rapidyaml-c4log-00066ad7f624556f066f3d60766a2c33aeb3c6f0.tar.gz https://github.com/yaml/yaml-test-suite/archive/6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz -> rapidyaml-yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f29f83894eec004adac2efb6e6224063
+_md5_=168e5ed6f16a7045a196c086a2c86fa5
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index dda6d33a4b7d..b7059d87c10e 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/jackrabbit-webdav-2.21.7-r1 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
deleted file mode 100644
index 083b33a5f381..000000000000
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/httpcomponents-client:4 dev-java/httpcore:0 dev-java/osgi-annotation-versioning:0 dev-java/slf4j-api:0 >=virtual/jdk-1.8:* dev-java/osgi-annotation-versioning:0 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Generic WebDAV Library
-EAPI=7
-HOMEPAGE=https://jackrabbit.apache.org
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/httpcomponents-client:4 dev-java/httpcore:0 dev-java/osgi-annotation-versioning:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/jackrabbit/2.21.7/jackrabbit-2.21.7-src.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=4369d49a60ad185c8d0ddf2c0b6993df
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r1 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r2
index 3a1342eebcfb..6b6dc7de02e3 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r1
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=virtual/jdk:1.8 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=virtual/jdk:1.8 dev-java/tomcat-servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
 DESCRIPTION=The JavaHelp system online help system
 EAPI=8
 HOMEPAGE=https://javaee.github.io/javahelp/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-ant-2
 IUSE=examples source
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.4 dev-java/tomcat-servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=7f4094b8588d34c5b84a29b688f91d16
+_md5_=4f1b469f4907b26166c31faf1da1151c
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1 b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1
deleted file mode 100644
index 5345fcea1711..000000000000
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Resin Servlet API 2.4/JSP API 2.0 implementation
-EAPI=7
-HOMEPAGE=http://www.caucho.com/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.4
-SRC_URI=http://www.caucho.com/download/resin-3.0.25-src.zip mirror://gentoo/resin-gentoo-patches-3.0.25.tar.bz2
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=65d5b79e953b706a291d61e12571b93f
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1
deleted file mode 100644
index d6deaf04fb97..000000000000
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Resin Servlet API 3.0/JSP API 2.1 implementation
-EAPI=8
-HOMEPAGE=https://caucho.com
-INHERIT=java-pkg-2 java-ant-2
-IUSE=source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=https://caucho.com/download/resin-4.0.46-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=13dffd9c17ccbe2c79962cdaac838432
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index f98c3de0a531..0119e5609242 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/erlang-25.2.2 b/metadata/md5-cache/dev-lang/erlang-25.2.2
new file mode 100644
index 000000000000..199aaae105d9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/erlang-25.2.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
+EAPI=7
+HOMEPAGE=https://www.erlang.org/
+INHERIT=elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
+IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets java
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/25.2.2
+SRC_URI=https://github.com/erlang/otp/archive/OTP-25.2.2.tar.gz -> erlang-25.2.2.tar.gz https://github.com/erlang/otp/releases/download/OTP-25.2/otp_doc_man_25.2.tar.gz -> erlang_doc_man_25.2.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-25.2/otp_doc_html_25.2.tar.gz -> erlang_doc_html_25.2.tar.gz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_md5_=3cdd307f8195688b30cc8df01da3d5e8
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 9fcc78d2fc22..eb2b2dff91be 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libmemcached-awesome-1.1.3 b/metadata/md5-cache/dev-libs/libmemcached-awesome-1.1.3-r1
index 5638ca946a06..3609802e67fc 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-awesome-1.1.3
+++ b/metadata/md5-cache/dev-libs/libmemcached-awesome-1.1.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-libs/libmemcached libevent? ( dev-libs/libevent:= ) sasl? ( dev-libs/cyrus-sasl:2 ) test? ( net-misc/memcached )
+DEPEND=!app-forensics/memdump !dev-libs/libmemcached libevent? ( dev-libs/libevent:= ) sasl? ( dev-libs/cyrus-sasl:2 ) test? ( net-misc/memcached )
 DESCRIPTION=a C/C++ memcached client library
 EAPI=8
 HOMEPAGE=https://github.com/awesomized/libmemcached
@@ -8,9 +8,9 @@ INHERIT=cmake
 IUSE=+libevent sasl test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=!dev-libs/libmemcached libevent? ( dev-libs/libevent:= ) sasl? ( dev-libs/cyrus-sasl:2 )
+RDEPEND=!app-forensics/memdump !dev-libs/libmemcached libevent? ( dev-libs/libevent:= ) sasl? ( dev-libs/cyrus-sasl:2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awesomized/libmemcached/archive/refs/tags/1.1.3.tar.gz -> libmemcached-awesome-1.1.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d063b7b04e83fd8c18308b89d5b34d4e
+_md5_=c2fb49f0c85de27e7e7685a136e0a187
diff --git a/metadata/md5-cache/dev-libs/qcoro5-0.6.0-r1 b/metadata/md5-cache/dev-libs/qcoro5-0.6.0-r1
deleted file mode 100644
index e9021212a1ec..000000000000
--- a/metadata/md5-cache/dev-libs/qcoro5-0.6.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dbus? ( dev-qt/qtdbus:5 ) network? ( dev-qt/qtnetwork:5 ) websockets? ( dev-qt/qtwebsockets:5 ) examples? ( dev-qt/qtconcurrent:5 dev-qt/qtwidgets:5 ) test? ( dev-qt/qtconcurrent:5 dev-qt/qttest:5 )
-DESCRIPTION=C++ Coroutine Library for Qt5
-EAPI=8
-HOMEPAGE=https://qcoro.dvratil.cz/ https://github.com/danvratil/qcoro
-INHERIT=cmake
-IUSE=dbus examples +network test websockets
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=MIT
-RDEPEND=dev-qt/qtcore:5 dbus? ( dev-qt/qtdbus:5 ) network? ( dev-qt/qtnetwork:5 ) websockets? ( dev-qt/qtwebsockets:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/danvratil/qcoro/archive/refs/tags/v0.6.0.tar.gz -> qcoro5-0.6.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2a21ab6c0ae9538c8fa75e8598f2da40
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.2 b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.2
new file mode 100644
index 000000000000..274a30927994
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-util/tree-sitter-cli )
+DEFINED_PHASES=compile install test
+DEPEND=dev-libs/tree-sitter
+DESCRIPTION=TypeScript grammar for Tree-sitter
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter-typescript
+INHERIT=tree-sitter-grammar
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter-typescript/archive/v0.20.2.tar.gz -> tree-sitter-typescript-0.20.2.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	tree-sitter-grammar	906809fa94608a0cfa55f9bfd82c04a4
+_md5_=f604011e477772bdf23ba7a27e7ec1c4
diff --git a/metadata/md5-cache/dev-python/Faker-16.6.1 b/metadata/md5-cache/dev-python/Faker-16.6.1
index 0c690f37003a..e2a2241f296d 100644
--- a/metadata/md5-cache/dev-python/Faker-16.6.1
+++ b/metadata/md5-cache/dev-python/Faker-16.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-16.6.1.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	e4454f875cffa353ec3efbd0ef682569	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	5da49b80cc8a4556953c178d416718c6	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=723359bb8bc2da6e40d8a67190702de3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index db2058a94a49..632489e2fcb3 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/ensurepip-pip-23.0 b/metadata/md5-cache/dev-python/ensurepip-pip-23.0
index 14ed3ce417fe..15a18a8ddf2a 100644
--- a/metadata/md5-cache/dev-python/ensurepip-pip-23.0
+++ b/metadata/md5-cache/dev-python/ensurepip-pip-23.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
 RDEPEND=!<dev-python/ensurepip-wheels-100
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-23.0-py3-none-any.whl
-_eclasses_=pypi	e4454f875cffa353ec3efbd0ef682569
+_eclasses_=pypi	5da49b80cc8a4556953c178d416718c6
 _md5_=52d63d07eb0541c68b13f1996d952a7a
diff --git a/metadata/md5-cache/dev-python/ensurepip-setuptools-66.1.1 b/metadata/md5-cache/dev-python/ensurepip-setuptools-66.1.1
index c7c59214a2ed..8dcc34c123b6 100644
--- a/metadata/md5-cache/dev-python/ensurepip-setuptools-66.1.1
+++ b/metadata/md5-cache/dev-python/ensurepip-setuptools-66.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<dev-python/ensurepip-wheels-100
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-66.1.1-py3-none-any.whl
-_eclasses_=pypi	e4454f875cffa353ec3efbd0ef682569
+_eclasses_=pypi	5da49b80cc8a4556953c178d416718c6
 _md5_=08fe3857532f43de1b87ad248b0526fa
diff --git a/metadata/md5-cache/dev-python/ensurepip-setuptools-67.1.0 b/metadata/md5-cache/dev-python/ensurepip-setuptools-67.1.0
index 11f49bd2f5c7..526e004a452a 100644
--- a/metadata/md5-cache/dev-python/ensurepip-setuptools-67.1.0
+++ b/metadata/md5-cache/dev-python/ensurepip-setuptools-67.1.0
@@ -2,9 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Shared setuptools wheel for ensurepip Python module
 EAPI=8
 HOMEPAGE=https://pypi.org/project/setuptools/
+INHERIT=pypi
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=!<dev-python/ensurepip-wheels-100
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-67.1.0-py3-none-any.whl
-_md5_=8ed714fd61e6144487e7e560ce16638d
+_eclasses_=pypi	5da49b80cc8a4556953c178d416718c6
+_md5_=08fe3857532f43de1b87ad248b0526fa
diff --git a/metadata/md5-cache/dev-python/execnet-1.9.0-r1 b/metadata/md5-cache/dev-python/execnet-1.9.0-r1
index ed6ae81ba759..ed7b9d16dcaf 100644
--- a/metadata/md5-cache/dev-python/execnet-1.9.0-r1
+++ b/metadata/md5-cache/dev-python/execnet-1.9.0-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Rapid multi-Python deployment
 EAPI=8
 HOMEPAGE=https://codespeak.net/execnet/ https://pypi.org/project/execnet/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/e/execnet/execnet-1.9.0.tar.gz https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch -> execnet-1.9.0-pytest-7.2.patch
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=7789aa2dcae39ee98fdacd437456692d
+SRC_URI=https://files.pythonhosted.org/packages/source/e/execnet/execnet-1.9.0.tar.gz https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch -> execnet-1.9.0-pytest-7.2.patch
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	5da49b80cc8a4556953c178d416718c6	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=80887f92920083025af9b035ee297718
diff --git a/metadata/md5-cache/dev-python/markups-4.0.0 b/metadata/md5-cache/dev-python/markups-4.0.0
index cd59e2cf62ab..fbe7acd64c65 100644
--- a/metadata/md5-cache/dev-python/markups-4.0.0
+++ b/metadata/md5-cache/dev-python/markups-4.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/M/Markups/Markups-4.0.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	e4454f875cffa353ec3efbd0ef682569	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	5da49b80cc8a4556953c178d416718c6	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=fbce60c0e9e9439b55f2e897dc7edf9b
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.7.4 b/metadata/md5-cache/dev-python/pyroute2-0.7.4
new file mode 100644
index 000000000000..6770d9c62b75
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyroute2-0.7.4
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pure Python netlink and Linux network configuration library
+EAPI=8
+HOMEPAGE=https://github.com/svinota/pyroute2
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/svinota/pyroute2/archive/0.7.4.tar.gz -> pyroute2-0.7.4.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=0fa65aef715fd60207bd68b8bdddff26
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 51e3ff80fffa..efbaddce0a1c 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.8-r2 b/metadata/md5-cache/dev-qt/qtcore-5.15.8-r3
index fc8d9607760d..41b64ece47f5 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.8-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.8-r3
@@ -11,6 +11,6 @@ LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=5/5.15.8
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=c42fbe8380a3d3938108e221782abe94
+_md5_=e3c6af2cd757035be06b42ddc8ca13ae
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.8-r2 b/metadata/md5-cache/dev-qt/qtgui-5.15.8-r3
index fdf8c4ba5374..4de4ff6b0d16 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.8-r2
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.8-r3
@@ -13,6 +13,6 @@ RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.8*:5= dev-util/gtk-update-icon-cache
 REQUIRED_USE=|| ( eglfs linuxfb vnc X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2-only? ( egl ) )
 RESTRICT=test
 SLOT=5/5.15.8
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=d5128de375dce9c0d31d2ca95c5c714c
+_md5_=87a26164c9a622155642338bf73586ce
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r1 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r2
index d29f95d13b68..14c4c34326e3 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r2
@@ -12,6 +12,6 @@ RDEPEND==dev-qt/qtcore-5.15.8*:5= =dev-qt/qtgui-5.15.8*:5=[gles2-only=,png=,X?]
 REQUIRED_USE=gtk? ( dbus )
 RESTRICT=test
 SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=a9664342c120e67c12613ea915f457b8
+_md5_=51946323d099db251855c6bc4a14b648
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 2574b7c9dd02..6898676d31d1 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/async-io-1.34.3 b/metadata/md5-cache/dev-ruby/async-io-1.34.3
new file mode 100644
index 000000000000..108ab7c50390
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/async-io-1.34.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/async[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/async[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/async[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/async-container-0.15:0[ruby_targets_ruby27(-)] >=dev-ruby/async-rspec-1.10:1[ruby_targets_ruby27(-)] dev-ruby/rack-test[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/async-container-0.15:0[ruby_targets_ruby30(-)] >=dev-ruby/async-rspec-1.10:1[ruby_targets_ruby30(-)] dev-ruby/rack-test[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/async-container-0.15:0[ruby_targets_ruby31(-)] >=dev-ruby/async-rspec-1.10:1[ruby_targets_ruby31(-)] dev-ruby/rack-test[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Provides support for asynchonous TCP, UDP, UNIX and SSL sockets
+EAPI=8
+HOMEPAGE=https://github.com/socketry/async-io
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/async[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/async[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/async[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/socketry/async-io/archive/v1.34.3.tar.gz -> async-io-1.34.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=95512204d6e11bd566cdd6cd8596b79b
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index e8a4e6e3fd15..8d2ae39a39c2 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/naev-0.10.4 b/metadata/md5-cache/games-strategy/naev-0.10.4
new file mode 100644
index 000000000000..bff084d0357b
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/naev-0.10.4
@@ -0,0 +1,18 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.11.1:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/pyyaml[python_targets_python3_9(-)] ) ) sys-devel/gettext doc? ( app-doc/doxygen dev-lua/ldoc media-gfx/graphviz ) test? ( x11-base/xorg-server[-minimal] ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-games/physfs dev-libs/libpcre2:= dev-libs/libunibreak:= dev-libs/libxml2 media-libs/freetype:2 media-libs/libglvnd media-libs/libsdl2[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png,webp] net-libs/enet:1.3= sci-libs/cholmod sci-libs/cxsparse sci-libs/openblas sci-libs/suitesparse sci-mathematics/glpk:= virtual/libintl test? ( dev-games/physfs[zip] media-libs/libsdl2[X] media-libs/mesa[llvm] )
+DESCRIPTION=2D space trading and combat game, in a similar vein to Escape Velocity
+EAPI=8
+HOMEPAGE=https://naev.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=lua-single meson python-any-r1 virtualx xdg
+IUSE=doc lua_single_target_luajit lua_single_target_lua5-1 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ Apache-2.0 BSD BSD-2 CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 GPL-2+ MIT OFL-1.1 public-domain
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-games/physfs dev-libs/libpcre2:= dev-libs/libunibreak:= dev-libs/libxml2 media-libs/freetype:2 media-libs/libglvnd media-libs/libsdl2[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png,webp] net-libs/enet:1.3= sci-libs/cholmod sci-libs/cxsparse sci-libs/openblas sci-libs/suitesparse sci-mathematics/glpk:= virtual/libintl
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/naev/naev/releases/download/v0.10.4/naev-0.10.4-source.tar.xz
+_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4ce2445a34a22b4ba3f1eaa720d5b641
diff --git a/metadata/md5-cache/java-virtuals/Manifest.gz b/metadata/md5-cache/java-virtuals/Manifest.gz
index cf664f696126..729d13c66d4b 100644
--- a/metadata/md5-cache/java-virtuals/Manifest.gz
+++ b/metadata/md5-cache/java-virtuals/Manifest.gz
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.4-r1 b/metadata/md5-cache/java-virtuals/servlet-api-2.4-r1
deleted file mode 100644
index c31693be9689..000000000000
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-java/java-config
-DESCRIPTION=Virtual for servlet api
-EAPI=8
-HOMEPAGE=https://jcp.org/en/jsr/detail?id=340
-INHERIT=java-virtuals-2
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=public-domain
-RDEPEND=|| ( dev-java/tomcat-servlet-api:2.4 dev-java/resin-servlet-api:2.4 ) dev-java/java-config
-SLOT=2.4
-_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-virtuals-2	80385d4bf7cd873a5de3785354ead6c4
-_md5_=8ef2b1266b1e5f942b0bf5351727c0df
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-3.1-r2 b/metadata/md5-cache/java-virtuals/servlet-api-3.1-r2
deleted file mode 100644
index 239962202eeb..000000000000
--- a/metadata/md5-cache/java-virtuals/servlet-api-3.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-java/java-config
-DESCRIPTION=Virtual for servlet api
-EAPI=8
-HOMEPAGE=https://jcp.org/en/jsr/detail?id=340
-INHERIT=java-virtuals-2
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=public-domain
-RDEPEND=|| ( dev-java/tomcat-servlet-api:3.1 dev-java/resin-servlet-api:3.1 ) dev-java/java-config
-SLOT=3.1
-_eclasses_=java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	java-virtuals-2	80385d4bf7cd873a5de3785354ead6c4
-_md5_=8bebfcc8637f0dc8bdcada8b87ec5ce3
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 0bd528ae7837..99ba34959302 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.102.0 b/metadata/md5-cache/kde-frameworks/kdav-5.102.0
index b41ba82cd926..e3291235bc11 100644
--- a/metadata/md5-cache/kde-frameworks/kdav-5.102.0
+++ b/metadata/md5-cache/kde-frameworks/kdav-5.102.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.102
 SRC_URI=mirror://kde/stable/frameworks/5.102/kdav-5.102.0.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2de854dda6d6fe042a2f43144302c2c6
+_md5_=ca72fbb743049c8c1290a8fc909e5f2f
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.102.0 b/metadata/md5-cache/kde-frameworks/kded-5.102.0
deleted file mode 100644
index e12552dfd926..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.102.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.102:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 =kde-frameworks/kconfig-5.102*:5[dbus] =kde-frameworks/kcoreaddons-5.102*:5 =kde-frameworks/kcrash-5.102*:5 =kde-frameworks/kdbusaddons-5.102*:5 =kde-frameworks/kinit-5.102*:5 =kde-frameworks/kservice-5.102*:5 dev-qt/qtcore:5
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=8
-HOMEPAGE=https://develop.kde.org/products/frameworks/
-INHERIT=ecm frameworks.kde.org
-IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 =kde-frameworks/kconfig-5.102*:5[dbus] =kde-frameworks/kcoreaddons-5.102*:5 =kde-frameworks/kcrash-5.102*:5 =kde-frameworks/kdbusaddons-5.102*:5 =kde-frameworks/kinit-5.102*:5 =kde-frameworks/kservice-5.102*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.102
-SRC_URI=mirror://kde/stable/frameworks/5.102/kded-5.102.0.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f14467574fb4968065aa0a3df8742273
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.102.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.102.0
deleted file mode 100644
index f93dec7e10e7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.102.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=wayland? ( >=dev-qt/qtwaylandscanner-5.15.5:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 ( =dev-qt/qtcore-5.15.8*:5 =dev-qt/qtgui-5.15.8*:5 =dev-qt/qthelp-5.15.8*:5 =dev-qt/qtsql-5.15.8*:5 =dev-qt/qtwidgets-5.15.8*:5 ) ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.5:5 dbus? ( >=dev-qt/qtdbus-5.15.5:5 ) wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.5:5=[wayland] >=dev-qt/qtwayland-5.15.5:5 ) X? ( >=dev-qt/qtx11extras-5.15.5:5 x11-libs/libX11 ) x11-base/xorg-proto wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 ) X? ( x11-libs/libxcb ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=8
-HOMEPAGE=https://develop.kde.org/products/frameworks/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm frameworks.kde.org
-IUSE=dbus wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.5:5 dbus? ( >=dev-qt/qtdbus-5.15.5:5 ) wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.5:5=[wayland] >=dev-qt/qtwayland-5.15.5:5 ) X? ( >=dev-qt/qtx11extras-5.15.5:5 x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.102
-SRC_URI=mirror://kde/stable/frameworks/5.102/kguiaddons-5.102.0.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a659312660e1f2e9258115ffa1f008a1
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.102.0 b/metadata/md5-cache/kde-frameworks/kio-5.102.0
deleted file mode 100644
index 0086cb88d8ee..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.102.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ( =dev-qt/qtcore-5.15.8*:5 =dev-qt/qtgui-5.15.8*:5 =dev-qt/qthelp-5.15.8*:5 =dev-qt/qtsql-5.15.8*:5 =dev-qt/qtwidgets-5.15.8*:5 ) ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5[ssl] >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 =kde-frameworks/kauth-5.102*:5 =kde-frameworks/karchive-5.102*:5 =kde-frameworks/kbookmarks-5.102*:5 =kde-frameworks/kcodecs-5.102*:5 =kde-frameworks/kcompletion-5.102*:5 =kde-frameworks/kconfig-5.102*:5 =kde-frameworks/kconfigwidgets-5.102*:5 =kde-frameworks/kcoreaddons-5.102*:5 =kde-frameworks/kcrash-5.102*:5 =kde-frameworks/kdbusaddons-5.102*:5 =kde-frameworks/kguiaddons-5.102*:5 =kde-frameworks/ki18n-5.102*:5 =kde-frameworks/kiconthemes-5.102*:5 =kde-frameworks/kitemviews-5.102*:5 =kde-frameworks/kjobwidgets-5.102*:5 =kde-frameworks/knotifications-5.102*:5 =kde-frameworks/kservice-5.102*:5 =kde-frameworks/ktextwidgets-5.102*:5 =kde-frameworks/kwidgetsaddons-5.102*:5 =kde-frameworks/kwindowsystem-5.102*:5[X?] =kde-frameworks/kxmlgui-5.102*:5 =kde-frameworks/solid-5.102*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.102*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.102*:5 ) X? ( >=dev-qt/qtx11extras-5.15.5:5 ) >=dev-qt/qtconcurrent-5.15.5:5 test? ( sys-libs/zlib ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=8
-HOMEPAGE=https://develop.kde.org/products/frameworks/
-INHERIT=ecm frameworks.kde.org xdg-utils
-IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.102:5
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5[ssl] >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 =kde-frameworks/kauth-5.102*:5 =kde-frameworks/karchive-5.102*:5 =kde-frameworks/kbookmarks-5.102*:5 =kde-frameworks/kcodecs-5.102*:5 =kde-frameworks/kcompletion-5.102*:5 =kde-frameworks/kconfig-5.102*:5 =kde-frameworks/kconfigwidgets-5.102*:5 =kde-frameworks/kcoreaddons-5.102*:5 =kde-frameworks/kcrash-5.102*:5 =kde-frameworks/kdbusaddons-5.102*:5 =kde-frameworks/kguiaddons-5.102*:5 =kde-frameworks/ki18n-5.102*:5 =kde-frameworks/kiconthemes-5.102*:5 =kde-frameworks/kitemviews-5.102*:5 =kde-frameworks/kjobwidgets-5.102*:5 =kde-frameworks/knotifications-5.102*:5 =kde-frameworks/kservice-5.102*:5 =kde-frameworks/ktextwidgets-5.102*:5 =kde-frameworks/kwidgetsaddons-5.102*:5 =kde-frameworks/kwindowsystem-5.102*:5[X?] =kde-frameworks/kxmlgui-5.102*:5 =kde-frameworks/solid-5.102*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.102*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.102*:5 ) X? ( >=dev-qt/qtx11extras-5.15.5:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.102
-SRC_URI=mirror://kde/stable/frameworks/5.102/kio-5.102.0.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f5db1ad9ab9f7a52e696b90e2c122c9e
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.102.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.102.0
deleted file mode 100644
index ec9ff3a05b83..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.102.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15.5:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtquickcontrols2-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
-EAPI=8
-HOMEPAGE=https://techbase.kde.org/Kirigami
-INHERIT=ecm frameworks.kde.org toolchain-funcs
-IUSE=+openmp debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtquickcontrols2-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtgraphicaleffects-5.15.5:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.102
-SRC_URI=mirror://kde/stable/frameworks/5.102/kirigami2-5.102.0.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3945736ed4a8ca1319e13d09bafb5f2a
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.102.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.102.0
deleted file mode 100644
index 74118ac71511..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.102.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ( =dev-qt/qtcore-5.15.8*:5 =dev-qt/qtgui-5.15.8*:5 =dev-qt/qthelp-5.15.8*:5 =dev-qt/qtsql-5.15.8*:5 =dev-qt/qtwidgets-5.15.8*:5 ) ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 =kde-frameworks/attica-5.102*:5 =kde-frameworks/karchive-5.102*:5 =kde-frameworks/kcompletion-5.102*:5 =kde-frameworks/kconfig-5.102*:5 =kde-frameworks/kcoreaddons-5.102*:5 =kde-frameworks/ki18n-5.102*:5 =kde-frameworks/kiconthemes-5.102*:5 =kde-frameworks/kio-5.102*:5 =kde-frameworks/kitemviews-5.102*:5 =kde-frameworks/kpackage-5.102*:5 =kde-frameworks/kservice-5.102*:5 =kde-frameworks/ktextwidgets-5.102*:5 =kde-frameworks/kwidgetsaddons-5.102*:5 =kde-frameworks/kxmlgui-5.102*:5 opds? ( =kde-frameworks/syndication-5.102*:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=8
-HOMEPAGE=https://develop.kde.org/products/frameworks/
-INHERIT=ecm frameworks.kde.org
-IUSE=opds debug designer doc
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 =kde-frameworks/attica-5.102*:5 =kde-frameworks/karchive-5.102*:5 =kde-frameworks/kcompletion-5.102*:5 =kde-frameworks/kconfig-5.102*:5 =kde-frameworks/kcoreaddons-5.102*:5 =kde-frameworks/ki18n-5.102*:5 =kde-frameworks/kiconthemes-5.102*:5 =kde-frameworks/kio-5.102*:5 =kde-frameworks/kitemviews-5.102*:5 =kde-frameworks/kpackage-5.102*:5 =kde-frameworks/kservice-5.102*:5 =kde-frameworks/ktextwidgets-5.102*:5 =kde-frameworks/kwidgetsaddons-5.102*:5 =kde-frameworks/kxmlgui-5.102*:5 opds? ( =kde-frameworks/syndication-5.102*:5 ) >=kde-frameworks/kirigami-5.102:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.102
-SRC_URI=mirror://kde/stable/frameworks/5.102/knewstuff-5.102.0.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a318924201b8c4eaefa4135f04d4091a
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.102.0-r1 b/metadata/md5-cache/kde-frameworks/plasma-5.102.0-r1
deleted file mode 100644
index 29942031c28e..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.102.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.102:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 ( =dev-qt/qtcore-5.15.8*:5 =dev-qt/qtgui-5.15.8*:5 =dev-qt/qthelp-5.15.8*:5 =dev-qt/qtsql-5.15.8*:5 =dev-qt/qtwidgets-5.15.8*:5 ) ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5[gles2-only=,X] >=dev-qt/qtquickcontrols-5.15.5:5 >=dev-qt/qtsql-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtx11extras-5.15.5:5 =kde-frameworks/kactivities-5.102*:5 =kde-frameworks/karchive-5.102*:5 =kde-frameworks/kconfig-5.102*:5[qml] =kde-frameworks/kconfigwidgets-5.102*:5 =kde-frameworks/kcoreaddons-5.102*:5 =kde-frameworks/kdeclarative-5.102*:5 =kde-frameworks/kglobalaccel-5.102*:5 =kde-frameworks/kguiaddons-5.102*:5 =kde-frameworks/ki18n-5.102*:5 =kde-frameworks/kiconthemes-5.102*:5 =kde-frameworks/kio-5.102*:5 =kde-frameworks/kirigami-5.102*:5 =kde-frameworks/knotifications-5.102*:5 =kde-frameworks/kpackage-5.102*:5 =kde-frameworks/kservice-5.102*:5 =kde-frameworks/kwidgetsaddons-5.102*:5 =kde-frameworks/kwindowsystem-5.102*:5[X] =kde-frameworks/kxmlgui-5.102*:5 x11-libs/libX11 x11-libs/libxcb !gles2-only? ( media-libs/libglvnd[X] ) wayland? ( =kde-frameworks/kwayland-5.102*:5 media-libs/libglvnd ) x11-base/xorg-proto test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma framework
-EAPI=8
-HOMEPAGE=https://develop.kde.org/products/frameworks/
-INHERIT=ecm frameworks.kde.org
-IUSE=gles2-only man wayland test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5[gles2-only=,X] >=dev-qt/qtquickcontrols-5.15.5:5 >=dev-qt/qtsql-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtx11extras-5.15.5:5 =kde-frameworks/kactivities-5.102*:5 =kde-frameworks/karchive-5.102*:5 =kde-frameworks/kconfig-5.102*:5[qml] =kde-frameworks/kconfigwidgets-5.102*:5 =kde-frameworks/kcoreaddons-5.102*:5 =kde-frameworks/kdeclarative-5.102*:5 =kde-frameworks/kglobalaccel-5.102*:5 =kde-frameworks/kguiaddons-5.102*:5 =kde-frameworks/ki18n-5.102*:5 =kde-frameworks/kiconthemes-5.102*:5 =kde-frameworks/kio-5.102*:5 =kde-frameworks/kirigami-5.102*:5 =kde-frameworks/knotifications-5.102*:5 =kde-frameworks/kpackage-5.102*:5 =kde-frameworks/kservice-5.102*:5 =kde-frameworks/kwidgetsaddons-5.102*:5 =kde-frameworks/kwindowsystem-5.102*:5[X] =kde-frameworks/kxmlgui-5.102*:5 x11-libs/libX11 x11-libs/libxcb !gles2-only? ( media-libs/libglvnd[X] ) wayland? ( =kde-frameworks/kwayland-5.102*:5 media-libs/libglvnd ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.102
-SRC_URI=mirror://kde/stable/frameworks/5.102/plasma-framework-5.102.0.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4d6a03526b3627049702d55cb233977a
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.102.0-r2 b/metadata/md5-cache/kde-frameworks/plasma-5.102.0-r2
deleted file mode 100644
index 9b7739eb9298..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.102.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.102:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 ( =dev-qt/qtcore-5.15.8*:5 =dev-qt/qtgui-5.15.8*:5 =dev-qt/qthelp-5.15.8*:5 =dev-qt/qtsql-5.15.8*:5 =dev-qt/qtwidgets-5.15.8*:5 ) ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5[gles2-only=,X] >=dev-qt/qtquickcontrols-5.15.5:5 >=dev-qt/qtsql-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtx11extras-5.15.5:5 =kde-frameworks/kactivities-5.102*:5 =kde-frameworks/karchive-5.102*:5 =kde-frameworks/kconfig-5.102*:5[qml] =kde-frameworks/kconfigwidgets-5.102*:5 =kde-frameworks/kcoreaddons-5.102*:5 =kde-frameworks/kdeclarative-5.102*:5 =kde-frameworks/kglobalaccel-5.102*:5 =kde-frameworks/kguiaddons-5.102*:5 =kde-frameworks/ki18n-5.102*:5 =kde-frameworks/kiconthemes-5.102*:5 =kde-frameworks/kio-5.102*:5 =kde-frameworks/kirigami-5.102*:5 =kde-frameworks/knotifications-5.102*:5 =kde-frameworks/kpackage-5.102*:5 =kde-frameworks/kservice-5.102*:5 =kde-frameworks/kwidgetsaddons-5.102*:5 =kde-frameworks/kwindowsystem-5.102*:5[X] =kde-frameworks/kxmlgui-5.102*:5 x11-libs/libX11 x11-libs/libxcb !gles2-only? ( media-libs/libglvnd[X] ) wayland? ( =kde-frameworks/kwayland-5.102*:5 media-libs/libglvnd ) x11-base/xorg-proto test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma framework
-EAPI=8
-HOMEPAGE=https://develop.kde.org/products/frameworks/
-INHERIT=ecm frameworks.kde.org
-IUSE=gles2-only man wayland test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5[gles2-only=,X] >=dev-qt/qtquickcontrols-5.15.5:5 >=dev-qt/qtsql-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtx11extras-5.15.5:5 =kde-frameworks/kactivities-5.102*:5 =kde-frameworks/karchive-5.102*:5 =kde-frameworks/kconfig-5.102*:5[qml] =kde-frameworks/kconfigwidgets-5.102*:5 =kde-frameworks/kcoreaddons-5.102*:5 =kde-frameworks/kdeclarative-5.102*:5 =kde-frameworks/kglobalaccel-5.102*:5 =kde-frameworks/kguiaddons-5.102*:5 =kde-frameworks/ki18n-5.102*:5 =kde-frameworks/kiconthemes-5.102*:5 =kde-frameworks/kio-5.102*:5 =kde-frameworks/kirigami-5.102*:5 =kde-frameworks/knotifications-5.102*:5 =kde-frameworks/kpackage-5.102*:5 =kde-frameworks/kservice-5.102*:5 =kde-frameworks/kwidgetsaddons-5.102*:5 =kde-frameworks/kwindowsystem-5.102*:5[X] =kde-frameworks/kxmlgui-5.102*:5 x11-libs/libX11 x11-libs/libxcb !gles2-only? ( media-libs/libglvnd[X] ) wayland? ( =kde-frameworks/kwayland-5.102*:5 media-libs/libglvnd ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.102
-SRC_URI=mirror://kde/stable/frameworks/5.102/plasma-framework-5.102.0.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d7eb9385b9edcbdd79f883437acf5057
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 8609d776a662..48b74ee25831 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/hydrus-510 b/metadata/md5-cache/media-gfx/hydrus-510
deleted file mode 100644
index f32c059db223..000000000000
--- a/metadata/md5-cache/media-gfx/hydrus-510
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_10(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) )
-DEFINED_PHASES=compile install postinst prepare setup test
-DESCRIPTION=A booru-like media organizer for the desktop
-EAPI=8
-HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-INHERIT=python-single-r1 desktop docs optfeature
-IUSE=test python_single_target_python3_9 python_single_target_python3_10 doc
-KEYWORDS=~amd64
-LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_10(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v510.tar.gz -> hydrus-510.tar.gz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	docs	314e509c51630fb75f120d62a77d008c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=24bce584ed7abbeb82e75d857bc590e3
diff --git a/metadata/md5-cache/media-gfx/hydrus-511 b/metadata/md5-cache/media-gfx/hydrus-511
deleted file mode 100644
index 01096e5fa859..000000000000
--- a/metadata/md5-cache/media-gfx/hydrus-511
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_10(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) )
-DEFINED_PHASES=compile install postinst prepare setup test
-DESCRIPTION=A booru-like media organizer for the desktop
-EAPI=8
-HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-INHERIT=python-single-r1 desktop docs optfeature
-IUSE=test python_single_target_python3_9 python_single_target_python3_10 doc
-KEYWORDS=~amd64
-LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_10(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v511.tar.gz -> hydrus-511.tar.gz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	docs	314e509c51630fb75f120d62a77d008c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=24bce584ed7abbeb82e75d857bc590e3
diff --git a/metadata/md5-cache/media-gfx/hydrus-512 b/metadata/md5-cache/media-gfx/hydrus-512
new file mode 100644
index 000000000000..f0557960b558
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-512
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=8
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+INHERIT=python-single-r1 desktop docs optfeature
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 doc
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v512.tar.gz -> hydrus-512.tar.gz
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	docs	314e509c51630fb75f120d62a77d008c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=93c5665efa1b2f181b9924f9c365d9dd
diff --git a/metadata/md5-cache/media-gfx/hydrus-513 b/metadata/md5-cache/media-gfx/hydrus-513
new file mode 100644
index 000000000000..23144c743948
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-513
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=8
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+INHERIT=python-single-r1 desktop docs optfeature
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 doc
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v513.tar.gz -> hydrus-513.tar.gz
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	docs	314e509c51630fb75f120d62a77d008c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=93c5665efa1b2f181b9924f9c365d9dd
diff --git a/metadata/md5-cache/media-gfx/librecad-2.2.0 b/metadata/md5-cache/media-gfx/librecad-2.2.0
new file mode 100644
index 000000000000..c298d6e51fc0
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/librecad-2.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/freetype:2 dev-qt/qthelp:5 dev-qt/qtxml:5
+DESCRIPTION=Generic 2D CAD program
+EAPI=8
+HOMEPAGE=https://www.librecad.org/
+INHERIT=desktop edo plocale qmake-utils
+IUSE=debug doc tools
+KEYWORDS=~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/freetype:2
+SLOT=0
+SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.2.0.tar.gz -> librecad-2.2.0.tar.gz
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	950fbaec7deeba41b5bcc0572cca99b9	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=849c0ffa5315d16e0a8088101d42ae18
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index b840e44f6573..c283f9e40208 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/assimp-5.2.5 b/metadata/md5-cache/media-libs/assimp-5.2.5-r1
index d2572c6a4ad9..5a5615c85d16 100644
--- a/metadata/md5-cache/media-libs/assimp-5.2.5
+++ b/metadata/md5-cache/media-libs/assimp-5.2.5-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.2.5
 SRC_URI=https://github.com/assimp/assimp/archive/v5.2.5.tar.gz -> assimp-5.2.5.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=eb89ae146c92706c2b6c9850e0a07e50
+_md5_=25773b5ea780768a77d7bcfc6829faf1
diff --git a/metadata/md5-cache/media-libs/openal-1.23.0 b/metadata/md5-cache/media-libs/openal-1.23.0
new file mode 100644
index 000000000000..2b319c09a912
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openal-1.23.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pipewire? ( media-video/pipewire[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oss? ( virtual/os-headers )
+DESCRIPTION=A software implementation of the OpenAL 3D audio API
+EAPI=8
+HOMEPAGE=https://www.openal-soft.org/
+INHERIT=cmake-multilib
+IUSE=alsa coreaudio debug jack oss pipewire portaudio pulseaudio sdl sndio qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2+ BSD
+RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pipewire? ( media-video/pipewire[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://www.openal-soft.org/openal-releases/openal-soft-1.23.0.tar.bz2
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6b37d45957d5cbc3341dd8f84fa27d03
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 9beb5229ab96..b983869483fb 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/knot-resolver-5.6.0 b/metadata/md5-cache/net-dns/knot-resolver-5.6.0
new file mode 100644
index 000000000000..c97f7885d96a
--- /dev/null
+++ b/metadata/md5-cache/net-dns/knot-resolver-5.6.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-knot-resolver ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst setup test unpack
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) acct-group/knot-resolver acct-user/knot-resolver dev-db/lmdb:= dev-libs/libuv:= net-dns/knot:= net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) kresc? ( dev-libs/libedit ) nghttp2? ( net-libs/nghttp2:= ) systemd? ( sys-apps/systemd:= ) test? ( dev-util/cmocka )
+DESCRIPTION=A scaleable caching DNS resolver
+EAPI=8
+HOMEPAGE=https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver
+INHERIT=lua-single meson tmpfiles verify-sig
+IUSE=caps dnstap kresc nghttp2 systemd test +lua_single_target_luajit verify-sig
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) acct-group/knot-resolver acct-user/knot-resolver dev-db/lmdb:= dev-libs/libuv:= net-dns/knot:= net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) kresc? ( dev-libs/libedit ) nghttp2? ( net-libs/nghttp2:= ) systemd? ( sys-apps/systemd:= ) virtual/tmpfiles
+REQUIRED_USE=^^ ( lua_single_target_luajit )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://secure.nic.cz/files/knot-resolver/knot-resolver-5.6.0.tar.xz verify-sig? ( https://secure.nic.cz/files/knot-resolver/knot-resolver-5.6.0.tar.xz.asc )
+_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=c0a6e921871cb2f4c42429438b1c1d85
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 1b2ac98c1f36..06d0be6ea48a 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/mu-1.8.14 b/metadata/md5-cache/net-mail/mu-1.8.14
new file mode 100644
index 000000000000..b0110cb3fe30
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mu-1.8.14
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig >=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=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
+DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
+EAPI=8
+HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
+INHERIT=elisp-common meson
+IUSE=emacs readline
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
+SLOT=0
+SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.14/mu-1.8.14.tar.xz
+_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=777e2dd47710d26bceacaa6475fb81f7
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 3a9db9158910..9fa7142c875f 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.7.1 b/metadata/md5-cache/net-nntp/sabnzbd-3.7.1
index 094c851f2121..8e3cb620eb6a 100644
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.7.1
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.7.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/flaky[python_targets_python3_9(-)] >=dev-python/lxml-4.5.0[python_targets_python3_9(-)] dev-python/pkginfo[python_targets_python3_9(-)] dev-python/pyfakefs[python_targets_python3_9(-)] dev-python/pytest-httpbin[python_targets_python3_9(-)] dev-python/pytest-httpserver[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/selenium[python_targets_python3_9(-)] dev-python/tavalidate[python_targets_python3_9(-)] dev-python/werkzeug[python_targets_python3_9(-)] dev-python/xmltodict[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flaky[python_targets_python3_10(-)] >=dev-python/lxml-4.5.0[python_targets_python3_10(-)] dev-python/pkginfo[python_targets_python3_10(-)] dev-python/pyfakefs[python_targets_python3_10(-)] dev-python/pytest-httpbin[python_targets_python3_10(-)] dev-python/pytest-httpserver[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/selenium[python_targets_python3_10(-)] dev-python/tavalidate[python_targets_python3_10(-)] dev-python/werkzeug[python_targets_python3_10(-)] dev-python/xmltodict[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flaky[python_targets_python3_11(-)] >=dev-python/lxml-4.5.0[python_targets_python3_11(-)] dev-python/pkginfo[python_targets_python3_11(-)] dev-python/pyfakefs[python_targets_python3_11(-)] dev-python/pytest-httpbin[python_targets_python3_11(-)] dev-python/pytest-httpserver[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/selenium[python_targets_python3_11(-)] dev-python/tavalidate[python_targets_python3_11(-)] dev-python/werkzeug[python_targets_python3_11(-)] dev-python/xmltodict[python_targets_python3_11(-)] ) app-arch/p7zip app-arch/unrar app-arch/unzip www-apps/chromedriver-bin ) virtual/pkgconfig
+BDEPEND=test? ( python_single_target_python3_9? ( dev-python/flaky[python_targets_python3_9(-)] >=dev-python/lxml-4.5.0[python_targets_python3_9(-)] dev-python/pkginfo[python_targets_python3_9(-)] dev-python/pyfakefs[python_targets_python3_9(-)] dev-python/pytest-httpbin[python_targets_python3_9(-)] dev-python/pytest-httpserver[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/selenium[python_targets_python3_9(-)] dev-python/werkzeug[python_targets_python3_9(-)] dev-python/xmltodict[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flaky[python_targets_python3_10(-)] >=dev-python/lxml-4.5.0[python_targets_python3_10(-)] dev-python/pkginfo[python_targets_python3_10(-)] dev-python/pyfakefs[python_targets_python3_10(-)] dev-python/pytest-httpbin[python_targets_python3_10(-)] dev-python/pytest-httpserver[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/selenium[python_targets_python3_10(-)] dev-python/werkzeug[python_targets_python3_10(-)] dev-python/xmltodict[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flaky[python_targets_python3_11(-)] >=dev-python/lxml-4.5.0[python_targets_python3_11(-)] dev-python/pkginfo[python_targets_python3_11(-)] dev-python/pyfakefs[python_targets_python3_11(-)] dev-python/pytest-httpbin[python_targets_python3_11(-)] dev-python/pytest-httpserver[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/selenium[python_targets_python3_11(-)] dev-python/werkzeug[python_targets_python3_11(-)] dev-python/xmltodict[python_targets_python3_11(-)] ) app-arch/p7zip app-arch/unrar app-arch/unzip www-apps/chromedriver-bin ) virtual/pkgconfig
 DEFINED_PHASES=install postinst setup test
 DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_11(-)] >=dev-python/guessit-3.1.0[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_11(-)] )
 DESCRIPTION=Binary newsgrabber with web-interface
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.7.1/SABnzbd-3.7.1-src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=54d64649ca012616bb6cd7d9c0895021
+_md5_=92b85dbe04edbd6fbc6e5b1f68bbe803
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c052f3206586..615fedf6e85d 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/memtest86+-6.10 b/metadata/md5-cache/sys-apps/memtest86+-6.10
new file mode 100644
index 000000000000..43a32c99b0f1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/memtest86+-6.10
@@ -0,0 +1,13 @@
+BDEPEND=iso32? ( dev-libs/libisoburn sys-fs/dosfstools sys-fs/mtools ) iso64? ( dev-libs/libisoburn sys-fs/dosfstools sys-fs/mtools )
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend
+DESCRIPTION=Memory tester based on PCMemTest
+EAPI=8
+HOMEPAGE=https://www.memtest.org/
+INHERIT=mount-boot toolchain-funcs
+IUSE=bios32 bios64 +boot efi32 efi64 iso32 iso64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v6.10.tar.gz -> memtest86+-6.10.tar.gz
+_eclasses_=mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=8e67c23784ca824c768c1954c5738e68
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 0e274ee9b0e8..b89bb7aeedf3 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_security-2.9.7 b/metadata/md5-cache/www-apache/mod_security-2.9.7
new file mode 100644
index 000000000000..ac3cdaa41219
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_security-2.9.7
@@ -0,0 +1,18 @@
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/apr:1= dev-libs/apr-util:1[openssl] dev-libs/expat dev-libs/libxml2 dev-libs/libpcre[jit?] net-misc/curl sys-apps/util-linux sys-libs/gdbm:= virtual/libcrypt:= fuzzyhash? ( app-crypt/ssdeep ) json? ( dev-libs/yajl ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) mlogc? ( net-misc/curl ) pcre2? ( dev-libs/libpcre2:= ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2*
+DESCRIPTION=Application firewall and intrusion detection for Apache
+EAPI=7
+HOMEPAGE=https://github.com/SpiderLabs/ModSecurity
+INHERIT=autotools apache-module lua-single
+IUSE=doc fuzzyhash geoip jit json lua mlogc pcre2 lua_single_target_lua5-1 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+PDEPEND=>=www-apache/modsecurity-crs-3.3.2
+RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1[openssl] dev-libs/expat dev-libs/libxml2 dev-libs/libpcre[jit?] net-misc/curl sys-apps/util-linux sys-libs/gdbm:= virtual/libcrypt:= fuzzyhash? ( app-crypt/ssdeep ) json? ( dev-libs/yajl ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) mlogc? ( net-misc/curl ) pcre2? ( dev-libs/libpcre2:= ) www-servers/apache[apache2_modules_unique_id] geoip? ( dev-libs/geoip ) mlogc? ( dev-lang/perl ) =www-servers/apache-2*
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.7/modsecurity-2.9.7.tar.gz
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=80411962dc1f56a5cb2d7627b9aec1ab
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 3763d70fb6dc..f69b530df052 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20230104 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20230104
new file mode 100644
index 000000000000..24915259dceb
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20230104
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DESCRIPTION=Free and open source SVG icon theme
+EAPI=8
+HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=xdg
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20230104.tar.gz -> papirus-icon-theme-20230104.tar.gz
+_eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=919fa0e6536c964ab505a7c8fb47ee9a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 447207d45adf..38c8e74f4066 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15152 BLAKE2B c1d08f39453125718bfb044cbe0dd8c2d1d6ee790e3d7e8488ae11fc536eb3f4232a0679f80662b1e041f8edd39b6ec4d2d39c7e6ac1b418151d9c3853698313 SHA512 b37bf15aece1c30972723d2b64d1d1613bce0e6747a01563fb993e46731ebc5b99ca0625ecd9086c739877084416aa12e6c2a5650a2bfe625796875f89cc89dc
-TIMESTAMP 2023-02-05T08:39:46Z
+TIMESTAMP 2023-02-05T14:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPfa1JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPfv61fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBuCxAArB5j7xGAX/KwKFBfvz9T7SF8LSXn0DOGsOA8akV0EdX9ujqtALY7PwmR
-QZBYKJQDNfWqSflnTOu00DvTyqMzNWYaCC8X7LiULIp6I6/v8oQ2wK5/f7zRO9ax
-HxMdfgyD8X+YTgdL+/Wv6YeBe0OD1OlmOC0A/o20+ulKbJjcCueVcuP5+mFaeoI6
-omPLCOPZYJmZpJFFTMCa4U6Y52lcoozmOafNIc9/9dr1KhAhj1VX9gSUoBq+wuQj
-wX5FxfiDgUyWbCjLeCrwVJEB4rHZS2hEygXIGStKmLomQCBp9vpV6/27rEy0NC6E
-RRoC0lIdFw1SAnPLxBrfbDX56cEt/9uTO4TbJjvI0SnsF/VPie92iOjOxybx4iSs
-M4wCPoNEcmi+ET6VbFk5WLadBgO6nDkpUlNhnRM7VCHDrG/fglPof10kT8cues1O
-Mpm3nFhLSS2+Aj2170V9zFtytOIvXI1gPAsLxREYWSdhEqjHsQmNYkTUtTcTzOyZ
-eg75XkipeuIy0ewnmk1h8VxRlt1uCIJgf+6pOgn7pRIi9eKAzBIgR2TUrcEl5T9r
-v0Earq80Mj0tOoJn3SmSpG9JThk0GpRIFcZdtYlcqUglpMgM/dJ3rSzowY+DkYPO
-f7JPXChKWawsb/orUmc98sYeMAEg8HcPCvYTgyGNOXZQ4HZ8/PY=
-=m1Nd
+klAkig/9GunWfcWd4yfxGfzag1qJb6Yexc7a5FCH/WiCvyhWsoKK89G7T0GUdXT0
+DoGsvRGYcnkdSR5zEoermqMivOPDDSmUHe/qFOcA50R1Ughx/ob/liL8LZT/UxvU
+pIE/8znVfur7HU07jy1Xc1RCDIPDbg3XYZD0ZY2UQ79qpyQ7O4Lt1QNyPkbToJdq
+hRtXKwZ0S5mw9UBtFyMLyei7/mOGRU2XsL8ZU4SoVw05xCvQoyCv82gmKXYIP5c4
+XTTgda5WwJEB611ILoEC5FC0OWNsQsKdVsQkJ5v3FexJQ3vd81b67J0GHiN/7B8W
+k1OS3jJYtHdfMWjTV6ndzBQgMdbILENaSsACOW4WMuXbA+Rq7MtTjHeXaLKkb+7g
+IobBbNBqovZDW5Q0lGDV2kyHJUJEpoc87oS2FsPFbf+sg72uW04RDNgypAshIgvV
+FD7z8EVXc7RJiMf3optHA1kM5vlhLeNonhSXK9KD9v/Np1QsuSzro1etPX/2tNF2
+rJgWIXQNYS5ErADhu5NE5mVgIYpVVTiK7qW3yWgEPLkXar8wS/hMZHKEMPYKVxdS
+JCyCGSJhsYUZA3ey/yYNeTJxUddLOeJNTrzO+Vi9rrpFdl7jtrtm7KxoqsQ0mi/V
+ZIo7B1Dm9i9ckmWmlqKrEHWyQbthRVIMsaeHWkQ9mC6DykBh1Vk=
+=8n2d
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 412aadfb139f..a2d3c4478185 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 05 Feb 2023 08:39:42 +0000
+Sun, 05 Feb 2023 14:39:37 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b7a8860b3bce..8980656c3fcb 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Feb  5 08:39:42 AM UTC 2023
+Sun Feb  5 02:39:37 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1a4b836a991c..7e46a8963ae2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 05 Feb 2023 08:45:01 +0000
+Sun, 05 Feb 2023 14:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2dc7c43637fd..e5de9c0df214 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-1a4fbf509d0aa9c1b2f4014593e03e0fb7f505ed 1675585836 2023-02-05T08:30:36+00:00
+8682d0e31f40449fcbe7837a5422e99707d802ba 1675606926 2023-02-05T14:22:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 535c262fa844..efb40363deb8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1675586401 Sun 05 Feb 2023 08:40:01 AM UTC
+1675608001 Sun 05 Feb 2023 02:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 412aadfb139f..a2d3c4478185 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 05 Feb 2023 08:39:42 +0000
+Sun, 05 Feb 2023 14:39:37 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 2d381b4d5e30..9390f56ea4fb 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index 1e647b2a137d..b1c17827135a 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -2,5 +2,8 @@ AUX knot-resolver-5.5.3-docdir.patch 925 BLAKE2B 9d40a287fe0a6d883d46dbe13fa3ba5
 AUX knot-resolver-5.5.3-nghttp-openssl.patch 1087 BLAKE2B 4570658d9d358384c435c0b4694995945f9c788249899670e000d3273ae6c2631ff69319660db2d04f4143e24746bc0160295042a7887d30dae09de11556ce8e SHA512 50e8a99aef8bc4ce41ddb4d1760cd96818859b440aa74effdc1482af150c21f4fc3e451fae739a07161fc5a2e0ee2cd093c26950dd4e16de430e6bb8a635dd84
 DIST knot-resolver-5.5.3.tar.xz 1921668 BLAKE2B 7efdf1a69081d8f9f43b5bbe1b483826b94b87a0b001a449a5f89988afce070e4e3310e513e6281691bd81274a523ab8c7e52fe56a3d62019efe07809033a5a8 SHA512 7bf29bbf82e71727c1f47095a04a12712ca89a6f34d3a325337625ad116f49a47a90cb402525fdbf59cb0889b64d7083b908c335d65429b24d776603a3a8f28a
 DIST knot-resolver-5.5.3.tar.xz.asc 833 BLAKE2B 7ab348587c2604f14171d09436b2a296e9fb7124e6f899aba91215d32d8642dc5b9ae8300edf55c0790289bc954d5cf95c71b66a20b960c848d15e34469fc2f3 SHA512 1e95fffdb1c78a225b5bf861f978c1c18a9935ecd495e8f708ed4a241308b9302d2cf5a5ec51334dbecf50950af5f775bfff78995663cf1681a3dbc354d3a686
+DIST knot-resolver-5.6.0.tar.xz 1923196 BLAKE2B 8d1595e29ca5a3d597f15eda799a1e4e91bcd992c25f442f7b9247b4facec21fb41a89c4db3b2efcd8b8384d9463965ea16c617950fb408685ee6d565686d4e2 SHA512 efa978a8885e9aa6459bad8016e872ded5923d6c4367bb9586764ebfbad903923583ede9cab6339107d32450bf0846a40b8ab72ba7011d57827a86d822b95840
+DIST knot-resolver-5.6.0.tar.xz.asc 833 BLAKE2B 0a5ea3a5458be6a9b8a6cb34e3862119a53841b98148cc543046d745e14cfb49952bf2dbece6cfb3ed302affbcc6dce1911fc8900c0f4cb0acf22698d8b2257c SHA512 1c3ebe636b8295b31fffe08bd1ffade9d6c83a0584ef5cf84cb9f3951260b2e77272c4524789f244cd209381c7adb8c2e4b140e2fae616927a7d037cb187b165
 EBUILD knot-resolver-5.5.3.ebuild 1976 BLAKE2B bfc97cfa0b887c4bd7dd5afd43ce3260942735496749cea618b25c7a3f2bf7a28925c063760df27ff5dc70f60e6bce387d82e62b697fbd069ede8f898829211d SHA512 1f7493f996cc3d519cc488cd9edf293970ebabee6d6991384dca9e05a660c4a1cc8297b6f1a70a8fc39ae3b1c051a068636e3155da6287e5ca4c7bbb9143c88b
+EBUILD knot-resolver-5.6.0.ebuild 1982 BLAKE2B df2d424fa46c672cd995788ab1f375acbedc7e525676dc64d8416bd87ab5e5a33eeb95917043819055f79ff476ee28ae7fb27958022391ac668a0acfe5eff09b SHA512 95053a36a0bd49243d4425769ed54b4c3dc9c128274bcf26c64c36e96c155f541e4f343668bb2aaed68031cca61773415e9f702b8fbe547dbe7807171d65133d
 MISC metadata.xml 470 BLAKE2B 16d945ec59b8b4bf54306a3f3182bc61f45ec8cc1880480366a6a918cbad337fc102ae6d2f0cdf3347e7a7a85fc5bc58129bb7e2f1378e42cb047aaa15dbc138 SHA512 09e7fce327eff1d4b5c4702ac4c90c6cf157d076715808eaea42cf0371007ed44a84466bed7c03b296c3fc1b99059cfd0cb575a2a957e7730d49a26bb35c160a
diff --git a/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild b/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
new file mode 100644
index 000000000000..b191f7d5aaa2
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.6.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+
+inherit lua-single meson tmpfiles verify-sig
+
+DESCRIPTION="A scaleable caching DNS resolver"
+HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
+SRC_URI="
+	https://secure.nic.cz/files/${PN}/${P}.tar.xz
+	verify-sig? ( https://secure.nic.cz/files/${PN}/${P}.tar.xz.asc )
+"
+
+LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="caps dnstap kresc nghttp2 systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	acct-group/knot-resolver
+	acct-user/knot-resolver
+	dev-db/lmdb:=
+	dev-libs/libuv:=
+	net-dns/knot:=
+	net-libs/gnutls:=
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c:=
+	)
+	kresc? ( dev-libs/libedit )
+	nghttp2? ( net-libs/nghttp2:= )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		  dev-util/cmocka
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-knot-resolver )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.3-docdir.patch
+	"${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/${PN}.gpg
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+	fi
+
+	unpack ${P}.tar.xz
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var # double lib
+		# https://bugs.gentoo.org/870019
+		-Dauto_features=disabled
+		-Ddoc=disabled
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		-Dopenssl=disabled
+		$(meson_feature caps capng)
+		$(meson_feature dnstap)
+		$(meson_feature kresc client)
+		$(meson_feature nghttp2)
+		$(meson_feature test unit_tests)
+		$(meson_feature systemd systemd_files)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	fowners -R ${PN}: /etc/${PN}
+}
+
+pkg_postinst() {
+	use systemd && tmpfiles_process knot-resolver.conf
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index f8499e8e5bc8..8bbb59a03cb6 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 41f8c9e47e31..7a545b277ac2 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,5 +1,7 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
 AUX mu-1.8.13-add-cstdint-inc.patch 1158 BLAKE2B 6f8b7529c6a8b6f432303ee7aac811d66011f098a50b15817f83a397481af69045cd1558e0480be649f7781578fbbcced6c0dea1065e7b21d742041b3b29d61b SHA512 d7c2d43ceb92fbc509df0af4e0a97a993b9da15109ac7a9e7d05909d7ed2cb6e5dd8b2e2b9aadf56c1bbc83f5fb9e643db0f64daa6b1275e3be0016af8fedac1
 DIST mu-1.8.13.tar.xz 543696 BLAKE2B 7e96040b12630d8dd1320475e8b7e62b7f349767d331237838e2dd092df51c4f94cf8605d1266d26f4d2fa9aa092ba03546ed21968448302c3a12495702e46bb SHA512 c9dd7564070191e251e8e072042c0d2957e9c9c31064aececf24b9dc99a9b51c6bd60138e88bd86f175365775e98ba49e3bdb5bea02f7738b5e1e68efd7e1a7c
+DIST mu-1.8.14.tar.xz 543828 BLAKE2B d64e52a66f3b68a2d5b039eaff668c5ecf0da8b1e77719de49316cbe96bb9d34c3e4f8636cfd63cf473218ea6ec428f8c2be2d80c94d1b1456e4b7f17c5ab52c SHA512 8d5514cf08891180163e4d7caff7a3d75dd39a6397c0c8608a85b613f83a4f714f772400c2a057c1f9ef46dedd4f240828ced4e8a1b38ebe4340041059a3ad44
 EBUILD mu-1.8.13.ebuild 2166 BLAKE2B 9d7bbb994a7d91528e80276d52a9e0944b86826d867d082e56db2297af23e7ae318a64016e1b945fd212757d4c65cfd45bfbb2088629d0ca61e049c07587f32b SHA512 e949d9e9a7fe1ea1141100abf67f21da7cdd73b045389c5ca933d40ad5a7e8c338a3c3837ba51d336b5ea37b21251a60b4fcac17e244f2478893056e2d1f4890
+EBUILD mu-1.8.14.ebuild 2173 BLAKE2B 771ec59a30fb656e018ce37148f5d1cc03b9431f7d27c5ca72dfaf9c26594044f4f6176583e41faae4be83aafa6e229bf7e8dbf4bd9e92b93cd4f05e344eaad3 SHA512 d2cc6c4eaa6e65ec55c9236cedf71a05011b154b0eb0503ee48fbcf1f437c3e05ec2d3416fac77fda66532151c6d84473a327a1ffe0695925abcd4cf0762f7d7
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/mu-1.8.14.ebuild b/net-mail/mu/mu-1.8.14.ebuild
new file mode 100644
index 000000000000..508631d8e85f
--- /dev/null
+++ b/net-mail/mu/mu-1.8.14.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common meson
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+IUSE="emacs readline"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4:=
+	emacs? ( >=app-editors/emacs-25.3:* )
+	readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/texinfo
+	virtual/pkgconfig
+"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.13-add-cstdint-inc.patch
+)
+
+src_prepare() {
+	default
+
+	# Don't install NEWS.org into /usr/share/doc.
+	sed -i '/NEWS.org/,+1 d' meson.build || die
+	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
+
+	# Don't compress the info file.
+	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
+
+	# Instead, put it in /usr/share/doc/${PF}.
+	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature readline)
+		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
+		# NOTE: Guile interface is deprecated to be removed shortly.
+		-Dguile=disabled
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Since meson no longer installs NEWS.org, install it with dodoc.
+	# Also, it must be uncompressed so that it can be viewed with
+	# mu4e-info.
+	docompress -x /usr/share/doc/${PF}/NEWS.org
+	dodoc NEWS.org
+
+	# Same as above.
+	docompress -x /usr/share/doc/${PF}/mu4e-about.org
+	dodoc mu4e/mu4e-about.org
+}
+
+pkg_preinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "After upgrading from an old major version, you should"
+		elog "rebuild your mail index."
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+
+		elisp-site-regen
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 17bcf136480e..f646a14e4678 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 378a625a15a7..a615f983e2f3 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -3,5 +3,5 @@ AUX sabnzbd-r1.initd 1391 BLAKE2B 1ff6d3dc4f5ece413cf1c0ab104b23c3a4ab451d5cda28
 AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b314b3a7a12742ae4da5de93d771f3fb11a8c2ff5a7eef8fc1b879c1d85757ce218d9357037a70d6 SHA512 91915b54b6e2c2dc7839c23726aba7982b158b20a813ad0f66fa879d2454db14e24472e57e076b41866b28c7cd3991f9961c114b17dfc7e37322b23aa1e6c468
 AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e3a6b53fbb8e0c7df2100ac13ee746e4b6cd45b384acfe6a9478df3a3d1f75bfc70dc41f51ac8f018916 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34
 DIST SABnzbd-3.7.1-src.tar.gz 5108463 BLAKE2B 5858fc5ece3948696132c64c1f4a7459319bbc604074dc78339e54e7e77353dbd141b4aad0c0cd027ac6ea1499aee0100ed7f4a1b20d0786728503eb6ffad055 SHA512 c76f74e20943196467206b5c0427421d7fe4e614855c477a045d06854c5247c13056ce9055d82b5f0c6391a046dc3c65c577e50fc30646c8f2290df4bada4fb9
-EBUILD sabnzbd-3.7.1.ebuild 4829 BLAKE2B d36ce1e07d8e988618d258e0bc331eff92a4b08c2478e3a9a2f2bb401e6f2ba7ca8a47dd7a5ba3b9d6ed33d3da5ce590add822bd877408c97947159b5cdbbfd6 SHA512 a5de870863ef8471a001e31f68b3613281a88fe4d03b5fd95a90a4d12c01cd93d9e34559409bd9e44585e1282a2576f30166f5abd7ed5c804eeaa244140c2404
+EBUILD sabnzbd-3.7.1.ebuild 4786 BLAKE2B 5e627a67df321770413b02bce15201eca1b1e4ea136dbc9577dafd57fd1ac6ec2a6e99d2fd890c3a826bdf8beaa747f60a519b2b0b2e175fbaf8675370e2c258 SHA512 7f9d136ade530658bd45c1cd2f285c05c3ab1eafaaedafd9ca568cc4599dffdca01788c649adfbde9d911da23db42d6b6a823b18b1e9b3a019be1f063e89178a
 MISC metadata.xml 463 BLAKE2B 90b3702d7d29524a2f0c450d757fa35178211816fbf04661251a257d681d0af7ca7020f920e51fb1ae380fa24c5dd473588ae8ea42f1eb4982246c903872becd SHA512 ea4d26003fa929bc21a5678633a8df6cf76a6ce4dc4a6c33c15207e41fd147e94e2632dfcf3c1bfd46467920d8c46a667ec83fe71caa1347a5da2b798dffc329
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
index 7117af8b6abe..01d022e53ae2 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
@@ -61,7 +61,6 @@ BDEPEND="
 			dev-python/pytest[${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/selenium[${PYTHON_USEDEP}]
-			dev-python/tavalidate[${PYTHON_USEDEP}]
 			dev-python/werkzeug[${PYTHON_USEDEP}]
 			dev-python/xmltodict[${PYTHON_USEDEP}]
 		')
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8a4e3b31e46d..0e1886c9313c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 0441dd272c02..bfd6d6821b96 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2023-02-05)
+# dev-python/python-box has broken build system that prevents us from
+# bumping it.  Its only used by dev-python/tavern that is last rited,
+# and dev-python/tavalidate that no longer has any revdeps.
+# Removal on 2023-03-07.
+dev-python/python-box
+dev-python/tavalidate
+
 # Arthur Zamarin <arthurzam@gentoo.org> (2023-02-04)
 # pytest plugin, which breaks a lot of python_test of other ebuilds
 # if installed unless disabled. The package itself is hard to
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a1dabd2cbcea..d8cc5590504e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8536,6 +8536,7 @@ www-apache/mod_security:geoip - Pull in dev-libs/geoip for use by the SecGeoLook
 www-apache/mod_security:jit - Add support for the PCRE Just-in-Time optimisation, as enabled by dev-libs/libpcre with jit USE flag enabled. Might not be available on hardened systems.
 www-apache/mod_security:json - Suppose JSON in the request body parser through dev-libs/yajl.
 www-apache/mod_security:mlogc - Build and install the ModSecurity Audit Log Collector (mlogc).
+www-apache/mod_security:pcre2 - Use dev-libs/libpcre2 as regex implementation
 www-apache/pwauth:domain-aware - Ignore leading domain names in username (Windows compat)
 www-apache/pwauth:faillog - Log failed login attempts
 www-apache/pwauth:ignore-case - Ignore string case in username (mostly Windows compat)
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 54092382a760..a6dd2738742b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 880dd52f31e0..7cde7c52471a 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -12,7 +12,9 @@ AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 DIST memtest86+-6.00.tar.gz 224187 BLAKE2B bba26dab7165239fe95dc7f174e5f876f47421008ca6201bc57549598f512df56a6a0ca71f8c2c26c01188d243b58ab6ddd525cf01f0dece0cdb61a6acf38685 SHA512 7538afb9e894fbb0f57d40e6d05016beb157648a67dc2d081754e5c03f17a7a5f6adb0c3385c524c0f66d5c90c87a0d7267994d0b1c2b30a3ccac4f99fc6e4af
 DIST memtest86+-6.01.tar.gz 224548 BLAKE2B 429df2d71cb0d84bec9aa3a25023f2a9db2e8c01b32b0af1f42b689a4a7da192d5ddb77a5cb126a162aba0c1e704a2da8f5dee88caae0d9f78545e9e9c14eee9 SHA512 a80256e2cfdad927d55a2f67d65255f90e911e8bfb59d9da841482ddeca7f3cf767b029c299aca8076c9bd2b9ee71671bb768b551a7ea041009bb89ebec927dc
+DIST memtest86+-6.10.tar.gz 230056 BLAKE2B 2462c31f1ca27aa166c447e51a9b388872faaf7f845100a122f5dd8eb11dc76e26c503dc14d0825bda397c7180a5259094a020d25dd9d43b1997bfbe424c7f65 SHA512 2fb8e6d375f7ced53b1c2d50ffeeafcee1282b2495ea4241958e210c0b4a3500701025041469459c0db1662c448a3b65a51a994d19bc8ac217e23fa935700e42
 EBUILD memtest86+-5.31b-r3.ebuild 2858 BLAKE2B 47a6e5a68e77f6425b7761d5cc18378a13bc6f6b3febb2624277fa3bf24374e69265ab0c97a3854abbfa5acd96f984b2d1392acb29fb3cda37357370d57067c8 SHA512 8c8846addd0db5093b384c36a74eea8e853e66b174c7f9930d9a61abc71c41cdaf5e1967b01eaad77af68a4f81b7687517e0b23e26f26cd11ae104da0c49e881
 EBUILD memtest86+-6.00.ebuild 1728 BLAKE2B c3e4c03d7edef1be8df82ff06e228209eae03b4cc91360099ec6738118842c0cc682088e889f1f585acbe4d30a24141d5f968bc30f9ed86daebafabdcd9d07da SHA512 2feb77c3bc8d2013d9599deb38ba1e950a1b9e6b45610c1e659a60fd228ca1f17fde4b38dd5c6f04739118731d65662d2fb0bc5aeb21468e5553cf3da380f411
 EBUILD memtest86+-6.01.ebuild 1733 BLAKE2B 0cc7eef2f79cb4923a9853c8d80e0f253dd34b8fc5850a246de754420a3053ab0b6c00e85c0b95563dc09aacaeb625f31c4bc918747171874d89e20633299ddf SHA512 1240ecf9052cc01b39003adafb2e97d84227c959b62556be0455b8cd4ad38584154f486a1d56c7799295091f1a67ba858134c73dbe28cf3a14c5acb4a87d60a7
+EBUILD memtest86+-6.10.ebuild 1735 BLAKE2B c714b91e5e8b1aa7061cf55dd24ed5e1e0ce6fa888fdac3b717259705de15e2a2e4056fa9336c57194bbed5401a5b242da49f8b64ca60f1ba2c554ccd491ef01 SHA512 07bf4e1c1109258536f83683399fc4046a0bf105a760f408ab18c6c4c988606720e6fc92d256b73cb76b9ed24a5636ac0e9af7c86f4fc2a80481385f29906853
 MISC metadata.xml 1033 BLAKE2B 1de0b3113db89962f9566a73eb6aae90d5faf62502910020292a72baaf2a068f03866db231e9b927ea484b20606b726c417f8a8882ba0eae0e82352f8b76a1ed SHA512 6f45ad3578993ffb1e6ec76075b2d3047a9a69f8893e30dbe6a7fe6345d25b3a448495a3374c369c948e1d01d7fbde1e667507d8aeb5273513a0898d1715942e
diff --git a/sys-apps/memtest86+/memtest86+-6.10.ebuild b/sys-apps/memtest86+/memtest86+-6.10.ebuild
new file mode 100644
index 000000000000..ba53cf25aeee
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.10.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
+	pushd build32
+		use bios32 && emake memtest.bin
+		use efi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use efi64 && emake memtest.efi
+		use iso64 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use efi32 && newins build32/memtest.efi memtest.efi32
+	use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+}
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 6e472383da64..8e509956ac8e 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index c2b009646289..53a1ee309a0d 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -2,5 +2,7 @@ AUX 79_mod_security.conf 729 BLAKE2B 5a415b7890a6d9553ec6e974825adad596a8f6d5c3b
 AUX mod_security-2.9.3-autoconf_lua_package_name.patch 350 BLAKE2B 272cb5f4c2fc666423b762d3ceca73f305ba7b280e4ac3e65f45111cea18b4b1edc923c56225f4a422cdeb54b381a40f5152a338d767b037bf1c7806de1bc4a5 SHA512 0abeba7b02cd0aef25f61a811b258bee6025c43ec9c2ebe98542e2e5dab2cb2060055058d4c2f2b235f7b2773ced53ab2173be6c9de3cb46c16d5bdbd7af13c8
 AUX modsecurity-2.7.conf 394 BLAKE2B c9d55e8b4419e5b54a364e03dd02e9d0e5609954d1538c77baa33e0abc46110fa8aaf3207490a80a2fedc13d42558632703ee4552ebbaa99d67d929720008dd2 SHA512 ab8c1ee6372249613f853654f115102c7951ea021f47389510bca6c5d1226e7aa9d90bb47649cf4ca62b8d8f926eba9f5c0b02321851ec2e8452de70dd4c1839
 DIST modsecurity-2.9.6.tar.gz 4316582 BLAKE2B f344f8630218c401a3b0eb0de9f5f23d9d1f9f65bf5c4cff2d8d0ea3ebd27cf0202ce2199b1c6d923237ee49a3b151cce46a8de3563fa743cf119c8c25270af3 SHA512 54b3316950094b3951fcfdd82bbacd34dfa8f5500b9a772d3296f411711bad0dcad51068b25cb2c196fdc4b2e1095d54701370d25180c0c68cf0913bd7d4ea03
+DIST modsecurity-2.9.7.tar.gz 4320766 BLAKE2B 2e0c62ae4f6fcef0b41bf1f74ab5acbae485e728f35bf621a96e622d86e2256c7e052d3a452ff49a4c4cb824243e71a706f9a5868bb3f77e37191a1dfe1b371b SHA512 a333d142f0dedf332a3cccca8267ccf9193cd4ad5a026b3cdbe0713dd1f3edde33739eae8baced2c63409cc0b220001e0a226ea032874a97c08e4065eb1fbdd5
 EBUILD mod_security-2.9.6.ebuild 2931 BLAKE2B 08a8f6a93e70d500a6bb42be6e716bd1aaed9e5f79111fc37c6c99aea90db46ae87bd84b476ed0b4c823bdcaa904314420efcdb2bcfd987d21fd9f1c7f0e6816 SHA512 6cd1ba268e27d0b2e41118a71a3ff7c3a611515109ed5431764684ab6eb03fe1644a2ef46d59904ab4d3f3331d9a49a779e0f15b549c0c75c071d72a504197a9
-MISC metadata.xml 1010 BLAKE2B d8c9d6cb841ebd546aa9ac5c6e5078f846b31f8c499e69bef93777c512cc180068064b5d5c6a65c4cce179b3a5946cf3a6572ae10a2eaf6d25c6e1ac81b964f4 SHA512 0b06a417e39afc6326940eff1ed4da2aaed091b1fe01eabb58c62e5131ae7a4c922ca118799f26c91325187022052a34cd3c7979719e50b1a8837ab23468b13d
+EBUILD mod_security-2.9.7.ebuild 3026 BLAKE2B a66894e91d80acb8de5186e6c7b723b81f1f5080c752657901e092d9930a24b4961ca6b997e3c7ec3c9b9807465f85ba1c4eea85020f919b018bfd4b0c7a05ec SHA512 b2f02e704b617b8fbf12457bb2e52e4e471e2f2bd69857f50ad650e9887d8d21c27913af15e41ff6f1424002be51406e91c8728aee8f79e3f972bc3972c6c8d3
+MISC metadata.xml 1110 BLAKE2B 0f41b3a576170632aadbe53c213b4774618719d41ca4f7099cc96d4e009f065e162789025e7c6a2db32076a448d7c88b405631e796133ef65cc2b03aa2894673 SHA512 6f9e932ff1123863a0617c27c3ac0e4df6f1df5745f00c640b4d2d6e66b5c92f784e55087c70617177b6745998c8cf5e328a50a970e4b55eda547c3a1ea1462e
diff --git a/www-apache/mod_security/metadata.xml b/www-apache/mod_security/metadata.xml
index f17aaffc87b9..b17d41d2886d 100644
--- a/www-apache/mod_security/metadata.xml
+++ b/www-apache/mod_security/metadata.xml
@@ -27,6 +27,10 @@
     <flag name="mlogc">
       Build and install the ModSecurity Audit Log Collector (mlogc).
     </flag>
+
+    <flag name="pcre2">
+      Use <pkg>dev-libs/libpcre2</pkg> as regex implementation
+    </flag>
   </use>
 
   <upstream>
diff --git a/www-apache/mod_security/mod_security-2.9.7.ebuild b/www-apache/mod_security/mod_security-2.9.7.ebuild
new file mode 100644
index 000000000000..6905aea4982b
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.9.7.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools apache-module lua-single
+
+MY_PN=modsecurity
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Application firewall and intrusion detection for Apache"
+HOMEPAGE="https://github.com/SpiderLabs/ModSecurity"
+SRC_URI="https://github.com/SpiderLabs/ModSecurity/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuzzyhash geoip jit json lua mlogc pcre2"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="dev-libs/apr:1=
+	dev-libs/apr-util:1[openssl]
+	dev-libs/expat
+	dev-libs/libxml2
+	dev-libs/libpcre[jit?]
+	net-misc/curl
+	sys-apps/util-linux
+	sys-libs/gdbm:=
+	virtual/libcrypt:=
+	fuzzyhash? ( app-crypt/ssdeep )
+	json? ( dev-libs/yajl )
+	lua? ( ${LUA_DEPS} )
+	mlogc? ( net-misc/curl )
+	pcre2? ( dev-libs/libpcre2:= )
+	www-servers/apache[apache2_modules_unique_id]"
+BDEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="${DEPEND}
+	geoip? ( dev-libs/geoip )
+	mlogc? ( dev-lang/perl )"
+PDEPEND=">=www-apache/modsecurity-crs-3.3.2"
+
+S="${WORKDIR}/${MY_P}"
+
+APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
+APACHE2_MOD_CONF="79_${PN}"
+APACHE2_MOD_DEFINE="SECURITY"
+
+# Tests require symbols only defined within the Apache binary.
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.3-autoconf_lua_package_name.patch
+)
+
+need_apache2
+
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--enable-request-early
+		--with-apxs="${APXS}"
+		--with-pic
+		$(use_enable doc docs)
+		$(use_enable jit pcre-jit)
+		$(use_enable lua lua-cache)
+		$(use_enable mlogc)
+		$(use_with fuzzyhash ssdeep)
+		$(use_with json yajl)
+		$(use_with lua)
+		$(use_with pcre2)
+	)
+
+	econf ${myconf[@]}
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	apache-module_src_install
+
+	dodoc CHANGES README.md modsecurity.conf-recommended unicode.mapping
+
+	if use doc; then
+		dodoc -r doc/apache/html
+	fi
+
+	if use mlogc; then
+		insinto /etc/
+		newins mlogc/mlogc-default.conf mlogc.conf
+		dobin mlogc/mlogc
+		dobin mlogc/mlogc-batch-load.pl
+		newdoc mlogc/INSTALL INSTALL-mlogc
+	fi
+
+	# Use /var/lib instead of /var/cache. This stuff is "persistent,"
+	# and isn't a cached copy of something that we can recreate.
+	# Bug 605496.
+	keepdir /var/lib/modsecurity
+	fowners apache:apache /var/lib/modsecurity
+	fperms 0750 /var/lib/modsecurity
+	for dir in data tmp upload; do
+		keepdir "/var/lib/modsecurity/${dir}"
+		fowners apache:apache "/var/lib/modsecurity/${dir}"
+		fperms 0750 "/var/lib/modsecurity/${dir}"
+	done
+}
+
+pkg_postinst() {
+	elog "The base configuration file has been renamed ${APACHE2_MOD_CONF}"
+	elog "so that you can put your own configuration in (for example)"
+	elog "90_modsecurity_local.conf."
+	elog ""
+	elog "That would be the correct place for site-global security rules."
+	elog "Note: 80_modsecurity_crs.conf is used by www-apache/modsecurity-crs"
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 29db5d8e21a8..f43e306d3489 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index fe0114b612a0..2fc45912ef2a 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -1,3 +1,5 @@
 DIST papirus-icon-theme-20221201.tar.gz 33494699 BLAKE2B 546c7b3530fc039821e2d183f426d4131182c5c923c51b86367352c39d40c7f96e4f1f3e842d1c286db68685ecc5afa5898de2605f299eff781f7d1a801ec3e9 SHA512 2c4f73f3036a66efccbc6c19d6e571782f0d8549a4bcee55d85413f4960dc1941a15cdc667760d73d5e75211444d4c4b9814bdd6294037719dd5cfe03a2ad445
+DIST papirus-icon-theme-20230104.tar.gz 33527798 BLAKE2B 9aa80a3611f0a39aa0fabeb0a20a7d901ed983c046208784bbd268151a7668adf99d0e4d9df9efe544864278dc2ff417a40ab581610f11d204a4288e68173adb SHA512 c07adc6258e9c0b37b250efae91825004b5b440304b9a901dbccec90fe683eee6871f5bf3205e79ee1bf44fe13ce5f014cbfc99b1bb6488e82bd6b0b8b730bfa
 EBUILD papirus-icon-theme-20221201.ebuild 798 BLAKE2B 55cbb7bcc7a649fef1c2c33ed7d3435e6a8a1a9436c1486b5f4988ede7373e15f0f34e38626409636d3d6188b0337c2194f0e0ec2d59c4248ebd2de43556c28f SHA512 2fffe21a494e4ad3ad469fef1e9ce1286abf1589f10e379fef8ec9d77e5708ffd853ffb580918d48b098a74a89ed2758693004fd5f60f6100390c8830f60390c
+EBUILD papirus-icon-theme-20230104.ebuild 802 BLAKE2B 28a81bde45b41514604074903656e18d7575e71194772a17f107e2a808e3959183cb5210784624ff741940eaa4b0be4e2b72e17619aa3238e03c53bcc7dfec95 SHA512 a81d6a499625b46d6ce3d85902d043daba76a74c3a7da93b3c12eef4e38baa37ca115fee771bc2db555f6bd1f66d9b867ff822359386b75b7077acea65673e29
 MISC metadata.xml 436 BLAKE2B f884e84b63ce044c156c635e6bdc6e7b970e7ece131ec561df7f24280302ee8b13a84c4363649040358de88459371c490ce187b50e6fcda07328315e1bcd865a SHA512 64a963b39e82b2df247b72db0c57a6451b5b0f7c3063101848d4838b78ccf86065725606b78ca3d3143efb35bffab4d9cf9609274f46314c66a65541d53ff8fe
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20230104.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20230104.ebuild
new file mode 100644
index 000000000000..4460fa17b1f7
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20230104.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit xdg
+
+DESCRIPTION="Free and open source SVG icon theme"
+HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
+SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+src_prepare() {
+	default
+	# https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/issues/3241
+	cd Papirus/128x128/apps/ || die
+	ln -s beneath-a-steel-sky.svg bass.svg || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r Papirus{,-Dark,-Light}
+
+	# Install variants designed for elementary OS and Pantheon Desktop only
+	doins -r ePapirus{,-Dark}
+}