Adding metadata

17 files changed, 68 insertions, 1036 deletions

diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 10629dd4ef76..f718db1a636a 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,4 +1,5 @@
 DIST gdm-48.0.tar.xz 939740 BLAKE2B 77ba0e24c1a1fd17e25adf46ce9d9e881a21143536bba63907e489837e1574b1ec1c5e0836d7539fcd616608a1bb7b8881a0330566d3da2fa8c028969914e754 SHA512 3e4a320cc6a0b43d65122bacd2b99531695f20ec809a767b957d63a511e00da017a9a4abe815596c6ad1398c5d427418d5c51bf6162216f60fdae5e8095bd305
 DIST gdm-49.2.tar.xz 968944 BLAKE2B 880672b61a534a225f7db80ce1d1e050e11c883b5eca8ec963cdac9ce9ff55a3e5bf1157910330a4cc5d918e983308f823e11683654303456486e7983ee063f7 SHA512 2055d17d00e76427ff36cfb7cc18c73cab90954bd2ed25048e43d60980a6d4a86e64e6cf478eb26269ff4100fec262e4b5a08e5ee706523ee4ed8199c0bd62b0
 DIST gdm-49.3.tar.xz 1015288 BLAKE2B ded7b6cd28475bdbde452321affd4a510e123515a4c33776d8b4fdc61ad90f946b6634f980e8ecb1df3344f1d2f51c68c3210c0a6cadef7bec9f39f188225958 SHA512 7bd87411ab432ec14c6d3186c6e602aa49e85cce59686499b4689a23287c0280fa8062838a5abdf5bd5ddaa09aadcbbdb469188833fcc05362cd3e58f901edf0
+DIST gdm-49.4.tar.xz 1016128 BLAKE2B 9625751d5562b7b7bd7835bd1d913840f0ee42a855e6e41522c92c63c7b0091fc414e969a5d773813f15153774551fbc0edc82d099f2f5d75d18f90136e3bbaf SHA512 03b812b8b6f2caad542d1f81329bc959c53ea8b64eb6fa67a6a9290727baf98be0d7f2ee1e5476d213cf4f732b282d750c9d938d575c785991a5a8b217dd63c8
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
diff --git a/gnome-base/gdm/files/gdm-pam-openrc.patch b/gnome-base/gdm/files/gdm-pam-openrc.patch
index d554a17d2403..aee849dfad5a 100644
--- a/gnome-base/gdm/files/gdm-pam-openrc.patch
+++ b/gnome-base/gdm/files/gdm-pam-openrc.patch
@@ -1,7 +1,9 @@
-Needed to start the user daemon for newer GDM version.
+Needed to start the user daemon for newer GDM version. Also attempts to run gnome session openrc's PAM module.
 
 The latter change may be an OpenRC issue, but I haven't ruled it out. This works for now.
 
+XXX for gdm-password.pam: Technically system-local-login should take care of this. Might be an openrc bug?
+
 diff --git a/data/pam-exherbo/gdm-launch-environment.pam b/data/pam-exherbo/gdm-launch-environment.pam
 index 3f5d788b1..3bf3bd551 100644
 --- a/data/pam-exherbo/gdm-launch-environment.pam
@@ -21,7 +23,7 @@ index d462030a2..860324c53 100644
  password include  system-local-login
  password optional pam_gnome_keyring.so use_authtok
  
-+# XXX: Technically system-local-login should take care of this. Might be an openrc bug?
++-session optional pam_gnome_session_openrc.so
 +-session optional pam_openrc.so
  session  include  system-local-login
  session  optional pam_gnome_keyring.so auto_start
diff --git a/gnome-base/gdm/gdm-49.2-r2.ebuild b/gnome-base/gdm/gdm-49.2-r3.ebuild
index afa70bc52543..afa70bc52543 100644
--- a/gnome-base/gdm/gdm-49.2-r2.ebuild
+++ b/gnome-base/gdm/gdm-49.2-r3.ebuild
diff --git a/gnome-base/gdm/gdm-49.3-r2.ebuild b/gnome-base/gdm/gdm-49.3-r3.ebuild
index dcce10178e63..dcce10178e63 100644
--- a/gnome-base/gdm/gdm-49.3-r2.ebuild
+++ b/gnome-base/gdm/gdm-49.3-r3.ebuild
diff --git a/gnome-base/gdm/gdm-49.3.ebuild b/gnome-base/gdm/gdm-49.4.ebuild
index 8047741876ff..dcce10178e63 100644
--- a/gnome-base/gdm/gdm-49.3.ebuild
+++ b/gnome-base/gdm/gdm-49.4.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	>=dev-libs/libgudev-232:=
 	>=dev-libs/glib-2.68:2
 	>=dev-libs/json-glib-1.2.0
-	>=sys-apps/accountsservice-0.6.35
+	>=sys-apps/accountsservice-0.6.35:=
 	sys-apps/keyutils:=
 	selinux? ( sys-libs/libselinux )
 
@@ -73,7 +73,6 @@ RDEPEND="${COMMON_DEPEND}
 	acct-group/gdm
 	acct-user/gdm
 	>=gnome-base/gnome-shell-49
-	x11-apps/xhost
 
 	fprint? ( sys-auth/fprintd[pam] )
 	systemd? (
@@ -82,6 +81,7 @@ RDEPEND="${COMMON_DEPEND}
 			sys-apps/acl
 		)
 	)
