Attachment #226511 for bug #312017

Line 0 Link Here

(-)a/gnome-base/gdm/Manifest (+10 lines)
	1	AUX 49-keychain 181 RMD160 32ce131e93fc2d8640edee72ad42124537860156 SHA1 b4518f9d8ba65d0cf4d64ded844e59be343088d3 SHA256 d73e07847bfa6ac69938aa309f5c137d4c36248cedf9834db1315ba1b2b87140
	2	AUX 50-ssh-agent 243 RMD160 14327252dc1da75bdb49380960434a613b28cfa6 SHA1 e808be7a34324b269d493585990f134e82cc722a SHA256 f0790148b975ef1e7a37ffe8f5d90f943746f0a3bcf9d7fad8500219e2114042
	3	AUX gdm-2.26.1-libxklavier4.patch 1842 RMD160 cae9308944ff4118bd06e411b11e1df6b97fdf99 SHA1 0fbb97f83b980c9bfaab1e95108d9462640c9134 SHA256 7978417318e80628939cdbf62d59ba56cb15242748cb89b5a8b6c02b5265173a
	4	AUX gdm-2.29.92-custom-session.patch 1092 RMD160 2e2cbf5610f8a3df6c04eb8b5c319146ad9d1a81 SHA1 f6f783016f36d4f61d9326e68800aa341f5a73b9 SHA256 bdde8eafaf8f44f90ba3b3d4e3cad5b53a74ed6f922b8dc894c33f7af8fdd2aa
	5	AUX gdm-2.29.92-fix-daemonize-regression.patch 3938 RMD160 c6235babd7aeb6cbcf0e20c459da6f5b4322a0d9 SHA1 36dfa1acf5190c461a19270e284af3bc77c6b092 SHA256 c84196666794d56c9dadb4cb1aa8a3c23c5b7225e5c45ffb841cd2ecc2e6d96f
	6	AUX gdm-2.30.0-include.patch 705 RMD160 3e56f7f1139bf5dd8660d4c7b5e4c7bd70aa3525 SHA1 d6f1910e685f4d9757495b0ecd5b4711e8949813 SHA256 b6dd686ce43f63c8e5b252350a39b32b8ab7999a64a7a7f1d8aeb5d8256aee09
	7	DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4548b9f1556d3 SHA1 28ceedb42440fdb50dffa7e69b18f213b00e3935 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9
	8	DIST gdm-2.26-gentoo-patches.tar.bz2 4175 RMD160 356cd339b733e41c504bf2c951a322da205439be SHA1 a58adde0bb70b56d4b61cd5bf0ca81fbbfa44c69 SHA256 e6ad1a4995eb622cf74e5e897ac0588dff122446af5e1e52f165fd8bccb105d2
	9	DIST gdm-2.30.0.tar.bz2 2291133 RMD160 246d02fb64cfd4f77380722a0bbc1e3062a19a02 SHA1 0251222195d3558993e3144b78d5bc718986672b SHA256 ac2c367766b8fa20ebeb41033931fc4d91482ad3d377823f1c7ad84eee12dc15
	10	EBUILD gdm-2.30.0.ebuild 5491 RMD160 5eb081ee7da9896d6ea5df7ff6c96f8aa7a2bf9c SHA1 ac9cd1aebec0420676d46e417e08308ee37848cc SHA256 0394879979b674b4e313c958628e6923279eff9f4c29f9e667ea84a51140283c

Line 0 Link Here

(-)a/gnome-base/gdm/files/49-keychain (+9 lines)
	1	#!/bin/bash
	2
	3	# source keychain variables
	4
	5	keychain="`which keychain`"
	6	if [ -n "$keychain" ] && [ -x "$keychain" ] && [ -f "$HOME/.bash_profile" ]
	7	then
	8	. "${HOME}/.bash_profile"
	9	fi

Line 0 Link Here

(-)a/gnome-base/gdm/files/50-ssh-agent (+10 lines)
	1	#!/bin/sh
	2
	3	# add ssh-agent if found
	4
	5	sshagent="`which ssh-agent`"
	6	if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
	7	command="$sshagent -- $command"
	8	elif [ -z "$sshagent" ] ; then
	9	echo "$0: ssh-agent not found!"
	10	fi




