gentoo auto-resync : 21:03:2023 - 00:38:34

author: V3n3RiX <venerix@koprulu.sector> 2023-03-21 00:38:34 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-03-21 00:38:34 +0000
commit: d39430b96ad12b39a0ce35745f3d45d980d1b328 (patch)
tree: fef90d0b467c23d538da717540b56a1be7ec29f0
parent: a075e288474a3a53905a044068223546c5360298 (diff)
121 files changed, 1710 insertions, 388 deletions
diff --git a/Manifest b/Manifest
index 5534e06826cc..297e1cc9fd18 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29502 BLAKE2B b4c6ec41a82da82ccda9566fdbcc38c50ccb7804f222e6052a9b7aa9704dc0da5ca6f2b819b90d6738759c2a7d2639d684884dd367024c852d66ae18040175a0 SHA512 8d130ea174ce247e3532bccc7a95717064f8ea5bb0bac0e2e8872fe5cc43de15e838d83e314c15d0317f49af8950c592be1624f339e1797d673b81f9fd433627
-TIMESTAMP 2023-03-20T18:10:02Z
+MANIFEST Manifest.files.gz 29491 BLAKE2B d4dc02dea0c766440a98b41f722043031d3e8c0714d86f38e54a140a67774f69cf7af3cb7af421cade814dab1d78b06cbb1d511e6109241bd7cbc1859e334e21 SHA512 bd059f05a4698163d14de0a2cc2eb199cf79590e67966f56fda709f67ea5b836618f51f6fcd8e6b2115dcf352eb270c2a4ad33248bf5e4ba41a35b76308d50f4
+TIMESTAMP 2023-03-21T00:10:03Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQYoXpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQY9dtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAm4RAAot4xJzrdQv5Lnv3M4BIAzBJQZruRdHTofYAfapRuP1LaI6T7oZbyN5X0
-9oDigcgFAnmf5g2jRqamdhgbzaFCcY+nVmMZk1HYrHCynVxOBT64TkpFOVklT9aN
-QDwECs+3nbGjhG6VzcI5P/2oHYhpYSoAIR8k/r8DkmT1pH83nSKv1RikgLb3C89M
-M52l4XCqoT8shYmqsLUjT7xe9xfvliD6WHCNTsiZQD64cH3tF1/l/nWKCKvps0qj
-r+7MWIQSqHBwSp+qiq1aF7wiOGV8aSrUUFQL+TpInNCYI8409GdK1nbd8CfGT1F+
-qWshkm+A6wdneV2q5LQxKn7dVZ7CYWQQqWW7jKFG7fG9J7cs94R2k4jAYTvLF8PM
-lk+5PGP7Rg+R9g7czbYD85REp3M/kjlW1v3d+NT2FSVLjPLXEx6juTEYhDAsbCl+
-qy5JgGWnhhfnaZqjGZknq+T9pLkO5EdcDTf2RnOzp85SpWDg3fs9NTvPtVjYOc+y
-CPbqiWeki8P2ZGqg/Pat1GhJfqYd1/LH4Ndg7IAr+C1/9Q4e8ewzjg88RO+Y67pl
-UqqhjW2Nz8TefgSYWgDQe2A2TaVCjhnyQw3jykO+MSq4/cc7XWoiwNZ3I1Hla4Zr
-+yluU5xBtShmD0iCT1oMaXGWZTbfNNpHmBkuQtLEi5zchpxxOmY=
-=sOhV
+klAIrw//S1f31VNuiU8SCdvH8pQurGITGX5RZQHS/selFT9tv+TH5dr3PPuTJ5J3
+MBzU26I8+IeLMg0WJDuNK/dHKACZerHDz17gFwFym2IRA2n9NWlFc9SmUiZE5lWa
+SUuItDgXEOknxc6BZ61xEmOdbXOxgXVMyKY5bc09rZiEh+OJTT8JPHxa/W/oQlUs
+jCu3QJWbauD4uTSotSUKWmQdvVs+GeQO5tq3W0aWw1fOl5sZew4xUl0+Ri59cyMs
+29IVuia6IFXZzWUjFV0Zakiay7VNtkUDqogeW0nRxRRw3V5i1M6e7+O7aEcR/CC9
+3DJV/Sa4BJcr3pnK5oyIG0gL0AY94PRI7tz7wSK0QXSjVy3LtjZdrxQc90QUMt9c
+uYr2GnrF7pxksMKOy5RAtqn9hdcYonF6ZiOfMbvO5jbXNbYIMOys+LNvYuxOUxW4
+EZZZvV/8lE/qWP594xaCAWKNzScrPF/+ZTKlqdKm9VoZHXQFKa6lp2hMnGRYavop
+DBhtFnMqrpcBZu7G3EnHwoenVuArv9BA76HJUOLxWXQUQFKfv+IVtSgCQ/Uu+/2B
+JqxJwSHfwXLVXubvZO6Y8/hOR8FCtIkv72kauL11RvagSYu2cJf0CaWMBSt3reK7
+5RZYibVONPNV5y0De7/KgEKd/tjih5MnNk0H1vHQNQIsKWtG3lo=
+=uwWj
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 740d78aa1ebc..0f46d31cfc18 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ab575bce33a6..aaa015d103b8 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 0c35ad7e19d9..8c3a6cc820d3 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,7 +1,9 @@
 DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe48275364c4d0c973da6467ea044303d75f94cc0b963c3b423a7ec61d8eff26da30c102c557ccd5a4e8cf984db4f6 SHA512 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516
 DIST conky-1.17.0.tar.gz 1699311 BLAKE2B 9aead9e1e9bf4bf61c1b3e09c6e319135ccce19c43740c1bb3c6142c936c2a045820078f4684ea037fc26a8b02343e11b5372f74258fdf2c5386459410498cc9 SHA512 4da55ba3835e8ff42747f2bc01c34a94b2819e08eb74ddb913fd34bf4b682d75331119745ee006d842d3d2142fc53eeada16afdf698a60f37b566f55896aa2db
 DIST conky-1.18.1.tar.gz 1703018 BLAKE2B ba3c0f9624bfcf229de4376a9446ad05285db4241d1caf4a7a8ac92971f57d022192504c9831a786e3c02db140d70f10cf34d7e146c8647cb2a2b923e6acc2cc SHA512 e390d2aa8a3f3b570b2e3dc43ef71ff0001e36f3b42ce5a9c01b8dca656a23b1af80ee2ee138f38b12b4581dd03711562445fb53e23ca0f26e8b8af878aa2ba1
+DIST conky-1.18.3.tar.gz 1710600 BLAKE2B 5664c504bab8ddda14e4442fce3c4bda70033b8b1efb0642901f154306adee300673756a776e304a151214fc9a3d7dd8277336ffd13305ff1d86c4d65819cfb4 SHA512 702932bad88265619cb6de60b2fe86e834e7828343f31e966df1838c6742d5da2998aab71704bb22e4b0bdc3d05e3c082c9ab6231124b310e8c14c89bd80ad52
 EBUILD conky-1.13.1.ebuild 4795 BLAKE2B daff0445b97281fcd8fd737b681b862fae0570c15bbdcd9dd25fbaf5db825e8b6e0eeba771b34d09329ca338e869d341cd83b3ace80f31b28ccc103d59a66829 SHA512 75bd14e46fb12acc2d31b933adcfccf3a25e0202c8a40238bc585c9275c875e145833ae5e9870a9d0697bcf2b04b1ae5bbbb680fcd3c023ca21350fd6ead6e7f
 EBUILD conky-1.17.0.ebuild 5305 BLAKE2B e8e3480f4c13c1eb939154ec9019bd66821d433719accf6bafc3763fb29b8bd8ce1e6ac656010959855f43e32977263a31da19185a6abf0a8b1f6545d9afbc65 SHA512 4ff429e7766ae867daf3a23e962996be1d85a53d8cd5110b9ce07c1245d856f06f981295660b86b23b2d23fc12cce648fdcc75fd370db1ff8b458c82b7ce2947
-EBUILD conky-1.18.1.ebuild 5443 BLAKE2B e90677a3ea0cb529aaf27a9bc29852129f88e940f4b0dbbccbfebe2694c2d5f4a61a062987ccb79a7c2d4ae2178fdb6d2f6427c240b5cb1124b4a4f932cd9eb3 SHA512 f40b45c43dede63420b63e2e53e623b319df66883dcf6424f986f38a9d6794969eaad3145a74454844025696437c728a979118ebb0a7441014c5d7a890487e39
+EBUILD conky-1.18.1.ebuild 5458 BLAKE2B 37661e86b290cfcc889f0da5bade56c886ae506daa423812d4148fc4ae3836105fbd0c78565d47c7db9bf110dea3015b6bcc2f18cf5908169b395f93169a9cf5 SHA512 44dc89ed780c179e33344ff3907c493614e162bb14305376e158a9a73c023147d94b72e2415595ce612f617e2db0cd2d874928d91f572efe51b1269728c9d21f
+EBUILD conky-1.18.3.ebuild 5446 BLAKE2B a8256a09de877bbcf176775ab65e7a6a9a87a70f3e7eb397a6646fc0dd18828aab778bf2b471c2b95400f9dcacd6e1bcd2ac44b2686351ecec78bce9ca344099 SHA512 b3ffb447b2dbf8de69e7b0a400b6541e41ff64beb237ca15a7493a8ae30c96daa1738166708d0872d202272e71a05edc8b809e218234b9f9c990a7eec012fb62
 MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48
diff --git a/app-admin/conky/conky-1.18.1.ebuild b/app-admin/conky/conky-1.18.1.ebuild
index 44dd8a64799f..f60c0ae116e7 100644
--- a/app-admin/conky/conky-1.18.1.ebuild
+++ b/app-admin/conky/conky-1.18.1.ebuild
@@ -38,7 +38,6 @@ COMMON_DEPEND="
 	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
 	wayland? (
 		dev-libs/wayland
-		dev-libs/wayland-protocols
 		x11-libs/pango
 	)
 	wifi? ( net-wireless/wireless-tools )