+	X? ( x11-apps/xhost )
 "
 # This is a 'workaround' built into gdm 49, as elogind does not yet have
 # 'working' userdb support in stable or testing.
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index a950cdc395ca..902ec0c48942 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,10 +1,6 @@
-DIST gnome-control-center-47.3-patchset.tar.xz 4980 BLAKE2B a9c8e8b20462d368d579c004e17ba837b7bae4d391ce5ecca5311dd3d3d11a20b7b06c1abe419adcda22e97ba0d3dd752926bccf27756353e9cbaaf8d0afed0a SHA512 a5ade6c98b3ba5b51e20ec22ea3d64c169b08f23c99fe988afd8d8699edaec8b158da652dacb236e0b16c446e9bd2d384cc4e383c5148acaa0792ca44a6e8bb1
-DIST gnome-control-center-47.7.tar.xz 7089812 BLAKE2B 013567b7442a506e5328ad646b517afd305a28a10711f47d2b401d8158e994da28db7109ae3a7277f9e84085e5a0a541e2964fe2db456323bb56c5314d90ba4e SHA512 50b2555e973319227568619dbba00b2e9d08c5d76606dbb8205742a0ce86a5c7473e7ce9b43089354c8666d81de5b23fa760fbbdd9a1e1c7e2acd601dca44e1f
-DIST gnome-control-center-48.3-patchset.tar.xz 6532 BLAKE2B ab062746d9bdb384c8717de24830986e9be5735c422b8ca23456ca8c242c6db5375d65a455c448b88c42a15d8e8831bc421db8e1c0efa426535d84fc3def8f7a SHA512 b86ffb87b354adb627c94f6d4ffe4a8008bfbf173f935e4d36bbb7525030c428ebc5030723a7588ce3ac29755719ddeae69e11ef99837339455f7839b3254bac
-DIST gnome-control-center-48.4.tar.xz 7146860 BLAKE2B b4b92b7ac78bea1983cc7417151efe9f34cdf8c58b950d74f0c60fdad396f566cdcebd38e3cae73ceaf09f0e4c0cce4a95e89180f7eea91841dfa585e9d7a1b3 SHA512 4e7ee9aef625907b969179a915136d3dca5ef9b9e63653ba676bb2ccd2eaa61a96a1bcb7e586ceeb2e0613ccd25d9e56ffc49c09b44bbed35d6f50d5f0bd9f0a
-DIST gnome-control-center-48.7.tar.xz 7188960 BLAKE2B 05646e6523ba5650faf6262f52d7f102fe57039ab9c9bee9edbd6da61146d9767e59e4ca2ac6210214590d6e48e7c7a22d1eb25369b6a2413c11108d4911cd8e SHA512 33263eb454a9a156d345cd0102dfe4238d45e288e30140d269dd279144707e9a06ac5dd0dd296d48b91d85ae1d155fb83aacc480c2f29228d8394a7daf7affe9
 DIST gnome-control-center-49.5-patchset.tar.xz 6384 BLAKE2B 4ba396513539f8b8d88b33527989c32edb3ccf219ee3867f9fcd468a85b5361d04b79fe2e590d72e2d7fa9e9ba41eba82c6e66e3c06780ecc07ea65de29c9278 SHA512 3f4c6b8d970dea1980b2fcf9fea80efb4fe8f6cf53e4e43736533ab94d9fcfaf4f0ad89b35b939a52048b261d30ced0626b424fd70cfce210716ea7e62e0af67
 DIST gnome-control-center-49.7.tar.xz 7077972 BLAKE2B e1090d458e7f5034e48df169a580ce23b5a871a5e835966ec8c7e720679dbbbb9793295bbb60475f07310d4c331ea9477f6b0f227ffffcc4e9a7565d91195c4e SHA512 7345370c2e78166225cbc5a34bbd2e1c75f51fcfe67aaa5197db4be20679363f6ade8fb9090b88ebbcd803ccc0fbcacf78d9b94f5adeea67c209eb427d53e142
 DIST gnome-control-center-49.8.tar.xz 7110244 BLAKE2B 6e1f62b01acc93fd2a4da400b5f48d09718bfddd923e6f6e3500d58525a5f643fd08868d9cedf9eca26154def3b9b2f9f0d87ccf1588280ec5acc71c6a33899b SHA512 69994d80887a920a45c1068ac53eeb9ae163caec9ad1423be591084f5a9b7109860d38f760ae2eb1650bbf1db37c52252a65dcc265b3aa76f2eaa456f39ea8f0
+DIST gnome-control-center-49.9.tar.xz 7110980 BLAKE2B 3629c9b999008e89f11278ab4570347b4728b6149826a24951f09fdb670075ca020c48e952ec40ca5a1f67e69187bb9c072ba59f6920f66012a88f95331f055a SHA512 84b47dd29af602c0373821bbc8b6cdf61a792697f91f3d16e8dbee5519325ba8cd40689d1cfeae5701d44a76083f5df03e39c17cba6420976285e0ee34b5751f
 DIST gnome-control-center-gentoo-logo-dark.svg 14293 BLAKE2B 570e9326b8abe45849c31fd5cdb3fcfb1b2f18eac522f958928df5c3b747b0699f50a882f31cf7c0ae1f2138194f18596f738f42c942b57d340c53d46d82c551 SHA512 91227dafcf2091bb1568b0f9eec68b5e371ec64c9a6bc3605821f60d6bf2bd94dec0564f6a16a4a70d1db4d4df49fc25b6c910367bae3b85205cc609a9f2701b
 DIST gnome-control-center-gentoo-logo.svg 14288 BLAKE2B 371fc68b1015c8672db3e3858ae9077b1e3a9937e6add8690c39db36302ec031391c4d35e0c0b87094ca474a00c4187849e2d7111df34f43bc5bd7be52678527 SHA512 cf88933546de54ca15e2e830ac1086a78c4150f0ff59b8091e7e1cade5961c4e4cb83120a818a960b77841353ce3584ddc8f36b6edbde05543600283a143ad7b
