gentoo resync : 12.05.2022

107 files changed, 394 insertions, 317 deletions

diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 4d8a59ded9cc..cac538fbd9c5 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r5 b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r5
index ff1812147baf..ab925aa17f5a 100644
--- a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r5
+++ b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r5
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
+INHERIT=cmake python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-3+
@@ -11,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/chrome-gnome-shell/10/chrome-gnome-shell-10.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c6cac1537d71c93f3981340b4f7b7cdd
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-5.0.6-r1 b/metadata/md5-cache/gnome-extra/cinnamon-5.0.6-r1
deleted file mode 100644
index 8f693c9a788a..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-5.0.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon
-IUSE=+gstreamer gtk-doc +nls +networkmanager python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) >=app-accessibility/caribou-0.3 dev-libs/keybinder:3[introspection] dev-libs/libtimezonemap python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pexpect[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] dev-python/pypam[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/tinycss2[python_targets_python3_8(-)] >=dev-python/python3-xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pexpect[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] dev-python/pypam[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/tinycss2[python_targets_python3_9(-)] >=dev-python/python3-xapp-2.2.0[python_targets_python3_9(-)] ) >=gnome-base/dconf-0.4.1 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/libgnomekbd-2.91.4 >=gnome-extra/cinnamon-control-center-5.0[networkmanager=] >=gnome-extra/cinnamon-screensaver-5.0 >=gnome-extra/cinnamon-session-5.0 >=gnome-extra/cinnamon-settings-daemon-5.0 >=gnome-extra/nemo-5.0 gnome-extra/polkit-gnome net-misc/wget sys-apps/accountsservice[introspection] sys-power/upower[introspection] >=x11-libs/xapp-2.2.0[introspection] x11-misc/xdg-utils x11-themes/adwaita-icon-theme x11-themes/gnome-themes-standard nls? ( >=gnome-extra/cinnamon-translations-5.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon/archive/5.0.6.tar.gz -> cinnamon-5.0.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=abb24a652e0651c47ca429a62c972fbb
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-5.2.7-r2 b/metadata/md5-cache/gnome-extra/cinnamon-5.2.7-r3
index e44469c93aa3..c42d8595902c 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-5.2.7-r2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-5.2.7-r3
@@ -4,12 +4,13 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml]
 DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon
+INHERIT=meson gnome2-utils pax-utils python-single-r1 xdg
 IUSE=+eds +gstreamer gtk-doc +nls +networkmanager python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.2:0= >=gnome-extra/cinnamon-menus-5.2 >=gnome-extra/cjs-5.2[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.2[introspection] eds? ( gnome-extra/evolution-data-server ) gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) >=app-accessibility/caribou-0.3 dev-libs/keybinder:3[introspection] dev-libs/libtimezonemap python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pexpect[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] dev-python/pypam[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/tinycss2[python_targets_python3_8(-)] >=dev-python/python3-xapp-2.2.1-r1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pexpect[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] dev-python/pypam[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/tinycss2[python_targets_python3_9(-)] >=dev-python/python3-xapp-2.2.1-r1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/pexpect[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] dev-python/pypam[python_targets_python3_10(-)] dev-python/pytz[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] dev-python/tinycss2[python_targets_python3_10(-)] >=dev-python/python3-xapp-2.2.1-r1[python_targets_python3_10(-)] ) >=gnome-base/dconf-0.4.1 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/libgnomekbd-2.91.4 >=gnome-extra/cinnamon-control-center-5.2[networkmanager=] >=gnome-extra/cinnamon-screensaver-5.2 >=gnome-extra/cinnamon-session-5.2 >=gnome-extra/cinnamon-settings-daemon-5.2 >=gnome-extra/nemo-5.2 gnome-extra/polkit-gnome net-misc/wget sys-apps/accountsservice[introspection] sys-power/upower[introspection] >=x11-libs/xapp-2.2.8[introspection] x11-misc/xdg-utils x11-themes/adwaita-icon-theme x11-themes/gnome-themes-standard nls? ( >=gnome-extra/cinnamon-translations-5.2 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.2:0= >=gnome-extra/cinnamon-menus-5.2 >=gnome-extra/cjs-5.2[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.2[introspection] eds? ( gnome-extra/evolution-data-server ) gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) >=app-accessibility/caribou-0.3 dev-libs/keybinder:3[introspection] dev-libs/libtimezonemap python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pexpect[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] dev-python/python-pam[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/tinycss2[python_targets_python3_8(-)] >=dev-python/python3-xapp-2.2.1-r1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pexpect[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] dev-python/python-pam[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/tinycss2[python_targets_python3_9(-)] >=dev-python/python3-xapp-2.2.1-r1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/pexpect[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] dev-python/python-pam[python_targets_python3_10(-)] dev-python/pytz[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] dev-python/tinycss2[python_targets_python3_10(-)] >=dev-python/python3-xapp-2.2.1-r1[python_targets_python3_10(-)] ) >=gnome-base/dconf-0.4.1 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/libgnomekbd-2.91.4 >=gnome-extra/cinnamon-control-center-5.2[networkmanager=] >=gnome-extra/cinnamon-screensaver-5.2 >=gnome-extra/cinnamon-session-5.2 >=gnome-extra/cinnamon-settings-daemon-5.2 >=gnome-extra/nemo-5.2 gnome-extra/polkit-gnome net-misc/wget sys-apps/accountsservice[introspection] sys-power/upower[introspection] >=x11-libs/xapp-2.2.8[introspection] x11-misc/xdg-utils x11-themes/adwaita-icon-theme x11-themes/gnome-themes-standard nls? ( >=gnome-extra/cinnamon-translations-5.2 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon/archive/5.2.7.tar.gz -> cinnamon-5.2.7.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dbbad03742808d32567cae8700e30c84
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a4943e81bca05e95986c1453065b84c3
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.0.2 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.0.2
deleted file mode 100644
index 3c42a418ae68..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/glib-utils >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.44.0:2 >=gnome-base/libgnomekbd-3.0.0:0= >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0:0= media-libs/fontconfig >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 >=x11-libs/libxklavier-5.1 colord? ( >=x11-misc/colord-0.1.14:0= ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-extra/cinnamon-settings-daemon-5.0:0= >=x11-libs/libXi-1.2 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager?] modemmanager? ( >=net-misc/modemmanager-0.7 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.18.0 ) app-text/iso-codes x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Cinnamons's main interface to configure various aspects of the desktop
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center
-IUSE=+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test test
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.44.0:2 >=gnome-base/libgnomekbd-3.0.0:0= >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0:0= media-libs/fontconfig >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 >=x11-libs/libxklavier-5.1 colord? ( >=x11-misc/colord-0.1.14:0= ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-extra/cinnamon-settings-daemon-5.0:0= >=x11-libs/libXi-1.2 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager?] modemmanager? ( >=net-misc/modemmanager-0.7 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.18.0 ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd )
-REQUIRED_USE=modemmanager? ( networkmanager )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/5.0.2.tar.gz -> cinnamon-control-center-5.0.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=797eb7ced4092a7fb2806c2c1de0cb31
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.2.1 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.2.1-r1
index ed74203df78b..40e4cc1c3aea 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.2.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.2.1-r1
@@ -1,16 +1,17 @@
 BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/glib-utils >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.44.0:2 >=gnome-base/libgnomekbd-3.0.0:0= >=gnome-extra/cinnamon-desktop-5.2:0= >=gnome-extra/cinnamon-menus-5.2:0= media-libs/fontconfig >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 >=x11-libs/libxklavier-5.1 colord? ( >=x11-misc/colord-0.1.14:0= ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-extra/cinnamon-settings-daemon-5.2:0= >=x11-libs/libXi-1.2 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager?] modemmanager? ( >=net-misc/modemmanager-0.7 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.18.0 ) app-text/iso-codes x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.44.0:2 >=gnome-base/libgnomekbd-3.0.0:0= >=gnome-extra/cinnamon-desktop-5.2:0= >=gnome-extra/cinnamon-menus-5.2:0= media-libs/fontconfig >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 >=x11-libs/libxklavier-5.1 colord? ( >=x11-misc/colord-0.1.14:0= ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-extra/cinnamon-settings-daemon-5.2:0= >=x11-libs/libXi-1.2 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-libs/libnma-1.8.34 >=net-misc/networkmanager-1.2.0:=[modemmanager?] modemmanager? ( >=net-misc/modemmanager-0.7 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.18.0 ) app-text/iso-codes x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cinnamons's main interface to configure various aspects of the desktop
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center
+INHERIT=meson gnome2-utils python-any-r1 xdg virtualx
 IUSE=+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test test
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.44.0:2 >=gnome-base/libgnomekbd-3.0.0:0= >=gnome-extra/cinnamon-desktop-5.2:0= >=gnome-extra/cinnamon-menus-5.2:0= media-libs/fontconfig >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 >=x11-libs/libxklavier-5.1 colord? ( >=x11-misc/colord-0.1.14:0= ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-extra/cinnamon-settings-daemon-5.2:0= >=x11-libs/libXi-1.2 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager?] modemmanager? ( >=net-misc/modemmanager-0.7 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.18.0 ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd )
+RDEPEND=>=dev-libs/glib-2.44.0:2 >=gnome-base/libgnomekbd-3.0.0:0= >=gnome-extra/cinnamon-desktop-5.2:0= >=gnome-extra/cinnamon-menus-5.2:0= media-libs/fontconfig >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 >=x11-libs/libxklavier-5.1 colord? ( >=x11-misc/colord-0.1.14:0= ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-extra/cinnamon-settings-daemon-5.2:0= >=x11-libs/libXi-1.2 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-libs/libnma-1.8.34 >=net-misc/networkmanager-1.2.0:=[modemmanager?] modemmanager? ( >=net-misc/modemmanager-0.7 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.18.0 ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd )
 REQUIRED_USE=modemmanager? ( networkmanager )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/5.2.1.tar.gz -> cinnamon-control-center-5.2.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d1468d797739351dc91d209962de21f2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b0dc1643c484fe549b709160e0d4699b
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-5.0.0 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-5.0.0
deleted file mode 100644
index 29d0d52d19b0..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-5.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/glib-utils >=dev-util/intltool-0.40.6 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/gobject-introspection-0.10.2:= >=gnome-base/gsettings-desktop-schemas-3.5.91 media-sound/pulseaudio[glib] sys-apps/accountsservice x11-libs/cairo:=[X] >=x11-libs/gdk-pixbuf-2.22:2[introspection] >=x11-libs/gtk+-3.3.16:3[introspection] x11-libs/libX11 >=x11-libs/libXext-1.1 x11-libs/libxkbfile >=x11-libs/libXrandr-1.3 x11-misc/xkeyboard-config x11-base/xorg-proto
-DESCRIPTION=A collection of libraries and utilites used by Cinnamon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-desktop
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/gobject-introspection-0.10.2:= >=gnome-base/gsettings-desktop-schemas-3.5.91 media-sound/pulseaudio[glib] sys-apps/accountsservice x11-libs/cairo:=[X] >=x11-libs/gdk-pixbuf-2.22:2[introspection] >=x11-libs/gtk+-3.3.16:3[introspection] x11-libs/libX11 >=x11-libs/libXext-1.1 x11-libs/libxkbfile >=x11-libs/libXrandr-1.3 x11-misc/xkeyboard-config
-SLOT=0/4
-SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/5.0.0.tar.gz -> cinnamon-desktop-5.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=eefef75ad83c531d89c8edcab416bbde
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-5.2.1 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-5.2.1
index eceb5681cade..753a79dcb6c8 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-5.2.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-5.2.1
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/gobject-introspection-0.10.2:=
 DESCRIPTION=A collection of libraries and utilites used by Cinnamon
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-desktop
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+INHERIT=meson gnome2-utils python-any-r1
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/gobject-introspection-0.10.2:= >=gnome-base/gsettings-desktop-schemas-3.5.91 media-sound/pulseaudio[glib] sys-apps/accountsservice x11-libs/cairo:=[X] >=x11-libs/gdk-pixbuf-2.22:2[introspection] >=x11-libs/gtk+-3.3.16:3[introspection] x11-libs/libX11 >=x11-libs/libXext-1.1 x11-libs/libxkbfile >=x11-libs/libXrandr-1.3 x11-misc/xkeyboard-config
 SLOT=0/4
 SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/5.2.1.tar.gz -> cinnamon-desktop-5.2.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=744fc846da3093ff3da26dd65bab4a29
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5210621592a49ab4411b0250fd8166ee
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-menus-5.0.0 b/metadata/md5-cache/gnome-extra/cinnamon-menus-5.0.0
deleted file mode 100644
index 5d8ca287ab27..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-menus-5.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/intltool-0.40.6 sys-devel/gettext virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.29.15:2 >=dev-libs/gobject-introspection-0.9.12:= dev-libs/gobject-introspection-common dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Cinnamon's library for the Desktop Menu fd.o specification
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-menus
-IUSE=gtk-doc
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.29.15:2 >=dev-libs/gobject-introspection-0.9.12:=
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/5.0.0.tar.gz -> cinnamon-menus-5.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a99756d1c5ecd8f1abd0e78994e54e37
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-menus-5.2.0 b/metadata/md5-cache/gnome-extra/cinnamon-menus-5.2.0
index ebf9c6862a15..f7cf83e07a98 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-menus-5.2.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-menus-5.2.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.29.15:2 >=dev-libs/gobject-introspection-1.58.3:= dev-l
 DESCRIPTION=Cinnamon's library for the Desktop Menu fd.o specification
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-menus
+INHERIT=meson xdg
 IUSE=gtk-doc
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.29.15:2 >=dev-libs/gobject-introspection-1.58.3:=
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/5.2.0.tar.gz -> cinnamon-menus-5.2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c7c3f54477d090dbcc7351ea8732e127
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=98c39defba55456eaca561b80e227535
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.7 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.7
deleted file mode 100644
index 9fa3a55b7d2a..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-5.0:0= sys-apps/dbus sys-libs/pam >=x11-libs/gtk+-3.22:3[introspection] x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-themes/adwaita-icon-theme xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Screensaver for Cinnamon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-screensaver
-IUSE=systemd xinerama python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-5.0:0= sys-apps/dbus sys-libs/pam >=x11-libs/gtk+-3.22:3[introspection] x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-themes/adwaita-icon-theme xinerama? ( x11-libs/libXinerama ) >=app-accessibility/caribou-0.3 sys-apps/accountsservice[introspection] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] >=dev-python/python3-xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] >=dev-python/python3-xapp-2.2.0[python_targets_python3_9(-)] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( sys-auth/elogind )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/5.0.7.tar.gz -> cinnamon-screensaver-5.0.7.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=09994e8f70dcc3cc31e84f78831468ed
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.2.1 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.2.1
index 61b9521e9bfb..63ac5d3cb526 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.2.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.2.1
@@ -4,12 +4,13 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=Screensaver for Cinnamon
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-screensaver
+INHERIT=meson python-single-r1 xdg
 IUSE=systemd xinerama python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-5.2:0= sys-apps/dbus sys-libs/pam >=x11-libs/gtk+-3.22:3[introspection] x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-themes/adwaita-icon-theme xinerama? ( x11-libs/libXinerama ) >=app-accessibility/caribou-0.3 sys-apps/accountsservice[introspection] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] >=dev-python/python3-xapp-2.2.1-r1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] >=dev-python/python3-xapp-2.2.1-r1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psutil[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] >=dev-python/python3-xapp-2.2.1-r1[python_targets_python3_10(-)] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( sys-auth/elogind )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/5.2.1.tar.gz -> cinnamon-screensaver-5.2.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7754fa0b67bcd71dede1a11ab4b686bb
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=25341806455e8196e3815b808966efb1
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-5.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-session-5.0.1
deleted file mode 100644
index 2162bf1231f4..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-5.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/gdbus-codegen >=dev-util/intltool-0.40.6 virtual/pkgconfig doc? ( app-text/xmlto dev-libs/libxslt ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.37.3:2 media-libs/libcanberra[pulseaudio] virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] >=x11-libs/xapp-2.2.0 systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-auth/elogind[policykit] )
-DESCRIPTION=Cinnamon session manager
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session
-IUSE=doc ipv6 systemd
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.37.3:2 media-libs/libcanberra[pulseaudio] virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] >=x11-libs/xapp-2.2.0 systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-auth/elogind[policykit] ) >=gnome-extra/cinnamon-desktop-5.0:0=
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/5.0.1.tar.gz -> cinnamon-session-5.0.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a7b26a815d05337964e6399ab7f07130
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-5.2.0 b/metadata/md5-cache/gnome-extra/cinnamon-session-5.2.0
index 2204166c87a8..e5ce007ae4ac 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-5.2.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-5.2.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.37.3:2 media-libs/libcanberra[pulseaudio] virtual/openg
 DESCRIPTION=Cinnamon session manager
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session
+INHERIT=meson gnome2-utils python-any-r1 xdg-utils
 IUSE=doc ipv6 systemd
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.37.3:2 media-libs/libcanberra[pulseaudio] virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] >=x11-libs/xapp-2.2.8 systemd? ( >=sys-apps/systemd-183 ) !systemd? ( sys-auth/elogind[policykit] ) >=gnome-extra/cinnamon-desktop-5.2:0=
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/5.2.0.tar.gz -> cinnamon-session-5.2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5088c3e467e91a8da3713d1aef005ad5
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4228aecc07aa37760376fd5cba07e23e
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.4 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.4
deleted file mode 100644
index 1cde9bf749aa..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/glib-utils dev-util/gdbus-codegen >=dev-util/intltool-0.37.1 virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6 >=gnome-extra/cinnamon-desktop-5.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3,pulseaudio] >=media-sound/pulseaudio-0.9.16[glib] >=sys-apps/dbus-1.1.2 dev-libs/dbus-glib >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi >=x11-libs/libxklavier-5.0 >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-base/librsvg-2.36.2 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= ) dev-libs/libxml2:2 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Cinnamon's settings daemon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon
-IUSE=+colord cups input_devices_wacom smartcard systemd
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6 >=gnome-extra/cinnamon-desktop-5.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3,pulseaudio] >=media-sound/pulseaudio-0.9.16[glib] >=sys-apps/dbus-1.1.2 dev-libs/dbus-glib >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi >=x11-libs/libxklavier-5.0 >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-base/librsvg-2.36.2 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/5.0.4.tar.gz -> cinnamon-settings-daemon-5.0.4.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9cab4bc7105b038f81d2f1ce01e3f4bf
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.2.0 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.2.0
index 3645defd850d..93a433ebe493 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.2.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-5.2.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6
 DESCRIPTION=Cinnamon's settings daemon
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon
+INHERIT=meson gnome2-utils python-any-r1 xdg
 IUSE=+colord cups input_devices_wacom smartcard systemd
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgudev:= >=gnome-base/libgnomekbd-3.6 >=gnome-extra/cinnamon-desktop-5.2:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3,pulseaudio] >=media-sound/pulseaudio-0.9.16[glib] >=sys-apps/dbus-1.1.2 dev-libs/dbus-glib >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi >=x11-libs/libxklavier-5.0 >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=gnome-base/librsvg-2.36.2 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/5.2.0.tar.gz -> cinnamon-settings-daemon-5.2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e127b1c8764cc2718545de475214d3f9
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=45021fca56257fb800cf0cd057325ec9
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-5.0.2 b/metadata/md5-cache/gnome-extra/cinnamon-translations-5.0.2
deleted file mode 100644
index 079e4c5737b0..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-5.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=sys-devel/gettext
-DEFINED_PHASES=configure install
-DESCRIPTION=Translation data for Cinnamon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/5.0.2.tar.gz -> cinnamon-translations-5.0.2.tar.gz
-_eclasses_=plocale	7ce00136a77130df46fbbd5966f98a61
-_md5_=ff45178e58d989716e9d988fbb552911
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-5.2.2 b/metadata/md5-cache/gnome-extra/cinnamon-translations-5.2.2
index b09872f80a3c..c11831ac61b6 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-5.2.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-5.2.2
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Translation data for Cinnamon
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+INHERIT=plocale
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/5.2.2.tar.gz -> cinnamon-translations-5.2.2.tar.gz
 _eclasses_=plocale	7ce00136a77130df46fbbd5966f98a61