@@ -66,6 +65,9 @@ RDEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
+	wayland? (
+		dev-libs/wayland-protocols
+	)
 "
 BDEPEND="
 	doc? (
diff --git a/app-admin/conky/conky-1.18.3.ebuild b/app-admin/conky/conky-1.18.3.ebuild
new file mode 100644
index 000000000000..ff1244c36105
--- /dev/null
+++ b/app-admin/conky/conky-1.18.3.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+PYTHON_COMPAT=( python{3_9,3_10,3_11} )
+
+inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
+	intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
+	mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
+	wayland webserver wifi X xinerama xmms2"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	ical? ( dev-libs/libical:= )
+	iconv? ( virtual/libiconv )
+	imlib? ( media-libs/imlib2[X] )
+	irc? ( net-libs/libircclient )
+	lua-cairo? ( x11-libs/cairo[X] )
+	lua-imlib? ( media-libs/imlib2[X] )
+	lua-rsvg? ( gnome-base/librsvg )
+	mysql? ( dev-db/mysql-connector-c )
+	ncurses? ( sys-libs/ncurses:= )
+	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	pulseaudio? ( media-libs/libpulse )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	systemd? ( sys-apps/systemd )
+	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/pango
+	)
+	wifi? ( net-wireless/wireless-tools )
+	webserver? ( net-libs/libmicrohttpd )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		x11-libs/libXext
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xmms2? ( media-sound/xmms2 )
+	${LUA_DEPS}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	apcupsd? ( sys-power/apcupsd )
+	cmus? ( media-sound/cmus )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	extras? (
+		app-editors/nano
+		|| ( app-editors/vim app-editors/gvim )
+		)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	wayland? (
+		dev-libs/wayland-protocols
+	)
+"
+BDEPEND="
+	doc? (
+		virtual/pandoc
+		$(python_gen_any_dep '
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+		')
+	)
+	extras? (
+		$(python_gen_any_dep '
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/jinja[${PYTHON_USEDEP}]
+		')
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+python_check_deps() {
+	use doc || use extras || return 0
+	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+REQUIRED_USE="
+	imlib? ( X )
+	lua-cairo? ( X  bundled-toluapp )
+	lua-imlib? ( X  bundled-toluapp )
+	lua-rsvg? ( X  bundled-toluapp )
+	nvidia? ( X )
+	truetype? ( X )
+	xinerama? ( X )
+"
+
+CONFIG_CHECK="~IPV6"
+
+DOCS=( README.md AUTHORS )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
+
+There are pretty html docs available at https://conky.cc/.
+
+Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	lua-single_pkg_setup
+	if use doc || use extras; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# pin lua 5.4
+	sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \
+		cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
+
+	cmake_src_prepare
+	xdg_environment_reset
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	if use X; then
+		mycmakeargs+=(
+			-DBUILD_ARGB=yes
+			-DBUILD_X11=yes
+			-DBUILD_XDAMAGE=yes
+			-DBUILD_XDBE=yes
+			-DBUILD_XSHAPE=yes
+			-DBUILD_MOUSE_EVENTS=yes
+			-DOWN_WINDOW=yes
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_X11=no
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_AUDACIOUS=no
+		-DBUILD_BUILTIN_CONFIG=yes
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_EXTRAS=$(usex extras)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_I18N=yes
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IMLIB2=$(usex imlib)
+		-DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_IPV6=yes
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_NVIDIA=$(usex nvidia)
+		-DBUILD_OLD_CONFIG=yes
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_WAYLAND=$(usex wayland)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_XFT=$(usex truetype)
+		-DBUILD_XINERAMA=$(usex xinerama)
+		-DBUILD_XMMS2=$(usex xmms2)
+		-DDOC_PATH=/usr/share/doc/${PF}
+		-DMAINTAINER_MODE=no
+		-DRELEASE=yes
+	)
+
+	if use doc || use extras; then
+		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use extras; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
+
+		insinto /usr/share/nano/
+		doins "${BUILD_DIR}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_pkg_postinst
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index cfcbd88bed13..a1af4da95c50 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 0eefce4258f8..f6698aa1add2 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,4 +1,6 @@
 DIST iwdevtools-0.12.3.tar.gz 89745 BLAKE2B 7d52bd59fcc98cff28873dd8d7737b1e75a99111ea27dac6803d2a14975eb04dc5be88a03e6efd46eef6662828453fc7c53afc9c920d82e74b44fd1e837e58df SHA512 f2efdce89350f85d2c77c7df9fa5fde62ac2923b5cc36eedd4c6ce507fbbe12f915e138a16c8b6b360f093057118a274844c112158ce01bb3f456a415b222216
+DIST iwdevtools-0.12.4.tar.gz 89925 BLAKE2B 6fd87cc528784d443cf966fd126f4bcb020bbaf759509eb1d3e512af73d16fc22b12de06510d2486fcb96ff8c86f8fc77d404d55b2935ef0b456f582a007d903 SHA512 c6486a16ade37a98f38e551e8c01c19c1704b1d99cef87fd1bff9575dcb52df6a1429a2fc26783cbcdc64c971f4885286e9155786a8aa23360c32826e6b8f19e
 EBUILD iwdevtools-0.12.3.ebuild 1927 BLAKE2B e092ed1ba8b5d3e2e31622aa4b54417889f60fe8f5b2f9674699a4c847f35b593d53e0b6df047643e3be1cd55f21c9d2f5c1ece5fbc8a4140e9b27e2d45bf8a3 SHA512 f986ee0e61d226609d977cacb079861ba8dd1d5f5eb65e8f7862aff1a43eea23ff995a534b714ee5ffbce3e80d08e0f3ee4befae0603c9d662704485890a253b
+EBUILD iwdevtools-0.12.4.ebuild 1927 BLAKE2B e092ed1ba8b5d3e2e31622aa4b54417889f60fe8f5b2f9674699a4c847f35b593d53e0b6df047643e3be1cd55f21c9d2f5c1ece5fbc8a4140e9b27e2d45bf8a3 SHA512 f986ee0e61d226609d977cacb079861ba8dd1d5f5eb65e8f7862aff1a43eea23ff995a534b714ee5ffbce3e80d08e0f3ee4befae0603c9d662704485890a253b
 EBUILD iwdevtools-9999.ebuild 1826 BLAKE2B 3374f5d939144190c7f8aefd57fd72cffa0f68e310fc08f5961d5cd945f2665b6a613feca445f9bd33a4c468b0cd33b267d87e52e690feef6fd4360a7c15ecf9 SHA512 e2609aeac7bb0e367c111e2ec1c798c5df8ffd85032aee29ed2837e0379032651ee10c58f26d148cce99564a176e4eca9c676d4e5584e8c51ff3d8bac030aa72
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.12.4.ebuild b/app-portage/iwdevtools/iwdevtools-0.12.4.ebuild
new file mode 100644
index 000000000000..ad9fe2c7e81b
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.12.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	>=app-shells/bash-5.1
+	dev-libs/libxml2:2
+	sys-apps/coreutils
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	|| ( sys-apps/util-linux app-misc/getopt )"
+BDEPEND="
+	sys-apps/help2man
+	|| ( sys-apps/util-linux app-misc/getopt )
+	test? ( ${RDEPEND} )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
+		$(meson_use test)
+	)
+
+	has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
+		elog
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index f283379fa1d8..4ef1ad3e3b47 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/VSS/Manifest b/dev-ada/VSS/Manifest
index 815e2577b882..e7350affe2a7 100644
--- a/dev-ada/VSS/Manifest
+++ b/dev-ada/VSS/Manifest
@@ -1,5 +1,5 @@
 DIST VSS-22.0.0.tar.gz 310314 BLAKE2B 710645472b0e767f744ca12564a595fabc6bd931a271bc6fd575fdee70ade1676f3a0dbe00d7700ba5bbeb341fa6cc767b8efb18162f1fc308edcb653c9919f4 SHA512 b38582efc2b334a5b550eb9eacadd721b354f51d4cc26fcb4da1c8e7d241a848d5d3ee2651a72b552e2d5357b9fde46ba48e694f17f49cc2bcdad63d2f9d685e
 DIST VSS-23.0.0.tar.gz 481748 BLAKE2B eb84e1b84b2d3a463a0e19a3cdd8b6e1e0dd666f72cd79f592f07f75fd7f2c8496f89f5d272c2be1af8a75491a8e3f0f11131dbfe892f3fe107f7e50223ea4bd SHA512 11e762a6ade7137acb32c0776db06244b40a137df90ee5d25855503deeba2a22e6e962ed56d991c71fd27a514edca22ff3d35b0f783855e2d670eb6b45aa4c03
-EBUILD VSS-22.0.0.ebuild 918 BLAKE2B 7c7eca24f61af70250f03a44483be9181673b5aa36de61110c72eb86d8ad73b618780243d23f3d9205d8b6ce1ea8e332bda2bed40cee03c48d0d88fedc20938d SHA512 698788f40ffae9b3df7e58d16e72916c277f2d48f8d0c08ec2c674f01d08ac4cfd447c9b29b5336ed509afb75233de1e82f60faba4ca99ebaa1ff1cccbe55116
-EBUILD VSS-23.0.0.ebuild 1031 BLAKE2B 3c87b0ae903c06238fd945878105d4c3275358046cc7cb782a64b4bfa835d5be6db4a23455831aed04b9daf0f465743f8b45f23c9196a7c9b8bd65fbd69368b6 SHA512 c4c10ee659d96a6c94ec244122c10e53959a2855108634731bf395cf1ad42f7c4ee369050c59b9210b3b0bd743e90e24f8c2177655aa2e35ac6e65f2eb042bec
+EBUILD VSS-22.0.0-r1.ebuild 925 BLAKE2B b398e558021b8e1dfab697da24de7cc5faada640e46efaa6325bc2b80da7fb85f8bff7abb58e9b7040e2c3d56ba1811363654dfab96d22fcfc21d8b232a11380 SHA512 84f879fda03ed3a5e869ae732a4dfea5282941607f13a237ec82b099397ee689877d8480ce285d0ea064b33795fc200ce35d4a8d6c3dba21b246d320791a3789
+EBUILD VSS-23.0.0-r1.ebuild 1038 BLAKE2B 37be8a0505cc7d1f67d4b20b7879af5d920698d4668feefe318e9aed4d157340b88b26dc7d75fbe27182d5c3fde548d83b38ca0858c7b1fdd14fd6bb7250bcf7 SHA512 26309582a348a77f015a6fb7ed017559a9790f27f89ec060d89f1435e8ece1f1d1f7f90f3c468a821742e316a3b576f35a80857803d8441b4255e2415f091e47
 MISC metadata.xml 292 BLAKE2B 5a618f9fd5bd6c227fb9c7a5c40c47ed72a314d5dbf2d5f93cb97a7c34236064ed43c4f874561e5e48b385c10eebb9d8a75f9916a722e5f460091738cf6e4679 SHA512 9440e2195e1500bb2edbb5cf4b800d211f6637749a2b5833d341409cfb11a854b0d18cb997e8ff4bfd1afbfb8d49b6f23957cf9b93bcaffd9bc0a60e7e8d8079
diff --git a/dev-ada/VSS/VSS-22.0.0.ebuild b/dev-ada/VSS/VSS-22.0.0-r1.ebuild
index a59fe4ac8241..2244278b3025 100644
--- a/dev-ada/VSS/VSS-22.0.0.ebuild
+++ b/dev-ada/VSS/VSS-22.0.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada multiprocessing
 
 DESCRIPTION="A high level string and text processing library"
diff --git a/dev-ada/VSS/VSS-23.0.0.ebuild b/dev-ada/VSS/VSS-23.0.0-r1.ebuild
index 7c3492e64841..9785ef553d34 100644
--- a/dev-ada/VSS/VSS-23.0.0.ebuild
+++ b/dev-ada/VSS/VSS-23.0.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gcc_12_2_0 )
+ADA_COMPAT=( gcc_12_2_0 gcc_12 )
 inherit ada multiprocessing
 
 DESCRIPTION="A high level string and text processing library"
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index c6e29991d244..12e0a13b4f55 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,6 +1,5 @@
 AUX gprbuild-22.0.0-gentoo.patch 2052 BLAKE2B dcab01dcc71bdab78ecf16796c4174401a3d1dd950fb3600b993ed8e3f9606b7bb19e0ef9e30a1e2265a2003154b6ed06de8b1da73bb3279301b21e68a58e7a0 SHA512 6266611075133e580b07044f1fa85a03918254c189d2def36e227996f377b56876085f3e3ff18b443ccb0cc1d67ee69cb478cd90403015ff4d68107870929c0d
 DIST gprbuild-23.0.0.tar.gz 952887 BLAKE2B a0de49e838dd41ca927d728dc2e7f23298bb3e7f865146ed6807e1da0f20fe9ce345d972ef93340f1a1fec91082ce14b575ad4e6642d759cb9d696602f291508 SHA512 d3b1af5295c0216eaa93e52b63ca51ceeaea324a3a3f40644e294f9048170f9294335e7e8ee2d77d99d4d9bb359267921632a01d43485d841b6e771143fb47a5
 DIST xmlada-23.0.0.tar.gz 1053370 BLAKE2B 4edf2244818d72d6fc760f60c8145f373e5445d1d245b20b605e21faa7eeefed7835db87c1fd1239008e75211a572294e1d8e35af16c2ba2631c02d1d3b6f52f SHA512 a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb
-EBUILD gprbuild-23.0.0-r1.ebuild 1701 BLAKE2B 289e0e6f3b3258ccaa8e50703fd72b4e1b474b65e593b9df15f40cab86a8db2d7500bc60a7d4db071aedeb45d1ccaf07eac4ee977682e6c5729bc3c12be3f963 SHA512 f6a508366308e431cfa12f441fc43b303785d1b68d779d8cd8627bb2c22933ba8640976f53b7495370a48fd80f8a756d64fd2607e781a3ac1230b72ccc22b828
-EBUILD gprbuild-23.0.0.ebuild 1692 BLAKE2B 4f215675325bd6930a377ca7575ec8b6bf92a9ca86707c3fdf872bd269ac2bbe11ff7f89a9ceee2739dbc3f0866fbea0a5801969661499c9ef64dcd0ab691c54 SHA512 1af41f7d3e5ae295f67b5281cd11184bea140f8595080d8277b235fd921d3ae013445f8a4e6e652ae157dd0d9760a7e54804874b8bcba54da4e418e60b48839f
+EBUILD gprbuild-23.0.0-r1.ebuild 1699 BLAKE2B 020a0820e3c02e78cab1d12725da25b4cfbfa2c55655d9f6372c0a8ea6d079becb2a395f7e9f94d41883292e0f6448eab16756f7daad921c7a89e26d7cbb757b SHA512 550b55b23f5cfff4a50db3239b0f3eb9a245e6fa25abb839cfd636e453959244c5d897dbcabc9d8ee2a93eb948a187f32cf476b4271d6a27795745e087ff0baa
 MISC metadata.xml 888 BLAKE2B 635ae939acfcaa26b0ba80341ed90cb02d8c5a2cfa50ca78bbcf19bd3081cf434a51ef1b05547bc80f9174db1aabfad1bde6270c3c08ea4c119684a4af7d5e4e SHA512 65b9e30e2b0d5694fe31c244eeca739327274beda743330edb8f85f050a7f9c809cfb3a115b4f9349f282fc39de36f934354db864669f515da746cd9551b5337
diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild
index 3e090bfd7e4d..9649280c1c56 100644
--- a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 		-> ${XMLADA}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="${ADA_DEPS}
diff --git a/dev-ada/gprbuild/gprbuild-23.0.0.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0.ebuild
deleted file mode 100644
index 3b99fe68bb8c..000000000000
--- a/dev-ada/gprbuild/gprbuild-23.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-
-inherit ada multiprocessing
-
-XMLADA=xmlada-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
-		-> ${XMLADA}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="${ADA_DEPS}
-	dev-ada/gprconfig_kb[${ADA_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATBIND@:${GNATBIND}:g" \
-		src/gprlib.adb \
-		|| die
-	cd gpr/src || die
-	ln -s gpr-util-put_resource_usage__unix.adb \
-		gpr-util-put_resource_usage.adb
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	local xmlada_src="../${XMLADA}"
-	inc_flags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-
-	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		gnatmake -j$(makeopts_jobs) ${inc_flags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \
-			-largs ${LDFLAGS} gpr_imports.o || die
-	done
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	einstalldocs
-}
diff --git a/dev-ada/gprconfig_kb/Manifest b/dev-ada/gprconfig_kb/Manifest
index 143fcc1de46c..290a084f82df 100644
--- a/dev-ada/gprconfig_kb/Manifest
+++ b/dev-ada/gprconfig_kb/Manifest
@@ -1,5 +1,4 @@
 AUX gprconfig_kb-23.0.0-gentoo.patch 5997 BLAKE2B ab522e5510b9a8cea9d0ad6bf9c9b27d74d00b8ab330f32fdb301f4441279a193ef8d07c8b2859dd739613baf32f0ffbeeb80b9b0e0d3370d1b6a87248febe67 SHA512 13c47f87f5c5dcee460e4380cc02cfdc849ee0a28092aa6aacd4371c7d7362099f2ef722a084ef9bb4f3fdc52d58cecf428e7062533ffd6c9558e06bf52e18f8
 DIST gprconfig_kb-23.0.0.tar.gz 42132 BLAKE2B ed39c8f199e0cd31dbd3b587bcf589d62befc29ab907c54d9bcbc08887239a5ce12bc22428631e32d8c69c0c6bdd01e4591d050f480ea461f4d8af0f1cc05288 SHA512 505b632ff744c8fbb75b72d0f406a88a2c675d5afead9f0f8ca282ae79ca4e38c174dfe424c4c4a55835a9ebdbc6d0a2f329592bd6dfb87d5493e8473a0b2376
-EBUILD gprconfig_kb-23.0.0-r1.ebuild 747 BLAKE2B fb3a4b71cb62bfbd81fc54492a70c2d81054cf4003991454429f9fe85a8e2f798c5721e6517c6612c6efa9392bdd990d4ce72d53679dfe71570d3708f121918f SHA512 bbc85f5dca732eaa3069c289dd6b4039a5427d6f448152568ca9da7d09e2528497f9f72cb4dea567de9251bb4e681b8d162eef7c3a9c03275cad6d7af453d835
-EBUILD gprconfig_kb-23.0.0-r2.ebuild 756 BLAKE2B 8fb9fecfe088022ff7f986f368ede855c4df7b04bcdb6848beb23c5b15258a77d80002cf14ca25ed3a4c3ca2c72404eb9ef8019912fb1dbe502ac98af85c7445 SHA512 420577cbe17df7e49a4aa4c95d4c1e1a68d6f92d0713283433639fed855e6f2e7908f0a2bf3c17fb0ee308f0370718e506772eed87bf6f4fe15a8f3ade944575
+EBUILD gprconfig_kb-23.0.0-r2.ebuild 718 BLAKE2B 3add45957eed5b88b9582641e2997f12b9aaf7372df7a3d1ad01a58f6e75e75b5e3c3f6542407722992b8c76f52956fbde47dd30ac14d6b49eacc3a6aed96628 SHA512 f0f61ff36c04cac43aabdb1e71e7faeed901e5803a9c03b11b5602fd569e87d8060abb76571394ac2317ba424d9776ca0d9bb61f5a86a63d9c3399b316bcbedf
 MISC metadata.xml 892 BLAKE2B 0c323b949a393a634485d849b25e56ba6a9f9922538c0c09690671810c6ce97842a52021bd2448408747d18210bc8363c94b03697884ad29090f7d7a2ca92a30 SHA512 a1a9312eb03f1e5d0194c21d365650348b2fff626875e075a94dece326a3a6c589133f75998d58d1e2f7053b39fa3fa9ae31074cc0484352024ed336843e819c
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r1.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r1.ebuild
deleted file mode 100644
index c3ffa5994631..000000000000
--- a/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-
-inherit ada
-
-DESCRIPTION="GPR configuration knowledge base"
-HOMEPAGE="https://www.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="!=dev-ada/gprbuild-2021*"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:@VER@:${GCC_PV}:g" \
-		db/compilers.xml \
-		db/gnat.xml \
-		db/c.xml \
-		db/linker.xml \
-		|| die
-}
-
-src_install() {
-	insinto /usr/share/gprconfig
-	doins db/*.xml
-	doins db/*.ent
-	einstalldocs
-}
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r2.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r2.ebuild
index 6c1b527c0680..e7fecf750ebd 100644
--- a/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r2.ebuild
+++ b/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r2.ebuild
@@ -13,11 +13,9 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="!=dev-ada/gprbuild-2021*"
-
 REQUIRED_USE="${ADA_REQUIRED_USE}"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
diff --git a/dev-ada/markdown/Manifest b/dev-ada/markdown/Manifest
index e2c5f652f7e1..a383b9c8a841 100644
--- a/dev-ada/markdown/Manifest
+++ b/dev-ada/markdown/Manifest
@@ -1,3 +1,3 @@
 DIST markdown-23.0.0.tar.gz 29626 BLAKE2B 146c980635aec06e8b806f3b00ef8a66b2a34de0a5aebf3ff1a83d3f99187b97c714c81a5a7054dd75d3fa87e6682b260636c12044fce05dc79ddf52d2fe56a5 SHA512 13497f8762d360190d158bbcbbb3a0efaaedad0c67b69d0df63c31029ed482c5b6a169152433fb3fd267e97bebc1950d0a8307fc849945a1b7f68892feb496c0
-EBUILD markdown-23.0.0.ebuild 520 BLAKE2B f4633db4f1561676548ce76cebcb80a8de66672b2425313e9ce1dc23c36dfe5f14f0f2791c5eecc4f5d80eb2bbc193b6259bf5bae67d56ec04457cd471b9d29a SHA512 f8756e911bba5a976a786ad2408b7fea50b74c4df9e0c243720a2426cc62472d92a9b6e1794caa8ef0a4ec337a492471fb2b1ae7b81082c3ba23b1f7e7c6990a
+EBUILD markdown-23.0.0.ebuild 532 BLAKE2B bc0353174cf9e751824838b8a6c72d9a0cb458c2446996b052f921fc158838665efde005d1838544317be1e30c2ac43b4d3a4f9ea1eb2277775615b483fbfbc2 SHA512 1610197d986116cd3c5c07eb6d62887e78b41363a1146377bfd7a2d2d83e7ce2fdd324a16505f7dfc552ed373708c9eeaf102109bb5dbcd940066022110ada89
 MISC metadata.xml 297 BLAKE2B e9b6674777967e3b392b904af4cac37deff1e0344979b3ae53cf4130353f2d8bf8a38ecd999182c958559a0c4c56255366253ece09f37f59583ebe9dd78dad20 SHA512 517d8222a6bc08f0cf301e11858640f2f40389f338fe1bf77aff093aa3c9ac886688a388f314d9b227f63eacf971034ae056988041c746e7dc9ce58e12ca5821
diff --git a/dev-ada/markdown/markdown-23.0.0.ebuild b/dev-ada/markdown/markdown-23.0.0.ebuild
index 211f2cb18159..f6a994928520 100644
--- a/dev-ada/markdown/markdown-23.0.0.ebuild
+++ b/dev-ada/markdown/markdown-23.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada
 
 DESCRIPTION="Provides a markdown parser written in Ada"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 6020eb2d8eec..b7d891cc05c1 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 016c6764e733..e60d161c0ba8 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -7,7 +7,9 @@ AUX godot-4.0_rc3-scons.patch 506 BLAKE2B 2fd1421760f082ea65febce90459f8a2d63e06
 DIST godot-3.5.1-stable.tar.xz 24153448 BLAKE2B 9d61276a2d82ef4f4487ec1046b7fa58f2b3626640b2db25c1f98c3f8e2ff40eddcf943fd9ffaaf6814fbafbbe7ef1d3f642d77af953b87731cff570ac3a5473 SHA512 59e5ca88534f542562971efb83b76561705f9ca8761311f01b4453857e7ae046c17cadd0d5ca6f6f56e262b5031294a8b9ad970fa6ffc95e1a6a1e1bae48d55f
 DIST godot-3.5.2-stable.tar.xz 24047432 BLAKE2B a4d600cb174b2f79cc91c583b1052db2e7e2921003ffd5a307a2484af9cc050b600e763b6016ba2df043ba5e492f0bdd13c207fd3a3d794b6602f7c574093cb0 SHA512 e9f3c8b23cd69422639fe22948fb1f5f2071dff6e013fee3c08d6d3c1f39de4dfc252d32eb395c847021c9bbc1b2fa320500140ff3e684bf00530889ba48a181
 DIST godot-4.0-stable.tar.xz 29435592 BLAKE2B 0802631f2995144b63c98c3a6031e7f9df771e7dd9491d38a5fcb3f52581c1f3d6a29cde5a43f9a3a83c9aaeaba9e53b22c22cdb67117f65189d916564db614b SHA512 a1de87425861dfd71bf6c6387008d72a0c80322865ffb4dbb4a87e58244d37d4d45d6f6df8e06ea6c4f979de80b364932891c65cf11c7f80727f33e28460cbd9
+DIST godot-4.0.1-stable.tar.xz 29626604 BLAKE2B 4dbcfe05b830a1e5e8cf23a31fc0ea743ae5985b9454eb41f3231d7e2b51d4e86dc1fba2c6ccf457a1c7e0d3336191b5e961936b3916837ca34b90609d9e4f30 SHA512 cb4f6eced611a3fd2f65ea31a80971f67d2f8b8bdb9a710bec41d2d9fc2d5714ab2a1ead58540dd0a7787b123dba6195fedf1b2eb56db122cb4f9f05f9633513
 EBUILD godot-3.5.1.ebuild 6752 BLAKE2B b7a6a3851292aa6bd134a45bf2ab7019a55da8bcc815e952ae3acd204b71314fb1a436fe5bab3c83906289566c274f1bc3240e3482c337aca488071d71618df5 SHA512 84a385fbcb01813c6b09e21a76b832b6e7329302e9d7ebd3d3ccbb37ce504f3cc13e1c0d460daa299ef40f9fe5cb04b7d1362e538004f96ef9b6c9dd56a115ac
 EBUILD godot-3.5.2.ebuild 6532 BLAKE2B 7c038530928461f198ce077a6e19e16b2ad3f4f3f144054dabd06e3ea40732099c9fff54cd89eade3470540fe97ed70ffe4f2bc8c187973f0d30b965401967d2 SHA512 2cb4c893c2c85e744f8a6232b4f39bed27123eed4bc3caea52d5daf34a02249ca364a7345d162c43cdaafda91d97c1e85d3c3a4134684dccc55c820da0f94549
+EBUILD godot-4.0.1.ebuild 7067 BLAKE2B dcdecf57b5d677fb33c6ae8d0389cb79662283cf3fb6614ad49389ab8c4d36d4b204533ecd3985fe5d59e0d9abcdf4c36b550f7239b9f42d22f4f062f7c28927 SHA512 d6a585e09aaeeaa67d32767edb418b7d9c65eb914b50cd980c5e5c0566219e41bc8f5ef2a8976a849e6633f22adc4130edbae920a791101ac1af9a46566b9853
 EBUILD godot-4.0.ebuild 6934 BLAKE2B 3424561869abcfa1dabc48c444c7642fe49577c67e05b751023d9fc0420f065ba6a7049d20671a98159cb53a6ae781184ab2d0d15daf84b18dba8a9f78a6f348 SHA512 30b1eeb9d5b40d95343953fa954243e2d3a6c07db45314e27b58549b63406ba0ee18545657c09443ed3b5496a3c10b032d751c396d0b9fccdeb898e73fea400c
 MISC metadata.xml 1606 BLAKE2B 5e4f1116549672d8cf6f88ef0b764e0710d5f5a1259110c323b67e911dc186c7b618ceb6e5d8b5ada540f531bf34b8e87c9de1652e13db9b08e865bacd7d0c29 SHA512 b4cdc297ad05067832bbd8ab849203201a3f65e00f0dd27ca4dd4c1f808ea2fd13a18615ac9fe6853ae30ae1e53168b73627d72df1f8f428d3979b06697defe5
diff --git a/dev-games/godot/godot-4.0.1.ebuild b/dev-games/godot/godot-4.0.1.ebuild
new file mode 100644
index 000000000000..0cfaf7e1e100
--- /dev/null
+++ b/dev-games/godot/godot-4.0.1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+
+DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
+HOMEPAGE="https://godotengine.org/"
+SRC_URI="https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz"
+S="${WORKDIR}/${P}-stable"
+
+LICENSE="
+	MIT
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
+SLOT="4"
+KEYWORDS="~amd64"
+# Enable roughly same as upstream by default so it works as expected,
+# except raycast (tools-only heavy dependency), and deprecated.
+IUSE="
+	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	+runner speech test +theora +tools +udev +upnp +vulkan +webp"
+# TODO: tests still need more figuring out
+RESTRICT="test"
+
+# dlopen: libglvnd
+RDEPEND="
+	app-arch/zstd:=
+	dev-games/recastnavigation:=
+	dev-libs/icu:=
+	dev-libs/libpcre2:=[pcre32]
+	media-libs/freetype[brotli,harfbuzz]
+	media-libs/harfbuzz:=[icu]
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libvorbis
+	<net-libs/mbedtls-3:=
+	net-libs/wslay
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig )
+	gui? (
+		media-libs/libglvnd
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxkbcommon
+		tools? ( raycast? ( media-libs/embree:3 ) )
+		vulkan? ( media-libs/vulkan-loader[X] )
+	)
+	pulseaudio? ( media-libs/libpulse )
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/miniupnpc:= )
+	webp? ( media-libs/libwebp:= )"
+DEPEND="
+	${RDEPEND}
+	gui? ( x11-base/xorg-proto )
+	tools? ( test? ( dev-cpp/doctest ) )"
+BDEPEND="virtual/pkgconfig"
+# Temporary range to ensure a non-broken scons, cleanup next bump
+# https://bugs.gentoo.org/900971#c7
+BDEPEND+="
+	|| (
+		>dev-util/scons-4.5.1-r1
+		<dev-util/scons-4.5.1
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
+	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
+	"${FILESDIR}"/${PN}-4.0_rc3-scons.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
+	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
+	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
+		-i misc/dist/linux/org.godotengine.Godot.desktop || die
+
+	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
+
+	# use of builtin_ switches can be messy (see below), delete to be sure
+	local unbundle=(
+		doctest embree freetype graphite harfbuzz icu4c libogg
+		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
+		miniupnpc pcre2 recastnavigation volk wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
+}
+
+src_compile() {
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		use_sowrap=no
+
+		alsa=$(usex alsa)
+		dbus=$(usex dbus)
+		deprecated=$(usex deprecated)
+		fontconfig=$(usex fontconfig)
+		opengl3=$(usex gui)
+		pulseaudio=$(usex pulseaudio)
+		speechd=$(usex speech)
+		udev=$(usex udev)
+		use_volk=no # unnecessary when linking directly to libvulkan
+		vulkan=$(usex gui $(usex vulkan))
+		x11=$(usex gui)
+
+		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+
+		# platform/*/detect.py uses builtin_* switches to check if need
+		# to link with system libraries, but ignores whether the dep is
+		# actually used, so "enable" deleted builtins on disabled deps
+		builtin_certs=no
+		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
+		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
+		builtin_freetype=no
+		builtin_glslang=yes #879111 (for now, may revisit if more stable)
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu4c=no
+		builtin_libogg=no
+		builtin_libpng=no
+		builtin_libtheora=$(usex !theora)
+		builtin_libvorbis=no
+		builtin_libwebp=$(usex !webp)
+		builtin_mbedtls=no
+		builtin_miniupnpc=$(usex !upnp)
+		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_pcre2=no
+		builtin_recastnavigation=no
+		builtin_rvo2=yes # bundled copy has godot-specific changes
+		builtin_squish=yes # ^ likewise, may not be safe to unbundle
+		builtin_wslay=no
+		builtin_xatlas=yes # not wired for unbundling nor packaged
+		builtin_zlib=no
+		builtin_zstd=no
+		# (more is bundled in third_party/ but they lack builtin_* switches)
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_mono_enabled=no # unhandled
+		# note raycast is only enabled on amd64+arm64, see raycast/config.py
+		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
+		module_theora_enabled=$(usex theora)
+		module_upnp_enabled=$(usex upnp)
+		module_webp_enabled=$(usex webp)
+
+		# let *FLAGS handle these, e.g. can pass -flto as-is
+		debug_symbols=no
+		lto=none
+		optimize=custom
+		use_static_cpp=no
+	)
+
+	if use runner && use tools; then
+		# build alternate faster + ~60% smaller binary for running
+		# games or servers without game development debug paths
+		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
+	fi
+
+	esconsargs+=(
+		target=$(usex tools editor template_$(usex debug{,} release))
+		dev_build=$(usex debug)
+
+		# harmless but note this bakes in --test in the final binary
+		tests=$(usex tools $(usex test))
+	)
+
+	escons extra_suffix=main "${esconsargs[@]}"
+}
+
+src_test() {
+	xdg_environment_reset
+	bin/godot*.main --headless --test || die
+}
+
+src_install() {
+	local s=godot${SLOT}
+
+	newbin bin/godot*.main ${s}
+	if use runner && use tools; then
+		newbin bin/godot*.runner ${s}-runner
+	else
+		# always available, revdeps shouldn't depend on [runner]
+		dosym ${s} /usr/bin/${s}-runner
+	fi
+
+	newman misc/dist/linux/godot.6 ${s}.6
+	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
+
+	if use gui; then
+		newicon icon.svg ${s}.svg
+		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
+			org.godotengine.${s^}.desktop
+
+		insinto /usr/share/metainfo
+		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
+			org.godotengine.${s^}.appdata.xml
+
+		insinto /usr/share/mime/application
+		newins misc/dist/linux/org.godotengine.Godot.xml \
+			org.godotengine.${s^}.xml
+	fi
+
+	newbashcomp misc/dist/shell/godot.bash-completion ${s}
+	bashcomp_alias ${s}{,-runner}
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins misc/dist/shell/godot.fish ${s}.fish
+	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/dist/shell/_godot.zsh-completion _${s}
+	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f7e744d6686b..c4fa7d812400 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 69f567d76898..6acd5871d9bf 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,10 +1,12 @@
 AUX apr-1.5.0-mint.patch 872 BLAKE2B dda2941cbed87117a8a6c488bd8045894686aef0ba219ff489f67dd03b58fb07a05f9e67c54cdff330c65e579c41c992446a465104661bbacbb2525a5b9518eb SHA512 ba71f17ef9f61a8379139f05ca17eb583ad34cbc3ebf5c4f59d011662db6b5c963da5c466c093c3eb98372299d8f202d927a05b52cc7515270ac52fe44ec6daf
 AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f8872557f361f3d5ffa0f2c7cd35e06cbf4d449e54f1b12978c0220b8ce4ae5d590ee9e04b5cd77af22876e3880deef115efbeb5a1dcc SHA512 ac097d28d5ae0b2437522da0578ff8bd049190d8df576e4e5298426f827b2bf69891e4f33bd1ffaf1a3c53143927e71f10d8362567121faa03cdf908d4fbc6c2
+AUX apr-1.7.2-autoconf-2.72.patch 570 BLAKE2B 6cfe6c2b00c3d0ac1f5776d546366355be3139a06c0b6229ee2830f1c8c019b16701f9404fda0071c085161461476271a7930c95ec0b6501c4a2df23a371b3fa SHA512 b44805e747c441407b01ae26e06eb1e16f4e5334f097e9eab3c41a4ed39978f483065eadc9a4514a11bf246080ea120f9b594c712d282c2be638a5eb01dc2fbb
 AUX apr-1.7.2-fix-pkgconfig-libs.patch 963 BLAKE2B fb36bb31050286064e17c2a9c9f3d48ce9c0e42f8ee6cfcfa45ec79ad57670acf953f273d83419d3b053a38d9786600a240b8b082615e0e1fe7f15dcd2793e6c SHA512 0d8bb84b71f6f9f590afc15a48010383ef6b5b84b2b64fcbb9489adefa32137a1af7c0b7b216dd18f9c04b92492772f2d9f9564b9fbfbffc019bed8e43818cfe
 AUX apr-1.7.2-libtool.patch 517 BLAKE2B da77ee1d94bc2bd46d4ef97f18f018fbcc67cceb17162787f0e2f02e7ae205f80121166551a90b62e24d77c5f4313a2fa68b90dca713923b1a78e649bcca70da SHA512 4e09e88bd2d9e5f25a1edc52bdb632b0e73b28d971a9b0974bdcff9f8217ef2abe5c3ab3ef8a592e56c272bf928569e5a9be78bd3124afafb5954b6b8ee6d0eb
 AUX apr-1.7.2-respect-flags.patch 652 BLAKE2B e9cef7a8eff52a0d1799c261b377026849d8b65770a9e6b1d93f936d5d6533635827d6bdada9cbfdd8f274b191234d4b07ec7afa640383cac965562153c54164 SHA512 8305861c1196bbc5262bdc5d9fe87ef7d5d38d827d829455db2007036c70d749901bc3d2b63570528a70dfb3ff6171e78b54ceaea8c9646e4aa53c173440e70b
 AUX apr-1.7.2-sysroot.patch 1399 BLAKE2B 921694b66e2a0fe687ec9acb7458b1c860c12665e553aba4e043d56732bc0adc944c7bdd609dd001fcf2c9716b30989a47207506d3ad9c0141174848ce6ad70c SHA512 0dc3cb41fa8ab909c14e3650f755a061b5a0fab052b6b94c16678af58013841614ff9a407c82764cd3435db5b1d5d5a5ce41bb1b430dae0b272cffc438e49003
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.7.2.tar.bz2 890218 BLAKE2B a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15 SHA512 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
+EBUILD apr-1.7.2-r1.ebuild 4629 BLAKE2B 345d5ad2ff4b99ebb95a69b5c6ac40cb0614d38ad50931d8c51b4179f9f335b9eeeb58ce673649252451988109d94af508ea8f94db320df772eaee2ccafdcd79 SHA512 a8eb336f494b349138f70e3ff3ae62689f68e7ff10d7ca8b8fed32c035300e6548f503ee889be6c2990952b438d8c4119aec65093788b1a8012f70aa15e50f32
 EBUILD apr-1.7.2.ebuild 4575 BLAKE2B a0bb685a7235819f77e0239120375fe335c86b9c99d258a4aefa999bbeae5ba41807bf6797267593ea5a19e1f7a3181df4328d04b87088fe4eb7f8533fc18f98 SHA512 189c3ac5aa060eb2d65013ae73a91498dd3a7a861d7434c007f24f31e2b895530b9f3d7a85f76da482b20870d0a505f454f2105d53f06159fb491cc8cc4227e1
 MISC metadata.xml 487 BLAKE2B 826e5b4b8b87d0077f1b2063ae1c808447987ddea524eeb4cdd17d60bea8b3919a2a714cdb0706cf758dfcf86109b702399c04dd054872d8465e1f6b3469c795 SHA512 9e8fbae61974080394151944ca7e2fec92a6c99b2c2fe75dc2486dced890933ac4694c8ac2984504bbfe42706bed6895b7d5fe9f9a9ced96c5c0ead8016f4366
diff --git a/dev-libs/apr/apr-1.7.2-r1.ebuild b/dev-libs/apr/apr-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..9ab51b0ca62a
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.2-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc old-kernel selinux static-libs +urandom"
+
+# See bug #815265 for libcrypt dependency
+DEPEND="
+	virtual/libcrypt:=
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-base-policy )
+"
+BDEPEND="
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-mint.patch
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
+	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
+	"${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
+	"${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
+	"${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
+	"${FILESDIR}"/config.layout.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+}
+
+src_configure() {
+	tc-export AS CC CPP
+
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+	)
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	if use old-kernel; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_mmap__dev_zero="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, apr detects this.
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	if [[ ${CHOST} == *-hpux11* ]]; then
+		myconf+=( --enable-dso=dlfcn )
+	elif [[ ${CHOST} == *-solaris2.10 ]]; then
+		local atomic_contents=$(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h)
+
+		case "${atomic_contents}" in
+			*atomic_cas_ptr*)
+				;;
+			*)
+				local patch_id=$([[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885)
+
+				elog "You do not have Solaris Patch ID ${patch_id} (Problem 4954703) installed on your host ($(hostname)),"
+				elog "using generic atomic operations instead."
+
+				myconf+=( --disable-nonportable-atomics )
+				;;
+		esac
+	else
+		if use ppc || use sparc || use mips; then
+			# Avoid libapr containing undefined references (underlinked)
+			# undefined reference to `__sync_val_compare_and_swap_8'
+			# (May be possible to fix via libatomic linkage in future?)
+			# bug #740464
+			myconf+=( --disable-nonportable-atomics )
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake all $(usev doc dox)
+}
+
+src_test() {
+	# Building tests in parallel is broken
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm "${ED}/usr/$(get_libdir)/apr.exp" || die
+}
diff --git a/dev-libs/apr/files/apr-1.7.2-autoconf-2.72.patch b/dev-libs/apr/files/apr-1.7.2-autoconf-2.72.patch
new file mode 100644
index 000000000000..49d3fd3f1638
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.7.2-autoconf-2.72.patch
@@ -0,0 +1,23 @@
+https://src.fedoraproject.org/rpms/apr/raw/rawhide/f/apr-1.7.2-autoconf.patch
+
+Similar to https://github.com/apache/apr/commit/a15958a37a06f71c42c690278f9c958b93b7ee20.
+--- a/build/apr_common.m4
++++ b/build/apr_common.m4
+@@ -468,15 +468,8 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
+  fi
+  AC_COMPILE_IFELSE(
+   [AC_LANG_SOURCE(
+-   [
+-#ifndef PACKAGE_NAME
+-#include "confdefs.h"
+-#endif
+-   ]
+-   [[$1]]
+-   [int main(int argc, const char *const *argv) {]
++   [[$1]],
+    [[$2]]
+-   [   return 0; }]
+   )], [CFLAGS=$apr_save_CFLAGS
+ $3],  [CFLAGS=$apr_save_CFLAGS
+ $4])
+
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index dcd5962c9197..72505c9bc22c 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -5,6 +5,6 @@ DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563
 DIST capstone-5.0_rc2.tar.gz 5761725 BLAKE2B 2f5074fe1881309ee2d36cdfeba10bacefbac5c994d42dd3b08c07fe8b70e298d9d18e9c061dad1a54c6368bdc296fd02f30d77f78b1ae05074764e7041aef2c SHA512 fdc4992399a2add960b12ff2495087a97fa66dce85e87375ba9d19e02b7ea5fb16a7efa93d839c2693378f6367efc9df68f192584ba624443d3b0b197d4dcd9a
 EBUILD capstone-4.0.2-r2.ebuild 1536 BLAKE2B ff48fcc776ee396d790f6c1a52a9059fc1db4650b1f73ef5b2de2caa0ed51c662ffef2d53c0008d7a3abb5261dd7ae22fbc0f214882b33e674ab7e64c2929831 SHA512 6b5913274cf1d6c9d6deb0972a2e2d3532b81e52acc88191560effa22bfc8df3374d09ea2ffa5f6ca804c292e671d523793dd937c7e658fe03cbc53ff331f3f7
 EBUILD capstone-5.0_rc2-r2.ebuild 1530 BLAKE2B 3cd7be6305deefb6c8c2b404119f9a139856c3156c255bac229bb0b2817a694f47e260a7e6e1385518f426e8ec10a2f64232039f00dfac40f7c0bfec88847ee9 SHA512 ff56bf0e531e1284963d79a5917fd3cc15c269f5986d5adba51fb3476abd629b85a390649dd011f44f3344028813a8349b0d27a4274c6d1ae86794a38eda05b0
-EBUILD capstone-5.0_rc2-r3.ebuild 1826 BLAKE2B e99b0f622f31504520faef815338404666afa5bce9483be742b09d8f0029dc4e15f56e81db85bd4c9d5eeeb0f864e9f655efe2f7d2ec56efe340af4260f47cd9 SHA512 1f1bee3d00ece564ec58e5b9ce6b6138e6cd42482c5d76e3a56c8a2a5f530e9c156a36b3119be5e34e8bc3aeb42ad2b460b225392a46a3247d9b05163b04f454
+EBUILD capstone-5.0_rc2-r3.ebuild 1824 BLAKE2B 57736dfd1a9b27e17bbb50ec109055cfb4204d5f38663c5810dd050ab945da758a5a3c9e19f0e7570fb0684f3ac1949e04684dd91e122d11d244abaf240f7a5b SHA512 5ba56034e254ff783ea48cc3e26145a9360b0d8f0917d3699ecbfe2c3c93c3c1dd9c2f543303d00939616e84edfdcd72d28f76e3d6c73c0ee6674dd0b473d6b3
 EBUILD capstone-9999.ebuild 1724 BLAKE2B 0a93e9a68ce80099c5b8ddf8fefd6254720138b24492bbe0825b9d14db1ada58a92040c8f669bca7861aa7904a1f9a0f10e265d336e6ed6d5354e7b9fdc10a48 SHA512 594cb2f8f049cdb0e1eec2457d19c31a580957a8bbc06cd6d2ca59d4fc07a7084e8d9dd653eef452bab064e70f9e0e3b06f291c87d8a7503d2aad458fdcf7581
 MISC metadata.xml 484 BLAKE2B 32c39bf06443ce4ca18191a4c9626cf517d5bd4f837c179e6186a68a0053217bf41d61d2c4d46c9792b1974879d22b36e4a02fa461a1b085acf5c4406bde4891 SHA512 f06dcd3133982f72cf21c5bb3d9a34207d7083233b5e70856f6a1dab60ef361cf1432659af30ea6b90fcb38cfdaec49f0792623ef841e136bc33cb5e1c40d1cf
diff --git a/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
index 52e6eaa6617a..c2a407fa7ca8 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 	S=${WORKDIR}/${P/_rc/-rc}
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-libs/libdex/Manifest b/dev-libs/libdex/Manifest
new file mode 100644
index 000000000000..db4c2ab1fc0e
--- /dev/null
+++ b/dev-libs/libdex/Manifest
@@ -0,0 +1,3 @@
+DIST libdex-0.2.0.tar.xz 91648 BLAKE2B 258193b29082024cce30d5e20903f1ba6a3c8e566652d341845178797126796fcc1cf628636de02ba9776cb9d8ff5d38c24f10f269fcd9acbc0cdbb1c0918d8b SHA512 db54fa974af97e59e7a21c19be73db8fec6565377ce313a3532435845d3571216d6617f9a8db500019390d85677ca6f30be3f9a36c60240c8130ae0834826a65
+EBUILD libdex-0.2.0.ebuild 1196 BLAKE2B 3e57c9a99a587f694750bad331a817591f0a62f97ba6a2f5c2c5aa07070abacbad0ab445b748126ac2940a5dcf90c0f65f4f155d78316b189fa31cd2ea5b9813 SHA512 9ac43c58013f6f2a66b7bcc7131d7cda25f1c21351fcdfb23d4912c284474a730a6876fa3809a1c0f9d1d5184def8d025c74ffb9f2787cddfce7faa61bdfb836
+MISC metadata.xml 887 BLAKE2B 981f85ed363974888b20a6a1c7d24a22e47502af784bbe983a15359546afba333fe347e6aab5e5f5bef90a6995a4216702a8dde7ad760b9e730f5113076d38ee SHA512 eea5374f3eb48ee5770cc0d6d9133f405b058e74714d29f973c46ad912ca96282eb7f584b6b396c9aa72eae345d45461bcf8d376d93cf5370f04ac45fbab7e47
diff --git a/dev-libs/libdex/libdex-0.2.0.ebuild b/dev-libs/libdex/libdex-0.2.0.ebuild
new file mode 100644
index 000000000000..f0d86d8a55dd
--- /dev/null
+++ b/dev-libs/libdex/libdex-0.2.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala
+
+DESCRIPTION="Deferred Execution library for GNOME and GTK"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libdex"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk-doc +introspection sysprof test vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.68:2
+	>=sys-libs/liburing-0.7:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	sysprof? ( dev-util/sysprof-capture:4 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gi-docgen )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dexamples=false
+		$(meson_use vala vapi)
+		$(meson_feature introspection)
+		-Dsysprof=false
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}-1 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/dev-libs/libdex/metadata.xml b/dev-libs/libdex/metadata.xml
new file mode 100644
index 000000000000..64509955e2ba
--- /dev/null
+++ b/dev-libs/libdex/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription>
+    Dex is a library supporting "Deferred Execution" with the explicit
+    goal of integrating with GNOME and GTK-based applications.
+    It provides primatives for supporting futures in a variety of ways
+    with both read-only and writable views. Additionally, integration
+    with existing asynchronous-based APIs is provided through the use
+    of wrapper promises.
+  </longdescription>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/libdex</remote-id>
+  </upstream>
+  <use>
+    <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 182c061ef355..727dafa66fd8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 09fb8f1bf8ff..bf0b87b623b8 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-builder-43.4.tar.xz 10284936 BLAKE2B 50af653566b35525a751d1ab0698c42e205aa8ab3205b390d10625f67a984986f24e5c0a5512629d81c082265435d5f39380de2c675d64e9f0b6d47c2fc62451 SHA512 c8600aea7bd01fb8a75baf321d8670600aa0ac77f7a42cccc7107fd9d2addd0264f132a4e36c2ae66ad7dbd8dc94dfc52421655254eee93d0a3298aa2cc224db
 DIST gnome-builder-43.6.tar.xz 10289396 BLAKE2B e9b8c98f5463906e0ec522307f0ec07c130045288db5b1295b56320ac36814019ee3350f73543c8a1655812dcd8b26da4cbe9d1b5bd3bda8cc7a943f308a91ee SHA512 e444843e1eae2a901048dc6f2ff7683c3693fcbceeb113ebd28e7a51d1ea9c3b7e317e28ceae9b659dc89cf3b75cabd526fff9483b81c623d809ca268a2c9a45