diff --git a/gnome-base/gnome-control-center/gnome-control-center-47.7-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-47.7-r1.ebuild
deleted file mode 100644
index 312fff35acda..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-47.7-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 2023-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://apps.gnome.org/Settings"
-SRC_URI+=" https://dev.gentoo.org/~pacho/${PN}/${PN}-47.3-patchset.tar.xz"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg"
-# Logo is CC-BY-SA-2.5
-LICENSE="GPL-2+ CC-BY-SA-2.5"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-IUSE="X +bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos +geolocation networkmanager systemd test wayland"
-REQUIRED_USE="
-	^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime,
-#   but needs testing if handled gracefully enough
-
-RESTRICT="!test? ( test )"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional).
-# Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
-	gnome-online-accounts? (
-		x11-libs/gtk+:3[X?,wayland?]
-		>=net-libs/gnome-online-accounts-3.51.0:=
-	)
-	>=media-libs/libpulse-2.0[glib]
-	>=gui-libs/gtk-4.15.2:4[X?,wayland?]
-	>=gui-libs/libadwaita-1.6_beta:1
-	>=sys-apps/accountsservice-23.11.69
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.76.6:2
-	gnome-base/gnome-desktop:4=
-	>=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-47.0
-	dev-libs/libxml2:2=
-	>=sys-power/upower-0.99.8:=
-	>=dev-libs/libgudev-232
-	>=x11-libs/libX11-1.8
-	>=x11-libs/libXi-1.2
-	media-libs/libepoxy
-	>=app-crypt/gcr-4.1.0
-	>=dev-libs/libpwquality-1.2.2
-	>=sys-auth/polkit-0.114
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	networkmanager? (
-		>=net-libs/libnma-1.10.2
-		>=net-misc/networkmanager-1.24.0[modemmanager]
-		>=net-misc/modemmanager-0.7.990:=
-	)
-	bluetooth? ( net-wireless/gnome-bluetooth:3= )
-	input_devices_wacom? ( >=dev-libs/libwacom-1.4:= )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.3.0:=
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	>=sys-fs/udisks-2.1.8:2
-	app-crypt/libsecret
-	net-libs/gnutls:=
-	media-libs/gsound
-
-	x11-libs/pango
-"
-# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in
-# Settings/Sound/Output/Output Device, bug #814110
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
-	media-libs/libcanberra[pulseaudio,sound(+)]
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? (
-		app-admin/openrc-settingsd
-		sys-auth/elogind
-	)
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper
-	)
-	gnome-extra/tecla
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 )
-	)
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
-	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	>=dev-util/gdbus-codegen-2.80.5-r1
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep '
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-		x11-apps/setxkbmap
-	)
-"
-
-PATCHES=(
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Mark python tests with shebang executable, so that meson will launch them directly, instead
-	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
-	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/889008
-	# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2563
-	#
-	# Do not trust with LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
-	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
-
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dcups=$(usex cups enabled disabled)
-		-Ddeprecated-declarations=disabled
-		-Ddocumentation=true # manpage
-		-Dlocation-services=$(usex geolocation enabled disabled)
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		$(meson_use ibus)
-		-Dkerberos=$(usex kerberos enabled disabled)
-		$(meson_use networkmanager network_manager)
-		-Dprivileged_group=wheel
-		-Dsnap=false
-		$(meson_use test tests)
-		$(meson_use input_devices_wacom wacom)
-		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
-		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2,
-		# which is the same as $(get_bashcompdir)
-		-Dmalcontent=false # unpackaged
-		-Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg
-		-Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# tests are fragile to long socket paths, bug #921583
-	local -x TMPDIR=/tmp
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-	insinto /usr/share/pixmaps
-	doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg
-	doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-48.4-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-48.4-r1.ebuild
deleted file mode 100644
index 29d5bdfb266f..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-48.4-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 2023-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://apps.gnome.org/Settings"
-SRC_URI+=" https://dev.gentoo.org/~pacho/${PN}/${PN}-48.3-patchset.tar.xz"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg"
-# Logo is CC-BY-SA-2.5
-LICENSE="GPL-2+ CC-BY-SA-2.5"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-
-IUSE="X +bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos +geolocation networkmanager systemd test wayland"
-REQUIRED_USE="
-	^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime,
-#   but needs testing if handled gracefully enough
-
-RESTRICT="!test? ( test )"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional).
-# Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
-	gnome-online-accounts? (
-		x11-libs/gtk+:3[X,wayland]
-		>=net-libs/gnome-online-accounts-3.51.0:=
-	)
-	>=media-libs/libpulse-2.0[glib]
-	>=gui-libs/gtk-4.17.1:4[X,wayland]
-	>=gui-libs/libadwaita-1.7_alpha:1
-	>=sys-apps/accountsservice-23.11.69
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.76.6:2
-	gnome-base/gnome-desktop:4=
-	>=gnome-base/gnome-settings-daemon-48_alpha[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-48_alpha
-	dev-libs/libxml2:2=
-	>=sys-power/upower-1.90.6:=
-	>=dev-libs/libgudev-232
-	>=x11-libs/libX11-1.8
-	>=x11-libs/libXi-1.2
-	media-libs/libepoxy
-	>=app-crypt/gcr-4.1.0
-	>=dev-libs/libpwquality-1.2.2
-	>=sys-auth/polkit-0.114
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	networkmanager? (
-		>=net-libs/libnma-1.10.2
-		>=net-misc/networkmanager-1.24.0[modemmanager]
-		>=net-misc/modemmanager-0.7.990:=
-	)
-	bluetooth? ( net-wireless/gnome-bluetooth:3= )
-	input_devices_wacom? ( >=dev-libs/libwacom-1.4:= )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.3.0:=
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	>=sys-fs/udisks-2.1.8:2
-	app-crypt/libsecret
-	net-libs/gnutls:=
-	media-libs/gsound
-
-	x11-libs/pango
-"
-# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in
-# Settings/Sound/Output/Output Device, bug #814110
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
-	media-libs/libcanberra[pulseaudio,sound(+)]
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? (
-		app-admin/openrc-settingsd
-		sys-auth/elogind
-	)
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper
-	)
-	>=gnome-extra/tecla-47.0
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 )
-	)
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
-	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	>=dev-util/gdbus-codegen-2.80.5-r1
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep '
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-		x11-apps/setxkbmap
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Mark python tests with shebang executable, so that meson will launch them directly, instead
-	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
-	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/889008
-	# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2563
-	#
-	# Do not trust with LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	local emesonargs=(
-		$(meson_use bluetooth)
-		$(meson_use cups)
-		-Ddeprecated-declarations=disabled
-		-Ddocumentation=true # manpage
-		-Dlocation-services=$(usex geolocation enabled disabled)
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		$(meson_use ibus)
-		$(meson_use kerberos)
-		$(meson_use networkmanager network_manager)
-		-Dprivileged_group=wheel
-		-Dsnap=false
-		$(meson_use test tests)
-		$(meson_use input_devices_wacom wacom)
-		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
-		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2,
-		# which is the same as $(get_bashcompdir)
-		-Dmalcontent=false # unpackaged
-		-Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg
-		-Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# tests are fragile to long socket paths, bug #921583
-	local -x TMPDIR=/tmp
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-	insinto /usr/share/pixmaps
-	doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg
-	doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-48.7.ebuild b/gnome-base/gnome-control-center/gnome-control-center-49.9.ebuild
index 88212e597fe4..a363285f9e26 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-48.7.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-49.9.ebuild
@@ -8,15 +8,15 @@ inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
 
 DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
 HOMEPAGE="https://apps.gnome.org/Settings"
