gentoo auto-resync : 26:01:2025 - 22:42:38

4 files changed, 22 insertions, 266 deletions

diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 7c0a7d820dc6..e8e9c861b352 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,10 +1,8 @@
 AUX default.pa 328 BLAKE2B 558dbedcb5a0f31e0bdc01ce21deaeacb4740dee998f8b2f947361745ea6680acf8662e426adf1d3f777af714c2fb7cf5ec74b2807187c37e2d8d896e863fa0d SHA512 4f0e9c38ae0c17b8f4ee6e37b87259676c4ff4e62fd315989c9e20012a8070c5b5571f835379639f76f157530495928cdc79265473478b1d9fe6d8ad0d64785d
 AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726e247aea1b3cad2a86c0b0e95c5f9953b680a072d244140615c38becbc605998a2be0ed3332d7b5ef802f55 SHA512 63428d4605d9f4f35445f364657c1d92818125a737add7bc5e5acab424beaf8ae5895368111cd2d1c03c75f5fd8b9538d8750ea732a0990b5b82507735850e4c
-AUX gdm-45.0.1-c99.patch 1112 BLAKE2B 1b1251a96f6016abdb1d3c6b4ba8127310e19c288b3e5876de77c87a8776a7416b2e8d711f2ede4995c9605222210488d8d7dca54d8bbd03f900ea718ddcfc48 SHA512 f2c3a0a8833ee3854cc10699fe2c849d3bce63262adb298c90d70a81d8599fd58096b5b3212ccb28749410510e9f636d7854d96469ee001916b56bee11fa3249
-DIST gdm-45.0.1.tar.xz 855004 BLAKE2B 1ec7250c49c40a31dbc21d0a141cbe6c2555c43d9a31aa6364b497812de0dab4785f509bf9f8b38febc449ada955a86a22b11986c30d9f9226042e2eb3c485e0 SHA512 f0c667dd5df034087e284c2ec1131b55a85cd9e832c15c2aff1637e1e36d4d62a7d86528a2e524bb2782ca7d7cc7cb9c34a9ce9bba688ad222af409e2eb69abe
 DIST gdm-46.2.tar.xz 931868 BLAKE2B 53b6efb6ae0a60592c6790c4ff676e6bdd7e8096eabb002f3c0d7ad1ba63498cd38799bf0d6606528d05a57b72630ce36bbd1c3e3810bc344df88c445a09c517 SHA512 29cb00b42b64313f63cbf33a0caf9ecaf43f38699983017966fba951b867742129ef150cd927d02add5f7c1c20049ba1301e5ee094caa54835dc12cf29c86210
+DIST gdm-47.0.tar.xz 936172 BLAKE2B 603c253888a2f10d5acf66c29b5892134375160c6edd8badbc6314c15b8ab82c38de7a7ef22c260e32d19ddb2893d8d3c498df8731a7c39ac2337f42faee8639 SHA512 5578b2839ec78ef0b155a6ef6b82384495ef0f3ceb49f4bc7c656bf9dafa95b260148c7fc9b8295b71d4a2d33f6fe6c4a47485cd9eba5c0929f0492ba06e0893
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-45.0.1-r2.ebuild 5813 BLAKE2B d9c32f5bbb3bb34c7c917e6d6145514953f75c78aaae7780179daeec096cf93dbcae873a18e26859b32f055c86277e54d2fef735d470afc8611315653d1d43bc SHA512 bbd0f006a767ccc517a73925cc38717bfff5e717668efc79a3224d4d834d83639bd3a5a091028d7a692ee2555148302448956b679984444a9ed73ebd7f89eacf
-EBUILD gdm-46.2-r1.ebuild 5741 BLAKE2B afcf4555f4d4d16561375cb9482a3fd309c633420e49834f6ad9c4b738ea6db9291bbf44334356e6595e111306643888ea65265dbc660885b8ed2ff06ebfc1a3 SHA512 4dfebfddad2422ad1ceabf441862a00d42212f06f38fe5f035f35e0c24a9259a9f54a57bd6f4ddf7f9d2ffeebcf9e220ad7cd80bc69716a1979a48db1ae6faa9
 EBUILD gdm-46.2-r2.ebuild 5782 BLAKE2B 847c64d7611304417e046c7c68b8c41cd90605469aad4c4513d33ea0edc6ae25cd9327fbc10d1b34bc2372c5c560644551a5a529bb29ffcaff3417d9481f28eb SHA512 1c03f8c5222d52e7017f1902b5f8cb9cc5831e60a2cef49d76cd99732ff0f4744e10484fd400764babad78a7196ffc289468ffb8cfa81f5b28dcd698e738ccf3