+DIST gnome-builder-44.1.tar.xz 9785408 BLAKE2B 43a41aa4856f3bbd84b6bab6686cd128d697d54e539d6b88e668a088eb256d11459d058046428564a706bf6e3766e3f61f9ff503151f16647f82bbbe400ab3fa SHA512 92653392fcd6c3a83f78c500037e8b8be05663cc8918e5521baacfbf5d251896358a284e7b37e4c49428c921b7f0cc2a96afa029cd00589b48f40b365e4decbc
 EBUILD gnome-builder-43.4.ebuild 8733 BLAKE2B 4fcfccd449d726ffb335101546cc1d8610fa48f93247413ac5c87b3207e005c61194c9963a3ef6896819861b3712b3e920ee7e7e926f157da66be6a2c2ab3cde SHA512 b90fea7c51cd3cc40f1ef4a2c4bca0852d9fa662b977f404832856f9eaa3759ac510550f89d5afe19fc58263533d3f4bff842140c18717264caa331c66ea0c54
 EBUILD gnome-builder-43.6.ebuild 8734 BLAKE2B dd1e2fc4af766378c4884d1642907421a89d468f12f3ff1feeb0c39fe6546ecf178a3762397727817a86f0210be07d67156546bfbf41be3f75bc901a2fbf6829 SHA512 d5bf9352f64e5a3e7b2c08cc5e91aa52b17490806906c28be0fee60b585dc9c437597c92c89309c6532bd200acbb43ac4052b9d42895b90d1fca91eb73129038