-SRC_URI+=" https://dev.gentoo.org/~pacho/${PN}/${PN}-48.3-patchset.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~pacho/${PN}/${PN}-49.5-patchset.tar.xz"
 SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg"
 SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg"
 # Logo is CC-BY-SA-2.5
 LICENSE="GPL-2+ CC-BY-SA-2.5"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
-IUSE="X +bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos +geolocation networkmanager systemd test wayland"
+IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos +geolocation networkmanager systemd test X"
 REQUIRED_USE="
 	^^ ( elogind systemd )
 " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime,
@@ -32,24 +32,22 @@ RESTRICT="!test? ( test )"
 # Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
 DEPEND="
 	gnome-online-accounts? (
-		x11-libs/gtk+:3[X,wayland]
+		x11-libs/gtk+:3[X?,wayland]
 		>=net-libs/gnome-online-accounts-3.51.0:=
 	)
 	>=media-libs/libpulse-2.0[glib]
-	>=gui-libs/gtk-4.17.1:4[X,wayland]
-	>=gui-libs/libadwaita-1.7_alpha:1
-	>=sys-apps/accountsservice-23.11.69
+	>=gui-libs/gtk-4.17.1:4[X?,wayland]
+	>=gui-libs/libadwaita-1.8_alpha:1
+	>=sys-apps/accountsservice-23.11.69:=
 	>=x11-misc/colord-0.1.34:0=
 	>=x11-libs/gdk-pixbuf-2.23.0:2
 	>=dev-libs/glib-2.76.6:2
 	gnome-base/gnome-desktop:4=
-	>=gnome-base/gnome-settings-daemon-48_alpha[colord,input_devices_wacom?]
+	>=gnome-base/gnome-settings-daemon-49
 	>=gnome-base/gsettings-desktop-schemas-48_alpha
 	dev-libs/libxml2:2=
 	>=sys-power/upower-1.90.6:=
 	>=dev-libs/libgudev-232
-	>=x11-libs/libX11-1.8
-	>=x11-libs/libXi-1.2
 	media-libs/libepoxy
 	>=app-crypt/gcr-4.1.0
 	>=dev-libs/libpwquality-1.2.2
@@ -61,9 +59,13 @@ DEPEND="
 	ibus? ( >=app-i18n/ibus-1.5.2 )
 	networkmanager? (
 		>=net-libs/libnma-1.10.2
-		>=net-misc/networkmanager-1.24.0[modemmanager]
+		>=net-misc/networkmanager-1.52.0[modemmanager]
 		>=net-misc/modemmanager-0.7.990:=
 	)
+	X? (
+		>=x11-libs/libX11-1.8
+		>=x11-libs/libXi-1.2
+	)
 	bluetooth? ( net-wireless/gnome-bluetooth:3= )
 	input_devices_wacom? ( >=dev-libs/libwacom-1.4:= )
 	kerberos? ( app-crypt/mit-krb5 )
@@ -106,8 +108,8 @@ RDEPEND="${DEPEND}
 		net-print/cups-pk-helper
 	)
 	>=gnome-extra/tecla-47.0
-	wayland? ( dev-libs/libinput )
-	!wayland? (
+	dev-libs/libinput
+	X? (
 		>=x11-drivers/xf86-input-libinput-0.19.0
 		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 )
 	)
@@ -124,7 +126,8 @@ BDEPEND="${PYTHON_DEPS}
 	app-text/docbook-xml-dtd:4.2
 	x11-base/xorg-proto
 	dev-libs/libxml2:2
-	>=dev-util/gdbus-codegen-2.80.5-r1
+	>=dev-util/blueprint-compiler-0.17
+	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
@@ -134,7 +137,6 @@ BDEPEND="${PYTHON_DEPS}
 		')
 		x11-apps/setxkbmap
 	)