-_md5_=c63fb17e0c1c55b38aa2052963e55e8c
+_md5_=432e098440c0bc9654db8af71a268089
diff --git a/metadata/md5-cache/gnome-extra/cjs-5.0.1 b/metadata/md5-cache/gnome-extra/cjs-5.0.1
deleted file mode 100644
index 2cd304b00338..000000000000
--- a/metadata/md5-cache/gnome-extra/cjs-5.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=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 prepare setup test
-DEPEND=dev-lang/spidermonkey:78 >=dev-libs/glib-2.58.0:2 >=dev-libs/gobject-introspection-1.58.3:= >=dev-libs/libffi-3.2.1:0= cairo? ( x11-libs/cairo[glib,X] ) readline? ( sys-libs/readline:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) test? ( sys-apps/dbus x11-libs/gtk+:3[introspection] )
-DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs
-IUSE=+cairo examples readline sysprof test test
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
-RDEPEND=dev-lang/spidermonkey:78 >=dev-libs/glib-2.58.0:2 >=dev-libs/gobject-introspection-1.58.3:= >=dev-libs/libffi-3.2.1:0= cairo? ( x11-libs/cairo[glib,X] ) readline? ( sys-libs/readline:0= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cjs/archive/5.0.1.tar.gz -> cjs-5.0.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ba15eb7509c6e33083d8c9b9c9641969
diff --git a/metadata/md5-cache/gnome-extra/cjs-5.2.0 b/metadata/md5-cache/gnome-extra/cjs-5.2.0
index 9187551280b8..a529b30b69de 100644
--- a/metadata/md5-cache/gnome-extra/cjs-5.2.0
+++ b/metadata/md5-cache/gnome-extra/cjs-5.2.0
@@ -4,12 +4,13 @@ DEPEND=dev-lang/spidermonkey:78 >=dev-libs/glib-2.58.0:2 >=dev-libs/gobject-intr
 DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs
+INHERIT=meson pax-utils python-any-r1 virtualx
 IUSE=+cairo examples readline sysprof test test
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=dev-lang/spidermonkey:78 >=dev-libs/glib-2.58.0:2 >=dev-libs/gobject-introspection-1.58.3:= >=dev-libs/libffi-3.2.1:0= cairo? ( x11-libs/cairo[glib,X] ) readline? ( sys-libs/readline:0= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/5.2.0.tar.gz -> cjs-5.2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=6b934a43b9fa151c96fec03b440298ed
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=c4c423fa142f0d3349fc3aaccd7f8291
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.42.4 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.42.4
index 1cbb9a17626b..82a644cb74ca 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.42.4
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.42.4
@@ -4,6 +4,7 @@ DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.
 DESCRIPTION=Evolution groupware backend
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+INHERIT=cmake db-use flag-o-matic gnome2 vala virtualx
 IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
@@ -12,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test !test? ( test )
 SLOT=0/63-26-20
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.42/evolution-data-server-3.42.4.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	db-use	867a9246a45efc09934e0f8e3380c813	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0fc5fc4c5ec85bad577e27f89cdb3585
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.0 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.0
index 1730ca8f0e96..448784aa6f8c 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.0
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.0
@@ -4,6 +4,7 @@ DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.
 DESCRIPTION=Evolution groupware backend
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+INHERIT=cmake db-use flag-o-matic gnome2 vala virtualx
 IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
@@ -12,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0/63-26-20
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.44/evolution-data-server-3.44.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	db-use	867a9246a45efc09934e0f8e3380c813	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	db-use	867a9246a45efc09934e0f8e3380c813	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8bac3480c561d4da41316e0035ae8b2d
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.1 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.1
new file mode 100644
index 000000000000..93063a66bc0b
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.91.0:4= ) vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) net-libs/libsoup:2.4[vala] dev-libs/libical[vala] oauth? ( dev-libs/libgdata[vala] ) gnome-online-accounts? ( dev-libs/libgdata[vala] ) )
+DESCRIPTION=Evolution groupware backend
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+INHERIT=cmake db-use flag-o-matic gnome2 vala virtualx
+IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
+RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.91.0:4= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=0/63-26-20
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.44/evolution-data-server-3.44.1.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	db-use	867a9246a45efc09934e0f8e3380c813	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8bac3480c561d4da41316e0035ae8b2d
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.42.4 b/metadata/md5-cache/gnome-extra/evolution-ews-3.42.4
index 8de37e3eaceb..b228a672479e 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.42.4
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.42.4
@@ -4,6 +4,7 @@ DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[intros
 DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+INHERIT=cmake gnome2
 IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[intro
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-ews/3.42/evolution-ews-3.42.4.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f1e3e2e08f8a0f0a8ae9d3445114f23f
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.44.0 b/metadata/md5-cache/gnome-extra/evolution-ews-3.44.0
index b6e48265e588..5087d6071a1f 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.44.0
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.44.0
@@ -4,6 +4,7 @@ DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[intros
 DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+INHERIT=cmake gnome2
 IUSE=test
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[intro
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-ews/3.44/evolution-ews-3.44.0.tar.xz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=45bf9da7ae2014eaebe6a773f6cd5718
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.44.1 b/metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
new file mode 100644
index 000000000000..3e0e158537d4
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.44.1:0= >=mail-client/evolution-3.44.1:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3 test? ( net-libs/uhttpmock )
+DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+INHERIT=cmake gnome2 optfeature
+IUSE=test
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.44.1:0= >=mail-client/evolution-3.44.1:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/evolution-ews/3.44/evolution-ews-3.44.1.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0a0878babc442a9ec8ec81d666ac1793
diff --git a/metadata/md5-cache/gnome-extra/filemanager-actions-3.4 b/metadata/md5-cache/gnome-extra/filemanager-actions-3.4
deleted file mode 100644
index df728980e219..000000000000
--- a/metadata/md5-cache/gnome-extra/filemanager-actions-3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/gtk+-3.4.1:3 >=dev-libs/glib-2.32.1:2 >=gnome-base/libgtop-2.28.4:2 >=dev-libs/libxml2-2.7.8:2 sys-apps/util-linux nautilus? ( >=gnome-base/nautilus-3.4.1 ) nemo? ( >=gnome-extra/nemo-1.8 ) caja? ( >=mate-base/caja-1.16.0 ) x11-libs/gdk-pixbuf:2 app-text/gnome-doc-utils dev-util/gdbus-codegen >=dev-util/intltool-0.50.2 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=File manager extension which offers user configurable context menu actions
-EAPI=6
-HOMEPAGE=https://gitlab.gnome.org/GNOME/filemanager-actions
-IUSE=caja +nautilus nemo
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ FDL-1.3
-RDEPEND=>=x11-libs/gtk+-3.4.1:3 >=dev-libs/glib-2.32.1:2 >=gnome-base/libgtop-2.28.4:2 >=dev-libs/libxml2-2.7.8:2 sys-apps/util-linux nautilus? ( >=gnome-base/nautilus-3.4.1 ) nemo? ( >=gnome-extra/nemo-1.8 ) caja? ( >=mate-base/caja-1.16.0 ) x11-libs/gdk-pixbuf:2
-REQUIRED_USE=|| ( caja nautilus nemo )
-SLOT=3
-SRC_URI=mirror://gnome/sources/filemanager-actions/3.4/filemanager-actions-3.4.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=824cf9caf77c086b45d283d6e481f231
diff --git a/metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1 b/metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1
index a63d77b84a0e..83667c2e8502 100644
--- a/metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1
+++ b/metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/gtk+-3.0.0:3 >=gnome-base/gconf-2.12:2 sys-devel/gettext app-t
 DESCRIPTION=An editor to the GNOME config system
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/Archive/gconf-editor
+INHERIT=gnome2
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-3.0.0:3 >=gnome-base/gconf-2.12:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gconf-editor/3.0/gconf-editor-3.0.1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b07ba0b50a9a231d56629b7685c94d64
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-41.3 b/metadata/md5-cache/gnome-extra/gnome-boxes-41.3
index 28d7066d0ef7..c3659f4456cf 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-41.3
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-41.3
@@ -4,11 +4,12 @@ DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24
 DESCRIPTION=Simple GNOME application to access remote or virtual systems
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
+INHERIT=gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
 IUSE=rdp
 KEYWORDS=amd64
 LICENSE=LGPL-2+ CC-BY-2.0
 RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] x11-libs/gtksourceview:4 >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/41/gnome-boxes-41.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=96ae40e8742479fb62f5dd07f10bf59a
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-42.0.1 b/metadata/md5-cache/gnome-extra/gnome-boxes-42.0.1
index 8e1cf14b5791..5dbc001a658c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-42.0.1
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-42.0.1
@@ -4,11 +4,12 @@ DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24
 DESCRIPTION=Simple GNOME application to access remote or virtual systems
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
+INHERIT=gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
 IUSE=rdp
 KEYWORDS=~amd64
 LICENSE=LGPL-2+ CC-BY-2.0
 RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] >=gui-libs/libhandy-1.5.0:1= >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/42/gnome-boxes-42.0.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1ec43277387678d5e77f3ba7c70bc78c
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-41.1 b/metadata/md5-cache/gnome-extra/gnome-calculator-41.1
index 8520296adc0a..2fe8b23e0a0e 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-41.1
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-41.1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 >
 DESCRIPTION=A calculator application for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
 IUSE=+introspection test test
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/41/gnome-calculator-41.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5ca2826d7c6998cf426db67ea4e2fe57
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-42.0 b/metadata/md5-cache/gnome-extra/gnome-calculator-42.0
index c25179111450..ce2cd709726a 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-42.0
@@ -4,12 +4,13 @@ DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 >
 DESCRIPTION=A calculator application for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
 IUSE=+introspection test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 >=dev-libs/libgee-0.20.0:0.8 dev-libs/mpc:= dev-libs/mpfr:0= >=gui-libs/gtk-4.4.1:4 >=gui-libs/libadwaita-1.0.0:1 >=gui-libs/gtksourceview-5.3.0:5 introspection? ( >=dev-libs/gobject-introspection-1.58:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/42/gnome-calculator-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f571388338660f2ec7cca07dc19c210e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=61a0ec4c5fbe06f937e95c62d1d93ea6
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-41.2 b/metadata/md5-cache/gnome-extra/gnome-calendar-41.2
index 8f59c314cab6..ce22050ee00a 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-41.2
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-41.2
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2
 DESCRIPTION=Manage your online calendars with simple and modern interface
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
+INHERIT=gnome.org gnome2-utils meson virtualx xdg
 IUSE=test
 KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calendar/41/gnome-calendar-41.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=705e4f904ec437175a3fc34ee9556805
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-42.0 b/metadata/md5-cache/gnome-extra/gnome-calendar-42.0
index f90040969ebf..de0e054076e9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-42.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2
 DESCRIPTION=Manage your online calendars with simple and modern interface
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
+INHERIT=gnome.org gnome2-utils meson virtualx xdg
 IUSE=test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calendar/42/gnome-calendar-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3f1136ee944a3adabae684ae7d5137b8
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-42.1 b/metadata/md5-cache/gnome-extra/gnome-calendar-42.1
new file mode 100644
index 000000000000..83ca305d6ade
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-42.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=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 test
+DEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=gui-libs/libadwaita-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.6.0:4 >=dev-libs/libgweather-4.0.0:4= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23
+DESCRIPTION=Manage your online calendars with simple and modern interface
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
+INHERIT=gnome.org gnome2-utils meson virtualx xdg
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=gui-libs/libadwaita-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.6.0:4 >=dev-libs/libgweather-4.0.0:4= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calendar/42/gnome-calendar-42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3f1136ee944a3adabae684ae7d5137b8
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-41.0 b/metadata/md5-cache/gnome-extra/gnome-characters-41.0
index 23441c77775b..b286a88d7863 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-41.0
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-41.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspecti
 DESCRIPTION=Unicode character map viewer and library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
+INHERIT=gnome.org gnome2-utils meson xdg
 KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+ BSD
 RDEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5:= >=x11-libs/gtk+-3.20:3[introspection] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection] gnome-base/gnome-desktop:3[introspection] >=gui-libs/libhandy-1.1:1=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/41/gnome-characters-41.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d626dcec480b4c0402630a3aaf5109cd
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-42.0 b/metadata/md5-cache/gnome-extra/gnome-characters-42.0
index 4f58d852d1ef..1f2ecef1f3a4 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-42.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspecti
 DESCRIPTION=Unicode character map viewer and library
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
+INHERIT=gnome.org gnome2-utils meson xdg
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+ BSD
 RDEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5:= >=gui-libs/gtk-4.6:4[introspection] >=gui-libs/libadwaita-1.0:1= x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection] gnome-base/gnome-desktop:3[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/42/gnome-characters-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=23f36a01b68e3687b0072b8108d071bf
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-41.0 b/metadata/md5-cache/gnome-extra/gnome-clocks-41.0
index 72eb98a73b68..c47dcc94dfc9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-41.0
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-41.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.68:2 >=x11-libs/gtk+-3.20:3 >=media-libs/gsound-0.98 >=
 DESCRIPTION=Clocks application for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Clocks
+INHERIT=gnome.org gnome2-utils meson vala xdg
 KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.68:2 >=x11-libs/gtk+-3.20:3 >=media-libs/gsound-0.98 >=dev-libs/libgweather-3.32.0:2= >=gnome-base/gnome-desktop-3.8:3= >=sci-geosciences/geocode-glib-1 >=app-misc/geoclue-2.4:2.0 >=gui-libs/libhandy-1.0.0:1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/41/gnome-clocks-41.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f66fd09e7c35f657e26873dcb41f438f
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-42.0 b/metadata/md5-cache/gnome-extra/gnome-clocks-42.0
index 776126348e36..69b843b3eb73 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-42.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.68:2 >=gui-libs/gtk-4.5:4 >=media-libs/gsound-0.98 >=de
 DESCRIPTION=Clocks application for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Clocks
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+INHERIT=gnome.org gnome2-utils meson vala xdg
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.68:2 >=gui-libs/gtk-4.5:4 >=media-libs/gsound-0.98 >=dev-libs/libgweather-4.0.0:4= gnome-base/gnome-desktop:4 >=sci-geosciences/geocode-glib-1 >=app-misc/geoclue-2.4:2.0 >=gui-libs/libadwaita-1.0:1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/42/gnome-clocks-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=033973ed19a73dbfb33708a9de44699a
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=85994b6e26d68c4bfa570d607776aadb
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.36.0 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.36.0
index cf1ca0b6152d..886774c905f3 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.36.0
+++ b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.36.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 >=x11-misc/colord-1.3.1
 DESCRIPTION=GNOME color profile tools
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-color-manager/
+INHERIT=gnome.org meson virtualx xdg
 IUSE=test test
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 >=x11-misc/colord-1.3.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-color-manager/3.36/gnome-color-manager-3.36.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=efe2497e6a55eee3f597046488887358
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.12.3.1 b/metadata/md5-cache/gnome-extra/gnome-commander-1.12.3.1
deleted file mode 100644
index 03891eae0a3a..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.12.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/yelp-tools dev-libs/atk dev-libs/glib:2 gnome-base/gconf:2 gnome-base/gnome-vfs media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( gnome-extra/libgsf:= ) pdf? ( >=app-text/poppler-0.18 ) samba? ( gnome-base/gnome-vfs:=[samba] ) taglib? ( >=media-libs/taglib-1.4 ) unique? ( >=dev-libs/libunique-0.9.3:1 ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=test? ( >=dev-cpp/gtest-1.7.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A graphical, full featured, twin-panel file manager
-EAPI=7
-HOMEPAGE=https://gcmd.github.io/
-IUSE=chm exif gsf pdf samba taglib test +unique
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/yelp-tools dev-libs/atk dev-libs/glib:2 gnome-base/gconf:2 gnome-base/gnome-vfs media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( gnome-extra/libgsf:= ) pdf? ( >=app-text/poppler-0.18 ) samba? ( gnome-base/gnome-vfs:=[samba] ) taglib? ( >=media-libs/taglib-1.4 ) unique? ( >=dev-libs/libunique-0.9.3:1 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-commander/1.12/gnome-commander-1.12.3.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=46f86794f9f0a7398d93854ea46d3959
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.14.2 b/metadata/md5-cache/gnome-extra/gnome-commander-1.14.2
index 61e645885bd5..bc60bc65ad9c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.14.2
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.14.2
@@ -5,11 +5,11 @@ DESCRIPTION=A graphical, full featured, twin-panel file manager
 EAPI=8
 HOMEPAGE=https://gcmd.github.io/
 IUSE=exif gsf pdf samba taglib test +unique
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.70.0:2 >=x11-libs/gtk+-2.24.0:2 exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12:= ) pdf? ( >=app-text/poppler-0.18 ) samba? ( gnome-base/gvfs[samba] ) taglib? ( >=media-libs/taglib-1.4 ) unique? ( >=dev-libs/libunique-0.9.3:1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-commander/1.14/gnome-commander-1.14.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=62592c274e3049d05a7ec3facdf3fd76
+_md5_=f1874bb97387d696a9e039188cc99788
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-41.0 b/metadata/md5-cache/gnome-extra/gnome-contacts-41.0
index 839fdf6581f4..e965391a7595 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-41.0
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-41.0
@@ -4,11 +4,12 @@ DEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-l
 DESCRIPTION=GNOME contact management application
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=telepathy v4l
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.23.1:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-1.0.0:1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/41/gnome-contacts-41.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5798a2a830e6725c2148ddb9f1c22a70
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-42.0 b/metadata/md5-cache/gnome-extra/gnome-contacts-42.0
index fd180d19d107..126f1d5c5a24 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-42.0
@@ -1,14 +1,15 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) >=dev-libs/gobject-introspection-1.54 dev-libs/folks[vala(+)] net-libs/gnome-online-accounts[vala] gnome-extra/evolution-data-server[gtk,vala] >=dev-libs/libportal-0.6:=[vala] telepathy? ( net-libs/telepathy-glib[vala] ) >=gui-libs/libhandy-1.1.0:1[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxml2:2 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( dev-lang/vala:0.56 dev-lang/vala:0.54 ) >=dev-libs/gobject-introspection-1.54 dev-libs/folks[vala(+)] net-libs/gnome-online-accounts[vala] gnome-extra/evolution-data-server[gtk,vala] >=dev-libs/libportal-0.6:=[vala] telepathy? ( net-libs/telepathy-glib[vala] ) >=gui-libs/libhandy-1.1.0:1[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxml2:2 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 net-libs/gnome-online-accounts:= >=gui-libs/gtk-4.6:4 gui-libs/libadwaita:1 telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-1.0.0:1
 DESCRIPTION=GNOME contact management application
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=telepathy
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
 LICENSE=GPL-2+
 RDEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 net-libs/gnome-online-accounts:= >=gui-libs/gtk-4.6:4 gui-libs/libadwaita:1 telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-1.0.0:1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/42/gnome-contacts-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=25ffa087108169c084e8682aa8f41993
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=78cfe07d57311cd9733a5d33081e2720
diff --git a/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.11 b/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.11
index 2031276ffb3f..e2c838fb23dc 100644
--- a/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.11
+++ b/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.11
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-
 DESCRIPTION=Thumbnail generator for directories
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer
+INHERIT=gnome2
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.2:3= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-directory-thumbnailer/0.1/gnome-directory-thumbnailer-0.1.11.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=6461d68d6f1db02401d77e6fab6f702f
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.34.0-r1 b/metadata/md5-cache/gnome-extra/gnome-documents-3.34.0-r1
index 20995bf9f782..bce1653f5aac 100644
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.34.0-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-documents-3.34.0-r1
@@ -3,10 +3,11 @@ DEPEND=>=app-text/evince-3.13.3[introspection] app-misc/tracker:0/2.0 >=dev-libs
 DESCRIPTION=A document manager application for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Documents
+INHERIT=gnome.org gnome2-utils meson xdg
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-text/evince-3.13.3[introspection] app-misc/tracker:0/2.0 >=dev-libs/gjs-1.48.0 >=dev-libs/glib-2.39.3:2 gnome-base/gnome-desktop:3=[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.15:3[introspection] >=net-libs/libsoup-2.41.3:2.4 >=net-libs/webkit-gtk-2.6:4[introspection] >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] >=app-misc/tracker-miners-2:0 net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-documents/3.34/gnome-documents-3.34.0.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2991407bc612e76c41c8e222f9eec7ad
diff --git a/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2 b/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2
index 0d72d2002e5d..ebf7905a1e11 100644
--- a/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2
+++ b/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2
@@ -3,6 +3,7 @@ DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_t
 DESCRIPTION=GNOME integration for Spotify
 EAPI=7
 HOMEPAGE=https://github.com/mrpdaemon/gnome-integration-spotify
+INHERIT=gnome2-utils python-r1
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mrpdaemon/gnome-integration-spotify/archive/20140907.tar.gz -> gnome-integration-spotify-20140907.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=52ec0168be56d5bf8680a2422dab8853
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-3.36.0 b/metadata/md5-cache/gnome-extra/gnome-logs-3.36.0
index 6953139db660..793863287440 100644
--- a/metadata/md5-cache/gnome-extra/gnome-logs-3.36.0
+++ b/metadata/md5-cache/gnome-extra/gnome-logs-3.36.0
@@ -4,10 +4,11 @@ DEPEND=gnome-base/gsettings-desktop-schemas >=dev-libs/glib-2.43.90:2 >=x11-libs
 DESCRIPTION=Log viewer for the systemd journal
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Logs
+INHERIT=gnome.org gnome2-utils meson xdg
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=gnome-base/gsettings-desktop-schemas >=dev-libs/glib-2.43.90:2 >=x11-libs/gtk+-3.22:3 sys-apps/systemd:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-logs/3.36/gnome-logs-3.36.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2894df647a241c32a5fd13015681c448
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-42.0 b/metadata/md5-cache/gnome-extra/gnome-logs-42.0
index 3a28abbcfe62..a6046f6290cb 100644
--- a/metadata/md5-cache/gnome-extra/gnome-logs-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-logs-42.0
@@ -4,10 +4,11 @@ DEPEND=gnome-base/gsettings-desktop-schemas >=dev-libs/glib-2.43.90:2 >=x11-libs
 DESCRIPTION=Log viewer for the systemd journal
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Logs
+INHERIT=gnome.org gnome2-utils meson xdg
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3+
 RDEPEND=gnome-base/gsettings-desktop-schemas >=dev-libs/glib-2.43.90:2 >=x11-libs/gtk+-3.22:3 >=gui-libs/libhandy-1.5.0:1 sys-apps/systemd:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-logs/42/gnome-logs-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=22aeed839d036b472570ab7efa07d0a8
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0
index 9da09de956a1..1957705c1176 100644
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0
+++ b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys
 DESCRIPTION=GNOME power statistics
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-power-manager
+INHERIT=gnome.org gnome2-utils meson virtualx xdg
 IUSE=test test
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sy
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-power-manager/3.32/gnome-power-manager-3.32.0.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a27720fdd07019ed2cd34d415aeb58dd
diff --git a/metadata/md5-cache/gnome-extra/gnome-search-tool-3.6.0 b/metadata/md5-cache/gnome-extra/gnome-search-tool-3.6.0
deleted file mode 100644
index 81f64f8827c3..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-search-tool-3.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/atk >=dev-libs/glib-2.30:2 sys-apps/grep x11-libs/gdk-pixbuf >=x11-libs/gtk+-3:3[X] x11-libs/libICE x11-libs/libSM >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Search tool for GNOME
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Attic/GnomeUtils
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 FDL-1.1
-RDEPEND=dev-libs/atk >=dev-libs/glib-2.30:2 sys-apps/grep x11-libs/gdk-pixbuf >=x11-libs/gtk+-3:3[X] x11-libs/libICE x11-libs/libSM sys-apps/findutils sys-apps/mlocate !<gnome-extra/gnome-utils-3.4
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-search-tool/3.6/gnome-search-tool-3.6.0.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e1ada718dc2a3c71e7e07d14600a4110
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-23.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-23.0
new file mode 100644
index 000000000000..de631f05f483
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-23.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DESCRIPTION=Restore the alphabetical ordering of the app grid
+EAPI=8
+HOMEPAGE=https://github.com/stuarthayhurst/alphabetical-grid-extension
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v23.0.tar.gz -> gnome-shell-extension-alphabetical-grid-23.0.tar.gz
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7cec7dac33b797f4e3717b6ba940c067
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-41 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-41
index d7e6af2faecb..fb2246c7f924 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-41
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-41
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst test
 DESCRIPTION=Support Ubuntu AppIndicators and KStatusNotifierItems in Gnome
 EAPI=7
 HOMEPAGE=https://github.com/ubuntu/gnome-shell-extension-appindicator
+INHERIT=gnome2-utils meson
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-gnome-shell-extensions dev-libs/libappindicator:3 >=gnome-base/gnome-shell-3.34
 SLOT=0
 SRC_URI=https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v41.tar.gz -> gnome-shell-extension-appindicator-41.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4a9ab05aed1a2d7f828822ea4900bd50
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-42 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-42
index 555e9b115c9b..b532d64b50a9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-42
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-42
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst test
 DESCRIPTION=Support Ubuntu AppIndicators and KStatusNotifierItems in Gnome
 EAPI=8
 HOMEPAGE=https://github.com/ubuntu/gnome-shell-extension-appindicator
+INHERIT=gnome2-utils meson
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-gnome-shell-extensions dev-libs/libappindicator:3 >=gnome-base/gnome-shell-3.34
 SLOT=0
 SRC_URI=https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v42.tar.gz -> gnome-shell-extension-appindicator-42.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4e1b425c0b4d407c000220a3d683caba
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-40 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-40
new file mode 100644
index 000000000000..bc93848cd10e
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-40
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Changes your wallpaper daily to the bing.com background image
+EAPI=8
+HOMEPAGE=https://github.com/neffo/bing-wallpaper-gnome-extension
+INHERIT=gnome2-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.36
+SLOT=0
+SRC_URI=https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v40.tar.gz -> gnome-shell-extension-bing-wallpaper-40.tar.gz
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5dd7b51ad8881281633d09f88016b2f3
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29
new file mode 100644
index 000000000000..f087e15cbd36
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Allow to connect bluetooth paired devices from gnome control panel
+EAPI=8
+HOMEPAGE=https://github.com/bjarosze/gnome-bluetooth-quick-connect
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=net-wireless/bluez app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40
+SLOT=0
+SRC_URI=https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v29.tar.gz -> gnome-shell-extension-bluetooth-quick-connect-29.tar.gz
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=10ac22ee68fb443ca1fd02f1d9499db7
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-47 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-47
new file mode 100644
index 000000000000..c2d9a3ccec6a
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-47
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2
+DESCRIPTION=An icon taskbar for the Gnome Shell
+EAPI=8
+HOMEPAGE=https://github.com/home-sweet-gnome/dash-to-panel
+IUSE=branding
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-41
+SLOT=0
+SRC_URI=https://github.com/home-sweet-gnome/dash-to-panel/archive/v47.tar.gz -> gnome-shell-extension-dash-to-panel-47.tar.gz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=bfdf5eef0ad1c6ea1293b974c4980c00
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-50 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-50
new file mode 100644
index 000000000000..0769474a54b8
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-50
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool sys-devel/gettext
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2
+DESCRIPTION=An icon taskbar for the Gnome Shell
+EAPI=8
+HOMEPAGE=https://github.com/home-sweet-gnome/dash-to-panel
+INHERIT=gnome2-utils
+IUSE=branding
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-41
+SLOT=0
+SRC_URI=https://github.com/home-sweet-gnome/dash-to-panel/archive/v50.tar.gz -> gnome-shell-extension-dash-to-panel-50.tar.gz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=bfdf5eef0ad1c6ea1293b974c4980c00
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-0.24.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-0.24.0
index 5f8d587e468c..02e3d1e49521 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-0.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-0.24.0
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2
 DESCRIPTION=Fork from the desktop-icons project, with several enhancements like Drag'n'Drop
 EAPI=7
 HOMEPAGE=https://gitlab.com/rastersoft/desktop-icons-ng
+INHERIT=gnome2-utils meson
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 >=gnome-base/nautilus-3.38
 SLOT=0
 SRC_URI=https://gitlab.com/rastersoft/desktop-icons-ng/uploads/dafbb13a766ebe39e2aa39964e7d3ede/ding-0.24.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b713a4e25dfb06f62967153be4464146
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-38.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-38.0
index 09fa078a2f42..753bf560dedf 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-38.0
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-38.0
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2
 DESCRIPTION=Fork from the desktop-icons project, with several enhancements like Drag'n'Drop
 EAPI=8
 HOMEPAGE=https://gitlab.com/rastersoft/desktop-icons-ng
+INHERIT=gnome2-utils meson
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 >=gnome-base/nautilus-3.38
 SLOT=0
 SRC_URI=https://gitlab.com/rastersoft/desktop-icons-ng/uploads/29844c90747e6a91c4d2d74313c49ce1/ding-38.0.tar.xz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d78d2b33993f279b42b975eb7191370a
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0
index 328eccf5fc53..7135c9991add 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2
 DESCRIPTION=Fork from the desktop-icons project, with several enhancements like Drag'n'Drop
 EAPI=8
 HOMEPAGE=https://gitlab.com/rastersoft/desktop-icons-ng
+INHERIT=gnome2-utils meson
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 >=gnome-base/nautilus-3.38
 SLOT=0
 SRC_URI=https://gitlab.com/rastersoft/desktop-icons-ng/uploads/9aed827b50dad3c55384b8a61eac04fe/ding-43.0.tar.xz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7abad5d851167c2d23e73fbe9aa6348c
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-45.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-45.0
new file mode 100644
index 000000000000..e926e272a2a4
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-45.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=dev-libs/glib:2
+DESCRIPTION=Fork from the desktop-icons project, with several enhancements like Drag'n'Drop
+EAPI=8
+HOMEPAGE=https://gitlab.com/rastersoft/desktop-icons-ng
+INHERIT=gnome2-utils meson
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 >=gnome-base/nautilus-3.38
+SLOT=0
+SRC_URI=https://gitlab.com/rastersoft/desktop-icons-ng/uploads/eaa0b5e8e61258bd108897fc2fbd2da2/ding-45.0.tar.xz
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=50264e37074c844e4b1e56e42416c97f
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-48 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-48
index db22646b37d1..04cdbf02f4c0 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-48
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-48
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=KDE Connect implementation for Gnome Shell
 EAPI=7
 HOMEPAGE=https://github.com/GSConnect/gnome-shell-extension-gsconnect
+INHERIT=gnome2-utils meson readme.gentoo-r1 xdg
 IUSE=nautilus
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.68 =gnome-base/gnome-shell-41* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
 SLOT=0
 SRC_URI=https://github.com/GSConnect/gnome-shell-extension-gsconnect/archive/v48.tar.gz -> gnome-shell-extension-gsconnect-48.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=910cecacc6e3418e03b6c38aeff22fad
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-49 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-49
index 6e7721b83e6a..3098e69ac7e2 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-49
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-49
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2
 DESCRIPTION=KDE Connect implementation for Gnome Shell
 EAPI=8
 HOMEPAGE=https://github.com/GSConnect/gnome-shell-extension-gsconnect
+INHERIT=gnome2-utils meson readme.gentoo-r1 xdg
 IUSE=nautilus
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.68 =gnome-base/gnome-shell-41* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
 SLOT=0
 SRC_URI=https://github.com/GSConnect/gnome-shell-extension-gsconnect/archive/v49.tar.gz -> gnome-shell-extension-gsconnect-49.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0306c2f781178daf3c4bb1d26c2bd599
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50
index a9156fead02c..a7e1414ea126 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2
 DESCRIPTION=KDE Connect implementation for Gnome Shell
 EAPI=8
 HOMEPAGE=https://github.com/GSConnect/gnome-shell-extension-gsconnect
+INHERIT=gnome2-utils meson readme.gentoo-r1 xdg
 IUSE=nautilus
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.68 =gnome-base/gnome-shell-42* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
 SLOT=0
 SRC_URI=https://github.com/GSConnect/gnome-shell-extension-gsconnect/archive/v50.tar.gz -> gnome-shell-extension-gsconnect-50.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d999f9ee2366a645d21b3aabcefe4f51
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20220504 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20220504
new file mode 100644
index 000000000000..269abadc61fe
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20220504
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DESCRIPTION=Display the current weather in the clock
+EAPI=8
+HOMEPAGE=https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clock
+INHERIT=gnome2-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 gnome-extra/gnome-weather
+SLOT=0
+SRC_URI=https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clock/archive/4c8dbc0831515e1b22d9b37601e83cebc2cc127d.tar.gz -> gnome-shell-extension-weather-in-the-clock-20220504.tar.gz
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d0c830a5296397baf999ab728b31fe89
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-41.2 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-41.2
index 5f55d7abc9e0..b723f2eec2dd 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-41.2
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-41.2
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-e
 DESCRIPTION=JavaScript extensions for GNOME Shell
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
+INHERIT=gnome.org readme.gentoo-r1 meson xdg
 KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-41* media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme >=x11-wm/mutter-3.32[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell-extensions/41/gnome-shell-extensions-41.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1ab9f997b572e3aceff96f7babab5c23
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.0
index 14ace1262f29..84c5c2318f6c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-e
 DESCRIPTION=JavaScript extensions for GNOME Shell
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
+INHERIT=gnome.org readme.gentoo-r1 meson xdg
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-42* media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme >=x11-wm/mutter-3.32[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell-extensions/42/gnome-shell-extensions-42.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1105294a54bd87a057340d56c8bf9bd1
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1
new file mode 100644
index 000000000000..ad13aea83e77
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211
+DESCRIPTION=JavaScript extensions for GNOME Shell
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
+INHERIT=gnome.org readme.gentoo-r1 meson xdg
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-42* media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme >=x11-wm/mutter-3.32[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell-extensions/42/gnome-shell-extensions-42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2523405f0125c5889002381b349729cd
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-41.4 b/metadata/md5-cache/gnome-extra/gnome-software-41.4
index ec861b85ef2e..bc15b4d9095f 100644
--- a/metadata/md5-cache/gnome-extra/gnome-software-41.4
+++ b/metadata/md5-cache/gnome-extra/gnome-software-41.4
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/
 DESCRIPTION=Gnome install & update software
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Software
+INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=flatpak +firmware gnome gtk-doc spell sysprof udev
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-software/41/gnome-software-41.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=aa145f7b45b399c39e167104977a6af2
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-42.0 b/metadata/md5-cache/gnome-extra/gnome-software-42.0
new file mode 100644
index 000000000000..194820a9eee7
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-software-42.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.66.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-2.52.0:2.4 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
+DESCRIPTION=Gnome install & update software
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Software
+INHERIT=gnome.org gnome2-utils meson virtualx xdg
+IUSE=flatpak +firmware gnome gtk-doc sysprof udev test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.66.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-2.52.0:2.4 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-software/42/gnome-software-42.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=531dc3fa4709fa24c7ec339c64353908
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-42.1 b/metadata/md5-cache/gnome-extra/gnome-software-42.1
new file mode 100644
index 000000000000..a8e39de0f35d
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-software-42.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.66.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-2.52.0:2.4 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
+DESCRIPTION=Gnome install & update software
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Software
+INHERIT=gnome.org gnome2-utils meson virtualx xdg
+IUSE=flatpak +firmware gnome gtk-doc sysprof udev test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.66.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-2.52.0:2.4 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-software/42/gnome-software-42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=531dc3fa4709fa24c7ec339c64353908
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-41.0 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-41.0
index eeb78b81ec5f..4228d1cbf5e9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-41.0
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-41.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-cpp/glibmm-2.46:2 >=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22:3[X
 DESCRIPTION=The Gnome System Monitor
 EAPI=7
 HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/stable/
+INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=systemd X
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-cpp/glibmm-2.46:2 >=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/atkmm-2.28:0 >=gnome-base/libgtop-2.37.2:2= >=gui-libs/libhandy-1.0.0:1= >=gnome-base/librsvg-2.35:2 >=dev-libs/libxml2-2.0:2 X? ( >=x11-libs/libwnck-2.91.0:3 ) systemd? ( >=sys-apps/systemd-44:0= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-monitor/41/gnome-system-monitor-41.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b235efffb654e31513f4c41aba09f194
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-42.0 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-42.0
index 93c84bb3d416..733a06409395 100644
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-42.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-cpp/glibmm-2.46:2 >=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22:3[X
 DESCRIPTION=The Gnome System Monitor
 EAPI=8
 HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/stable/
+INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=systemd X
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-cpp/glibmm-2.46:2 >=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/atkmm-2.28:0 >=gnome-base/libgtop-2.37.2:2= >=gui-libs/libhandy-1.5.0:1= >=gnome-base/librsvg-2.35:2 >=dev-libs/libxml2-2.0:2 X? ( >=x11-libs/libwnck-2.91.0:3 ) systemd? ( >=sys-apps/systemd-44:0= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-monitor/42/gnome-system-monitor-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7ff65816e2c0a71edb040d947f6bea57
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-40.0 b/metadata/md5-cache/gnome-extra/gnome-tweaks-40.0
index 4dc150d86119..b00dfdba98e8 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-40.0
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-40.0
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=Customize advanced GNOME options
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
+INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3+ CC0-1.0
@@ -11,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweaks/40/gnome-tweaks-40.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4771ce9aed77079b82843bc75160e0d3
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10 b/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10
index 666e4b975f7f..13fd0593d1cf 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=Customize advanced GNOME options
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
+INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+ CC0-1.0
@@ -11,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweaks/40/gnome-tweaks-40.10.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1324959bdc8d401dbac4fd0a09b51343
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-share-3.34.0 b/metadata/md5-cache/gnome-extra/gnome-user-share-3.34.0
index a6ab0b2fecf3..a8beda2d484a 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-share-3.34.0
+++ b/metadata/md5-cache/gnome-extra/gnome-user-share-3.34.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-3.27.90
 DESCRIPTION=Personal file sharing for the GNOME desktop
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-user-share
+INHERIT=gnome.org gnome2-utils meson multilib systemd xdg
 KEYWORDS=amd64 arm64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-3.27.90 >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-share/3.34/gnome-user-share-3.34.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c4b7165481f82feb563f281726c83165
diff --git a/metadata/md5-cache/gnome-extra/gnome-utils-3.8.0-r1 b/metadata/md5-cache/gnome-extra/gnome-utils-3.8.0-r1
deleted file mode 100644
index 2ab0dda207b5..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-utils-3.8.0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for utilities for the GNOME desktop
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Attic/GnomeUtils
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=metapackage
-RDEPEND=>=app-admin/gnome-system-log-3.8.0 >=app-dicts/gnome-dictionary-3.8.0 >=gnome-extra/gnome-search-tool-3.6.0 >=media-gfx/gnome-font-viewer-3.8.0 >=media-gfx/gnome-screenshot-3.8.0 >=sys-apps/baobab-3.8.0
-SLOT=0
-_md5_=3bfb4c8bf6511ea385ce07b6e79c5064
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-41.0 b/metadata/md5-cache/gnome-extra/gnome-weather-41.0
index c44b50158eaa..592c42d26d96 100644
--- a/metadata/md5-cache/gnome-extra/gnome-weather-41.0
+++ b/metadata/md5-cache/gnome-extra/gnome-weather-41.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.56:= >=x11-libs
 DESCRIPTION=A weather application for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Weather
+INHERIT=gnome.org gnome2-utils meson xdg
 KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.56:= >=x11-libs/gtk+-3.20:3 >=dev-libs/gjs-1.50 >=app-misc/geoclue-2.3.1:2.0 >=dev-libs/libgweather-40.0:= >=gui-libs/libhandy-1.1.90:1= gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-weather/41/gnome-weather-41.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3d0df79aaabf450e78c4a7e2d7c93450
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-42.0 b/metadata/md5-cache/gnome-extra/gnome-weather-42.0
index 8142989decd6..a87b32c8f969 100644
--- a/metadata/md5-cache/gnome-extra/gnome-weather-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-weather-42.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.56:= >=gui-libs
 DESCRIPTION=A weather application for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Weather
+INHERIT=gnome.org gnome2-utils meson xdg
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.56:= >=gui-libs/gtk-4.5:4 >=dev-libs/gjs-1.71.0 >=app-misc/geoclue-2.3.1:2.0 >=gui-libs/libadwaita-1.0.0:1= >=dev-libs/libgweather-3.90.0:4= gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-weather/42/gnome-weather-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=92af0e8e00d684139c1d5548bbf437a0
diff --git a/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r2 b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r2
index 8688d435fb30..63ad9919d91f 100644
--- a/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r2
+++ b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r2
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango app-text/enc
 DESCRIPTION=Lightweight HTML rendering/printing/editing engine
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/Archive/gtkhtml
+INHERIT=gnome2
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango app-text/enchant:2 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4
 SLOT=4.0
 SRC_URI=mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=00f09531dab7acd8c1d331822bf692a7
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-14.0.2 b/metadata/md5-cache/gnome-extra/gucharmap-14.0.2
index f018e3bc74a3..5554c5210246 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-14.0.2
+++ b/metadata/md5-cache/gnome-extra/gucharmap-14.0.2
@@ -4,6 +4,7 @@ DEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[intro
 DESCRIPTION=Unicode character map viewer and library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+INHERIT=gnome2-utils meson python-any-r1 vala xdg
 IUSE=+introspection gtk-doc vala
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3+
@@ -11,5 +12,5 @@ RDEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[intr
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=https://gitlab.gnome.org/GNOME/gucharmap/-/archive/14.0.2/gucharmap-14.0.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=57b3d5315e04b07d1075b34f7d076cc4
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-14.0.3 b/metadata/md5-cache/gnome-extra/gucharmap-14.0.3
index a07fbc0c8732..bf7226901349 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-14.0.3
+++ b/metadata/md5-cache/gnome-extra/gucharmap-14.0.3
@@ -4,6 +4,7 @@ DEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[intro
 DESCRIPTION=Unicode character map viewer and library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap https://gitlab.gnome.org/GNOME/gucharmap/
+INHERIT=gnome2-utils meson python-any-r1 vala xdg
 IUSE=+introspection gtk-doc vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3+
@@ -11,5 +12,5 @@ RDEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[intr
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=https://gitlab.gnome.org/GNOME/gucharmap/-/archive/14.0.3/gucharmap-14.0.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=541df7ed9df49d1b1c0b6d5d8a5c209b
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-3.0.1-r200 b/metadata/md5-cache/gnome-extra/gucharmap-3.0.1-r200
index 536c7e5d6902..d712a41714a8 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-3.0.1-r200
+++ b/metadata/md5-cache/gnome-extra/gucharmap-3.0.1-r200
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/glib-2.16.3:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-lib
 DESCRIPTION=Unicode character map viewer library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+INHERIT=gnome2
 IUSE=cjk debug doc +introspection
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16.3:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-2.14.0:2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gucharmap/3.0/gucharmap-3.0.1.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c5d6bb03593b14482c1f0fdacae7e27e
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.2.9 b/metadata/md5-cache/gnome-extra/libgda-5.2.9
index 1d5bc986f79a..ef46a6818f90 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.2.9
+++ b/metadata/md5-cache/gnome-extra/libgda-5.2.9
@@ -3,13 +3,14 @@ DEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/l
 DESCRIPTION=GNOME database access library
 EAPI=6
 HOMEPAGE=https://www.gnome-db.org/
+INHERIT=db-use flag-o-matic gnome2 java-pkg-opt-2 vala
 IUSE=berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl vala java
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline:0= sys-libs/ncurses:0= berkdb? ( sys-libs/db:* ) firebird? ( dev-db/firebird ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0= ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap:= ) mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) ssl? ( dev-libs/openssl:0= ) >=dev-db/sqlite-3.10.2:3= vala? ( dev-libs/libgee:0.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=canvas? ( gtk ) graphviz? ( gtk ) sourceview? ( gtk ) vala? ( introspection )
 RESTRICT=test firebird? ( bindist )
 SLOT=5/4
 SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.9.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	db-use	867a9246a45efc09934e0f8e3380c813	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	92b5a4d196abffe2dbe3bdc1cf4ef2ae	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6d42e74a8e3378119c613d1b95667539
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	db-use	867a9246a45efc09934e0f8e3380c813	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=76dcc02b4294b4cc5e98b595b110ecdb
diff --git a/metadata/md5-cache/gnome-extra/mousetweaks-3.32.0 b/metadata/md5-cache/gnome-extra/mousetweaks-3.32.0
index 8460fbbabba0..89f1e8aa1bc5 100644
--- a/metadata/md5-cache/gnome-extra/mousetweaks-3.32.0
+++ b/metadata/md5-cache/gnome-extra/mousetweaks-3.32.0
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/glib-2.25.9:2 >=x11-libs/gtk+-3:3[X] >=gnome-base/gsettings-de
 DESCRIPTION=Mouse accessibility enhancements for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Mousetweaks
+INHERIT=gnome2
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.25.9:2 >=x11-libs/gtk+-3:3[X] >=gnome-base/gsettings-desktop-schemas-0.1 x11-libs/libX11 x11-libs/libXtst x11-libs/libXfixes x11-libs/libXcursor
 SLOT=0
 SRC_URI=mirror://gnome/sources/mousetweaks/3.32/mousetweaks-3.32.0.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7e66457e43f6b7ca8d7372c553848e25
diff --git a/metadata/md5-cache/gnome-extra/nautilus-dropbox-2019.02.14 b/metadata/md5-cache/gnome-extra/nautilus-dropbox-2019.02.14
index 08d8614c1d8c..e2397dbbcfa5 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-dropbox-2019.02.14
+++ b/metadata/md5-cache/gnome-extra/nautilus-dropbox-2019.02.14
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) gn
 DESCRIPTION=Dropbox Nautilus Extension
 EAPI=7
 HOMEPAGE=https://github.com/dropbox/nautilus-dropbox
+INHERIT=autotools python-single-r1 xdg-utils
 IUSE=debug +python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 CC-BY-ND-3.0
@@ -11,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) g
 REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://linux.dropboxstatic.com/packages/nautilus-dropbox-2019.02.14.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=218d8289d7683a5e0b41406ba82fa55f
diff --git a/metadata/md5-cache/gnome-extra/nautilus-dropbox-2020.03.04 b/metadata/md5-cache/gnome-extra/nautilus-dropbox-2020.03.04
index 752f99e2ab3c..81cb03b2f0c1 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-dropbox-2020.03.04
+++ b/metadata/md5-cache/gnome-extra/nautilus-dropbox-2020.03.04
@@ -4,6 +4,7 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=Dropbox Nautilus Extension
 EAPI=7
 HOMEPAGE=https://github.com/dropbox/nautilus-dropbox
+INHERIT=autotools python-single-r1 xdg-utils
 IUSE=debug python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 CC-BY-ND-3.0
@@ -11,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://linux.dropboxstatic.com/packages/nautilus-dropbox-2020.03.04.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e65a402db323f3b5d60d927ed4d58df3
diff --git a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6 b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
index 7907c0bdd3f4..ff5129313533 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
+++ b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/glib-2.25.9:2 >=sys-devel/gettext-0.19.8 dev-libs/appstream-gl
 DESCRIPTION=A nautilus extension for sending files to locations
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/Archive/nautilus-sendto
+INHERIT=gnome.org meson
 IUSE=debug
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.25.9:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus-sendto/3.8/nautilus-sendto-3.8.6.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=2735fdb3fc4bc311d05615ba27aa37ae
diff --git a/metadata/md5-cache/gnome-extra/nemo-5.0.4 b/metadata/md5-cache/gnome-extra/nemo-5.0.4
deleted file mode 100644
index 91e8f5072de4..000000000000
--- a/metadata/md5-cache/gnome-extra/nemo-5.0.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/gdbus-codegen-2.31.0 >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-libs/glib-2.45.7:2[dbus] >=dev-libs/gobject-introspection-0.9.12:= >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/libgsf >=x11-libs/gtk+-3.10.0:3[introspection] >=x11-libs/libnotify-0.7:= x11-libs/libX11 >=x11-libs/pango-1.40.0 >=x11-libs/xapp-2.2.0 exif? ( >=media-libs/libexif-0.6.20:= ) selinux? ( sys-libs/libselinux ) tracker? ( >=app-misc/tracker-2.0:0= ) xmp? ( >=media-libs/exempi-2.2.0:= ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo
-IUSE=exif gtk-doc +nls selinux test tracker xmp python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1
-PDEPEND=>=gnome-base/gvfs-0.1.2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-libs/glib-2.45.7:2[dbus] >=dev-libs/gobject-introspection-0.9.12:= >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/libgsf >=x11-libs/gtk+-3.10.0:3[introspection] >=x11-libs/libnotify-0.7:= x11-libs/libX11 >=x11-libs/pango-1.40.0 >=x11-libs/xapp-2.2.0 exif? ( >=media-libs/libexif-0.6.20:= ) selinux? ( sys-libs/libselinux ) tracker? ( >=app-misc/tracker-2.0:0= ) xmp? ( >=media-libs/exempi-2.2.0:= ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-5.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linuxmint/nemo/archive/5.0.4.tar.gz -> nemo-5.0.4.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9e5ecbeeba37fce88b4848307dfb3825
diff --git a/metadata/md5-cache/gnome-extra/nemo-5.2.4 b/metadata/md5-cache/gnome-extra/nemo-5.2.4
index 030a23a78d93..0e6f8e736ad1 100644
--- a/metadata/md5-cache/gnome-extra/nemo-5.2.4
+++ b/metadata/md5-cache/gnome-extra/nemo-5.2.4
@@ -4,8 +4,9 @@ DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) py
 DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo
+INHERIT=meson gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
 IUSE=exif gtk-doc +nls selinux test tracker xmp python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1
 PDEPEND=>=gnome-base/gvfs-0.1.2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-libs/glib-2.45.7:2[dbus] >=dev-libs/gobject-introspection-0.9.12:= >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= >=gnome-extra/cinnamon-desktop-5.2:0= gnome-extra/libgsf >=x11-libs/gtk+-3.10.0:3[introspection] >=x11-libs/libnotify-0.7:= x11-libs/libX11 >=x11-libs/pango-1.40.0 >=x11-libs/xapp-2.2.8 exif? ( >=media-libs/libexif-0.6.20:= ) selinux? ( sys-libs/libselinux ) tracker? ( >=app-misc/tracker-2.0:0= ) xmp? ( >=media-libs/exempi-2.2.0:= ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-5.2 )
@@ -13,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/5.2.4.tar.gz -> nemo-5.2.4.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	59dddabd6a41ab69723654916142f63b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=786dc1b8dfeb0d85d0d7305a8997d1a6
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ae4f8b6ba5ce8077ef250027caa5f4ac
diff --git a/metadata/md5-cache/gnome-extra/nemo-fileroller-5.0.1 b/metadata/md5-cache/gnome-extra/nemo-fileroller-5.0.1
deleted file mode 100644
index 060daa304c4f..000000000000
--- a/metadata/md5-cache/gnome-extra/nemo-fileroller-5.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.14.0 >=gnome-extra/nemo-2.0.0
-DESCRIPTION=Nemo file-roller integration
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo-extensions
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14.0 >=gnome-extra/nemo-2.0.0 app-arch/file-roller
-SLOT=0
-SRC_URI=https://github.com/linuxmint/nemo-extensions/archive/5.0.0.tar.gz -> nemo-extensions-5.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1f35d48a4563a7b925191af2b7f793ca
diff --git a/metadata/md5-cache/gnome-extra/nemo-fileroller-5.2.0 b/metadata/md5-cache/gnome-extra/nemo-fileroller-5.2.0
index 7d93de7c242c..2f3ef8010779 100644
--- a/metadata/md5-cache/gnome-extra/nemo-fileroller-5.2.0
+++ b/metadata/md5-cache/gnome-extra/nemo-fileroller-5.2.0
@@ -4,10 +4,11 @@ DEPEND=>=dev-libs/glib-2.14.0 >=gnome-extra/nemo-2.0.0
 DESCRIPTION=Nemo file-roller integration
 EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo-extensions
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+INHERIT=meson
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14.0 >=gnome-extra/nemo-2.0.0 app-arch/file-roller
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo-extensions/archive/5.2.0.tar.gz -> nemo-extensions-5.2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=299a3e60ad4742ff690aeaa0c82e7cfb
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=41cd082386ce38257986cf81563bde8b
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.24.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.24.0
index d9084998f786..8bf365493ac8 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.24.0
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.24.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.2
 DESCRIPTION=NetworkManager connection editor and applet
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+INHERIT=gnome.org meson xdg
 IUSE=appindicator modemmanager selinux teamd
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7:= ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.24/network-manager-applet-1.24.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c6a479a4939e6277dd7694650bf3c162
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.26.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.26.0
index 36a241aa4e13..32dd030a9477 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.26.0
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.26.0
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.2
 DESCRIPTION=NetworkManager connection editor and applet
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+INHERIT=gnome.org meson xdg
 IUSE=appindicator modemmanager selinux teamd
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7:= ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.26/network-manager-applet-1.26.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=fd13dfc7748b312da477fd4f666f7a3e
diff --git a/metadata/md5-cache/gnome-extra/office-runner-1.0.3 b/metadata/md5-cache/gnome-extra/office-runner-1.0.3
index f24e53056874..4358cd38a1a3 100644
--- a/metadata/md5-cache/gnome-extra/office-runner-1.0.3
+++ b/metadata/md5-cache/gnome-extra/office-runner-1.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 >=gnome-base/gnome-settings-daemon-3.0 >=x11-libs/gtk+-3.8:3 >=sys-apps/systemd-190
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/GNOME/office-runner/-/archive/1.0.3/office-runner-1.0.3.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=35bfb0c77d234127fb0f2718558496ed
diff --git a/metadata/md5-cache/gnome-extra/pch-session-42.0 b/metadata/md5-cache/gnome-extra/pch-session-42.0
new file mode 100644
index 000000000000..8d0741ac8eca
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/pch-session-42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=Unofficial gnome based session with different default settings and extensions
+EAPI=8
+HOMEPAGE=https://gitlab.com/pachoramos/pch-session
+INHERIT=gnome2-utils
+IUSE=bluetooth qt5 webp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnome-base/gnome-shell-42 >=gnome-extra/gnome-shell-extensions-42 >=gnome-extra/gnome-shell-extension-alphabetical-grid-23.0 >=gnome-extra/gnome-shell-extension-appindicator-42 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-15 >=gnome-extra/gnome-shell-extension-bing-wallpaper-40 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323 >=gnome-extra/gnome-shell-extension-dash-to-panel-47 >=gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0 >=gnome-extra/gnome-shell-extension-gsconnect-50 >=gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108-r1 >=gnome-extra/gnome-tweaks-40.10 gnome-extra/gnome-clocks gnome-extra/seahorse-nautilus >=media-fonts/fonts-meta-2 bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29 ) qt5? ( x11-themes/adwaita-qt ) webp? ( gui-libs/gdk-pixbuf-loader-webp )
+SLOT=0
+SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/42.0/pch-session-42.0.tar.bz2
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e3b6ed852d37df619fc288e57c787e8d
diff --git a/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92 b/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92
index a070b3de26a4..1f21866652c2 100644
--- a/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92
+++ b/metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92
@@ -3,10 +3,11 @@ DEPEND=>=app-crypt/gpgme-1.0.0 >=app-crypt/gcr-3.4[gtk] >=dev-libs/dbus-glib-0.3
 DESCRIPTION=Nautilus extension for encrypting and decrypting files with GnuPG
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
+INHERIT=gnome2
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/gpgme-1.0.0 >=app-crypt/gcr-3.4[gtk] >=dev-libs/dbus-glib-0.35 >=dev-libs/glib-2.28:2 gnome-base/gnome-keyring >=gnome-base/nautilus-3 x11-libs/gtk+:3 >=x11-libs/libcryptui-3.9.90 >=x11-libs/libnotify-0.3:= >=app-crypt/gnupg-1.4 !app-crypt/seahorse-plugins[nautilus]
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse-nautilus/3.11/seahorse-nautilus-3.11.92.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9c35c53b6b9de799bf1bc86397e281f0
diff --git a/metadata/md5-cache/gnome-extra/sushi-41.0 b/metadata/md5-cache/gnome-extra/sushi-41.0
index b2be413a940c..16c83d862d40 100644
--- a/metadata/md5-cache/gnome-extra/sushi-41.0
+++ b/metadata/md5-cache/gnome-extra/sushi-41.0
@@ -4,6 +4,7 @@ DEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/freet
 DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/sushi
+INHERIT=gnome.org meson xdg
 IUSE=office wayland +X
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/free
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sushi/41/sushi-41.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f623af495720650f6e89bd1a29381074
diff --git a/metadata/md5-cache/gnome-extra/sushi-41.1 b/metadata/md5-cache/gnome-extra/sushi-41.1
index 3609ccbd90b4..0b63f44cdcc2 100644
--- a/metadata/md5-cache/gnome-extra/sushi-41.1
+++ b/metadata/md5-cache/gnome-extra/sushi-41.1
@@ -4,6 +4,7 @@ DEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/freet
 DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/sushi
+INHERIT=gnome.org meson xdg
 IUSE=office wayland +X
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/free
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sushi/41/sushi-41.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=cbb70958d203040762f1a4be09ad684a
diff --git a/metadata/md5-cache/gnome-extra/sushi-41.2 b/metadata/md5-cache/gnome-extra/sushi-41.2
index 5c0fa593846f..bb83a955e40c 100644
--- a/metadata/md5-cache/gnome-extra/sushi-41.2
+++ b/metadata/md5-cache/gnome-extra/sushi-41.2
@@ -4,6 +4,7 @@ DEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/freet
 DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/sushi
+INHERIT=gnome.org meson xdg
 IUSE=office wayland +X
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/free
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sushi/41/sushi-41.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f9913508614657123e66855bfa82a620
diff --git a/metadata/md5-cache/gnome-extra/yelp-41.2 b/metadata/md5-cache/gnome-extra/yelp-41.2
index a45b1d21741d..afd70418f9c2 100644
--- a/metadata/md5-cache/gnome-extra/yelp-41.2
+++ b/metadata/md5-cache/gnome-extra/yelp-41.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.67.4:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-41.0 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp/41/yelp-41.2.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c2b8315f31b09eb219dcbd0fdf6f22da
diff --git a/metadata/md5-cache/gnome-extra/yelp-42.0 b/metadata/md5-cache/gnome-extra/yelp-42.0
index d93bb6d261b4..67c6bcf3a3dc 100644
--- a/metadata/md5-cache/gnome-extra/yelp-42.0
+++ b/metadata/md5-cache/gnome-extra/yelp-42.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.67.4:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-41.0 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 >=gui-libs/libhandy-1.5.0:1 x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp/42/yelp-42.0.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0352f99e01c2d37174ece687eb886ab4
diff --git a/metadata/md5-cache/gnome-extra/yelp-42.1 b/metadata/md5-cache/gnome-extra/yelp-42.1
index ae1b02791bc2..2e9922b041d8 100644
--- a/metadata/md5-cache/gnome-extra/yelp-42.1
+++ b/metadata/md5-cache/gnome-extra/yelp-42.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.67.4:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-41.0 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 >=gui-libs/libhandy-1.5.0:1 x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp/42/yelp-42.1.tar.xz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0352f99e01c2d37174ece687eb886ab4
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.41.0 b/metadata/md5-cache/gnome-extra/zenity-3.41.0
index 42048db25d59..fa85f2ef4f64 100644
--- a/metadata/md5-cache/gnome-extra/zenity-3.41.0
+++ b/metadata/md5-cache/gnome-extra/zenity-3.41.0
@@ -4,11 +4,12 @@ DEPEND=>=x11-libs/gtk+-3.16.0:3[X] >=dev-libs/glib-2.43.4:2 libnotify? ( >=x11-l
 DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
+INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=libnotify webkit
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/gtk+-3.16.0:3[X] >=dev-libs/glib-2.43.4:2 libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 ) x11-libs/libX11 x11-libs/gdk-pixbuf:2 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://gnome/sources/zenity/3.41/zenity-3.41.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=47110577ad4a41560f9b7afd3174c43d
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.42.0 b/metadata/md5-cache/gnome-extra/zenity-3.42.0
index 0c256a13027d..aff0d3e6e2ec 100644
--- a/metadata/md5-cache/gnome-extra/zenity-3.42.0
+++ b/metadata/md5-cache/gnome-extra/zenity-3.42.0
@@ -4,11 +4,12 @@ DEPEND=>=x11-libs/gtk+-3.16.0:3[X] >=dev-libs/glib-2.43.4:2 libnotify? ( >=x11-l
 DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
+INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=libnotify webkit
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/gtk+-3.16.0:3[X] >=dev-libs/glib-2.43.4:2 libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 ) x11-libs/libX11 x11-libs/gdk-pixbuf:2 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://gnome/sources/zenity/3.42/zenity-3.42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	2d8a51910bc57e004c37aa55c7d99ce4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	python-utils-r1	59dddabd6a41ab69723654916142f63b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a713bedc64b9b64ad2c2ab90fd10875b
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.42.1 b/metadata/md5-cache/gnome-extra/zenity-3.42.1
new file mode 100644
index 000000000000..9cc3205d6966
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/zenity-3.42.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/itstool >=sys-devel/gettext-0.19.4 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=x11-libs/gtk+-3.16.0:3[X] >=dev-libs/glib-2.43.4:2 libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 ) x11-libs/libX11 x11-libs/gdk-pixbuf:2 x11-libs/pango
+DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=libnotify webkit
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2+
+RDEPEND=>=x11-libs/gtk+-3.16.0:3[X] >=dev-libs/glib-2.43.4:2 libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 ) x11-libs/libX11 x11-libs/gdk-pixbuf:2 x11-libs/pango
+SLOT=0
+SRC_URI=mirror://gnome/sources/zenity/3.42/zenity-3.42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a713bedc64b9b64ad2c2ab90fd10875b