+EBUILD gnome-builder-44.1.ebuild 8982 BLAKE2B e21d41fbd298d8b62b4c124e9d0123899f0bd14540db06be7f436c5b4265f8a5656a038aec50e1cb77550465f75269f13f72170e7037596a2933959899a3a017 SHA512 64eef400246e57efe70bea3b23f0ea4e754ffa53f4473bce7606980a0dfb38639d96f36278254644892a9dd3ef4c506fa2b633df6bb7030fb837dd96b8770fab
 MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2
diff --git a/dev-util/gnome-builder/gnome-builder-44.1.ebuild b/dev-util/gnome-builder/gnome-builder-44.1.ebuild
new file mode 100644
index 000000000000..1961588e03a8
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-44.1.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	flatpak? ( git )
+"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/glib-2.75.0:2
+	>=gui-libs/gtk-4.8:4[introspection]
+	>=gui-libs/libadwaita-1.3.0:1
+	>=gui-libs/libpanel-1.1.2:1
+	>=gui-libs/gtksourceview-5.7.2:5[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.43.0:=
+	>=dev-libs/libdex-0.1.1:=
+	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]
+	dev-libs/libportal:=[gtk,introspection]
+	>=dev-libs/template-glib-3.36.1:=[introspection]
+	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
+	>=dev-libs/libxml2-2.9.0
+	webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] )
+	>=app-text/cmark-0.29.0:0=
+	d-spy? ( >=dev-util/d-spy-1.4.0:1 )
+	app-text/editorconfig-core-c
+	flatpak? (
+		dev-util/ostree
+		>=net-libs/libsoup-3:3.0
+		>=sys-apps/flatpak-1.10.2
+	)
+	git? (
+		dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-1.1.0[ssh]
+	)
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	spell? (
+		app-text/enchant:2
+		dev-libs/icu:=
+	)
+	sysprof? (
+		>=dev-util/sysprof-capture-3.46.0:4
+		>=dev-util/sysprof-3.46.0:0/4
+	)
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+	)
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.3
+	)
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus
+	)
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/python-lsp-server for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* virtual/rust for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dchannel=other
+
+		-Ddevelopment=false
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dwith_safe_path=''
+		-Dgnome_sdk_version=master
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+		-Dnetwork_tests=false
+		-Dctags_path=''
+		$(meson_feature webkit)
+
+		-Dplugin_autotools=true
+		-Dplugin_bash_language_server=true
+		-Dplugin_blueprint=true
+		-Dplugin_buildstream=true
+		-Dplugin_c_pack=true
+		-Dplugin_cargo=true
+		$(meson_use clang plugin_clang)
+		$(meson_use clang plugin_clangd)
+		$(meson_use clang plugin_clang_format)
+		-Dplugin_cmake=true
+		-Dplugin_codesearch=true
+		-Dplugin_codeshot=true
+		-Dplugin_codespell=true
+		-Dplugin_code_index=true
+		-Dplugin_copyright=true
+		-Dplugin_ctags=true
+		-Dplugin_deviced=false # libdeviced not packaged?
+		$(meson_use d-spy plugin_dspy)
+		-Dplugin_dub=true
+		-Dplugin_editorconfig=true
+		-Dplugin_eslint=true
+		-Dplugin_file_search=true
+		$(meson_use flatpak plugin_flatpak)
+		-Dplugin_gdb=true
+		-Dplugin_gdiagnose=true
+		-Dplugin_gettext=true
+		$(meson_use git plugin_git)
+		-Dplugin_glsl_language_server=true
+		-Dplugin_golang=true
+		-Dplugin_gopls=true
+		-Dplugin_gradle=true
+		-Dplugin_grep=true
+		-Dplugin_hadolint=true
+		-Dplugin_html_completion=true
+		$(meson_use webkit plugin_html_preview)
+		-Dplugin_intelephense=true
+		-Dplugin_jdtls=true
+		-Dplugin_jedi_language_server=false
+		-Dplugin_jhbuild=true
+		-Dplugin_lua_language_server=true
+		-Dplugin_make=true
+		-Dplugin_make_templates=true
+		$(meson_use webkit plugin_markdown_preview)
+		$(meson_use webkit plugin_markdown_indenter)
+		-Dplugin_maven=true
+		-Dplugin_meson=true
+		-Dplugin_meson_templates=true
+		-Dplugin_modelines=true
+		-Dplugin_mono=true
+		-Dplugin_newcomers=true
+		-Dplugin_notification=true
+		-Dplugin_npm=true
+		-Dplugin_phpize=true
+		-Dplugin_podman=true
+		-Dplugin_pygi=true
+		-Dplugin_python_lsp_server=true
+		-Dplugin_qemu=true
+		-Dplugin_quick_highlight=true
+		-Dplugin_retab=true
+		-Dplugin_rstcheck=true
+		-Dplugin_rubocop=true
+		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
+		-Dplugin_serve_d=true
+		-Dplugin_shellcheck=true
+		-Dplugin_shellcmd=true
+		-Dplugin_sourcekit_lsp=true
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use webkit plugin_sphinx_preview)
+		-Dplugin_stylelint=true
+		-Dplugin_swift=true
+		-Dplugin_swiftformat=true
+		-Dplugin_swiftlint=true
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_todo=true
+		-Dplugin_ts_language_server=true
+		-Dplugin_update_manager=true
+		-Dplugin_valac=true
+		-Dplugin_vala_indenter=true
+		-Dplugin_vala_language_server=true
+		-Dplugin_valgrind=true
+		-Dplugin_waf=true
+		-Dplugin_words=true
+		-Dplugin_xml_pack=true
+		-Dplugin_zls=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+
+	optfeature_header "Language support"
+	optfeature "Rust's Cargo build system" virtual/rust
+	optfeature "CMake" dev-util/cmake
+	optfeature "Java Maven build system" dev-java/maven-bin
+	optfeature "Meson Build system" dev-util/meson
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index f9a67b4b2e1f..6ad7d87b1abd 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -5,10 +5,11 @@ DIST SCons-4.5.1.tar.gz 3194371 BLAKE2B 830e3365be99e38aec0f3b99d406bb7547d3d8b7
 DIST scons-4.4.0-user.html 1608381 BLAKE2B ff4eb1e0f9c5e8ea7ca44cc00dc37e3e2dd38c24cb09a857c691e6a48f11e5fc86a55740037cc295e6b23df2a1c1b600adf0462320ec87cc26d4bcf919b07342 SHA512 8c1d6578270054efba34c56ddc07b4314bf62630f6a445f5b9f865cc48d593f6c92101a8d216dece201b8d6cb5bce59ff4adb51caaa40128e96b6235087f748c
 DIST scons-4.4.0-user.pdf 2964111 BLAKE2B 45b37c99c3f3d0e9969a16506e27aeabfd562155405f5a59ba79c24404b14e5588fbd0673d86e2266adbd25eca140c9e1cf86e271228658591c0d9285474f078 SHA512 57330f685e7c775cb1c782e40f711c2b2322fad19212a22a920aff92db974610cc78f276e1606fb827660bb488ce803e2458bb9d93c452fa0600df4478f03d06
 DIST scons-4.4.0.gh.tar.gz 5808265 BLAKE2B f6ce757f2edc40551b05285098626bb62def6abda2380d4885ee4443868e715e53aaa34f26c09dc689bb6ade26d1b0e276046fe3b1d2ddf8eb40400bca9ea164 SHA512 01fcd40bf818ca22a278973af1cda3024efb74cf877f15d46607fda860448fbd577fc96ba33fef2bed3d145e662a0371f55e8c927e7ac44feea7f3081791ce11
+DIST scons-4.5.1-mergeflags.patch 10518 BLAKE2B ea059c4347cfa8dcd99353c1f6b6c1d3aae1c6225b4683e421f3f3ea9181d5597862603c2491abff40dd1599094638239f34bf88458e7c44a8f28908eb91934c SHA512 11771c99d64cee413311f595faec8d2025152a7871ef53bdf0b22be45ffefc0d0c4bf49d185a10c1d3d2fb76ac94b04d992990375dc144587b101761a5d985a4
 DIST scons-4.5.1-user.html 1655168 BLAKE2B 644c808f129d2d83f40b1ef2c8c12781b697a0120dfc00f5f0425e88e23c609290ecf2c8b6daad556c876ae3a86e8b262c53915b05d69c6e3c79f58395789362 SHA512 171d9330df520a75fbc124bf646c55c5868b24343ff46755a6283fe444ad4e090f5658dafa7239e708b4ff8b910e81201c27655674bdaffd20e8cc6ffb81d633
 DIST scons-4.5.1-user.pdf 3023817 BLAKE2B caa782f77fac668eee0ccd76f3e96168ae3d61c9c3e80123c34bc45625182f77973fbab24170c5f67f133c6124412eadbf02c3497373211560c58a348d6b00ab SHA512 41fddff58032b6364ff3935259d4bf81a0d69398cd52158c42be71e4ff6efaebd2faaf1354781f7336ba1aa4f0cf99f0f37edcd72baf325f9ced7ec88b76ce88
 DIST scons-4.5.1.gh.tar.gz 5844118 BLAKE2B 88a82e12a034f6d0748555d0d33716e5af6ff957a9345d5b0ba87c2a36544bae0965ea0a29e3cc80d6d2493f3f8bf0bd314bed5824dc609123972f640b19a53a SHA512 160089342b93197237b9f0c5f0ada42126f3e5c83e0026f6dc121aaae85c94774b01ea3b0b0fc56edf3effd87d91612b2167d004abe7a00bd8d107d5415f5d4a
 EBUILD scons-4.4.0-r1.ebuild 3748 BLAKE2B 8a0d34afdd7ff554764e41608d75cece47bb47988371da296f5739d2aa2e3d0c7cd589d519edd089b26bae7385727005ab459e23549bd0d3c1a77be4a11faba2 SHA512 c7ae3e2a735b0e3adcd7b2fad1bc030eb3c557a51cc200bd38026e06c6e4adadffba236bceca0b79c47626aaf12e6da5ab74313766434927eaa9381ac069a2d0
 EBUILD scons-4.4.0.ebuild 3659 BLAKE2B 1bd5799550b7874e8885f538d7ddc68b77c50012a03c8e8f71a1f68f8c3d38aacb8e851754bf1b9c0044d520049231e12630a8b372ae8316bc1da29f364934ef SHA512 1e289c45de9c534f56c851da908bf2d4bc05129b054faa35ba4fe6050077cabcf45b8048cd34e347218345df01ea0b95eee0c1634a4dd291f4be3c47647b84ea
-EBUILD scons-4.5.1.ebuild 3863 BLAKE2B 50b42ce30b6d28f47e8394a754ca781c307acee255005d32c95282a41baf5fffc6cf728854319d437ca8f6a803ad1f4c0fdf5c43e15f830b47a406278f105b1f SHA512 fe8df981334f50724d914b2d0923b4f12b2f23c5e997c471a74b1589295679db03f28eeb082e4d9b32e6e39f33b4ceb9a967265889527f248ded3c19928d2cc9
+EBUILD scons-4.5.1-r1.ebuild 3935 BLAKE2B f666846a43e32a19f60ada0354e0b688668ae66f209bac0a1d3eb45b9fe228fc5d2d33cd01f85c22e0418505b1caaeeb3a796e4520497a78ee898e6fb53be608 SHA512 2a760d90c90d2389f4070c8588922ffa80ae1359aed5249de443c61a3f8144bf81e688747366797dbf1fe660f1f4f29c6c10f4628ca4f051115f7e4f07cd741b
 MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad
diff --git a/dev-util/scons/scons-4.5.1.ebuild b/dev-util/scons/scons-4.5.1-r1.ebuild
index 87c03687ce2a..d12cdf7c1bd8 100644
--- a/dev-util/scons/scons-4.5.1.ebuild
+++ b/dev-util/scons/scons-4.5.1-r1.ebuild
@@ -18,16 +18,16 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz
+	https://github.com/SCons/scons/pull/4322.patch
+		-> ${P}-mergeflags.patch
+	https://github.com/SCons/scons/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
 	doc? (
 		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf
 			-> ${P}-user.pdf
 		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html
 			-> ${P}-user.html
 	)