-	wayland? ( dev-util/wayland-scanner )
 "
 
 PATCHES=(
@@ -176,9 +178,9 @@ src_configure() {
 		-Dsnap=false
 		$(meson_use test tests)
 		$(meson_use input_devices_wacom wacom)
-		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
 		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2,
 		# which is the same as $(get_bashcompdir)
+		$(meson_use X x11)
 		-Dmalcontent=false # unpackaged
 		-Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg
 		-Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg
diff --git a/gnome-base/gnome-session-openrc/Manifest b/gnome-base/gnome-session-openrc/Manifest
index 86edacb65748..61f7afff9c02 100644
--- a/gnome-base/gnome-session-openrc/Manifest
+++ b/gnome-base/gnome-session-openrc/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-session-openrc-49.1.tar.gz 16074 BLAKE2B 3d961d7976e850f0e81200e8026478b5762026c90c28141ef2445e8849cdae1ab6a266433e6a79e1b98cbae001456077cf1f68b8aeaa85e36d8104e72857e6c6 SHA512 746ac9b4b04c13f955e84a1511ca869997342c7c968c0cfbfb37926bbaaa6afe9f9cf30b692f629c30368813a76ef45e8927193f1f3bd1dc804d6d8e223530a9
 DIST gnome-session-openrc-49.2.tar.gz 16244 BLAKE2B 63c93dff4534e301b6b982be9430bf9f431d492e874ced901a4528ef407629da58edcdc9d8d1181ac15a9d3aab3af865d6ab4bec342665bb7837ab1f4c88377a SHA512 90ae0c748aea08aa7cc5b858e951c1825d77f28e7ba681e99e85249bed33214cbe793d85b09475b613ede23d49d8625359054d49e66bfe60f541c271f4b0b46f
+DIST gnome-session-openrc-49.3.tar.gz 17962 BLAKE2B 428ad5f7b9c9156e7f75b4baabf9eccb8649e2b478b8c7c1469db91dc90dbea5b675dd1fe05f07f1dd1293a166773cf7d73cc3e5e145e8d4ca24027b581705ce SHA512 c61f288831b6682bbbf6a1f8e70c3b61a14019a853026d52343ae80570221c1e5e44c5c1b111b128cc866e6f8d577e7ae1ef4824105d4ca270b5710fa025bce4
diff --git a/gnome-base/gnome-session-openrc/gnome-session-openrc-49.1-r2.ebuild b/gnome-base/gnome-session-openrc/gnome-session-openrc-49.3.ebuild
index 0ccf27832bef..88dba908c3f5 100644
--- a/gnome-base/gnome-session-openrc/gnome-session-openrc-49.1-r2.ebuild
+++ b/gnome-base/gnome-session-openrc/gnome-session-openrc-49.3.ebuild
@@ -31,6 +31,7 @@ BDEPEND="
 src_configure() {
 	local emesonargs=(
 		$(meson_use X x11)
+		-Dsecuredir=/$(get_libdir)/security
 	)
 	meson_src_configure
 }
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index db3c2043495a..09e0171529d9 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,6 +1,4 @@
-DIST gnome-shell-48.5.tar.xz 2237380 BLAKE2B cd531e41fdafface229870c685593506f8d6db1d89b0ee05327c38b0f0e7aadfc834daf7d1d5d544b456842f918b9b04841b5356b6ca017231f0e6a31780b2ff SHA512 c5ed53fd956f905f2129d26cd62055c86e3555dd0417caae8dd6e8d395be59a35193a388d33f23012588585a48110a083c8f036992f1bd21f461f0401f4b39c5
-DIST gnome-shell-48.7.tar.xz 2244996 BLAKE2B d0cee05aba38815ae87afc9efc252b934b4b2dc69bdd2acabf33891109ec0af7ea8e642db8884a5c2d1ad1b0b46a6bdc74c1effa6950b06a16c6b1e4d1486b6c SHA512 03405021f0e169bbc24dd35a795358f7f7d2a9fd9437adbdfa168ad1a74e4cdfcd3ca8415119b1fbd63a1092a58ccb0ea040bd783ef787911fd2d73b4ec3bcae
 DIST gnome-shell-48.8.tar.xz 2253148 BLAKE2B 2ce713f9cb9f9b3aa2091a7f8ab5ceb50e56e553d2f3a00d1cc7dd09c6a3c447a8183f7682a8abb87a376457ab1d317f50d6b3f6022fc3fa0fe14fa05aedadd1 SHA512 1dfdc942517785a514f806c299ede60a6299c7ae497f1d68b1847f276b4de51b30d8c0ca6802703030730add0a682eb0bc3a27cf6bd8a4a39f94ea133349b3e4
-DIST gnome-shell-49.6.tar.xz 2310480 BLAKE2B ee43239b58fcd7fdb04169128f81ae8f10ffd724c4057d1d1240ea1497842d8f592e7c2646b3a825015b42691d52bb0814b1db23c08a935221032104ac5ef8c1 SHA512 b5a9a416e787b17297fa919b0228eaf1ba2ecf3b251c8f3d585c7616f4de7776d491735e2f0d37001bc6cb420eff8f6eb5ce1b5dcda5076423ef7ab207380cf8
 DIST gnome-shell-49.7.tar.xz 2311204 BLAKE2B 24fc0e183992a3489eb72a3c10eda8c301e98a3c9c5102006d9ac95d4d958ccd65497e9ff68aa92331c4a9eb26a0afce4fd47ae2f0dd2cbe3d1ffc535bbb80a8 SHA512 542cd03c0c724aee4970fb68a27e852f9f04bd1a847952e811a9c359e3124954554de4347ffdd03b48c31cd3f01aebb3138329c628df7beacc7b59348af57495
 DIST gnome-shell-49.8.tar.xz 2311376 BLAKE2B ed6b2249cfafa06d18cee383a0ec90b8f1ad2c22afca29ed9037f346820de6d1b37b323a75368dd27b3a0b3c6d17d193939ba803cd495b4fd24db6d4a3551b28 SHA512 ccd6d9b31193dcca7a5bb596e8945bc9d19f00de1696b25b31288dab34ca3d95ab719aed56f34f303b35e62ae7b68d128ddfb550259b1782d3be163cd056ea50
+DIST gnome-shell-49.9.tar.xz 2311756 BLAKE2B a4acb09de28c94d0a0278b8ee58333c2bcb5f8c7d536480cd7b68bdf994ecddb6dfe8c60931b501bb0c08546b5b644e2e5be8a255ab40b90aebe70c02be78f03 SHA512 e5c4e15f55b0daca7cac368c25e78213fc9298d02400d9787f19d81e0c96365fce86f6821406aea92f6d2e958ef62b5e380a8eafa3c8b27f9b18de8c0d952aac
diff --git a/gnome-base/gnome-shell/gnome-shell-48.5.ebuild b/gnome-base/gnome-shell/gnome-shell-48.5.ebuild
deleted file mode 100644
index 9d56aa87f189..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-48.5.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-shell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-
-IUSE="X elogind gtk-doc +ibus +networkmanager pipewire systemd test wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-DEPEND="
-	>=gnome-extra/evolution-data-server-3.46.0:=
-	>=app-crypt/gcr-3.90.0:4=[introspection]
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/gobject-introspection-1.82.0-r2:=
-	>=dev-libs/gjs-1.73.1[cairo(+)]
-	>=gui-libs/gtk-4:4[X?,introspection,wayland?]
-	>=x11-wm/mutter-48.0:0/16[introspection,test?]
-	>=sys-auth/polkit-0.120_p20220509[introspection]
-	>=gnome-base/gsettings-desktop-schemas-48_beta[introspection]
-	>=app-i18n/ibus-1.5.19
-	dev-python/docutils
-	>=gnome-base/gnome-desktop-40.0:4=
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4[introspection]
-		net-libs/libnma[introspection]
-		>=app-crypt/libsecret-0.18
-	)
-	pipewire? ( >=media-video/pipewire-0.3.49:= )
-	systemd? (
-		>=sys-apps/systemd-246:=
-		>=gnome-base/gnome-desktop-3.34.2:3=[systemd]
-	)
-	elogind? ( >=sys-auth/elogind-237 )
-
-	app-arch/gnome-autoar
-	dev-libs/json-glib
-
-	>=app-accessibility/at-spi2-core-2.46:2[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2=
-	x11-libs/libX11
-
-	>=media-libs/libpulse-2[glib]
-	dev-libs/libical:=
-	x11-libs/libXext
-	>=x11-libs/libXfixes-5.0
-
-	gui-libs/gtk:4[introspection]
-
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	media-libs/libglvnd[X]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated from inspection of the output of:
-#  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
-# or
-#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
-# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
-# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
-# Each block:
-# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. xdg-utils needed for xdg-open, used by extension tool
-# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 7. IBus is needed for nls integration
-# 8. Adwaita font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632
-# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue:2.0[introspection]
-	media-libs/graphene[introspection]
-	>=x11-libs/pango-1.46.0[introspection]
-	net-libs/libsoup:3.0[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	gnome-base/librsvg:2[introspection]
-	gui-libs/libadwaita:1[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data
-	)
-	ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
-	media-fonts/adwaita-fonts
-
-	sys-apps/xdg-desktop-portal-gnome
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection(+)]
-	>=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
-"
-BDEPEND="
-	>=dev-build/meson-1.3.0
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.80.5-r1
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		>=dev-util/gi-docgen-2021.1
-		app-text/docbook-xml-dtd:4.5 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		sys-apps/dbus
-		x11-wm/mutter[test]
-	)
-"
-# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
-# dev-lang/sassc
-# app-text/asciidoc
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Hack in correct python shebang
-	sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
-	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
-
-	local emesonargs=(
-		$(meson_use pipewire camera_monitor)
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use test tests)
-		$(meson_use networkmanager)
-		$(meson_use networkmanager portal_helper)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file modifying XDG_DATA_DIRS
-	gnome2_environment_reset
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection]
-	optfeature "Browser extension integration" gnome-extra/gnome-browser-connector
-	optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
-	optfeature "Weather support" dev-libs/libgweather:4[introspection]
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-48.7.ebuild b/gnome-base/gnome-shell/gnome-shell-48.7.ebuild
deleted file mode 100644
index 506b90182f2c..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-48.7.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-shell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-IUSE="X elogind gtk-doc +ibus +networkmanager pipewire selinux systemd test wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-DEPEND="
-	>=gnome-extra/evolution-data-server-3.46.0:=
-	>=app-crypt/gcr-3.90.0:4=[introspection]
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/gobject-introspection-1.82.0-r2:=
-	>=dev-libs/gjs-1.81.2[cairo(+)]
-	>=gui-libs/gtk-4:4[X?,introspection,wayland?]
-	>=x11-wm/mutter-48.0:0/16[introspection,test?]
-	>=sys-auth/polkit-0.120_p20220509[introspection]
-	>=gnome-base/gsettings-desktop-schemas-48_beta[introspection]
-	>=app-i18n/ibus-1.5.19
-	dev-python/docutils
-	>=gnome-base/gnome-desktop-40.0:4=
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4[introspection]
-		net-libs/libnma[introspection]
-		>=app-crypt/libsecret-0.18
-	)
-	pipewire? ( >=media-video/pipewire-0.3.49:= )
-	systemd? (
-		>=sys-apps/systemd-246:=
-		>=gnome-base/gnome-desktop-3.34.2:3=[systemd]
-	)
-	elogind? ( >=sys-auth/elogind-237 )
-
-	app-arch/gnome-autoar
-	dev-libs/json-glib
-
-	>=app-accessibility/at-spi2-core-2.46:2[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2=
-	x11-libs/libX11
-
-	>=media-libs/libpulse-2[glib]
-	dev-libs/libical:=
-	x11-libs/libXext
-	>=x11-libs/libXfixes-5.0
-
-	gui-libs/gtk:4[introspection]
-
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	media-libs/libglvnd[X]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated from inspection of the output of:
-#  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
-# or
-#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
-# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
-# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
-# Each block:
-# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. xdg-utils needed for xdg-open, used by extension tool
-# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 7. IBus is needed for nls integration
-# 8. Adwaita font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632
-# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue:2.0[introspection]
-	media-libs/graphene[introspection]
-	>=x11-libs/pango-1.46.0[introspection]
-	net-libs/libsoup:3.0[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	gnome-base/librsvg:2[introspection]
-	gui-libs/libadwaita:1[introspection]
-
-	>=gnome-base/gnome-session-48.0-r2
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data
-	)
-	ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
-	selinux? ( sec-policy/selinux-wm )
-	media-fonts/adwaita-fonts
-
-	sys-apps/xdg-desktop-portal-gnome
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection(+)]
-	>=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
-"
-BDEPEND="
-	>=dev-build/meson-1.3.0
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.80.5-r1
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		>=dev-util/gi-docgen-2021.1
-		app-text/docbook-xml-dtd:4.5 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		sys-apps/dbus
-		x11-wm/mutter[test]
-	)
-"
-# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
-# dev-lang/sassc
-# app-text/asciidoc
-
-PATCHES=(
-	# https://bugs.gentoo.org/959295 gnome-session thinks gnome-shell died when built with USE="-X"
-	"${FILESDIR}"/notify-gnome-session-when-ready.patch
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Hack in correct python shebang
-	sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
-	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
-
-	local emesonargs=(
-		$(meson_use pipewire camera_monitor)
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use test tests)
-		$(meson_use networkmanager)
-		$(meson_use networkmanager portal_helper)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file modifying XDG_DATA_DIRS
-	gnome2_environment_reset
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection]
-	optfeature "Browser extension integration" gnome-extra/gnome-browser-connector
-	optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
-	optfeature "Weather support" dev-libs/libgweather:4[introspection]
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-49.6-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-49.9.ebuild
index b0e2be7412bb..b0944a390823 100644
--- a/gnome-base/gnome-shell/gnome-shell-49.6-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-49.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{13..14} )
 
-inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
+inherit flag-o-matic gnome.org gnome2-utils meson optfeature python-single-r1 xdg
 
 DESCRIPTION="Provides core UI functions for the GNOME desktop"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-shell"
@@ -30,9 +30,9 @@ DEPEND="
 	>=sys-auth/polkit-0.120_p20220509[introspection]
 	>=gnome-base/gsettings-desktop-schemas-49_alpha[introspection]
 	X? (
-	   x11-libs/libX11
-	   x11-libs/libXext
-	   >=x11-libs/libXfixes-5.0
+		x11-libs/libX11
+		x11-libs/libXext
+		>=x11-libs/libXfixes-5.0
 	)
 	>=app-i18n/ibus-1.5.19
 	dev-python/docutils
@@ -70,18 +70,20 @@ DEPEND="
 # Introspection deps generated from inspection of the output of:
 #  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
 # or
-#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
-# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
+#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | \
+#    awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
+# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as
+# desired.
 # Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
 # Each block:
 # 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
 # 2. gnome-session needed for shutdown/reboot/inhibitors/etc
 # 3. Control shell settings
 # 4. xdg-utils needed for xdg-open, used by extension tool
-# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 5. adwaita-icon-theme needed for various icons & arrows
 # 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
 # 7. IBus is needed for nls integration