From 90267c7f7afc73b27193632ec4af2c5360fab85a Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Tue, 21 Jul 2009 00:56:37 +0200
Subject: [PATCH] Add support for libxklavier-4

---
 configure.ac                     |   10 +++++++---
 gui/simple-greeter/gdm-layouts.c |    4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index d4a44d5..068e45c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,9 +114,13 @@ AC_ARG_ENABLE([libxklavier],
 have_libxklavier=no
 if test "x$enable_libxklavier" = "xyes"; then
    PKG_CHECK_MODULES(LIBXKLAVIER,
-	  libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
-          have_libxklavier=yes,
-          have_libxklavier=no)
+	  libxklavier >= 4,
+	  [AC_DEFINE(HAVE_XKL_4, [1], [lixklavier-4 support])
+	   have_libxklavier=yes],
+	  [PKG_CHECK_MODULES(LIBXKLAVIER,
+		libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
+		have_libxklavier=yes,
+		have_libxklavier=no)])
    if test "x$have_libxklavier" = "xyes" ; then
       AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier])
    fi
diff --git a/gui/simple-greeter/gdm-layouts.c b/gui/simple-greeter/gdm-layouts.c
index dc35094..97e1e08 100644
--- a/gui/simple-greeter/gdm-layouts.c
+++ b/gui/simple-greeter/gdm-layouts.c
@@ -52,7 +52,11 @@ init_xkl (void)
                 engine = xkl_engine_get_instance (GDK_DISPLAY ());
                 xkl_engine_backup_names_prop (engine);
                 config_registry = xkl_config_registry_get_instance (engine);
+#if HAVE_XKL_4
+                xkl_config_registry_load (config_registry, FALSE);
+#else
                 xkl_config_registry_load (config_registry);
+#endif
 
                 initial_config = xkl_config_rec_new ();
                 if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
-- 
1.6.3.3