-	test? (
-		https://github.com/SCons/scons/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	)
 "
 S="${WORKDIR}/${P}/src"
 
@@ -45,6 +45,9 @@ BDEPEND="
 "
 
 PATCHES=(
+	# https://bugs.gentoo.org/900971
+	"${DISTDIR}/${P}-mergeflags.patch"
+
 	# support env passthrough for Gentoo ebuilds
 	"${FILESDIR}"/scons-4.1.0-env-passthrough.patch
 	# respect CC, CXX, C*FLAGS, LDFLAGS by default
@@ -54,12 +57,7 @@ PATCHES=(
 src_unpack() {
 	# use the git directory structure, but put pregenerated release
 	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-	else
-		mkdir -p "${P}"/src || die
-	fi
-
+	unpack "${P}.gh.tar.gz"
 	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die
 }
 
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index bee6b43f9961..fec80b1f0eb4 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 18e358716835..8c70b7beb86b 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -5,7 +5,9 @@ AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc5
 AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac
 AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2
 DIST gnome-session-43.0.tar.xz 484196 BLAKE2B 2d0ce93d756f2eeac084a912c36cc68134054abc21811541d1aa2734e5e8f7b25ceb2acf69dc575a7f0e149b7b19cfa42ac77e0b783c88ce55245c48a588c3ad SHA512 9948dff9a342589b91d18e5f39f9857276e9dbfa36da452bd818d44b31e73cc4fe0e18353b537963b78ea63b39aa644d4d0864dd2f6a19f62409a644e5626aec
+DIST gnome-session-44.0.tar.xz 485372 BLAKE2B aacfbec2c59f41b7b36107a59f8e9177ab45dca4c82a6aa3982951eda8ef2b2aae22a43a5d9d43b30f6ab010529ba20754f3de87df2abd5ca812bb0e878c6357 SHA512 0e8672531bc1818cfb6dbb5b133374e4041ec471e04968a587a93d0ee9697393ee976e1aa5dfacf707a46d816da6be6b1ef52e89f47d9d206a319eb79aae1078
 DIST gnome-session-44.rc.tar.xz 485348 BLAKE2B 3ed571bb324f12b762e6440badeedb7676945f848f10bba63aa28980fb8d72a2f798c442802969cba5848befdfe127a08ccb42f0d9c193b796102667aff25b99 SHA512 b1a7e7db60eb1636ad3bc29974b3b9ad42c8a9cff6ebc982e1518229c9b67bc0d58bb8f3bd5109de58103ecfd7d4b285ac2cd39caa408d90b9366a48f1e98321
 EBUILD gnome-session-43.0.ebuild 3466 BLAKE2B 8d3eadee7dc87b992cee95655093df25de896e573b76c8c49fa987d544e45feceb9fe4144e965ca3d5bab69d98cc744901789a552caad74423fe42fca47531e9 SHA512 a045a00cd44e80650ce515e364e276020494e139f76e41c8fb5619157dc69eaaee6eb5d95d120f20bcd027749ee7b81fb56141792cfdceacc0123358eb00642d
+EBUILD gnome-session-44.0.ebuild 3532 BLAKE2B 1472cfd95fc352dff63f85104dc4d3d40f1d549da3c9787dccee04fe32d32f382e9333beb3cfef09f6fc6b755bc88e730d42103a4334d4a06b5bea3fd5d391de SHA512 32f81bac62fea4a9b6a63530489d064c9ceb8c59bca1c5f795bf8b79e0731943c866ee733e23d64e7d377401a50d9a0172865fc8575a64fde99cc379a59e14c7
 EBUILD gnome-session-44_rc.ebuild 3632 BLAKE2B 15ca02e3fb8d5add554ccf3e47953c5446c813041884330c507c0aa173f7e67022d8d7fc791e87c9d0aaf51ec167999b6489054c436a288d5e897cd0ed426d02 SHA512 d13061b3045cf56653410e702f166396b578395d5ba44d0d8177473da783778330a2f895c0d570754e873d6db0df6786cf9fdc9273780d075b7bd5c7c50d2438
 MISC metadata.xml 460 BLAKE2B a735510be82f9e08b4002cbf033f75e601ec6f35a860c92728439367e6bdedf747c4fccc0250c89d231aa8e96348ae01275f577a21c958985cdaf0ef47615216 SHA512 df3adfa8e27c264a9bb6ba74ca43345a15f1cb0984461ea1fb831d4b355c77dfa94d491fdf28b34d58fd1d9e60428cfa8c40af2402bb9be42292202b63e7a052
diff --git a/gnome-base/gnome-session/gnome-session-44.0.ebuild b/gnome-base/gnome-session/gnome-session-44.0.ebuild
new file mode 100644
index 000000000000..f49bf19eac11
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-44.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elogind systemd"
+# There is a null backend available, thus ?? not ^^
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/glib-2.46.0:2
+	>=x11-libs/gtk+-3.22.0:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=gnome-base/gnome-desktop-3.34.2:3=
+	>=dev-libs/json-glib-0.10
+	media-libs/libglvnd[X]
+	media-libs/libepoxy
+	x11-libs/libXcomposite
+
+	systemd? ( >=sys-apps/systemd-242:0= )
+	elogind? ( >=sys-auth/elogind-239.4 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here.
+# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# sys-apps/dbus[X] is needed for session management.
+# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
+RDEPEND="${DEPEND}
+	>=gnome-base/gnome-settings-daemon-3.35.91
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	sys-apps/dbus[X]
+
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+"
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	x11-libs/xtrans
+	virtual/pkgconfig
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# Install USE=doc in ${PF} if enabled
+	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddeprecation_flags=false
+		$(meson_use elogind)
+		-Dsession_selector=true # gnome-custom-session
+		$(meson_use systemd)
+		-Dsystemd_session=$(usex systemd default disable)
+		$(meson_use systemd systemd_journal)
+		$(meson_use doc docbook)
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		-Dconsolekit=false
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+	# This should be done here as discussed in bug #270852
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+	# Set XCURSOR_THEME from current dconf setting instead of installing
+	# default cursor symlink globally and affecting other DEs (bug #543488)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
+	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+		ewarn "If you use a custom .xinitrc for your X session,"
+		ewarn "make sure that the commands in the xinitrc.d scripts are run."
+	fi
+
+	if ! use systemd && ! use elogind; then
+		ewarn "You are building without systemd or elogind support."
+		ewarn "gnome-session won't be able to correctly track and manage your session."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 040598c1d728..462464b10da9 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,4 +1,6 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
 DIST gsettings-desktop-schemas-43.0.tar.xz 736456 BLAKE2B 8fa0866a2747af370dbdc329afc2272e998d992bb4d19079a15d8f04063bd09660cabaf19123fedced5c6ebca13a21c207e1238178344d92a3a3d60ef0aa0152 SHA512 a3acd953ec206375e99e0988438e46b42668094d1b5425ccf21a7fe451887b705e2a5efe6870ee6bfc6722f54e5aa6a422de2af2099f29a5230f415744df2cf8
+DIST gsettings-desktop-schemas-44.0.tar.xz 739836 BLAKE2B 01a5ca9fb73dc9768f5bb42192f282cc06348f0532b19648aa6b4c33f87e0a9febf0d50047de6cb4c9e921df2df6b45cdde9514d4c0be322b04553f525f84311 SHA512 3995fb7a87c4a922d71ec599dffed4edf145992e08eb09cd8aae1912533ea5a7354bc8e92946246e3d6d3fa9bdaaa0d5247a5d8edaa4eef0a7a522a03ee087d7
 EBUILD gsettings-desktop-schemas-43.0.ebuild 1130 BLAKE2B 3a2a5fba94a7b26a493a9dbacc25e06ca691c2a779f3289465d490134c4b66b443e921359caadf9f863fd85c0dd34cb427c8141e197c2205b1068a4da08b9266 SHA512 86cd341b092469d7e9d8301836e2b87932672c5a93c39ab5c0d632d91abda1ca236323f9d5245823ec05d73f68d9bc1e8ec03607c8125efc4f2109d342ef19e6
+EBUILD gsettings-desktop-schemas-44.0.ebuild 1018 BLAKE2B 73490a7a702d510aaa4778950020edc82081f466470deeca256e5ada590d926aa07feb1660046708db3f40cba675004a37edf95901aa5afd7ea3845a775ece4b SHA512 8a5577d1fa68363302d0863cef4d72ced8f48fb8f3ccce2f91b4e7355e88f616cb9e02304e9e5b7e9b37b07ccb20b4ed9cfbf97cb43556c60d6ee43065e78125
 MISC metadata.xml 366 BLAKE2B ace189d0622624dc509c7f713a397c8b823bf9d46ae172f0fa2c8e1bb63f844ec98c265d31a7493e4439ac4b088b44c3307eb03dfe4613185452af5f001b62c1 SHA512 58de08b7a1f45b56f16ef5d0b827486011011496256bb30ab0390dbcbc3de09cc817b97fd3f82b726a6c7c90876542f0a12844f0f008e6477a4535f0cb2385dd
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-44.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-44.0.ebuild
new file mode 100644
index 000000000000..44b5f0366aff
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-44.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+
+BDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
+	"${FILESDIR}"/3.32.0-default-fonts.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 87e3f0f43c8d..94d7f8e4433f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index c649f3932bd7..dc964ae45195 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,8 +1,5 @@
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
-DIST feh-3.7.2.tar.bz2 2121677 BLAKE2B ce9acf27dc312ef46bcfbbdb5bf982d3a5c5a32ea56e716982c0e3dfaa3a66643bc9471353cca4dde9e28fcb8d002d38bfbafab699d952b81c59bababfafb82f SHA512 e74c4a4ce655711dc3c777f83c9376d54aa82aa7e38e07837b8593ed19ba813217f99d5768c8f8d0b6c1a0f6475a5e36cf404f4bc024674214568715a931b9e3
 DIST feh-3.9.1.tar.bz2 2108873 BLAKE2B af559837224a90e403015648717cb9aa516d18bceb0a49a0635b471435370209c80b77a7a87f66b22c99615d44be0832a0d03152aabde72917417e5f992a5d8a SHA512 78682ec80df6b6655dbc18774ee95b3d68f1711a50129a9befb8adfb8c1a74aeede2493a35955687cdc2aa079978927727dac02543643418ef8deefa0d8c6d05
-DIST feh-3.9.tar.bz2 2111997 BLAKE2B 853812e580eda808acbe4bc38325ac387b66eaf90b54da7e94980bd785d0001fa3f8d2507e2a435d5f533cc215bf8e28419b57b436d85c32b8e609b12c3a191a SHA512 0d217bdc9f78c8a4a40684ccc798986465c46282eef39a6792791763a5683ddc9a2ca277dc10c23bfe55aa11b415f5ff66b4ded2fe2a7a946660ccd07a4edc50
-EBUILD feh-3.7.2.ebuild 1511 BLAKE2B 4ea7b87f2abf97391df8d688bea31fa816725c716e8060c100fb3409eec59d5249ed6388b45eea434e348d75f66398ef644aef039a6fc59e211b63b427eda8a0 SHA512 c0a276d82a9f51eafcab4152091d4eee0daade48c0b18c4317e88d9de97cc295e18ed01bac02e29690d754d15efacc011d7b6a13ed6837a12f9d2066060fa800
-EBUILD feh-3.9-r1.ebuild 1527 BLAKE2B 03523723113bd743eb4094e5180e7d7f72b541db7e9dc5e5e8ff2ca0562aa2afb25883b8b307aedf42802decc3fa75dc2620e57dddb46b7c8b86d01bffb5dcf1 SHA512 79b7a6459a575b395b6a733737e982e26f0aba1278254836417c0001cbb898d2f298963bacacc563c130793717c43899098337578281530de6215eb1ace89bbe
+EBUILD feh-3.9.1-r1.ebuild 1593 BLAKE2B b6e91bf0d56443430f89437b66ac6d2a98ebf0645dabbb0d6a120225988df4a9db1b453e2c260cca16e2ee25e4c2c1174e498b8ab7588204fd8dc93ef03fa7a9 SHA512 5f39f768af70b56e8890dfbe769e19941eac0ab068548e012ba69c5dc375e2681513dc9eb94da1b6e30d525eacddc4b6cf9d2ce9797859fbde4c2e7d34baa49b
 EBUILD feh-3.9.1.ebuild 1532 BLAKE2B e2a475b618b97749c568e6afd10b4047c137964b7f71b8cef77277968a42a228801ce924ea6e9a47dd6b2dde66771404fd6d970029a0829757299b0b820b7bdf SHA512 279bd900631c97e9e14998ba7629b92a4f057f0229f440db0f1080b087810f9a49366ea5c5e0892c5fd5bd25c6709baed6da3c55bb1bfd9508aa01f60b29ffc9
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/media-gfx/feh/feh-3.7.2.ebuild b/media-gfx/feh/feh-3.7.2.ebuild
deleted file mode 100644
index 92720f85d06b..000000000000
--- a/media-gfx/feh/feh-3.7.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86"
-IUSE="debug curl exif test xinerama inotify"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-		inotify=$(use_feh inotify)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.9-r1.ebuild b/media-gfx/feh/feh-3.9.1-r1.ebuild
index b05cfb8585a7..7ea8a8a2d3be 100644
--- a/media-gfx/feh/feh-3.9-r1.ebuild
+++ b/media-gfx/feh/feh-3.9.1-r1.ebuild
@@ -12,9 +12,13 @@ LICENSE="feh"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug curl exif test xinerama inotify"
-RESTRICT="!test? ( test )"
+RESTRICT="test" # Tests are broken.
 
-COMMON_DEPEND="media-libs/imlib2[X]
+COMMON_DEPEND="
+	|| (
+		>=media-libs/imlib2-1.11.0[X,text]
+		<media-libs/imlib2-1.11.0[X]
+	)
 	>=media-libs/libpng-1.2:0=
 	x11-libs/libX11
 	curl? ( net-misc/curl )
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index c3d64ff7c990..13dc94a34851 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 224454258039..7c56575ffafb 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 20 Mar 2023 18:09:57 +0000
+Tue, 21 Mar 2023 00:09:59 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 79b748229710..18dc8a759a60 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-03-20T18:10:02Z
+TIMESTAMP 2023-03-21T00:10:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQYoXpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQY9dpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBA6A//RVMps+9PPtECOotGFTIDbMWCa1+ztIkogyDVWUjZjLXxMo0TQsz0d9Oe
-aSay4+MQp7ju4TVXrv6RzHwNaEu2DCkytCjSWZ5Gc+jUPd9vg+PezkI3Hj9CiwqA
-ojfPN9E/YD7OpL3NHHh3p19+8lwyzdgIgtAK1dPyPGWZxFH07wdqUaa6NwBbq2Xm
-7O65U/NHSh51nG6Eak8dfYQgO/tHSY9CdybCYrqCidBOqKzav4HE4Kh13y7+jn9X
-0uM1AnVjnT7UH7uSIQChi/v7BoAjk4uej7asWEl3TpBhcip6XsEd4ShvHcR52MWo
-ZZAF6dyz+eWk/EqXEyKg/oV70w3BY8tW1Fn2XHIvV26vshGME0pucN7tGjC4wMru
-xtYj9QR71dkzgpLygp+PhNY7PAVm+pCUdPCspeGjPzJuySEkt5YpnIAOPAfGOY4E
-5ey9lkCLx9rH3lEk2s9VcmkNjOYTTdLOOF5W5/xzAC3QM7CJJzb49+ZbTgK/QPMC
-sOw1aQcoUqhmIO9FUcMCyTJbgN8lzAAWkBktkfyDtx9GBSBIDOiYdZtG05g8o2+R
-HVtu8JAA5XeYFnywPqKpSkxjWqWDtGSLNxQDV1nrn1LkycHWyAYMaBZMBfOYeh9U
-rkS0kFZ8FiPYnLXLRFqr77q81b7V9G7gHs58NL1i8MEl3ZN/Zwo=
-=2ZiX
+klBp9xAApVfOaIw2C51dhBJ+uOgO8+3yi2e8X9t44OTQtXI1GfHABqqj5PMyI8iU
+gVf8drN7SDSZ3o9sYlFToTdTXclz7FxveZqFHVDRp+uPE8iRtIKAah9O5Zoj0NN4
+eTkzhOmp/3W1+cRqFU1R+rfkjuWqIwNryJB+GZ0GWLYh2d3JV5Kb/ZIiW+oNSH58
+Hrn3z5m52JRxnjK7lGiDusykvP0ptsX6Jn9IQ5dQaQq2B4dhxk4l4WbmfIwYubu3
+KVlACVTxOjnLx+7ycMtJ2DUq+MsKK97LAcCVu40NBIla7S1amuZvfz5cLl+SJbjJ
+CeI8n3SwY3gCcTDt03e3+i3NKkADBd+Qedl4Wt9jv8RTAPRSAd4M2MucYyQG6YF/
+WAOfgfMnVLSeKSRkd8Ovl+zJqEuvDa86dWJShglHki+HDt0HcegJUhgayaKDAmpx
+RHC4bMLLbEf9yOJ7psZ4iSRmBCAbofHMPq9cYfpl5OCqcS18krg11JSUh8mKGD6o
+qGDzYKSaDT7vTBBXQ0OShn9pU52sLFPSLjoZbn4eiUkiHkxOOW2vkGNspV059HmE
+Zw8CPKOSND3QrDjvvddM/nbfCwK96s8Pcu/6XRvJoGdNEwMFLzIJBlPCdgeh3ztX
+BukgFNMCN32JL23vdmU9cLObcd4OpAkT9Oia5z2913NbWUgOkYM=
+=L3sB
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index dc2508b3fed2..7c56575ffafb 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 20 Mar 2023 18:09:58 +0000
+Tue, 21 Mar 2023 00:09:59 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 63fd0d34b2c1..5ed332025493 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 0b290a1c45da..c0035226131c 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/conky-1.18.1 b/metadata/md5-cache/app-admin/conky-1.18.1
index b41f96e38d3f..faa98c5989d3 100644
--- a/metadata/md5-cache/app-admin/conky-1.18.1
+++ b/metadata/md5-cache/app-admin/conky-1.18.1
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( virtual/pandoc || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pyyaml[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pyyaml[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pyyaml[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] ) ) ) extras? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pyyaml[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pyyaml[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pyyaml[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/pango ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+DEPEND=curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wayland? ( dev-libs/wayland x11-libs/pango ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) wayland? ( dev-libs/wayland-protocols )
 DESCRIPTION=An advanced, highly configurable system monitor for X
 EAPI=8
 HOMEPAGE=https://github.com/brndnmtthws/conky
@@ -9,9 +9,9 @@ INHERIT=cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
 IUSE=apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype wayland webserver wifi X xinerama xmms2 +lua_single_target_lua5-4
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3 BSD LGPL-2.1 MIT
-RDEPEND=curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/pango ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) apcupsd? ( sys-power/apcupsd ) cmus? ( media-sound/cmus ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) extras? ( app-editors/nano || ( app-editors/vim app-editors/gvim ) )
+RDEPEND=curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wayland? ( dev-libs/wayland x11-libs/pango ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) apcupsd? ( sys-power/apcupsd ) cmus? ( media-sound/cmus ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) extras? ( app-editors/nano || ( app-editors/vim app-editors/gvim ) )
 REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.18.1.tar.gz -> conky-1.18.1.tar.gz
 _eclasses_=cmake	2e47edc2986d4e1c0363867058cd4489	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=33d184e6efff2e0ae67e158e468f7792
+_md5_=89ce09d585d00965e1970ae7dd3aedb0
diff --git a/metadata/md5-cache/app-admin/conky-1.18.3 b/metadata/md5-cache/app-admin/conky-1.18.3
new file mode 100644
index 000000000000..cf34f8bf5e99
--- /dev/null
+++ b/metadata/md5-cache/app-admin/conky-1.18.3
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( virtual/pandoc || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pyyaml[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pyyaml[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pyyaml[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] ) ) ) extras? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pyyaml[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pyyaml[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pyyaml[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wayland? ( dev-libs/wayland x11-libs/pango ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) wayland? ( dev-libs/wayland-protocols )
+DESCRIPTION=An advanced, highly configurable system monitor for X
+EAPI=8
+HOMEPAGE=https://github.com/brndnmtthws/conky
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
+IUSE=apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype wayland webserver wifi X xinerama xmms2 +lua_single_target_lua5-4
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3 BSD LGPL-2.1 MIT
+RDEPEND=curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wayland? ( dev-libs/wayland x11-libs/pango ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) apcupsd? ( sys-power/apcupsd ) cmus? ( media-sound/cmus ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) extras? ( app-editors/nano || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
+SLOT=0
+SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.18.3.tar.gz -> conky-1.18.3.tar.gz
+_eclasses_=cmake	2e47edc2986d4e1c0363867058cd4489	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=953e4beb07c5c9ecc11135b1888f7927
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 379ca8bf75e0..8fb2b9b9879f 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.12.4 b/metadata/md5-cache/app-portage/iwdevtools-0.12.4
new file mode 100644
index 000000000000..1465161b21e5
--- /dev/null
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.12.4
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man || ( sys-apps/util-linux app-misc/getopt ) test? ( app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/coreutils sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
+EAPI=8
+HOMEPAGE=https://github.com/ionenwks/iwdevtools
+INHERIT=meson optfeature
+IUSE=test
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/coreutils sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.12.4.tar.gz -> iwdevtools-0.12.4.tar.gz
+_eclasses_=meson	cd2865332c8d99e1da0655523ff4a28f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=40c042085b300dc6db65410fd794882e
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index dfcb4426aaf9..1f2dd5aa7f96 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/VSS-22.0.0 b/metadata/md5-cache/dev-ada/VSS-22.0.0-r1
index c9d5891d7f86..1f3524816276 100644
--- a/metadata/md5-cache/dev-ada/VSS-22.0.0
+++ b/metadata/md5-cache/dev-ada/VSS-22.0.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-)] test? ( app-i18n/unicode-data )
+BDEPEND=dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?] test? ( app-i18n/unicode-data )
 DEFINED_PHASES=compile prepare setup test
-DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) ada_target_gcc_12? ( sys-devel/gcc:12[ada] )
 DESCRIPTION=A high level string and text processing library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/AdaCore/VSS
 INHERIT=ada multiprocessing
 IUSE=test ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12
 KEYWORDS=amd64 x86
 LICENSE=GPL-3 gcc-runtime-library-exception-3.1
-RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
-REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) ada_target_gcc_12? ( sys-devel/gcc:12[ada] )
+REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12 )
 RESTRICT=!test? ( test )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/VSS/archive/refs/tags/v22.0.0.tar.gz -> VSS-22.0.0.tar.gz
 _eclasses_=ada	16715c066d0691a4c61581d946cd3676	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=76b0f7076a18621511c2d1de95dc76f3
+_md5_=9c71f5246edb8276d4d4291e4ef20bb9
diff --git a/metadata/md5-cache/dev-ada/VSS-23.0.0 b/metadata/md5-cache/dev-ada/VSS-23.0.0
deleted file mode 100644
index fb8184d92150..000000000000
--- a/metadata/md5-cache/dev-ada/VSS-23.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-ada/gprbuild[ada_target_gcc_12_2_0(-)?,-ada_target_gnat_2021(-),-ada_target_gcc_12(-)] test? ( app-i18n/unicode-data dev-ada/xmlada[ada_target_gcc_12_2_0(-)?,-ada_target_gnat_2021(-),-ada_target_gcc_12(-)] )
-DEFINED_PHASES=compile prepare setup test
-DEPEND=ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/xmlada[ada_target_gcc_12_2_0(-)?,-ada_target_gnat_2021(-),-ada_target_gcc_12(-)]
-DESCRIPTION=A high level string and text processing library
-EAPI=7
-HOMEPAGE=https://github.com/AdaCore/VSS
-INHERIT=ada multiprocessing
-IUSE=test ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12
-KEYWORDS=amd64 x86
-LICENSE=GPL-3 gcc-runtime-library-exception-3.1
-RDEPEND=ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/xmlada[ada_target_gcc_12_2_0(-)?,-ada_target_gnat_2021(-),-ada_target_gcc_12(-)]
-REQUIRED_USE=ada_target_gcc_12_2_0
-RESTRICT=!test? ( test )
-SLOT=0/23.0.0
-SRC_URI=https://github.com/AdaCore/VSS/archive/refs/tags/v23.0.0.tar.gz -> VSS-23.0.0.tar.gz
-_eclasses_=ada	16715c066d0691a4c61581d946cd3676	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=fc14653819d7482fd285af7ce46e9e0d
diff --git a/metadata/md5-cache/dev-ada/VSS-23.0.0-r1 b/metadata/md5-cache/dev-ada/VSS-23.0.0-r1
new file mode 100644
index 000000000000..07e3a950f862
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/VSS-23.0.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-ada/gprbuild[ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?,-ada_target_gnat_2021(-)] test? ( app-i18n/unicode-data dev-ada/xmlada[ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?,-ada_target_gnat_2021(-)] )
+DEFINED_PHASES=compile prepare setup test
+DEPEND=ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) ada_target_gcc_12? ( sys-devel/gcc:12[ada] ) dev-ada/xmlada[ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?,-ada_target_gnat_2021(-)]
+DESCRIPTION=A high level string and text processing library
+EAPI=8
+HOMEPAGE=https://github.com/AdaCore/VSS
+INHERIT=ada multiprocessing
+IUSE=test ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12
+KEYWORDS=amd64 x86
+LICENSE=GPL-3 gcc-runtime-library-exception-3.1
+RDEPEND=ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) ada_target_gcc_12? ( sys-devel/gcc:12[ada] ) dev-ada/xmlada[ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?,-ada_target_gnat_2021(-)]
+REQUIRED_USE=^^ ( ada_target_gcc_12_2_0 ada_target_gcc_12 )
+RESTRICT=!test? ( test )
+SLOT=0/23.0.0
+SRC_URI=https://github.com/AdaCore/VSS/archive/refs/tags/v23.0.0.tar.gz -> VSS-23.0.0.tar.gz
+_eclasses_=ada	16715c066d0691a4c61581d946cd3676	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=82e834307055ba2062af23ac0af702e6
diff --git a/metadata/md5-cache/dev-ada/gprbuild-23.0.0 b/metadata/md5-cache/dev-ada/gprbuild-23.0.0
deleted file mode 100644
index cb39cefdcb44..000000000000
--- a/metadata/md5-cache/dev-ada/gprbuild-23.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gprconfig_kb[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-)]
-DESCRIPTION=Multi-Language Management
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/
-INHERIT=ada multiprocessing
-IUSE=ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gprconfig_kb[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-)]
-REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
-SLOT=0
-SRC_URI=https://github.com/AdaCore/gprbuild/archive/refs/tags/v23.0.0.tar.gz -> gprbuild-23.0.0.tar.gz https://github.com/AdaCore/xmlada/archive/refs/tags/v23.0.0.tar.gz -> xmlada-23.0.0.tar.gz
-_eclasses_=ada	16715c066d0691a4c61581d946cd3676	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=d550b524ff27fe44deb934b954b9f0fd
diff --git a/metadata/md5-cache/dev-ada/gprbuild-23.0.0-r1 b/metadata/md5-cache/dev-ada/gprbuild-23.0.0-r1
index 2b028e9dcc68..dbd28e63b1bd 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-23.0.0-r1
+++ b/metadata/md5-cache/dev-ada/gprbuild-23.0.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://libre.adacore.com/
 INHERIT=ada multiprocessing
 IUSE=ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) ada_target_gcc_12? ( sys-devel/gcc:12[ada] ) dev-ada/gprconfig_kb[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?]
 REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12 )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/gprbuild/archive/refs/tags/v23.0.0.tar.gz -> gprbuild-23.0.0.tar.gz https://github.com/AdaCore/xmlada/archive/refs/tags/v23.0.0.tar.gz -> xmlada-23.0.0.tar.gz
 _eclasses_=ada	16715c066d0691a4c61581d946cd3676	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=ea10c4f8ad843e29351db430400c93de