-# 8. Adwaita font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 8. Adwaita font used in gnome-shell global CSS (if removing this make sure it's pulled in somehow for non-meta users)
 # 9. xdg-desktop-portal-gtk for various integration, e.g. #764632
 # 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
 RDEPEND="${DEPEND}
@@ -163,18 +165,36 @@ src_configure() {
 		$(meson_use test tests)
 		$(meson_use networkmanager)
 		$(meson_use networkmanager portal_helper)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+		$(meson_use systemd)
 	)
 	meson_src_configure
 }
 
 src_test() {
-	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file modifying XDG_DATA_DIRS
-	gnome2_environment_reset
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+	# Some tests fail when /var/tmp/portage is used as PORTAGE_TMPDIR
+	# due to PATH becoming too long: OSError: AF_UNIX path too long
+	# Intercept system mutter_dbusrunner.py to shorten the paths.
+
+	local custom_mutter="${T}/custom-mutter"
+	mkdir -p "${custom_mutter}" || die
+	cp -r "${EPREFIX}"/usr/share/mutter-[0-9]*/tests/* "${custom_mutter}/" || die
+
+	sed -i -e "s/prefix='mutter-testroot-'/prefix='m-'/g" \
+		-e "s/'xdg_runtime_dir'/'run'/g" \
+		"${custom_mutter}/mutter_dbusrunner.py" || die
+
+	sed -i -e "s|/usr/share/mutter-[0-9]*/tests|${custom_mutter}|g" \
+		"${BUILD_DIR}/tests/gnome-shell-dbus-runner.py" || die
+
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html || die
+		mv "${ED}"/usr/share/doc/{st,shell} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
 }
 
 pkg_postinst() {
@@ -187,9 +207,11 @@ pkg_postinst() {
 		elog "media-libs/mesa if you do not have hardware 3D setup."
 	fi
 
-	optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection]
+	optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] \
+		net-wireless/gnome-bluetooth:3[introspection]
 	optfeature "Browser extension integration" gnome-extra/gnome-browser-connector