---
 fix custom sessions (see bug #216984, work done by Gilles, I'm just committing)

diff -ru gdm-2.29.92.orig/work/gdm-2.29.92/data/Xsession.in gdm-2.29.92/work/gdm-2.29.92/data/Xsession.in
--- gdm-2.29.92.orig/work/gdm-2.29.92/data/Xsession.in	2010-03-30 02:15:18.000000000 +0200

From b9f261de75356be6e4ee94c0cc53f2edbd8fe4d2 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue, 14 Oct 2008 07:06:21 -0700
Subject: [PATCH] Fork gdm-binary, except when -nodaemon is used

gdm-binary now forks and the parent terminates, except when the
-nodaemon or --nodaemon options are used. This provides compatibility
with xdm. Fixes bug #550170.

Updated for gdm-2.29.92 by Michael Weber gentoo at xmw dot de 20100330 

diff -ru gdm-2.29.92.orig/work/gdm-2.29.92/daemon/main.c gdm-2.29.92/work/gdm-2.29.92/daemon/main.c
--- gdm-2.29.92.orig/work/gdm-2.29.92/daemon/main.c	2010-03-30 02:02:05.000000000 +0200

--- gdm-2.30.0/daemon/simple-slave-main.c	2010-03-29 23:42:03.000000000 +0200

# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $

EAPI="2"

inherit eutils pam gnome2 autotools

DESCRIPTION="GNOME Display Manager"
HOMEPAGE="http://www.gnome.org/projects/gdm/"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"

IUSE_LIBC="elibc_glibc"
IUSE="accessibility +consolekit debug ipv6 gnome-keyring profile selinux tcpd test xinerama +xklavier $IUSE_LIBC"

# Name of the tarball with gentoo specific files
GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"

SRC_URI="${SRC_URI}
	mirror://gentoo/${PN}-2.26-gentoo-patches.tar.bz2
	mirror://gentoo/${GDM_EXTRA}.tar.bz2"

RDEPEND="app-text/iso-codes
	>=dev-libs/dbus-glib-0.74
	>=dev-libs/glib-2.22.0
	>=gnome-base/libglade-2
	>=gnome-base/gconf-2.6.1
	>=gnome-base/gnome-panel-2
	>=media-libs/fontconfig-2.5.0
	>=media-libs/libcanberra-0.4[gtk]
	>=sys-apps/devicekit-power-008
	virtual/pam
	x11-apps/sessreg
	>=x11-libs/gtk+-2.12.0
	x11-libs/libX11
	x11-libs/libXau
	x11-libs/libXdmcp
	x11-libs/libXi
	>=x11-libs/pango-1.3
	consolekit? (
		sys-auth/consolekit
		>=sys-apps/hal-0.5.12_rc1-r1[consolekit] )
	accessibility? ( x11-libs/libXevie )
	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
	selinux? ( sys-libs/libselinux )
	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
	xinerama? ( x11-libs/libXinerama )
	xklavier? ( >=x11-libs/libxklavier-4 )

	!gnome-extra/fast-user-switch-applet"
DEPEND="${RDEPEND}
	test? ( >=dev-libs/check-0.9.4 )
	xinerama? ( x11-proto/xineramaproto )
	sys-devel/gettext
	x11-proto/inputproto
	>=dev-util/intltool-0.40
	>=dev-util/pkgconfig-0.19
	>=app-text/scrollkeeper-0.1.4
	>=app-text/gnome-doc-utils-0.3.2"
PDEPEND=">=sys-auth/pambase-20090430[consolekit=,gnome-keyring=]"

DOCS="AUTHORS ChangeLog NEWS README TODO"

pkg_setup() {
	G2CONF="${G2CONF}
		--disable-schemas-install
		--localstatedir=/var
		--enable-console-helper
		--enable-authentication-scheme=pam
		--with-pam-prefix=/etc
		SOUND_PROGRAM=/usr/bin/gdmplay
		$(use_with accessibility xevie)
		$(use_enable debug)
		$(use_enable ipv6)
		$(use_with consolekit console-kit)
		$(use_enable profile profiling)
		$(use_with selinux)
		$(use_with tcpd tcp-wrappers)
		--with-xdmcp
		$(use_with xinerama)
		$(use_enable xklavier libxklavier)"

	enewgroup gdm
	enewuser gdm -1 -1 /var/lib/gdm gdm
}

src_prepare() {
	gnome2_src_prepare

	# remove unneeded linker directive for selinux (#41022)
	epatch "${WORKDIR}/${PN}-2.26.1-selinux-remove-attr.patch"

	# Make it daemonize so that the boot process can continue (#236701)
	epatch "${FILESDIR}/${PN}-2.29.92-fix-daemonize-regression.patch"

	## Fix VT grab problem causing GDM to grab VT2 instead of 7 (#261339)
	## would destroy user switch funcionality see c19 on #261339 
	#epatch "${WORKDIR}/${PN}-2.26.1-broken-VT-detection.patch"

	# Make custom session work, bug #.
	epatch "${FILESDIR}/${PN}-2.29.92-custom-session.patch"

	# ssh-agent handling must be done at xinitrc.d
	epatch "${WORKDIR}/${PN}-2.26.1-xinitrc-ssh-agent.patch"

	# Fix libxklavier automagic support
	epatch "${WORKDIR}/${PN}-2.26.1-automagic-libxklavier-support.patch"

	# Fix 2 QA issues
	epatch "${FILESDIR}/${PN}-2.30.0-include.patch"

	intltoolize --force --copy --automake || die "intltoolize failed"
	eautoreconf
}

src_install() {
	gnome2_src_install

	local gentoodir="${WORKDIR}/${GDM_EXTRA}"

	# gdm-binary should be gdm to work with our init (#5598)
	rm -f "${D}/usr/sbin/gdm"
	dosym /usr/sbin/gdm-binary /usr/sbin/gdm

	# our x11's scripts point to /usr/bin/gdm
	dosym /usr/sbin/gdm-binary /usr/bin/gdm

	# log, etc.
	keepdir /var/log/gdm
	keepdir /var/gdm

	fowners root:gdm /var/gdm
	fperms 1770 /var/gdm

	# add a custom xsession .desktop by default (#44537)
	exeinto /etc/X11/dm/Sessions
	doexe "${gentoodir}/custom.desktop" || die "doexe 1 failed"

	# add xinitrc.d scripts
	exeinto /etc/X11/xinit/xinitrc.d
	doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed"
	doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed"

	# install XDG_DATA_DIRS gdm changes
	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
	doenvd 99xdg-gdm || die "doenvd failed"

	# add a custom sound playing script (#248253)
	dobin "${gentoodir}/gdmplay"

	# avoid file collision, bug #213118
	rm -f "${D}/usr/share/xsessions/gnome.desktop"

	# We replace the pam stuff by our own
	rm -rf "${D}/etc/pam.d"

	use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*

	dopamd "${gentoodir}"/pam.d/*
	dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
}

pkg_postinst() {
	gnome2_pkg_postinst

	ewarn
	ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
	ewarn "visit us on #gentoo-desktop if you have problems."
	ewarn

	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
	elog "and then execute 'rc-update add xdm default'."
	elog "If you already have GDM running, you will need to restart it."

	if use gnome-keyring; then
		elog "For autologin to unlock your keyring, you need to set an empty"
		elog "password on your keyring. Use app-crypt/seahorse for that."
	fi

	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
	fi
}

pkg_postrm() {
	gnome2_pkg_postrm

	if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
		elog "To remove GDM from startup please execute"
		elog "'rc-update del xdm default'"
	fi
}

Return to bug 312017

Line 0 Link Here

(-)a/gnome-base/gdm/files/gdm-2.26.1-libxklavier4.patch (+50 lines)
	1	From 90267c7f7afc73b27193632ec4af2c5360fab85a Mon Sep 17 00:00:00 2001
	2	From: Gilles Dartiguelongue <eva@gentoo.org>
	3	Date: Tue, 21 Jul 2009 00:56:37 +0200
	4	Subject: [PATCH] Add support for libxklavier-4
	5
	6	---
	7	configure.ac \| 10 +++++++---
	8	gui/simple-greeter/gdm-layouts.c \| 4 ++++
	9	2 files changed, 11 insertions(+), 3 deletions(-)
	10
	11	diff --git a/configure.ac b/configure.ac
	12	index d4a44d5..068e45c 100644
	13	--- a/configure.ac
	14	+++ b/configure.ac
	15	@@ -114,9 +114,13 @@ AC_ARG_ENABLE([libxklavier],
	16	have_libxklavier=no
	17	if test "x$enable_libxklavier" = "xyes"; then
	18	PKG_CHECK_MODULES(LIBXKLAVIER,
	19	- libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
	20	- have_libxklavier=yes,
	21	- have_libxklavier=no)
	22	+ libxklavier >= 4,
	23	+ [AC_DEFINE(HAVE_XKL_4, [1], [lixklavier-4 support])
	24	+ have_libxklavier=yes],
	25	+ [PKG_CHECK_MODULES(LIBXKLAVIER,
	26	+ libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
	27	+ have_libxklavier=yes,
	28	+ have_libxklavier=no)])
	29	if test "x$have_libxklavier" = "xyes" ; then
	30	AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier])
	31	fi
	32	diff --git a/gui/simple-greeter/gdm-layouts.c b/gui/simple-greeter/gdm-layouts.c
	33	index dc35094..97e1e08 100644
	34	--- a/gui/simple-greeter/gdm-layouts.c
	35	+++ b/gui/simple-greeter/gdm-layouts.c
	36	@@ -52,7 +52,11 @@ init_xkl (void)
	37	engine = xkl_engine_get_instance (GDK_DISPLAY ());
	38	xkl_engine_backup_names_prop (engine);
	39	config_registry = xkl_config_registry_get_instance (engine);
	40	+#if HAVE_XKL_4
	41	+ xkl_config_registry_load (config_registry, FALSE);
	42	+#else
	43	xkl_config_registry_load (config_registry);
	44	+#endif
	45
	46	initial_config = xkl_config_rec_new ();
	47	if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
	48	--
	49	1.6.3.3
	50

Line 0 Link Here

(-)a/gnome-base/gdm/gdm-2.30.0.ebuild (-1 / +216 lines)
		1	---
		2	fix custom sessions (see bug #216984, work done by Gilles, I'm just committing)
		3
		4	diff -ru gdm-2.29.92.orig/work/gdm-2.29.92/data/Xsession.in gdm-2.29.92/work/gdm-2.29.92/data/Xsession.in
		5	--- gdm-2.29.92.orig/work/gdm-2.29.92/data/Xsession.in 2010-03-30 02:15:18.000000000 +0200
Line 0 Link Here
		1	From b9f261de75356be6e4ee94c0cc53f2edbd8fe4d2 Mon Sep 17 00:00:00 2001
		2	From: Dan Nicholson <dbn.lists@gmail.com>
		3	Date: Tue, 14 Oct 2008 07:06:21 -0700
		4	Subject: [PATCH] Fork gdm-binary, except when -nodaemon is used
		5
		6	gdm-binary now forks and the parent terminates, except when the
		7	-nodaemon or --nodaemon options are used. This provides compatibility
		8	with xdm. Fixes bug #550170.
		9
		10	Updated for gdm-2.29.92 by Michael Weber gentoo at xmw dot de 20100330
		11
		12	diff -ru gdm-2.29.92.orig/work/gdm-2.29.92/daemon/main.c gdm-2.29.92/work/gdm-2.29.92/daemon/main.c
		13	--- gdm-2.29.92.orig/work/gdm-2.29.92/daemon/main.c 2010-03-30 02:02:05.000000000 +0200
Line 0 Link Here
		1	--- gdm-2.30.0/daemon/simple-slave-main.c 2010-03-29 23:42:03.000000000 +0200
Line 0 Link Here
0	-	1	# Copyright 1999-2010 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3	# $Header: $
		4
		5	EAPI="2"
		6
		7	inherit eutils pam gnome2 autotools
		8
		9	DESCRIPTION="GNOME Display Manager"
		10	HOMEPAGE="http://www.gnome.org/projects/gdm/"
		11
		12	LICENSE="GPL-2"
		13	SLOT="0"
		14	KEYWORDS="~amd64 ~x86"
		15
		16	IUSE_LIBC="elibc_glibc"
		17	IUSE="accessibility +consolekit debug ipv6 gnome-keyring profile selinux tcpd test xinerama +xklavier $IUSE_LIBC"
		18
		19	# Name of the tarball with gentoo specific files
		20	GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
		21
		22	SRC_URI="${SRC_URI}
		23	mirror://gentoo/${PN}-2.26-gentoo-patches.tar.bz2
		24	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
		25
		26	RDEPEND="app-text/iso-codes
		27	>=dev-libs/dbus-glib-0.74
		28	>=dev-libs/glib-2.22.0
		29	>=gnome-base/libglade-2
		30	>=gnome-base/gconf-2.6.1
		31	>=gnome-base/gnome-panel-2
		32	>=media-libs/fontconfig-2.5.0
		33	>=media-libs/libcanberra-0.4[gtk]
		34	>=sys-apps/devicekit-power-008
		35	virtual/pam
		36	x11-apps/sessreg
		37	>=x11-libs/gtk+-2.12.0
		38	x11-libs/libX11
		39	x11-libs/libXau
		40	x11-libs/libXdmcp
		41	x11-libs/libXi
		42	>=x11-libs/pango-1.3
		43	consolekit? (
		44	sys-auth/consolekit
		45	>=sys-apps/hal-0.5.12_rc1-r1[consolekit] )
		46	accessibility? ( x11-libs/libXevie )
		47	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
		48	selinux? ( sys-libs/libselinux )
		49	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
		50	xinerama? ( x11-libs/libXinerama )
		51	xklavier? ( >=x11-libs/libxklavier-4 )
		52
		53	!gnome-extra/fast-user-switch-applet"
		54	DEPEND="${RDEPEND}
		55	test? ( >=dev-libs/check-0.9.4 )
		56	xinerama? ( x11-proto/xineramaproto )
		57	sys-devel/gettext
		58	x11-proto/inputproto
		59	>=dev-util/intltool-0.40
		60	>=dev-util/pkgconfig-0.19
		61	>=app-text/scrollkeeper-0.1.4
		62	>=app-text/gnome-doc-utils-0.3.2"
		63	PDEPEND=">=sys-auth/pambase-20090430[consolekit=,gnome-keyring=]"
		64
		65	DOCS="AUTHORS ChangeLog NEWS README TODO"
66
67	pkg_setup() {
68	G2CONF="${G2CONF}
69	--disable-schemas-install
70	--localstatedir=/var
71	--enable-console-helper
72	--enable-authentication-scheme=pam
73	--with-pam-prefix=/etc
74	SOUND_PROGRAM=/usr/bin/gdmplay
75	$(use_with accessibility xevie)
76	$(use_enable debug)
77	$(use_enable ipv6)
78	$(use_with consolekit console-kit)
79	$(use_enable profile profiling)
80	$(use_with selinux)
81	$(use_with tcpd tcp-wrappers)
82	--with-xdmcp
83	$(use_with xinerama)
84	$(use_enable xklavier libxklavier)"
85
86	enewgroup gdm
87	enewuser gdm -1 -1 /var/lib/gdm gdm
88	}
89
90	src_prepare() {
91	gnome2_src_prepare
92
93	# remove unneeded linker directive for selinux (#41022)
94	epatch "${WORKDIR}/${PN}-2.26.1-selinux-remove-attr.patch"
95
96	# Make it daemonize so that the boot process can continue (#236701)
97	epatch "${FILESDIR}/${PN}-2.29.92-fix-daemonize-regression.patch"
98
99	## Fix VT grab problem causing GDM to grab VT2 instead of 7 (#261339)
100	## would destroy user switch funcionality see c19 on #261339
101	#epatch "${WORKDIR}/${PN}-2.26.1-broken-VT-detection.patch"
102
103	# Make custom session work, bug #.
104	epatch "${FILESDIR}/${PN}-2.29.92-custom-session.patch"
105
106	# ssh-agent handling must be done at xinitrc.d
107	epatch "${WORKDIR}/${PN}-2.26.1-xinitrc-ssh-agent.patch"
108
109	# Fix libxklavier automagic support
110	epatch "${WORKDIR}/${PN}-2.26.1-automagic-libxklavier-support.patch"
111
112	# Fix 2 QA issues
113	epatch "${FILESDIR}/${PN}-2.30.0-include.patch"
114
115	intltoolize --force --copy --automake \|\| die "intltoolize failed"
116	eautoreconf
117	}
118
119	src_install() {
120	gnome2_src_install
121
122	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
123
124	# gdm-binary should be gdm to work with our init (#5598)
125	rm -f "${D}/usr/sbin/gdm"
126	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
127
128	# our x11's scripts point to /usr/bin/gdm
129	dosym /usr/sbin/gdm-binary /usr/bin/gdm
130
131	# log, etc.
132	keepdir /var/log/gdm
133	keepdir /var/gdm
134
135	fowners root:gdm /var/gdm
136	fperms 1770 /var/gdm
137
138	# add a custom xsession .desktop by default (#44537)
139	exeinto /etc/X11/dm/Sessions
140	doexe "${gentoodir}/custom.desktop" \|\| die "doexe 1 failed"
141
142	# add xinitrc.d scripts
143	exeinto /etc/X11/xinit/xinitrc.d
144	doexe "${FILESDIR}/49-keychain" \|\| die "doexe 2 failed"
145	doexe "${FILESDIR}/50-ssh-agent" \|\| die "doexe 3 failed"
146
147	# install XDG_DATA_DIRS gdm changes
148	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
149	doenvd 99xdg-gdm \|\| die "doenvd failed"
150
151	# add a custom sound playing script (#248253)
152	dobin "${gentoodir}/gdmplay"
153
154	# avoid file collision, bug #213118
155	rm -f "${D}/usr/share/xsessions/gnome.desktop"
156
157	# We replace the pam stuff by our own
158	rm -rf "${D}/etc/pam.d"
159
160	use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
161
162	dopamd "${gentoodir}"/pam.d/*
163	dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
164	}
165
166	pkg_postinst() {
167	gnome2_pkg_postinst
168
169	ewarn
170	ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
171	ewarn "visit us on #gentoo-desktop if you have problems."
172	ewarn
173
174	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
175	elog "and then execute 'rc-update add xdm default'."
176	elog "If you already have GDM running, you will need to restart it."
177
178	if use gnome-keyring; then
179	elog "For autologin to unlock your keyring, you need to set an empty"
180	elog "password on your keyring. Use app-crypt/seahorse for that."
181	fi
182
183	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
184	elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
185	elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
186	mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
187	fi
188	}
189
190	pkg_postrm() {
191	gnome2_pkg_postrm
192
193	if [[ "$(rc-config list default \| grep xdm)" != "" ]] ; then
194	elog "To remove GDM from startup please execute"
195	elog "'rc-update del xdm default'"
196	fi
197	}