gnome-base/gdm: Drop old versions

Bug: https://bugs.gentoo.org/762460
Signed-off-by: Matt Turner <mattst88@gentoo.org>

4 files changed, 0 insertions, 450 deletions

diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index d8fd955b0634..b604e3eaf4bc 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,3 +1,2 @@
-DIST gdm-3.36.4.tar.xz 1235796 BLAKE2B eeac6c3c95993d7a75eecd03b51f0519b2f899eaecce8767dbab01eead68bddde21edc999eaf6b7ce747084ac9f88ab71cd7bf602e3bdc5bfe09038e3b01ad3a SHA512 ee8a4ae4a1c4846e4d52fda0b115dfc79ef76b78a2349977767e4212910b5ad331b908601f252292a8a944973372d1dce3124d9ccb8a2519a98d0e4813a6ec61
 DIST gdm-40.0.tar.xz 800296 BLAKE2B 9c2038758cec09f13c18bd79d431e82a29fb1a2b8ab099498a0b8d920cb93896abceab9157edae8cc15312e03d21eb36b649c2cc8761f9af5fec387c5f28a261 SHA512 b20d02f8a80f6aff8909a69c6c621c20c5aa1b25cfedd68bf95faaaa56d5f7cd5d607d1a7388b97aa06510684f1e9e474248042a00203f496c39930e001bb64c
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
diff --git a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
deleted file mode 100644
index bfd8398af2b3..000000000000
--- a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c0581264d5e2b412aa27dc30623512b461024e4f Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 2 Nov 2010 23:19:31 +0100
-Subject: [PATCH 2/4] ssh-agent handling must be done at xinitrc.d
-
-Gentoo bug: #220603
----
- data/Xsession.in | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/data/Xsession.in b/data/Xsession.in
-index 201be92..88f1fd9 100755
---- a/data/Xsession.in
-+++ b/data/Xsession.in
-@@ -191,14 +191,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
-     done
- fi
- 
--# add ssh-agent if found
--sshagent="`gdmwhich ssh-agent`"
--if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
--    command="$sshagent -- $command"
--elif [ -z "$sshagent" ] ; then
--    echo "$0: ssh-agent not found!"
--fi
--
- echo "$0: Setup done, will execute: $command"
- 
- eval exec $command
--- 
-1.8.5.1
-
diff --git a/gnome-base/gdm/files/gdm-CanGraphical-wait.patch b/gnome-base/gdm/files/gdm-CanGraphical-wait.patch
deleted file mode 100644
index 206219d8e059..000000000000
--- a/gnome-base/gdm/files/gdm-CanGraphical-wait.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 198d6392ff595f330430d92d5c380cd993be73d7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Tue, 16 Oct 2018 20:59:23 +0200
-Subject: [PATCH] gdm3.service: wait for drm device before trying to start it
-
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1794280
-Forwarded: not-needed
----
- configure.ac             |   1 +
- data/Makefile.am         |   1 +
- data/gdm.service.in      |   1 +
- utils/Makefile.am        |   9 ++++
- utils/gdm-wait-for-drm.c | 101 +++++++++++++++++++++++++++++++++++++++
- 5 files changed, 113 insertions(+)
- create mode 100644 utils/gdm-wait-for-drm.c
-
-diff --git a/configure.ac b/configure.ac
-index a8dcfbef..2755c100 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,6 +76,7 @@ PKG_CHECK_MODULES(COMMON,
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-unix-2.0 >= $GLIB_REQUIRED_VERSION
-+        gudev-1.0
- )
- AC_SUBST(COMMON_CFLAGS)
- AC_SUBST(COMMON_LIBS)
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 162074f1..5f426fea 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -204,6 +204,7 @@ systemdsystemunit =
- gdm.service: $(srcdir)/gdm.service.in
- 	$(AM_V_GEN)sed \
- 		-e 's,[@]sbindir[@],$(sbindir),g' \
-+		-e 's,[@]libexecdir[@],$(libexecdir),g' \
- 		-e 's,[@]GDM_INITIAL_VT[@],$(GDM_INITIAL_VT),g' \
- 		-e 's,[@]LANG_CONFIG_FILE[@],$(LANG_CONFIG_FILE),g' \
- 		-e 's,[@]PLYMOUTH_QUIT_SERVICE[@],$(PLYMOUTH_QUIT_SERVICE),g' \
-diff --git a/data/gdm.service.in b/data/gdm.service.in
-index 57d60ada..f7630ec4 100644
---- a/data/gdm.service.in
-+++ b/data/gdm.service.in
-@@ -30,6 +30,7 @@ StandardError=inherit
- EnvironmentFile=-@LANG_CONFIG_FILE@
- ExecReload=/bin/kill -SIGHUP $MAINPID
- KeyringMode=shared
-+ExecStartPre=@libexecdir@/gdm-wait-for-drm
- 
- [Install]
- Alias=display-manager.service
-diff --git a/utils/Makefile.am b/utils/Makefile.am
-index babe890b..3eb43c30 100644
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -35,6 +35,7 @@ bin_PROGRAMS = \
- 
- libexec_PROGRAMS = \
- 	gdm-disable-wayland	\
-+	gdm-wait-for-drm	\
- 	$(NULL)
- 
- gdmflexiserver_LDADD =		\
-@@ -63,6 +64,14 @@ gdm_disable_wayland_SOURCES =	\
- 	gdm-disable-wayland.c	\
- 	$(NULL)
- 
-+gdm_wait_for_drm_LDADD =	\
-+	$(COMMON_LIBS)		\
-+	$(NULL)
-+
-+gdm_wait_for_drm_SOURCES =	\
-+	gdm-wait-for-drm.c	\
-+	$(NULL)
-+
- CLEANFILES = 			\
- 	$(NULL)
- 
-diff --git a/utils/gdm-wait-for-drm.c b/utils/gdm-wait-for-drm.c
-new file mode 100644
-index 00000000..aeffb3c0
---- /dev/null
-+++ b/utils/gdm-wait-for-drm.c
-@@ -0,0 +1,101 @@
-+#include <glib.h>
-+#include <gudev/gudev.h>
-+
-+/*
-+ * Workaround for LP: #1794280.
-+ *
-+ * That bug is because the DRM device isn't ready by the time GDM tries to
-+ * start wayland/X.
-+ * This is a script to add to ExecStartPre of gdm.service. It does the
-+ * following:
-+ *
-+ * 1. Enumerate drm devices from udev, looking for a DRM master. If found,
-+ *    exit.
-+ * 2. Connect to the 'uevent' signal of gudev, watching for the same to be
-+ *    added. Again exit if any are found.
-+ * 3. If, after 10 seconds, we haven't seen anything, try to proceed anyway as
-+ *    a failsafe.
-+ */
-+
-+static gboolean
-+handle_device (GUdevDevice *device)
-+{
-+        const gchar * const * tags;
-+        tags = g_udev_device_get_tags (device);
-+        g_debug ("%s\n", g_udev_device_get_name (device));
-+        if (g_strv_contains (tags, "master-of-seat"))
-+        {
-+                g_debug ("    is seat master\n");
-+                return TRUE;
-+        }
-+
-+        return FALSE;
-+}
-+
-+static void
-+uevent_cb (GUdevClient *client G_GNUC_UNUSED,
-+           gchar       *action,
-+           GUdevDevice *device,
-+           gpointer     user_data)
-+{
-+        GMainLoop *loop;
-+
-+        g_debug ("uevent action: %s\n", action);
-+
-+        loop = (GMainLoop *) user_data;
-+
-+        if (g_strcmp0 (action, "add") == 0)
-+        {
-+                if (handle_device (device))
-+                {
-+                        g_debug ("        this is good\n");
-+                        g_main_loop_quit (loop);
-+                }
-+                else
-+                {
-+                        g_debug ("        this is bad\n");
-+                }
-+        }
-+}
-+
-+int
-+main()
-+{
-+        const gchar * const subsystems[] = { "drm", NULL };
-+
-+        g_autoptr(GList) devices = NULL;
-+        g_autoptr(GMainLoop) loop = NULL;
-+        g_autoptr(GUdevClient) udev_client = NULL;
-+        g_autoptr(GUdevEnumerator) enumerator = NULL;
-+
-+        loop = g_main_loop_new (NULL, FALSE);
-+
-+        udev_client = g_udev_client_new (subsystems);
-+        enumerator = g_udev_enumerator_new (udev_client);
-+        g_udev_enumerator_add_match_is_initialized (enumerator);
-+        g_udev_enumerator_add_match_subsystem (enumerator, "drm");
-+
-+        devices = g_udev_enumerator_execute (enumerator);
-+
-+        g_debug ("enumerating devices...\n");
-+
-+        for (GList *l = devices; l != NULL; l = l->next)
-+        {
-+                g_autoptr(GUdevDevice) device = G_UDEV_DEVICE (l->data);
-+
-+                if (handle_device (device))
-+                {
-+                        g_debug ("        good enough for gdm\n");
-+                        return EXIT_SUCCESS;
-+                }
-+        }
-+
-+        g_signal_connect (udev_client, "uevent", G_CALLBACK (uevent_cb), loop);
-+
-+        /* after 10 seconds we try anyway */
-+        g_timeout_add_seconds (10, (GSourceFunc) g_main_loop_quit, loop);
-+
-+        g_main_loop_run (loop);
-+
-+        return EXIT_SUCCESS;
-+}
--- 
-2.17.0
-
diff --git a/gnome-base/gdm/gdm-3.36.4-r1.ebuild b/gnome-base/gdm/gdm-3.36.4-r1.ebuild
deleted file mode 100644
index 26581e5d1fa3..000000000000
--- a/gnome-base/gdm/gdm-3.36.4-r1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit desktop gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/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 +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# 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
-# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.44:2
-	dev-libs/libgudev
-	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	>=media-libs/fontconfig-2.5.0:1.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-apps/dbus
-	>=sys-apps/accountsservice-0.6.35
-
-	x11-base/xorg-server
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libxcb
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	sys-libs/pam
-	sys-apps/keyutils:=
-	elogind? ( >=sys-auth/elogind-239.3[pam] )
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-
-	sys-auth/pambase[elogind?,systemd?]
-
-	audit? ( sys-process/audit )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-# gnome-session-3.6 needed to avoid freezing with orca
-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
-" # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup)
-
-DOC_CONTENTS="
-	To make GDM start at boot with systemd, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	To make GDM start at boot with OpenRC, edit /etc/conf.d to have
-	DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
-	# rc-update add xdm
-	\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
-"
-
-src_prepare() {
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Support pam_elogind.so in gdm-launch-environment.pam
-	eapply "${FILESDIR}/pam-elogind.patch"
-
-	# Wait 10 seconds for a DRM master with systemd. Workaround for gdm not waiting for CanGraphical=yes property on the seat. Bug #613222
-	eapply "${FILESDIR}/gdm-CanGraphical-wait.patch" # needs eautoreconf
-
-	# Show logo when branding is enabled
-	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	# Xevie is obsolete, bug #482304
-
-	# --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.
-	# ! use plymouth && myconf="${myconf} --with-initial-vt=7"
-	local myconf=(
-		--enable-gdm-xsession
-		--enable-user-display-server
-		--with-run-dir=/run/gdm
-		--localstatedir="${EPREFIX}"/var
-		--disable-static
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-default-pam-config=exherbo
-		--with-pam-mod-dir=$(getpam_mod_dir)
-		--with-udevdir=$(get_udevdir)
-		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec
-		--without-xevie
-		$(use_enable systemd systemd-journal)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_with audit libaudit)
-		$(use_enable ipv6)
-		$(use_with plymouth)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_enable wayland wayland-support)
-		$(use_with xinerama)
-	)
-
-	if use elogind; then
-		local pkgconfig="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			--with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
-			SYSTEMD_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
-			SYSTEMD_LIBS="$(${pkgconfig} --libs "libelogind")"
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
-	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
-
-	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
-}