+_md5_=2909691f49c7e93114712f9dc283a212
diff --git a/metadata/md5-cache/dev-ada/gprconfig_kb-23.0.0-r1 b/metadata/md5-cache/dev-ada/gprconfig_kb-23.0.0-r1
deleted file mode 100644
index c6bdd4e09f16..000000000000
--- a/metadata/md5-cache/dev-ada/gprconfig_kb-23.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=GPR configuration knowledge base
-EAPI=7
-HOMEPAGE=https://www.adacore.com/
-INHERIT=ada
-IUSE=ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=!=dev-ada/gprbuild-2021*
-REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
-SLOT=0
-SRC_URI=https://github.com/AdaCore/gprconfig_kb/archive/refs/tags/v23.0.0.tar.gz -> gprconfig_kb-23.0.0.tar.gz
-_eclasses_=ada	16715c066d0691a4c61581d946cd3676
-_md5_=cd013fd283e87ddaa0de0c764b8defb5
diff --git a/metadata/md5-cache/dev-ada/gprconfig_kb-23.0.0-r2 b/metadata/md5-cache/dev-ada/gprconfig_kb-23.0.0-r2
index 88807c99d106..de1882161c18 100644
--- a/metadata/md5-cache/dev-ada/gprconfig_kb-23.0.0-r2
+++ b/metadata/md5-cache/dev-ada/gprconfig_kb-23.0.0-r2
@@ -4,11 +4,10 @@ EAPI=8
 HOMEPAGE=https://www.adacore.com/
 INHERIT=ada
 IUSE=ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=!=dev-ada/gprbuild-2021*
 REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12 )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/gprconfig_kb/archive/refs/tags/v23.0.0.tar.gz -> gprconfig_kb-23.0.0.tar.gz
 _eclasses_=ada	16715c066d0691a4c61581d946cd3676
-_md5_=db95da83cf9debd389b346ce16abe267
+_md5_=aade170a5aad20324319106cb5009bcd
diff --git a/metadata/md5-cache/dev-ada/markdown-23.0.0 b/metadata/md5-cache/dev-ada/markdown-23.0.0
index 2ca8a58ffc80..c68f21225936 100644
--- a/metadata/md5-cache/dev-ada/markdown-23.0.0
+++ b/metadata/md5-cache/dev-ada/markdown-23.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=setup
-DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-)] dev-ada/VSS[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-)]
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) ada_target_gcc_12? ( sys-devel/gcc:12[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?] dev-ada/VSS[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?]
 DESCRIPTION=Provides a markdown parser written in Ada
 EAPI=7
 HOMEPAGE=https://github.com/AdaCore/markdown
@@ -7,8 +7,8 @@ INHERIT=ada
 IUSE=ada_target_gnat_2021 ada_target_gcc_12_2_0 ada_target_gcc_12
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-)] dev-ada/VSS[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,-ada_target_gcc_12(-)]
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) ada_target_gcc_12? ( sys-devel/gcc:12[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?] dev-ada/VSS[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,ada_target_gcc_12(-)?]
 SLOT=0
 SRC_URI=https://github.com/AdaCore/markdown/archive/refs/tags/v23.0.0.tar.gz -> markdown-23.0.0.tar.gz
 _eclasses_=ada	16715c066d0691a4c61581d946cd3676
-_md5_=f8b7dffcba3cdbc196678aaf7d1a0918
+_md5_=43b38a438536bf5554608c96dca4f132
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 0b4508f049aa..aadc09d9977e 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/godot-4.0.1 b/metadata/md5-cache/dev-games/godot-4.0.1
new file mode 100644
index 000000000000..f5c28fd50836
--- /dev/null
+++ b/metadata/md5-cache/dev-games/godot-4.0.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig || ( >dev-util/scons-4.5.1-r1 <dev-util/scons-4.5.1 ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) )
+DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
+EAPI=8
+HOMEPAGE=https://godotengine.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+IUSE=alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast +runner speech test +theora +tools +udev +upnp +vulkan +webp
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
+RESTRICT=test
+SLOT=4
+SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0.1/godot-4.0.1-stable.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6b6d7c8da9da8374decd50e4f3a54d2c
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index d9fead14ac6a..27ef1724a2c3 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/apr-1.7.2-r1 b/metadata/md5-cache/dev-libs/apr-1.7.2-r1
new file mode 100644
index 000000000000..c344021d6965
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apr-1.7.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-devel/libtool-2.4.2 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 prepare test
+DEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+DESCRIPTION=Apache Portable Runtime Library
+EAPI=8
+HOMEPAGE=https://apr.apache.org/
+INHERIT=autotools toolchain-funcs
+IUSE=doc old-kernel selinux static-libs +urandom
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) selinux? ( sec-policy/selinux-base-policy )
+SLOT=1/1.7
+SRC_URI=mirror://apache/apr/apr-1.7.2.tar.bz2
+_eclasses_=autotools	b5529dc611971a61a30153916014f616	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=74dd4628e053579759f29dc6f2d43716
diff --git a/metadata/md5-cache/dev-libs/capstone-5.0_rc2-r3 b/metadata/md5-cache/dev-libs/capstone-5.0_rc2-r3
index 249c8b160562..dba963b4b7ab 100644
--- a/metadata/md5-cache/dev-libs/capstone-5.0_rc2-r3
+++ b/metadata/md5-cache/dev-libs/capstone-5.0_rc2-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.capstone-engine.org/
 INHERIT=cmake distutils-r1 toolchain-funcs
 IUSE=python static-libs test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/capstone-engine/capstone/archive/5.0-rc2.tar.gz -> capstone-5.0_rc2.tar.gz
 _eclasses_=cmake	2e47edc2986d4e1c0363867058cd4489	distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cb8a13d2b6684b3eb8a4f71b49a6c7b0
+_md5_=c4433a52b68f0c7a89f78b9ecd3a1e08
diff --git a/metadata/md5-cache/dev-libs/libdex-0.2.0 b/metadata/md5-cache/dev-libs/libdex-0.2.0
new file mode 100644
index 000000000000..8dac1157de61
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libdex-0.2.0
@@ -0,0 +1,17 @@
+BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) dev-util/glib-utils virtual/pkgconfig gtk-doc? ( dev-util/gi-docgen ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.68:2 >=sys-libs/liburing-0.7:= introspection? ( dev-libs/gobject-introspection:= ) sysprof? ( dev-util/sysprof-capture:4 )
+DESCRIPTION=Deferred Execution library for GNOME and GTK
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/libdex
+INHERIT=gnome.org meson vala
+IUSE=gtk-doc +introspection sysprof test vala
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.68:2 >=sys-libs/liburing-0.7:= introspection? ( dev-libs/gobject-introspection:= ) sysprof? ( dev-util/sysprof-capture:4 )
+REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=mirror://gnome/sources/libdex/0.2/libdex-0.2.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	cd2865332c8d99e1da0655523ff4a28f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
+_md5_=a598e75bc0f74164bf89d59d18b66d9f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index de32a49882ad..5e00e155db58 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/gnome-builder-44.1 b/metadata/md5-cache/dev-util/gnome-builder-44.1
new file mode 100644
index 000000000000..8aa8fb691b38
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gnome-builder-44.1
@@ -0,0 +1,18 @@
+BDEPEND=doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ) gtk-doc? ( dev-util/gi-docgen app-text/docbook-xml-dtd:4.3 ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=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 setup test
+DEPEND=>=dev-libs/glib-2.75.0:2 >=gui-libs/gtk-4.8:4[introspection] >=gui-libs/libadwaita-1.3.0:1 >=gui-libs/libpanel-1.1.2:1 >=gui-libs/gtksourceview-5.7.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.43.0:= >=dev-libs/libdex-0.1.1:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.1:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 ) !!sys-devel/llvm:0
+DESCRIPTION=An IDE for writing GNOME-based software
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
+IUSE=clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
+KEYWORDS=~amd64
+LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
+RDEPEND=>=dev-libs/glib-2.75.0:2 >=gui-libs/gtk-4.8:4[introspection] >=gui-libs/libadwaita-1.3.0:1 >=gui-libs/libpanel-1.1.2:1 >=gui-libs/gtksourceview-5.7.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.43.0:= >=dev-libs/libdex-0.1.1:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.1:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) flatpak? ( git )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-builder/44/gnome-builder-44.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	cd2865332c8d99e1da0655523ff4a28f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	ab0d5fcb35ad650a57b516e6f4c467e7	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b243ddc057ff26441a86fe308b8ac361
diff --git a/metadata/md5-cache/dev-util/scons-4.5.1 b/metadata/md5-cache/dev-util/scons-4.5.1-r1
index 23b3fbd8c8b6..f89b117ecb38 100644
--- a/metadata/md5-cache/dev-util/scons-4.5.1
+++ b/metadata/md5-cache/dev-util/scons-4.5.1-r1
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://downloads.sourceforge.net/project/scons/scons/4.5.1/SCons-4.5.1.tar.gz doc? ( https://www.scons.org/doc/4.5.1/PDF/scons-user.pdf -> scons-4.5.1-user.pdf https://www.scons.org/doc/4.5.1/HTML/scons-user.html -> scons-4.5.1-user.html ) test? ( https://github.com/SCons/scons/archive/4.5.1.tar.gz -> scons-4.5.1.gh.tar.gz )
+SRC_URI=https://downloads.sourceforge.net/project/scons/scons/4.5.1/SCons-4.5.1.tar.gz https://github.com/SCons/scons/pull/4322.patch -> scons-4.5.1-mergeflags.patch https://github.com/SCons/scons/archive/4.5.1.tar.gz -> scons-4.5.1.gh.tar.gz doc? ( https://www.scons.org/doc/4.5.1/PDF/scons-user.pdf -> scons-4.5.1-user.pdf https://www.scons.org/doc/4.5.1/HTML/scons-user.html -> scons-4.5.1-user.html )
 _eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c4939b0e203e02aa134d07cde55fc256