+EBUILD gdm-47.0.ebuild 5724 BLAKE2B 1b0a84e9cd43c045d46a736bc5f586524645e5efc005d696ec41d65aa9588afdf1d57d5f42fef24f4b3760a5e60e05b65401fc1d32205ff61557c829e3057341 SHA512 378137bcb4227a52dbc3e87ef2f2cd65db0a3c4030d2f91ce348880c915373f260bc7bb17d7fbeeb2744ac9964e842ebdc5df4bf067f120dfb05c561fb03477f
 MISC metadata.xml 775 BLAKE2B c5e6f026d1a42133c98e450ac82e943485e81d42ead7e632d9c8610442d5a138393bb1c0e97827f2b450719ba0450471eff7d04908429acd63818cbea6f49144 SHA512 562bea1d24550c5de69a15102f259e05498f1bd6b7d2a40bd4997546dd373e9fe9911a7873ee3b3c16c149f891766eb5bdfbefa3aa6589f9c8425f7d3b65ced0
diff --git a/gnome-base/gdm/files/gdm-45.0.1-c99.patch b/gnome-base/gdm/files/gdm-45.0.1-c99.patch
deleted file mode 100644
index 2d0f5b9cc0eb..000000000000
--- a/gnome-base/gdm/files/gdm-45.0.1-c99.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/919081
-https://gitlab.gnome.org/GNOME/gdm/-/issues/893
-https://gitlab.gnome.org/GNOME/gdm/-/commit/08ef19e848176e58511f1a66992b5a26cb3c51a2
-
-From 08ef19e848176e58511f1a66992b5a26cb3c51a2 Mon Sep 17 00:00:00 2001
-From: Alessandro Bono <alessandro.bono369@gmail.com>
-Date: Wed, 1 Nov 2023 12:35:44 +0100
-Subject: [PATCH] gdm-session: Pass the correct pointer type
-
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -3045,7 +3045,7 @@ free_pending_worker_connection (GdmSession      *self,
-         worker_manager_interface = g_object_get_data (G_OBJECT (connection),
-                                                       "gdm-dbus-worker-manager-interface");
-         if (worker_manager_interface != NULL) {
--                g_dbus_interface_skeleton_unexport (worker_manager_interface);
-+                g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (worker_manager_interface));
-                 g_object_set_data (G_OBJECT (connection),
-                                    "gdm-dbus-worker-manager-interface",
-                                    NULL);
--- 
-GitLab
diff --git a/gnome-base/gdm/gdm-45.0.1-r2.ebuild b/gnome-base/gdm/gdm-45.0.1-r2.ebuild
deleted file mode 100644
index 751155c45338..000000000000
--- a/gnome-base/gdm/gdm-45.0.1-r2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop flag-o-matic gnome2 meson pam readme.gentoo-r1 systemd udev
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM https://gitlab.gnome.org/GNOME/gdm"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit bluetooth-sound branding elogind fprint plymouth selinux systemd tcpd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# keyutils is automagic dep that makes autologin unlock login keyring
-# when all the passwords match (disk encryption, user pw and login keyring)
-# dbus-run-session used at runtime
-COMMON_DEPEND="
-	virtual/udev
-	>=dev-libs/libgudev-232:=
-	>=dev-libs/glib-2.56:2
-	>=x11-libs/gtk+-2.91.1:3
-	|| (
-		media-libs/libcanberra-gtk3
-		>=media-libs/libcanberra-0.4[gtk3(-)]
-	)
-	>=sys-apps/accountsservice-0.6.35
-	x11-libs/libxcb
-	sys-apps/keyutils:=
-	selinux? ( sys-libs/libselinux )
-
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-base/xorg-server[-minimal]
-	x11-libs/libXdmcp
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-	elogind? ( >=sys-auth/elogind-239.3[pam] )
-
-	plymouth? ( sys-boot/plymouth )
-	audit? ( sys-process/audit )
-
-	sys-libs/pam
-	sys-auth/pambase[elogind?,systemd?]
-
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	sys-apps/dbus
-
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	>=dev-libs/gobject-introspection-0.9.12:=
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-RDEPEND="${COMMON_DEPEND}
-	acct-group/gdm
-	acct-user/gdm
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	x11-apps/xhost
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		gnome-extra/mousetweaks
-	)
-	fprint? ( sys-auth/fprintd[pam] )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=gnome-base/dconf-0.20
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( >=dev-libs/check-0.9.4 )
-	app-text/yelp-tools
-"
-
-DOC_CONTENTS="
-	To start GDM at boot with systemd, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	To start GDM at boot with OpenRC, set DISPLAYMANAGER=\"gdm\"\n
-	in /etc/conf.d/display-manager and enable the display-manager service:\n
-	# rc-update add display-manager\n
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-45.0.1-c99.patch
-)
-
-src_prepare() {
-	default
-
-	# Show logo when branding is enabled
-	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
-}
-
-src_configure() {
-	# bug #944223
-	append-cflags -std=gnu17
-
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	# gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
-	# saves on memory. However this means if we don't start on VT1, gdm doesn't start up
-	# before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1,
-	# so lets try always having it in VT1 and see if that is an issue for people before
-	# hacking up workarounds for the initial start case.
-	local emesonargs=(
-		--localstatedir /var
-
-		-Ddefault-pam-config=exherbo
-		-Dgdm-xsession=true
-		-Dgroup=gdm
-		-Dipv6=true
-		$(meson_feature audit libaudit)
-		-Dlogind-provider=$(usex systemd systemd elogind)
-		-Dpam-mod-dir=$(getpam_mod_dir)
-		$(meson_feature plymouth)
-		-Drun-dir=/run/gdm
-		$(meson_feature selinux)
-		$(meson_use systemd systemd-journal)
-		$(meson_use tcpd tcp-wrappers)
-		-Dudev-dir=$(get_udevdir)/rules.d
-		-Duser=gdm
-		-Duser-display-server=true
-		$(meson_use wayland wayland-support)
-		-Dxdmcp=enabled
-	)
-
-	if use elogind; then
-		emesonargs+=(
-			-Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
-			-Dsystemdsystemunitdir=no
-			-Dsystemduserunitdir=no
-		)
-	else
-		emesonargs+=(
-			-Dinitial-vt=1
-			-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
-			-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	if ! use bluetooth-sound ; then
-		# Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
-		# bug #679526
-		insinto /var/lib/gdm/.config/pulse
-		doins "${FILESDIR}"/default.pa
-	fi
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local d ret
-
-	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing ${EROOT}/var/lib/gdm ownership"
-	chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
-	for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
-		[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	systemd_reenable gdm.service
-	readme.gentoo_print_elog
-
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/gnome-base/gdm/gdm-46.2-r1.ebuild b/gnome-base/gdm/gdm-47.0.ebuild
index abf4cbfb61f7..0ad8a60ead62 100644
--- a/gnome-base/gdm/gdm-46.2-r1.ebuild
+++ b/gnome-base/gdm/gdm-47.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit desktop flag-o-matic gnome2 meson pam readme.gentoo-r1 systemd udev
+inherit desktop gnome.org gnome2-utils meson pam readme.gentoo-r1 systemd udev xdg
 
 DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM https://gitlab.gnome.org/GNOME/gdm"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gdm"
 
 SRC_URI="${SRC_URI}
 	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
@@ -21,10 +21,10 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
-IUSE="accessibility audit bluetooth-sound branding elogind fprint plymouth selinux systemd tcpd test wayland"
+IUSE="accessibility audit bluetooth-sound branding elogind fprint plymouth selinux systemd tcpd test wayland +X"
 
 RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
+REQUIRED_USE="^^ ( elogind systemd ) || ( wayland X )"
 
 # dconf, dbus and g-s-d are needed at install time for dconf update
 # keyutils is automagic dep that makes autologin unlock login keyring
@@ -34,21 +34,19 @@ COMMON_DEPEND="
 	virtual/udev
 	>=dev-libs/libgudev-232:=
 	>=dev-libs/glib-2.68:2
-	>=x11-libs/gtk+-2.91.1:3
 	>=dev-libs/json-glib-1.2.0
-	|| (
-		media-libs/libcanberra-gtk3
-		>=media-libs/libcanberra-0.4[gtk3(-)]
-	)
 	>=sys-apps/accountsservice-0.6.35
-	x11-libs/libxcb
 	sys-apps/keyutils:=
 	selinux? ( sys-libs/libselinux )
 
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-base/xorg-server[-minimal]
-	x11-libs/libXdmcp
+	X? (
+		x11-libs/libxcb
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-base/xorg-server[-minimal]
+		x11-libs/libXdmcp
+		>=x11-libs/gtk+-2.91.1:3
+	)
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 
 	systemd? ( >=sys-apps/systemd-186:0=[pam] )
@@ -121,9 +119,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug #944223
-	append-cflags -std=gnu17
-
 	# --with-initial-vt=7 conflicts with plymouth, bug #453392
 	# gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
 	# saves on memory. However this means if we don't start on VT1, gdm doesn't start up
@@ -149,7 +144,8 @@ src_configure() {
 		-Duser=gdm
 		-Duser-display-server=true
 		$(meson_use wayland wayland-support)
-		-Dxdmcp=enabled
+		$(meson_use X x11-support)
+		$(meson_feature X xdmcp)
 	)
 
 	if use elogind; then
@@ -193,7 +189,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_pkg_postinst
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
 	local d ret
 
 	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
@@ -212,5 +210,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
 	udev_reload
 }