-	optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
+	optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] \
+		media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
 	optfeature "Weather support" dev-libs/libgweather:4[introspection]
 }
 
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 36a57a832563..2e8bde4ac69b 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,2 +1 @@
-DIST gvfs-1.56.1.tar.xz 1266412 BLAKE2B e9249a89b7af4633dd407d068ae0b07258340bc2fc52d6bba4758ef26b876d06b5ecfda96d53194e69d1cd2b6587beab5104012bd6988a223149d4135a7cfef8 SHA512 09a6fef47c7689437bb6ddf98baf228c25731e82ac6165838c55c8255c2079795e5bb824983a691c976875b2a086c46246a65979c54fdebb41a241ad983c3c33
 DIST gvfs-1.58.4.tar.xz 1295412 BLAKE2B 19496fcf78f8a58a98e8d9206dc7f16af63c611f8f5dad091543584c1c9ff0bc4337c841eeec50d1e613a926474ce7ee71420b98ca2f152f41a5cdde4207742d SHA512 eec57586c95c382834256b52e4241236e369ed0d5bb2caeb40a63b207bdac2ccd530ca0c2e6b4453aa7debbd004099b24725e26aac583fecd5aa999208a50dc0
diff --git a/gnome-base/gvfs/gvfs-1.56.1-r3.ebuild b/gnome-base/gvfs/gvfs-1.56.1-r3.ebuild
deleted file mode 100644
index 86e04d005942..000000000000
--- a/gnome-base/gvfs/gvfs-1.56.1-r3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TMPFILES_OPTIONAL=1
-inherit gnome.org gnome2-utils meson systemd tmpfiles xdg
-
-DESCRIPTION="Virtual filesystem implementation for GIO"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="afp archive bluray cdda cdr elogind fuse google keyring gnome-online-accounts gphoto2 +http ios mtp nfs onedrive policykit samba systemd test +udev udisks zeroconf"
-RESTRICT="!test? ( test )"
-# elogind/systemd only relevant to udisks (in v1.38.1)
-REQUIRED_USE="
-	?? ( elogind systemd )
-	cdda? ( udev )
-	google? ( gnome-online-accounts )
-	gphoto2? ( udev )
-	onedrive? ( gnome-online-accounts )
-	mtp? ( udev )
-	udisks? ( udev )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.70.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.33.0
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	sys-apps/dbus
-	app-crypt/gcr:4=
-	policykit? (
-		>=sys-auth/polkit-0.114
-		sys-libs/libcap
-	)
-	http? (
-		dev-libs/libxml2:2=
-		>=net-libs/libsoup-3.0.0:3.0
-	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-	udev? ( >=dev-libs/libgudev-147:= )
-	fuse? (
-		>=sys-fs/fuse-3.0.0:3=
-		virtual/tmpfiles
-	)
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	systemd? ( >=sys-apps/systemd-206:0= )
-	elogind? ( >=sys-auth/elogind-229:0= )
-	ios? (
-		>=app-pda/libimobiledevice-1.2:=
-		>=app-pda/libplist-1:=
-	)
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
-	keyring? ( app-crypt/libsecret )
-	bluray? ( media-libs/libbluray:= )
-	mtp? (
-		virtual/libusb:1
-		>=media-libs/libmtp-1.1.15:=
-	)
-	samba? ( >=net-fs/samba-4[client] )
-	archive? ( app-arch/libarchive:= )
-	cdda? (
-		dev-libs/libcdio:0=
-		>=dev-libs/libcdio-paranoia-0.78.2:=
-	)
-	google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] )
-	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
-	nfs? ( >=net-fs/libnfs-1.9.8:= )
-	onedrive? (
-		>=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts]
-		>=net-libs/msgraph-0.2.0:0/0.1
-	)
-	virtual/openssh
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	>=dev-util/gdbus-codegen-2.80.5-r1
-	test? ( dev-libs/libgdata )
-"
-
-src_configure() {
-	local enable_logind="false"
-	if use systemd || use elogind; then
-		enable_logind="true"
-	fi
-
-	# currently HAVE_GCRYPT and linkage only used with afp; check it on big
-	# bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
-	local enable_gcrypt="false"
-	if use afp; then
-		enable_gcrypt="true"
-	fi
-
-	# currently HAVE_LIBUSB and linkage only used with mtp; check it on big
-	# bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
-	local enable_libusb="false"
-	if use mtp; then
-		enable_libusb="true"
-	fi
-
-	local emesonargs=(
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-		-Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		$(meson_use policykit admin)
-		$(meson_use ios afc)
-		$(meson_use afp)
-		$(meson_use archive)
-		$(meson_use cdr burn)
-		$(meson_use cdda)
-		-Ddeprecated_apis=false
-		$(meson_use zeroconf dnssd)
-		$(meson_use gnome-online-accounts goa)
-		$(meson_use google)
-		$(meson_use gphoto2)
-		$(meson_use http)
-		$(meson_use mtp)
-		$(meson_use nfs)
-		$(meson_use onedrive)
-		-Dsftp=true
-		$(meson_use samba smb)
-		$(meson_use udisks udisks2)
-		$(meson_use bluray)
-		$(meson_use fuse)
-		-Dgcr=true
-		-Dgcrypt=${enable_gcrypt}
-		$(meson_use udev gudev)
-		$(meson_use keyring keyring)
-		-Dlogind=${enable_logind}
-		-Dlibusb=${enable_libusb}
-		# wouldn't install any of it as of 1.38.1; some tests need it,
-		# but they aren't automated tests in 1.38.1
-		-Ddevel_utils=false
-		-Dinstalled_tests=false
-		-Dman=true
-		-Dprivileged_group=wheel
-		# wsdd not in gentoo repository
-		-Dwsdd=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	if use fuse; then
-		tmpfiles_process gvfsd-fuse-tmpfiles.conf
-	fi
-
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	gnome2_giomodule_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-	gnome2_giomodule_cache_update
-}