+_md5_=ac0bb251750cd416a41dd65adc4a4044
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 42dafb60168e..36881e53d89d 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gnome-session-44.0 b/metadata/md5-cache/gnome-base/gnome-session-44.0
new file mode 100644
index 000000000000..1801690937a7
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-session-44.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxslt dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 x11-libs/xtrans virtual/pkgconfig doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.22.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/libglvnd[X] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 )
+DESCRIPTION=Gnome session manager
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-session
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop gnome.org gnome2-utils meson systemd xdg
+IUSE=doc elogind systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.22.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/libglvnd[X] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 ) >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-session/44/gnome-session-44.0.tar.xz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	cd2865332c8d99e1da0655523ff4a28f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6d636ea60c18b285037db1f909dd8abc
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-44.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-44.0
new file mode 100644
index 000000000000..20ec659b030d
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-44.0
@@ -0,0 +1,14 @@
+BDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DESCRIPTION=Collection of GSettings schemas for GNOME desktop
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=+introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/44/gsettings-desktop-schemas-44.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	cd2865332c8d99e1da0655523ff4a28f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7a69853a80b745cc9a671347159bb240
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 7370349e29e0..03b221514281 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/feh-3.7.2 b/metadata/md5-cache/media-gfx/feh-3.7.2
deleted file mode 100644
index 878cf5d74e89..000000000000
--- a/metadata/md5-cache/media-gfx/feh-3.7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
-DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=7
-HOMEPAGE=https://feh.finalrewind.org/
-INHERIT=toolchain-funcs xdg-utils
-IUSE=debug curl exif test xinerama inotify
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86
-LICENSE=feh
-RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.7.2.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e7d6fad597a0a1123398dd48986eb048
diff --git a/metadata/md5-cache/media-gfx/feh-3.9-r1 b/metadata/md5-cache/media-gfx/feh-3.9-r1
deleted file mode 100644
index e02d100e987e..000000000000
--- a/metadata/md5-cache/media-gfx/feh-3.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
-DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=8
-HOMEPAGE=https://feh.finalrewind.org/
-INHERIT=toolchain-funcs xdg-utils
-IUSE=debug curl exif test xinerama inotify
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86
-LICENSE=feh
-RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) media-libs/libjpeg-turbo:0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.9.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5fb60cef6101e707d0f54e8887e9a964
diff --git a/metadata/md5-cache/media-gfx/feh-3.9.1-r1 b/metadata/md5-cache/media-gfx/feh-3.9.1-r1
new file mode 100644
index 000000000000..57091c3c4207
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/feh-3.9.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=|| ( >=media-libs/imlib2-1.11.0[X,text] <media-libs/imlib2-1.11.0[X] ) >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
+DESCRIPTION=A fast, lightweight imageviewer using imlib2
+EAPI=8
+HOMEPAGE=https://feh.finalrewind.org/
+INHERIT=toolchain-funcs xdg-utils
+IUSE=debug curl exif test xinerama inotify
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86
+LICENSE=feh
+RDEPEND=|| ( >=media-libs/imlib2-1.11.0[X,text] <media-libs/imlib2-1.11.0[X] ) >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) media-libs/libjpeg-turbo:0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://feh.finalrewind.org/feh-3.9.1.tar.bz2
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=af0427651854bbd85bf650ecf60a14df
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 26d4cb9e2e0b..fb26f71580d4 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/rclone-1.62.0 b/metadata/md5-cache/net-misc/rclone-1.62.2
index 844543e68cba..d6f9d5626744 100644
--- a/metadata/md5-cache/net-misc/rclone-1.62.0
+++ b/metadata/md5-cache/net-misc/rclone-1.62.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/rclone/rclone/archive/v1.62.0.tar.gz -> rclone-1.62.0.tar.gz https://dev.gentoo.org/~slashbeast/distfiles/rclone/rclone-1.62.0-deps.tar.xz
+SRC_URI=https://github.com/rclone/rclone/archive/v1.62.2.tar.gz -> rclone-1.62.2.tar.gz https://dev.gentoo.org/~slashbeast/distfiles/rclone/rclone-1.62.2-deps.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	f9700c7efec1fd4955363169e9930c1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=da5299fdb4ca9e84dd835278f92e252a
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 22e8182c678b..847af151ce82 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.95_pre20171122 b/metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.95_pre20171122
new file mode 100644
index 000000000000..25d2881eb4bc
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.95_pre20171122
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool dev-util/desktop-file-utils dev-libs/libxslt virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=x11-misc/shared-mime-info
+DESCRIPTION=A collection of data files to add support for chemical MIME types
+EAPI=8
+HOMEPAGE=https://github.com/dleidert/chemical-mime
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools xdg
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=x11-misc/shared-mime-info
+SLOT=0
+SRC_URI=https://github.com/dleidert/chemical-mime/archive/4fd66e3b3b7d922555d1e25587908b036805c45b.tar.gz -> chemical-mime-data-0.1.95_pre20171122.tar.gz
+_eclasses_=autotools	b5529dc611971a61a30153916014f616	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=539a6cc98bda1a8dd57da941a90d6ff7
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 66790f87178b..220d45f9d022 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/coreutils-9.1_p20230313 b/metadata/md5-cache/sys-apps/coreutils-9.2
index a7dc1a24a3ad..89705c298fcb 100644
--- a/metadata/md5-cache/sys-apps/coreutils-9.1_p20230313
+++ b/metadata/md5-cache/sys-apps/coreutils-9.2
@@ -6,10 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/coreutils/
 INHERIT=flag-o-matic python-any-r1 toolchain-funcs verify-sig
 IUSE=acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) openssl? ( dev-libs/openssl:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://www.pixelbeat.org/cu/coreutils-9.1.198-e68b1.tar.xz -> coreutils-9.1_p20230313.tar.xz verify-sig? ( https://www.pixelbeat.org/cu/coreutils-9.1.198-e68b1.tar.xz.sig -> coreutils-9.1_p20230313.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
+SRC_URI=mirror://gnu/coreutils/coreutils-9.2.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.2.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=fdf5c87e04083ad16b135a75d709a04b
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index fc702b8693d9..2ab51521b2d9 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/fatsort-1.6.5.640 b/metadata/md5-cache/sys-fs/fatsort-1.6.5.640
new file mode 100644
index 000000000000..0f2ff592c993
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fatsort-1.6.5.640
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile prepare test
+DESCRIPTION=Sorts files on FAT16/32 partitions, ideal for basic audio players
+EAPI=8
+HOMEPAGE=http://fatsort.sourceforge.net/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/fatsort/fatsort-1.6.5.640.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=baf10880ea895769663cb94379c29d3b
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 11212327c565..2e816cee18bd 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/grafana-bin-9.3.8 b/metadata/md5-cache/www-apps/grafana-bin-9.3.8-r1
index b6a44cc551b9..ec2bdcd49403 100644
--- a/metadata/md5-cache/www-apps/grafana-bin-9.3.8
+++ b/metadata/md5-cache/www-apps/grafana-bin-9.3.8-r1
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.grafana.com/oss/release/grafana-9.3.8.linux-amd64.tar.gz -> grafana-bin-9.3.8.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f87fee7043dd867ab962098487f25058
+_md5_=ac759d28d5fad4b5df4a9e1c3e38cece
diff --git a/metadata/md5-cache/www-apps/grafana-bin-9.4.3 b/metadata/md5-cache/www-apps/grafana-bin-9.4.3-r1
index b8b85e313860..5e76197eb05c 100644
--- a/metadata/md5-cache/www-apps/grafana-bin-9.4.3
+++ b/metadata/md5-cache/www-apps/grafana-bin-9.4.3-r1
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.grafana.com/oss/release/grafana-9.4.3.linux-amd64.tar.gz -> grafana-bin-9.4.3.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f87fee7043dd867ab962098487f25058
+_md5_=ac759d28d5fad4b5df4a9e1c3e38cece
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index da8f58d9ec67..931553a40194 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-03-20T18:10:02Z
+TIMESTAMP 2023-03-21T00:10:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQYoXpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQY9dtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBjEA/9EVZ/9YQ87i50vaMaL9h7hoc3WLGt5z5RV8b+q/FBqT1yljiV6GyMjEwa
-a7mheuNm8yZpwhWqSRoC2ms1GionConBBMVtUBshgEFLWkb/c8DoO11qcVydjkw+
-lyHyayGerO27gjLxtBSvgcIlC/amHhZksp0jGLXori0UcrrZruB8WB106pgpFcZ2
-90dBv/G3yCLGQQ+G4vCSBtYq/D2vBtLXSwSdxlt4HhOW5a2szvh+Xkm26SyVEGID
-QWNgY+G15WXP8inX2SPWEHTpnl9bMw+WXiCuH0Dwedu1PDiLC/ReCcoXSXjOKjCJ
-zrj/blQ3m1UAIfErGwh45e6gHuvNhbN3y5p7T9RMO9D27sLQ7pTY1M+1rqhpWXHM
-81bs4k2eT3A2I94UlUncBIXYcQgPc0rguF+npDJ0ueeQeQ4n9RQmZFzhgWqlloB1
-AYbfCfB+71hY7szbvbuSKbpQnZnM5ieTTyT8hjdQOZwAvxJS6rfp8aLNDTzgSqjS
-jZwwAOsYUkUECHohzQ0N5vs5doFtAlQbuZjBz7OvQ97A/6TYcEKwgYvGkAuMvamd
-7wIXAGVFezGqiw1+2L27Xr6NiA+CLX98l6TzwkMRVBwMe61wweb/OonTiVPpXRoG
-GaztP1fTav0ngdMGaYSynUOQJxLBbArDvtYBkhK1tMrlwWGCMVY=
-=2gEJ
+klCX/xAAkYckABqyzeu8kwfyc2fDPuexHl47IOLI1ndr0ESltwZBB1Mj8LwBs0aY
+MtfK7ccOfOdT+kceIWyopVIL3562CrDCRnpdhR04EZDNpFbm+FZQgcQrYHfVmSyh
+SpTYRYVFODHGoAuzMPnr/Hv1wxtHhfZqaJ53lQHfcOjbjMoeijRvzxn6thiU4ERn
+xOJAGHK4cYBE+/n2qip/XRqW7bnuPLsCW18BZaMJBHpPd+mpjcxHBaxY09PlsYMR
+R8d4TeYW0wZFFJSgj9aUxGRV2xnvn0XC/y4Ubxwrs8gaVaIG84HFhZ2c6RBn8HOq
+/WjhGEb77QiOOtMqWQBALkk5GZwLABBUCDLkvtTUXjJ8lAJ4lba9eCN7h9EyNG8C
+iPtFrF13vGxex9nBsFlgRGEPggkWx2iQmVEGQCiQc1EApFfX/iDh+uwCTnoN2cRN
+OiEMpVSzsiCW1tQem8kQB02m0Apwqpp9hhw42xUOWJHpSSzlUOPQyIMk2UeDvkka
+HErebBGYWHSQU7WMDti/xtshzM4imls1O5n2qZpT2G4UbEC30+o9Ft46lHzkV2br
+8l9JTwt+sbd4i/PiYZUyLAep8k6illns7Zl1fnOEJZQndOT8I3EA7hE1DioOCnHD
+Wx3qpDi2/GoxcPXQyXaSnPBr0ZPt3sNq57kOnueJzgbguhLoMLc=
+=I/wx
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index dc2508b3fed2..7c56575ffafb 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 20 Mar 2023 18:09:58 +0000
+Tue, 21 Mar 2023 00:09:59 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a5fb2b8f9a47..0a3780564db8 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Mar 20 06:09:57 PM UTC 2023
+Tue Mar 21 12:09:59 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e661afc47cf3..0f6ea827402d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 20 Mar 2023 18:15:01 +0000
+Tue, 21 Mar 2023 00:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 9c59871db14f..8f42495dd619 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-015d7e1648ba32072eed926ee3009a3adf9037a1 1679333229 2023-03-20T17:27:09+00:00
+ab64654c353dd3a0465f6e8d42e9ce8a7c12755e 1679349989 2023-03-20T22:06:29+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 371d836b197d..5d8dc6552a92 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1679335801 Mon 20 Mar 2023 06:10:01 PM UTC
+1679357401 Tue 21 Mar 2023 12:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index dc2508b3fed2..7c56575ffafb 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 20 Mar 2023 18:09:58 +0000
+Tue, 21 Mar 2023 00:09:59 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index deb9a00b5200..8766dc196216 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index b0ad7bf9778d..90a56087d8f5 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,7 +1,7 @@
 DIST rclone-1.61.1-deps.tar.xz 286458984 BLAKE2B 5129b10d67c0b8dbc03d5f3250667fd7836234720e6ef171a46f364cecb9f81c33dbba46077e1d48380b3c04f444495a6482111636efa81134682379e678b4cd SHA512 0502424d66a9c029b95a34a15e60567f06f9cef35a2e9fd6a459b99a4b45a0a55dc7efc6f430dc718888542d532f614e3b3fbc320ea56e4852e75de2434ef21a
 DIST rclone-1.61.1.tar.gz 16112718 BLAKE2B cb68fedf03812451d9c8ded88bfc073c8177948b1e932acf99d22b23d3d11b1f52027e2afe88472ba6c88637a8e58e2955b67575ed7356b7b0900d6c7a7bb65c SHA512 739b976a4538586670b797c92f9cbd416c3589444a611926b5edd074e8249dfcff9d95e8053459aa42c4cbe90009a9ba1c3abb9be8e8718db6276fdc39386273
-DIST rclone-1.62.0-deps.tar.xz 294254004 BLAKE2B 8d41d7a784280ea82f86225283a3813db5d78c9982f019522b05d06610dfe8a84ffe282cca99814aad92759b60fde27f8340a2f34c151bdb519e94eeaff894d7 SHA512 ebb9636c2a1fac47b243f00e4b434b231d988d37650eb4add794ab1c2b3d4d66e2524c330f7d184ad45b7a9079a565745bda9c79ad7120ac7d868cc71942acb4
-DIST rclone-1.62.0.tar.gz 16170956 BLAKE2B f067252b1f06531dc969c0073eb299d5ffba4a1c89a99094cc8a3b6eb4c63866d1d28b72bac2c95323f8f644268fa802ccf43256fece46a31aaffb065f3a7a49 SHA512 3ab3bd07f1f83c19b9a9783df496c15273bd7bc192eac309683456589af8d179add8ee1cd334dbecbbae9ce8c9bfd84e905547e23c4d66452c96ca6a6d075755
+DIST rclone-1.62.2-deps.tar.xz 294265336 BLAKE2B 7f44b9972ab902ea53beb2cb6475dc4bbc1ca3b7254d1177a8d49107d6ce90724b0bb37567aecbd9421151ca0f7e7eaa01e6b4ed0d995264ddfc944cae98220e SHA512 2e1a6b864094b364745402b857036ebdea4dd83dddee6f18e3e40fbb0e740bae4d460b6f592d9ee50632fa73d6447f8dee0748a73a738a6dce263a20a1eae975
+DIST rclone-1.62.2.tar.gz 16172767 BLAKE2B 29dd755a25adb3b332b45a662dd6ae1280c38a940e76cc6e3c5ccd38620b43b0b9f0a4598d752583ddff7e2c860416e4e36b6cdfc00cf81f03437ac13e88aba3 SHA512 c29b666ab5573e80f9e61955e987cf3834306bfebce209775f5838a0844e26b5c5ec41d64b8a8444745a99fd8e9c104b18631aeffb438e89839f996221b1c8ca
 EBUILD rclone-1.61.1.ebuild 1079 BLAKE2B f256e5ec08ea22935f97159a9a617a03e35b96d1e459ba185cd74cee1d903bc240d13f07f1dabdee5af7f1198634dac97cd37def5ebeee8067c5e9d085cbe9a5 SHA512 07f84113fc42f6843b2e684acc7247f9e4ef8a11ed0c0b79de20c4e27d18ce72a042f7a67b7bf444374585b2d46ea5b0867e985011d5f2c3254964a5754001a4
-EBUILD rclone-1.62.0.ebuild 1081 BLAKE2B e4aada07e04c85d8d6e110009c00c91e550ca07280f2307c915e7065d8ccd969a63b05a375d13f618d9ea0f02eab542b83c9d5604c3343eb5cf9318813cbb844 SHA512 1c4d70158dc7e92be48764465d0ff1954d1da2ce116915f5fa8f2d974e9dd3a06252fdcf3e7e08593f6a166f1afb38d305ee9df43af0576a9b0d1bc1f3fb9e91
+EBUILD rclone-1.62.2.ebuild 1081 BLAKE2B e4aada07e04c85d8d6e110009c00c91e550ca07280f2307c915e7065d8ccd969a63b05a375d13f618d9ea0f02eab542b83c9d5604c3343eb5cf9318813cbb844 SHA512 1c4d70158dc7e92be48764465d0ff1954d1da2ce116915f5fa8f2d974e9dd3a06252fdcf3e7e08593f6a166f1afb38d305ee9df43af0576a9b0d1bc1f3fb9e91
 MISC metadata.xml 439 BLAKE2B b5861dff54f0d84231305efb12b3bae89c7f813b5da790804a3b5d7328ef85d7b059471ed1c652f9f53a10a3923c2c06913009b937e60adb1f45240ac8d988c1 SHA512 336fcb38344e49383a1daafb2f787485113ebe5dd473e833e3e60ad77361024ff97461e554c8216c24263d1ce22b1ed1bc42e3fec6225cf485a2ee5dea5c2c3a
diff --git a/net-misc/rclone/rclone-1.62.0.ebuild b/net-misc/rclone/rclone-1.62.2.ebuild
index 649ec2384a36..649ec2384a36 100644
--- a/net-misc/rclone/rclone-1.62.0.ebuild
+++ b/net-misc/rclone/rclone-1.62.2.ebuild
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b2780f19e744..171f635d6b4b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 448a40932b93..2855d7441956 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -160,6 +160,7 @@ dev-ruby/net-http-persistent:3
 >=app-text/evince-44_rc
 >=dev-libs/gjs-1.75
 >=dev-python/pygobject-3.43
+>=dev-util/gnome-builder-44
 >=gnome-base/gnome-session-44_rc
 >=gnome-base/gnome-settings-daemon-44_rc
 >=gnome-base/gnome-shell-44_rc
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0469e4062c39..dd4bafd4db0a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1942,6 +1942,7 @@ dev-libs/libcharon:client - Install the charon client library
 dev-libs/libclc:spirv - Build SPIRV targets
 dev-libs/libdbusmenu:gtk - Enable support for GTK+2
 dev-libs/libdbusmenu:gtk3 - Enable support for GTK+3
+dev-libs/libdex:sysprof - Enable profiling data capture support using dev-util/sysprof-capture
 dev-libs/libdynd:cuda - Enable NVIDIA CUDA toolkit support
 dev-libs/libevent:clock-gettime - Disable use of clock_gettime even if it is available
 dev-libs/libevent:debug - Support for running in debug mode
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 0a44ec925324..54e779f13404 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/chemical-mime-data/Manifest b/sci-chemistry/chemical-mime-data/Manifest
index 0a935b14c466..d0caeca0aaad 100644
--- a/sci-chemistry/chemical-mime-data/Manifest
+++ b/sci-chemistry/chemical-mime-data/Manifest
@@ -4,5 +4,7 @@ AUX chemical-mime-data-0.1.94-pigz.patch 481 BLAKE2B dee47e41645b5d196326fb7439e
 AUX chemical-mime-data-0.1.94-rsvg-convert-r2.patch 1305 BLAKE2B 22809dbd6c769a0dcc88d65c3454702021d9d6e082a50fce9a5f3a28743aafdbcb5e153a90ee43f7a42d4ccd5f98465f91f872e7fabf69086b8ecf1336a60e49 SHA512 4bea8dae65e28657ff75b5b613137c0f89f6de185db79297642616f208e841ba56181044eee194c619bad2c3bfb62454b7839b720d2f32fca0e768b75c842683
 AUX chemical-mime-data-0.1.94-turbomole.patch 2451 BLAKE2B 86b4b08b2af4503e0f8a525ebaa4231a3d0d3727c951b9e957c9fdac790bc41b7f01092350099a64cce66dbb61bc4cbd3654ef91834310c6c7cd1dc156ca87e8 SHA512 1bfa8818d159f0f917a24a06b0bfe926f0854f4242d8c2dbbedcd4210ffd38a459298862dc1d1aedbbe648a933db99c5d647c5409af74f88b03dd3033946df54
 DIST chemical-mime-data-0.1.94.tar.bz2 146077 BLAKE2B 9996c240446dc9571b6b4afbcdc6cf16a08e11314da9f785490b1b20933b6d18a333132492e30315c08f4441c048ec593a111815253050cfb5ab562aadb784f1 SHA512 7f3d967149f27ab1de53c948dc055959e661e1be9d778e3d56d06bea95769da7770ab5fb66afab6607747ef91ffb1dbbcf921e5f06e3303351781968594b5f00
+DIST chemical-mime-data-0.1.95_pre20171122.tar.gz 84515 BLAKE2B 42f76b44408c04e5a254c17502ea2c297727bb58fa3e86b8bca7f0c4c056ae7400b31f06b7d0c64b0712e97ab8a1f82549f44a3677720cd37a301ba99adb3d7a SHA512 a031e7a5bc31a74adcd8e5d827de71b6e0eafdceba16cf6f7407aa0266a9a082b0011963b315d2369f39abf45c4b41cedafccddbc2171673bf96ccbea51a4790
 EBUILD chemical-mime-data-0.1.94-r4.ebuild 1091 BLAKE2B 2014dc00aed88c563263444a32fa008b440413ddacca3a8e08a9f07191a0595f5166715e12f31c5454b32fe0561476b4b4400aeee6e7a99c9d791f923bd8b4fa SHA512 6760106eb5303b951b3a245de3da8356cf73a7bc6ba788554b308fd31c004ff18729e7c223264df011ac2a3493e201525e394b4f2a63bc4e7fbade9f0056663f
-MISC metadata.xml 359 BLAKE2B 21813389835e947fa641360371020e74592c4b3b54b9244f6a2c3e5022abeaf477d42b466ce041478626b035f4ea243a526ed1ce796a995482d8bce66a3c3105 SHA512 bea4afc5ec2f3d8ee195bf336c5f81a18690bd9fde14da425dcb3b123d9fec362106a13efe11121a42115209b4c6670a7f24bc4aff6a170f496a9f3cbb764bc6
+EBUILD chemical-mime-data-0.1.95_pre20171122.ebuild 1247 BLAKE2B 0654e887683d4624ce39da6c63019f54d9cf5cf95ec7b0a96b27d927f9c2e264378a51e09817b8da74866b2f3c0c1638a7bd24365cba08a0a44c67680af974f9 SHA512 5faeeb4fb80572189d99f3499d3460d180ba407c1c43cab1b2cf265a7c893be093c703f73a333db8b10bf231db38f88dfa841947a85aabbd098c54632d1efb7e
+MISC metadata.xml 403 BLAKE2B 57e1752722094936b1d76d3198ee397d233b3069df3ef15a60b2f25989418736a9d8672b53d78259a2d4f50fa6e5a635331cf1003dd2cbf87f66a60c85e0ba07 SHA512 c689663c874f6b8d63153fd84326dc5b00b733e98f04d763506f4fff4cbee3e642c5b4633ec3b6a6b5d2950928ba318e226eef85ee25cc8ff00c1dc25a87c3b5
diff --git a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.95_pre20171122.ebuild b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.95_pre20171122.ebuild
new file mode 100644
index 000000000000..13b91f044ac8
--- /dev/null
+++ b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.95_pre20171122.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools xdg
+
+DESCRIPTION="A collection of data files to add support for chemical MIME types"
+HOMEPAGE="https://github.com/dleidert/chemical-mime"
+COMMIT="4fd66e3b3b7d922555d1e25587908b036805c45b"
+SRC_URI="https://github.com/dleidert/chemical-mime/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="x11-misc/shared-mime-info"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	dev-util/desktop-file-utils
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://github.com/dleidert/chemical-mime/issues/5
+	"${FILESDIR}"/${PN}-0.1.95-turbomole.patch
+)
+
+S="${WORKDIR}/${PN/-data/}-${COMMIT}"
+
+src_prepare() {
+	default
+	# https://github.com/dleidert/chemical-mime/issues/4
+	sed -i -e \
+		'/<_comment/a\\t\t<generic-icon name="image-x-generic"/>' \
+		src/chemical-mime-database.xml.in || die
+	sed -i -e \
+		's:acronym|alias|comment|:acronym|alias|comment|generic-icon|:' \
+		xsl/cmd_freedesktop_org.xsl || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-update-database \
+		--without-gnome-mime \
+		--without-kde-mime \
+		--without-kde-magic
+}
diff --git a/sci-chemistry/chemical-mime-data/metadata.xml b/sci-chemistry/chemical-mime-data/metadata.xml
index 702a57465bce..59742c34e797 100644
--- a/sci-chemistry/chemical-mime-data/metadata.xml
+++ b/sci-chemistry/chemical-mime-data/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">chemical-mime</remote-id>
-  </upstream>
+<maintainer type="project">
+	<email>sci-chemistry@gentoo.org</email>
+	<name>Gentoo Chemistry Project</name>
+</maintainer>
+<upstream>
+	<remote-id type="sourceforge">chemical-mime</remote-id>
+	<remote-id type="github">dleidert/chemical-mime</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c53eb50b2a4e..43fdb58e0be6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index cfeeade4208b..7db0f9e6bd02 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -6,10 +6,10 @@ DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f015
 DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f
 DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
 DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
-DIST coreutils-9.1_p20230313.tar.xz 5741248 BLAKE2B b86a67c266fad13fc1d9a4c4775c60e480ab2925e1d2c8313d9da2e4eb45bb609641fa28336c54f05d7e22627906196ac52451a5fc18f538b6b133d7fdef56a7 SHA512 3046a4e02143105c4c7936ce67a59f99a3193fbb28b5bb491fcbb86a8698bf9f9bb83ea94aad225afaf3e2dd8a704fb77298e41fc3aebd1a42e3897e105bed0e
-DIST coreutils-9.1_p20230313.tar.xz.sig 833 BLAKE2B 44db6c8295b6edfa435853c9391f43f47cfe4ffbc7b58b5fc031c5f05fd4f850ec76bff79d9b53ae0aae84278b51cf3acf00a0a062b5928b407042a5072f65e8 SHA512 078b5158a6ad14ba51fb4e5bc4b4effda8011e6e12ebdc0cd864227c8405f8092502bca9b6bde49a802f77dea2b9c3441af0fd3bafc08354e1e8cc038fd42f6d
+DIST coreutils-9.2.tar.xz 5773008 BLAKE2B 026e01718d79dd95bf645088d395584cbd422bb318f414a6ad325aea5deeec7aecb63217c1ce8231e81dd3b6fee1c85c60616c57ef8e2e1d0b9d764fa5a68908 SHA512 7e3108fefba4ef995cc73c64ac5f4e09827a44649a97ddd624eb61d67ce82da5ed6dc8c0f79d3e269f5cdb7d43877a61ef5b93194dd905bec432a7e31f9f479c
+DIST coreutils-9.2.tar.xz.sig 833 BLAKE2B 225f6ea9d6c2a2b0e47093b6c10d648b8d847daf0733eeb779eb01cffde47f67b3328bdfb214298d669689f5de76f3c64384a6471dfc4ccc3a238bfc1943e654 SHA512 4219f3103d829841a11bf1fe42ae277a44347e555fbbaf48e5e87cce48deb96753cb6d25f2571b88685a164acb9f016ff7ea02346b799ce954599fa0124ef070
 EBUILD coreutils-8.32-r1.ebuild 5968 BLAKE2B ae5871d55509dbcd48c3f8b33938edfffca3a48bc2b422546b1bd818e7830b877af08f51605ba0d68299ea63d1f6d8246301223cfa5a29620619cd209cbaa1f5 SHA512 363adf232d9b3d158ec7535e84263286961e3e870ecdee3215162e398125999ccf2d1b76d065a7223d58d04ccd75fd65ab33cf409e155fb2788ca0defdc5094a
 EBUILD coreutils-9.1-r2.ebuild 7114 BLAKE2B 3a80919e840546badf681b0672fcad68e2ac0d9a29586e7a8fd712a11484057364ae015c21b92bfef404f6a9c094d828852d915754bae61ace060c0c6853290e SHA512 77c948b54e48907df14a9ac67b5ed1a36cb11acf709fdf009674b90e878c1efc6b4c449d7f4efcc39110f04692c8c274acc3fa32e242f196b0d8bddb27b963a7
-EBUILD coreutils-9.1_p20230313.ebuild 7500 BLAKE2B 00e7c094f7841dcafc5f107851d15c40d51d16b22b1c13c7948a9b42d9aeeabcdc00fbed61538df79493dca57e35caa5dfdb70418a3096b0fd0b4b0aea5c6229 SHA512 985be8b330fdca61f158c31318e240a1f0fcb66ca8b6238c282a1d88ba4b8ce58b9da0ce195d338eb642bec03555da2f2d92ec3afcdee402381daf66d28dc68e
+EBUILD coreutils-9.2.ebuild 7500 BLAKE2B 00e7c094f7841dcafc5f107851d15c40d51d16b22b1c13c7948a9b42d9aeeabcdc00fbed61538df79493dca57e35caa5dfdb70418a3096b0fd0b4b0aea5c6229 SHA512 985be8b330fdca61f158c31318e240a1f0fcb66ca8b6238c282a1d88ba4b8ce58b9da0ce195d338eb642bec03555da2f2d92ec3afcdee402381daf66d28dc68e
 EBUILD coreutils-9999.ebuild 7500 BLAKE2B 00e7c094f7841dcafc5f107851d15c40d51d16b22b1c13c7948a9b42d9aeeabcdc00fbed61538df79493dca57e35caa5dfdb70418a3096b0fd0b4b0aea5c6229 SHA512 985be8b330fdca61f158c31318e240a1f0fcb66ca8b6238c282a1d88ba4b8ce58b9da0ce195d338eb642bec03555da2f2d92ec3afcdee402381daf66d28dc68e
 MISC metadata.xml 1043 BLAKE2B db071746d60a62e435bfd6e297641411320b61a5716dc631150e5a3a19bcd49cc6121d2a404b8875d6927ad0114f28d33e2b21edb3bab49559d50fdc26b056f6 SHA512 65149d4bf9b16f7e1800fe8d9e23fa466307ff3f009e06f3736b4f55bce27ba74bc6d1547e0b2f06dcebfcba0f2d21ef3efdd4073ed4e525a2ebdc6e62190119
diff --git a/sys-apps/coreutils/coreutils-9.1_p20230313.ebuild b/sys-apps/coreutils/coreutils-9.2.ebuild
index 1acd3418a030..1acd3418a030 100644
--- a/sys-apps/coreutils/coreutils-9.1_p20230313.ebuild
+++ b/sys-apps/coreutils/coreutils-9.2.ebuild
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 9384635dc91f..44487c157d6c 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index 65cb2ce6fe84..d76649ea039b 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,3 +1,5 @@
 DIST fatsort-1.6.4.625.tar.xz 123964 BLAKE2B 4d958886af48e9f6d6a39b128b5ff96b809e67667026483a5abfb3db6f16d8a5ebb257433f2a7fbba6c7e4d81614477cc4cec437bcfba868a2c2fb6b13b15c42 SHA512 1d67c3cb515295d0a47054803e5b2a625875e71f41b2fad17f9d495b6aa4a291776696692545800bb4d5b826e9d622ea34077c81f7f08f41b8dfd70491e439ef
+DIST fatsort-1.6.5.640.tar.xz 131792 BLAKE2B 6e89c2240241642c828e462d44832e533351f5d6dcde78617b55fe61e24d30c92ebe567eaa4c2293e0db1671e60955cd2d48c83ade9acb6988371bbb05cd0953 SHA512 e4b0e6f007686ed873df8415e09787203cf508a27b94ac033c38b47bf9938f5d8fb130d98cc6588a376ea0004a8f8add55dc38e2fb9b133e6984b24bce3160ca
 EBUILD fatsort-1.6.4.625.ebuild 713 BLAKE2B d169a4b11e8379d413a8eb9bef788997723b4c298420cd1567906ca88a9169a6771db1a024553260f2dd292f598341e0118c3e868e7910fdc8c1a3752679bf68 SHA512 0525145f6894df5c88244752316a9814dd8ac52e5d31df71cdb104d0a936c5968e0c98eba99dbf6e17a2c39c97aa3b7fc643fdf2d3c7a5a89b8541a3f78defcd
+EBUILD fatsort-1.6.5.640.ebuild 715 BLAKE2B 441ba0343260fd9a1bf9534474c08c735a76a5ed2d6feee6d31568da6018a2356acf73cea65fd19f1bde57e58f15d0d2643cdb29755fd929cf94094e6e6a1b83 SHA512 a15fbb1f2aae07a6666b5fb273ff810cbd3b80d4e2424e3425b9fa06fbd7759ed57ffaee3f9a04ecd3b8a47103a7fcdebedb064031d2f64d90b6ea74999b6305
 MISC metadata.xml 739 BLAKE2B e9c57a69520793f24cfafb131edfb6b94cd1d0cccbe74494835cbbd597ea6ae0c5d6eacb54bb82bb21acbf2db0ed0b27988cd5e228bfc092c847aceeacac10da SHA512 1983abae2f5d444b6a20039e50606dbf9a9894dae4a0f95b2337f60e451e61f0b7f556c8906d4bb5611ed1bf5201412a677e3dacf6344a4903bf44be13d507aa
diff --git a/sys-fs/fatsort/fatsort-1.6.5.640.ebuild b/sys-fs/fatsort/fatsort-1.6.5.640.ebuild
new file mode 100644
index 000000000000..d318bb6ffdff
--- /dev/null
+++ b/sys-fs/fatsort/fatsort-1.6.5.640.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players"
+HOMEPAGE="http://fatsort.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	sed -i -e 's|/usr/local|/usr|g' \
+		$(find ./ -name Makefile || die) || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" LD="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		man
+}
+
+src_test() {
+	# Tests require root permissions and mounting filesystems which does
+	# not work inside the ebuild environment
+	true
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 40cabba341c3..853bad77b049 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 2ab676d14e71..402f187977e7 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,5 +1,6 @@
 AUX grafana-r1.confd 870 BLAKE2B e222e17f5a14dc48f9bbc922250754d88610a951b1e6230736fffc0624a24a140bd9a9f11c6900e0f57b652ce3f334963ea453a5db5ee667863c6b69acc0f207 SHA512 cb6836ba69b9d1f0c50778823c507eaffd963341edbc4ea5409d0b068cfcecececfacac71e34b1d546a85674f67b12db99f384e5c6aa2186abe86814818d5db1
 AUX grafana.initd 1498 BLAKE2B ac97391c228c09353ef11efb0de37f25802484fbbf71bccedfc9858079ca679ba1567a2a7a40e250ed1fa7477189c30b8c5f175e607b455ae755566a9d89098d SHA512 c3ef1926fabe53728adca6954eb48e8d69c33b4238795e2d0d0406e55e08b3f84760b1abfec556f258af3184e10e6fa116c1b21c704575a54f88050a5266ec87
+AUX grafana.initd2 1498 BLAKE2B ce22443e0f328487cc9e1ff3e7df23c5a0deb790dd99b51330d388df3345d33f9e0588733323a0becff9fcb559c004860a2c080b2dbb21731a49bce5b387db41 SHA512 c7684f2d8647cf3c48a030f17250a592614fb74f846ff8821f07cd2031bc39ab50bb1936eb5eddeab9f67823c86c392648373b551c2c30e728c1501b3273242b
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 DIST grafana-bin-9.3.0.tar.gz 88847005 BLAKE2B 4c37dc077b7f9fb8f9256a2a85094eef5ae2dabe693d039b7c5509ec2662ec544d307dc1cf0043301fb4c3525107bddfac0a7f7a67f0efb8b333936c1b96192d SHA512 1489d3f948259dd3db6403e95f176fea664cb5bfc83a6f22e57ffbe075cc07257a463c4b1d1fd8aa94fbad5473b29608f0c3fc6fdf0c08bcb72f3beeff5163c7
 DIST grafana-bin-9.3.2.tar.gz 89322650 BLAKE2B b9256b6468aa4eff1d77a7bce1f701ab61a372baf2f239572921b04a5624933e57c881035de9a0a86a5ff17b942e2965a7807ae2c183a60cfabb4bd4bf546acb SHA512 9d13624f728b5f5845c9780372b9334d81faadf03b47034b0de708fe87e50db3daff95f61e5649548cf6a4181253cc39f6d523dde5651833e72df42fe3577f16
@@ -9,6 +10,6 @@ DIST grafana-bin-9.4.3.tar.gz 83780585 BLAKE2B b8b609bb701b63262e0b70e551b608e49
 EBUILD grafana-bin-9.3.0.ebuild 1806 BLAKE2B 874e8d2ddc17eca0512231ed58b018230b1a59797820d57a5e7eda97db4f152b7029bf890612a23a1f4cd6d8c7a10e8866eaf5a9d24cd76c62ec2f639e2a0b1e SHA512 bb4063c8c87104da3b55d8c849fc7fb5e1ab68fcf2a087eaf262f6cf6493967281ca72e5ab8dc1850dffe640ab9e87380f8f484e04fe505b8bed92ac851355d5
 EBUILD grafana-bin-9.3.2.ebuild 1806 BLAKE2B 5ac9cd8971589bb59f04902d5b0c1fcb47e8c7ffc9e0c5e4312e098c5616dc6933f2db5dd7fab3530269f0182e9bd28d43bdaab832dcdf06de025669cac228a1 SHA512 1acd72fc8d8f70c8e1460fd413dd7cb6cb7e9507b2cd56bad3b4ccdcb0585dff4dff25d7b9ad6094fe29a16e0df13b8a135f4403f837833adcaa4a1a285ecc4f
 EBUILD grafana-bin-9.3.6.ebuild 1806 BLAKE2B 5ac9cd8971589bb59f04902d5b0c1fcb47e8c7ffc9e0c5e4312e098c5616dc6933f2db5dd7fab3530269f0182e9bd28d43bdaab832dcdf06de025669cac228a1 SHA512 1acd72fc8d8f70c8e1460fd413dd7cb6cb7e9507b2cd56bad3b4ccdcb0585dff4dff25d7b9ad6094fe29a16e0df13b8a135f4403f837833adcaa4a1a285ecc4f
-EBUILD grafana-bin-9.3.8.ebuild 1806 BLAKE2B 5ac9cd8971589bb59f04902d5b0c1fcb47e8c7ffc9e0c5e4312e098c5616dc6933f2db5dd7fab3530269f0182e9bd28d43bdaab832dcdf06de025669cac228a1 SHA512 1acd72fc8d8f70c8e1460fd413dd7cb6cb7e9507b2cd56bad3b4ccdcb0585dff4dff25d7b9ad6094fe29a16e0df13b8a135f4403f837833adcaa4a1a285ecc4f
-EBUILD grafana-bin-9.4.3.ebuild 1806 BLAKE2B 5ac9cd8971589bb59f04902d5b0c1fcb47e8c7ffc9e0c5e4312e098c5616dc6933f2db5dd7fab3530269f0182e9bd28d43bdaab832dcdf06de025669cac228a1 SHA512 1acd72fc8d8f70c8e1460fd413dd7cb6cb7e9507b2cd56bad3b4ccdcb0585dff4dff25d7b9ad6094fe29a16e0df13b8a135f4403f837833adcaa4a1a285ecc4f
+EBUILD grafana-bin-9.3.8-r1.ebuild 1826 BLAKE2B 4838306e575eb25b95298d28272f5e828cffb52d4431d1c74f884901cd389fdf17f0a886ccec9ad85e386bcc03efa283a1879326791573592e2634320d8c8d79 SHA512 069994b16dd9c8a037192528985a2d539231cbd6a80390e3fcadf862d31abf70841e477384593396e573a490c01fa9af5ceb2b31c87f388ebb020d1f7f03a0e0
+EBUILD grafana-bin-9.4.3-r1.ebuild 1826 BLAKE2B 4838306e575eb25b95298d28272f5e828cffb52d4431d1c74f884901cd389fdf17f0a886ccec9ad85e386bcc03efa283a1879326791573592e2634320d8c8d79 SHA512 069994b16dd9c8a037192528985a2d539231cbd6a80390e3fcadf862d31abf70841e477384593396e573a490c01fa9af5ceb2b31c87f388ebb020d1f7f03a0e0
 MISC metadata.xml 219 BLAKE2B e366b8552425c0b7293381e047210130af3c96a6be5877911f2e3ee77b0c80a475854ec7d59e1a5dea75e9d07cefcb3636947fa0af121357cfe7db12e05e6c34 SHA512 b5fce0d3f0f5fa2729808fad339e6843c6bdf814451d2b65b9b67b4b715194e6de20ad2702c9b5a08d260c97641ab9478d978486e702d85034cfb95d7ceab954
diff --git a/www-apps/grafana-bin/files/grafana.initd2 b/www-apps/grafana-bin/files/grafana.initd2
new file mode 100644
index 000000000000..1c8f6b2af56f
--- /dev/null
+++ b/www-apps/grafana-bin/files/grafana.initd2
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+GRAFANA_USER="${GRAFANA_USER:-"grafana"}"
+GRAFANA_GROUP="${GRAFANA_GROUP:-"grafana"}"
+GRAFANA_CONFIGFILE="${GRAFANA_CONFIGFILE:-"/etc/grafana/${RC_SVCNAME}.ini"}"
+GRAFANA_DATADIR="${GRAFANA_DATADIR:-"/var/lib/grafana"}"
+GRAFANA_LOGDIR="${GRAFANA_LOGDIR:-"/var/log/grafana"}"
+GRAFANA_PIDFILE="${GRAFANA_PIDFILE:-"/run/${RC_SVCNAME}.pid"}"
+GRAFANA_SSDARGS=${GRAFANA_SSDARGS:-"--wait 1000"}
+GRAFANA_TERMTIMEOUT=${GRFANA_TERMTIMEOUT:-"TERM/60/KILL/5"}
+
+command="/usr/bin/grafana"
+command_args="server -homepath=/usr/share/grafana"
+command_args="${command_args} -config=\"${GRAFANA_CONFIGFILE}\""
+command_args="${command_args} cfg:default.paths.data=\"${GRAFANA_DATADIR}\""
+command_args="${command_args} cfg:default.paths.logs=\"${GRAFANA_LOGDIR}\""
+command_background="yes"
+pidfile="${GRAFANA_PIDFILE}"
+retry="${GRAFANA_TERMTIMEOUT}"
+start_stop_daemon_args="--user ${GRAFANA_USER}:${GRAFANA_GROUP} ${GRAFANA_SSDARGS}"
+
+description="Grafana server, feature rich metrics dashboard and graph editor."
+
+required_files="${GRAFANA_CONFIGFILE}"
+
+depend() {
+	need localmount
+}
+
+start_pre() {
+	checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}" || return 1
+	checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}/dashboards" || return 1
+	checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "${GRAFANA_DATADIR}/plugins" || return 1
+}
diff --git a/www-apps/grafana-bin/grafana-bin-9.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-9.3.8-r1.ebuild
index 0e8aae35965c..ed079e9887f5 100644
--- a/www-apps/grafana-bin/grafana-bin-9.4.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-9.3.8-r1.ebuild
@@ -38,10 +38,11 @@ src_install() {
 	doins -r public conf
 
 	dobin bin/grafana-cli
+	dobin bin/grafana
 	dobin bin/grafana-server
 
 	newconfd "${FILESDIR}"/grafana-r1.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd grafana
+	newinitd "${FILESDIR}"/grafana.initd2 grafana
 	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
 
 	keepdir /var/{lib,log}/grafana
diff --git a/www-apps/grafana-bin/grafana-bin-9.3.8.ebuild b/www-apps/grafana-bin/grafana-bin-9.4.3-r1.ebuild
index 0e8aae35965c..ed079e9887f5 100644
--- a/www-apps/grafana-bin/grafana-bin-9.3.8.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-9.4.3-r1.ebuild
@@ -38,10 +38,11 @@ src_install() {
 	doins -r public conf
 
 	dobin bin/grafana-cli
+	dobin bin/grafana
 	dobin bin/grafana-server
 
 	newconfd "${FILESDIR}"/grafana-r1.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd grafana
+	newinitd "${FILESDIR}"/grafana.initd2 grafana
 	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
 
 	keepdir /var/{lib,log}/grafana
author	V3n3RiX <venerix@koprulu.sector>	2023-03-21 00:38:34 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-03-21 00:38:34 +0000
commit	d39430b96ad12b39a0ce35745f3d45d980d1b328 (patch)
tree	fef90d0b467c23d538da717540b56a1be7ec29f0
parent	a075e288474a3a53905a044068223546c5360298 (diff)