Bump to 2.20.10-r1, add consolekit USE flag (bug #239250) default on, move pambase to PDEPEND and replace built_with_use by USE-deps. Raise pambase dependency for proper consolekit handling. Clean up old revisions.

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

7 files changed, 67 insertions, 500 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 47a9a55bf2ad..89b6342dc683 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.293 2009/04/28 18:00:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.294 2009/05/01 10:28:07 eva Exp $
+
+*gdm-2.20.10-r1 (01 May 2009)
+
+  01 May 2009; Gilles Dartiguelongue <eva@gentoo.org> gdm-2.20.3.ebuild,
+  -gdm-2.20.7.ebuild, -gdm-2.20.8.ebuild, -gdm-2.20.9.ebuild,
+  +gdm-2.20.10-r1.ebuild:
+  Bump to 2.20.10-r1, add consolekit USE flag (bug #239250) default on, move
+  pambase to PDEPEND and replace built_with_use by USE-deps. Raise pambase
+  dependency for proper consolekit handling. Clean up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> gdm-2.20.9-r1.ebuild:
   arm/sh stable
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 42545c6bd6f8..bc4e62e0e7f6 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 49-keychain 182 RMD160 f5a0e62186d4caf1294b62b76800d3e6dc571b2f SHA1 8a7caeba473117564b131adee22d2700a069e8f6 SHA256 0c390ae39e82e27d0a39261a744f326b3a75f735cb0442b9c344efe54fa7c782
 AUX 50-ssh-agent 247 RMD160 d7bba6dd58341c55272cf37c0750bcacf226ad6a SHA1 40d5b30961237aee8b2a7550d8a2d793165fad1f SHA256 a3be3c5b4aa1fbbf4a6799ba82450b4da374bd9fd67a6e4b584ceeb335f393fb
 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b
@@ -8,19 +11,20 @@ AUX gdm-2.20.3-logging.patch 646 RMD160 d7494ad8f39d82f72673d59466cc29b8b5c26bfc
 AUX gdm-2.20.9-parallel-make.patch 1499 RMD160 aaca98cd72b464aec043b2aeb51973f9ab3c9a33 SHA1 1718004f16455a3f3c957b40b2391c563988681e SHA256 c8d04d1cae1c2bac16bf3f41fd481eacf5f4a3962f661996f93da39d4161bb0d
 DIST gdm-2.20.10.tar.bz2 3940077 RMD160 4bb50375d30638143b47b7884405e9999e304da5 SHA1 42e9e52184393352f005f1735843a30f764aef18 SHA256 5d4a2e5973a778871c9bfb91d76580747a4ef40771fd4368169a5868bb2db127
 DIST gdm-2.20.3.tar.bz2 3891861 RMD160 b6aace3153a9ba7adf4ed968ede9da19c3d706cb SHA1 de66323b890f2e65a33bb72c5937d1c95ee5bd89 SHA256 0d1c8e76fbebb2ba2b71c3adac3e7f6193971f75739978f81447e4127b898500
-DIST gdm-2.20.5-gentoo-files.tar.bz2 3214 RMD160 a075aa94fc3f6f2947bddf46f008979d62cc94d3 SHA1 9654caf36a91a83ffb5d4e53078a70e8c29a0b61 SHA256 47716f35eb1c6875e9c8e42120ff5f65da806aa06f15a48b082a6f5e5a94da83
-DIST gdm-2.20.7.tar.bz2 3978969 RMD160 1b9321a81aa5984e76715fec9ce7e01f161b8bcb SHA1 349a5a2e60a3e2e229afe99e1342f75e321e53e9 SHA256 84a71eae8a52c89e3044afa69424b8a7e79210024334eb7c23f25bdfa16ca825
-DIST gdm-2.20.8.tar.bz2 3932232 RMD160 c7ddaa03ee698541cea21ca27ebb99b1cdf258aa SHA1 f806b171d0eea6b62238655b6670434f019214ae SHA256 cef608d263866003f573a9b80d29c635a74ee73343d3f45bb381cf50b5c52894
 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4548b9f1556d3 SHA1 28ceedb42440fdb50dffa7e69b18f213b00e3935 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9
-DIST gdm-2.20.9-gentoo-files.tar.bz2 3472 RMD160 b69f79bee41e73321e39554eed2f086d1e767510 SHA1 1ac3766205ef185acfc1be6329a6fcb944dfe35c SHA256 01c51c85e6b8236e785db84c083fda17035f15c13a2c75a9bd6b473139d9f45a
 DIST gdm-2.20.9.tar.bz2 4034232 RMD160 923ec2c14eb153cc93c2291220b0f50f147dcd32 SHA1 b826a14f1f7bbb16d0f4c32c659eb499fefaf956 SHA256 c5c9a3b818f84656cf087da9312106b9aa5cc9d44fa8b4f45bd04799651bb5cd
 DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 SHA1 0b41c955ec8980c011b856aa653102da485dd20c SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
+EBUILD gdm-2.20.10-r1.ebuild 6392 RMD160 3f1a07e6e9fddaff1eb5ea6337316186f8882966 SHA1 a55641f9b3190f2a20c94fd615c1af7de8fa46fb SHA256 60ffedaccf1a7031b2d520e2c8c93a51467079606d0fc14a2907c41b7c31b89e
 EBUILD gdm-2.20.10.ebuild 6743 RMD160 03ab61f6293f77ef228cc83e5b5d45843681dcd8 SHA1 2c662bb64b4201b4e7d20ba8061a9062d9b7044c SHA256 4b40a13054ee52ccd8361a9b0ae5e4d74001aea7c5d66d3d470217ba8c024d0e
-EBUILD gdm-2.20.3.ebuild 5524 RMD160 00e95bcda06fd71d8cdf5792e9b9844589f55ca8 SHA1 5b499d45a07c065fd0681131fb9d7099ae820a08 SHA256 fdea28f1995f7559e9d8017a13e27450b33122235d63b955835413defb378b23
-EBUILD gdm-2.20.7.ebuild 6178 RMD160 e911bf4cc1dd74231a855a54524fd6368d0383f1 SHA1 06cd537541b0a47832cff1afb689ef1f4e7063a0 SHA256 a7d986cdc9365ee170deba46eb018fc7ce07c655d77e8e979629d17880ef6346
-EBUILD gdm-2.20.8.ebuild 6183 RMD160 08a7d477af0d830605c3367615a5ca6cecfcffff SHA1 fa02c4b9b75946cd986fcbb775b49312756320d1 SHA256 c526c51b73842baecd8f28b0ceb9a64ccbad25d7e9870cb8697dfd5cfd6823ad
+EBUILD gdm-2.20.3.ebuild 5462 RMD160 01aaa98ab94e130959e550282e4353727d972caa SHA1 7dbff1038ee6f984f2fbf705bf810a73561ea09b SHA256 1ad90379beebf205f16d2d5cc449e60a968e0854c438cd84413175a836accd87
 EBUILD gdm-2.20.9-r1.ebuild 6363 RMD160 3b4160a5ae31f902f8d13afab3ad7d00e19ef1ca SHA1 d5170509fdadb527f1e5001cdc7e8f8067ec5aad SHA256 0c761ebb646018875b2a326d578f1895cc48477bbb900b55034751478b236ec4
-EBUILD gdm-2.20.9.ebuild 6367 RMD160 1b7a062624f481e9bb4f596ab014092d8b7b7796 SHA1 0c75b8d7830978dadaadedf726f5600d915b5e7a SHA256 38b54d42824e27f375ccc9965ff896e2726e14812e62d3e5af294e66a21c63eb
-MISC ChangeLog 39679 RMD160 6c70238215bd7fff704341857890563ce867b492 SHA1 ad7571424f56e3b33846781905afa824e8253d67 SHA256 ef9430b8faa48606b4204a0976fee16f0b118edcdc09f3307f121f09702c5370
-MISC metadata.xml 316 RMD160 dd83f53b0fed42e9f805b80b04b3282b9845b31a SHA1 c9f36ef8bdecb74248a488aff5830b7b90b31ad6 SHA256 5a3f796b987e8e41016027fa87ca834f30449050b71b95e6ea91e6e37e4daa98
+MISC ChangeLog 40089 RMD160 2fdd62572560feb53ab0bc2156fb9a32db084d88 SHA1 7d48dc6b993654f038f0fa3b578f9dc1181fdfef SHA256 90575ddcc191ffa0c21476fd3eaa745d6ea789ff4c26d00ba8fd961edfb1868a
+MISC metadata.xml 443 RMD160 44d0b721c7724a73b7bb2bf544d36fde193fcfa4 SHA1 9acfe36b810e99721fa151c067b84dc5d55f25d6 SHA256 c2bf3ec85ffb1667081fc3a2126898947c138e9d06f968ccf1acf4e88195d9b5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn6zs4ACgkQ1fmVwcYIWAYy/ACfVCToFfE/Q8bA/uXIiu22oSZN
+/cgAn1wN/ebVg9ef6A0L1wUcPWMdpDvs
+=Ptb3
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-2.20.9.ebuild b/gnome-base/gdm/gdm-2.20.10-r1.ebuild
index 9f639f0609df..6af3f35fd450 100644
--- a/gnome-base/gdm/gdm-2.20.9.ebuild
+++ b/gnome-base/gdm/gdm-2.20.10-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.9.ebuild,v 1.2 2009/01/10 12:25:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.10-r1.ebuild,v 1.1 2009/05/01 10:28:07 eva Exp $
+
+EAPI="2"
 
 inherit eutils pam gnome2
 
@@ -12,17 +14,16 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
 IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
+IUSE="accessibility afs branding +consolekit dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
 
 # Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.9-gentoo-files"
+GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
 
 SRC_URI="${SRC_URI}
-		 mirror://gentoo/${GDM_EXTRA}.tar.bz2
-		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
+	mirror://gentoo/${GDM_EXTRA}.tar.bz2
+	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
 
-RDEPEND="dev-libs/dbus-glib
-	>=dev-libs/glib-2.12
+RDEPEND=">=dev-libs/glib-2.12
 	>=x11-libs/gtk+-2.6
 	>=x11-libs/pango-1.3
 	>=gnome-base/libglade-2
@@ -38,18 +39,19 @@ RDEPEND="dev-libs/dbus-glib
 	x11-apps/sessreg
 	x11-libs/libXdmcp
 	xinerama? ( x11-libs/libXinerama )
-	sys-auth/consolekit
+	consolekit? (
+		sys-auth/consolekit
+		dev-libs/dbus-glib )
 	accessibility? ( x11-libs/libXevie )
 	afs? ( net-fs/openafs sys-libs/lwp )
 	dmx? ( x11-libs/libdmx )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
-	pam? (
-		virtual/pam
-		>=sys-auth/pambase-20080318 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
+	pam? ( virtual/pam )
 	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
 	remote? ( gnome-extra/zenity )
 	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=x11-misc/xdg-utils-1.0.2-r3"
 DEPEND="${RDEPEND}
 	dmx? ( x11-proto/dmxproto )
 	xinerama? ( x11-proto/xineramaproto )
@@ -59,6 +61,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.19
 	>=app-text/scrollkeeper-0.1.4
 	>=app-text/gnome-doc-utils-0.3.2"
+PDEPEND="pam? ( >=sys-auth/pambase-20090430[consolekit=,gnome-keyring=] )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
@@ -69,33 +72,18 @@ pkg_setup() {
 		--localstatedir=/var
 		--with-xdmcp=yes
 		--with-pam-prefix=/etc
-		--with-console-kit=yes
 		SOUND_PROGRAM=/usr/bin/gdmplay
 		$(use_enable accessibility xevie)
 		$(use_enable ipv6)
 		$(use_enable remote secureremote)
+		$(use_with consolekit console-kit)
+		$(use_with dmx)
 		$(use_with selinux)
 		$(use_with tcpd tcp-wrappers)
 		$(use_with xinerama)"
 
-	if use dmx ; then
-		G2CONF="${G2CONF} --with-dmx=yes"
-	else
-		G2CONF="${G2CONF} --with-dmx=no"
-	fi
-
-	if use gnome-keyring && ! built_with_use gnome-base/gnome-keyring pam; then
-		eerror "You need to build gnome-base/gnome-keyring with USE=\"pam\""
-		eerror "for USE=\"gnome-keyring\" to have any effect on this package."
-	fi
-
 	if use pam; then
 		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-
-		if use gnome-keyring && ! built_with_use sys-auth/pambase gnome-keyring; then
-			eerror "You need USE=\"gnome\" in sys-auth/pambase for proper keyring"
-			eerror "unlocking at login time. It will not work properly otherwise."
-		fi
 	else
 		G2CONF="${G2CONF} --enable-console-helper=no"
 		if use elibc_glibc ; then
@@ -109,8 +97,8 @@ pkg_setup() {
 	enewuser gdm -1 -1 /var/lib/gdm gdm
 }
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 
 	# remove unneeded linker directive for selinux (#41022)
 	epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
@@ -119,7 +107,13 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
 
 	# Fix parallel install, bug #217037
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	epatch "${FILESDIR}/${PN}-2.20.9-parallel-make.patch"
+
+	# Make custom session work, bug #216984
+	epatch "${FILESDIR}/${PN}-2.20.10-custom-session.patch"
+
+	# ssh-agent handling must be done at xinitrc.d, bug #220603
+	epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.patch"
 }
 
 src_install() {
@@ -141,17 +135,21 @@ src_install() {
 	fowners root:gdm /var/gdm
 	fperms 1770 /var/gdm
 
-	# use our own session script
-	rm -f "${D}/etc/X11/gdm/Xsession"
-	exeinto /etc/X11/gdm
-	doexe "${gentoodir}/Xsession"
-
 	# add a custom xsession .desktop by default (#44537)
 	exeinto /etc/X11/dm/Sessions
 	doexe "${gentoodir}/custom.desktop"
 
+	# add xinitrc.d scripts
+	exeinto /etc/X11/xinit/xinitrc.d
+	doexe "${FILESDIR}/49-keychain" || die "doexe 1 failed"
+	doexe "${FILESDIR}/50-ssh-agent" || die "doexe 2 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"
+	dobin "${gentoodir}/gdmplay" || die "dobin failed"
 
 	# avoid file collision, bug #213118
 	rm -f "${D}/usr/share/xsessions/gnome.desktop"
@@ -223,7 +221,7 @@ pkg_postinst() {
 pkg_postrm() {
 	gnome2_pkg_postrm
 
-	if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
+	if [ "$(rc-config list default | grep xdm)" != "" ] ; then
 		elog "To remove GDM from startup please execute"
 		elog "'rc-update del xdm default'"
 	fi
diff --git a/gnome-base/gdm/gdm-2.20.3.ebuild b/gnome-base/gdm/gdm-2.20.3.ebuild
index 3fafa7c425e8..c0ee79b95280 100644
--- a/gnome-base/gdm/gdm-2.20.3.ebuild
+++ b/gnome-base/gdm/gdm-2.20.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.3.ebuild,v 1.10 2008/04/20 01:35:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.3.ebuild,v 1.11 2009/05/01 10:28:07 eva Exp $
 
 inherit autotools eutils pam gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/gdm/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~mips"
 
 IUSE_LIBC="elibc_glibc"
 IUSE="accessibility afs branding dmx ipv6 pam remote selinux tcpd xinerama $IUSE_LIBC"
diff --git a/gnome-base/gdm/gdm-2.20.7.ebuild b/gnome-base/gdm/gdm-2.20.7.ebuild
deleted file mode 100644
index 58a1428b9835..000000000000
--- a/gnome-base/gdm/gdm-2.20.7.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.7.ebuild,v 1.7 2008/11/13 19:45:00 ranger Exp $
-
-inherit eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.5-gentoo-files"
-
-SRC_URI="${SRC_URI}
-		 mirror://gentoo/${GDM_EXTRA}.tar.bz2
-		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND="dev-libs/dbus-glib
-		 >=dev-libs/glib-2.12
-		 >=x11-libs/gtk+-2.6
-		 >=x11-libs/pango-1.3
-		 >=gnome-base/libglade-2
-		 >=gnome-base/libgnomecanvas-2
-		 >=gnome-base/librsvg-1.1.1
-		 >=dev-libs/libxml2-2.4.12
-		 >=media-libs/libart_lgpl-2.3.11
-		 x11-libs/gksu
-		 x11-libs/libXi
-		 x11-libs/libXau
-		 x11-libs/libX11
-		 x11-libs/libXext
-		 x11-apps/sessreg
-		 x11-libs/libXdmcp
-		 xinerama? ( x11-libs/libXinerama )
-		 sys-auth/consolekit
-		 accessibility? ( x11-libs/libXevie )
-		 afs? ( net-fs/openafs sys-libs/lwp )
-		 dmx? ( x11-libs/libdmx )
-		 gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
-		 pam? (
-			virtual/pam
-			>=sys-auth/pambase-20080318
-		 )
-		 !pam? ( elibc_glibc? ( sys-apps/shadow ) )
-		 remote? ( gnome-extra/zenity )
-		 selinux? ( sys-libs/libselinux )
-		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-		dmx? ( x11-proto/dmxproto )
-		sys-devel/gettext
-		x11-proto/inputproto
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.19
-		>=app-text/scrollkeeper-0.1.4
-		>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-prefetch
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--with-xdmcp=yes
-		--with-pam-prefix=/etc
-		--with-console-kit=yes
-		$(use_enable accessibility xevie)
-		$(use_enable ipv6)
-		$(use_enable remote secureremote)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	if use dmx ; then
-		G2CONF="${G2CONF} --with-dmx=yes"
-	else
-		G2CONF="${G2CONF} --with-dmx=no"
-	fi
-
-	if use gnome-keyring && ! built_with_use gnome-base/gnome-keyring pam; then
-		eerror "You need to build gnome-base/gnome-keyring with USE=\"pam\""
-		eerror "for USE=\"gnome-keyring\" to have any effect on this package."
-	fi
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-
-		if use gnome-keyring && ! built_with_use sys-auth/pambase gnome-keyring; then
-			eerror "You need USE=\"gnome\" in sys-auth/pambase for proper keyring"
-			eerror "unlocking at login time. It will not work properly otherwise."
-		fi
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no"
-		if use elibc_glibc ; then
-			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
-		else
-			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
-		fi
-	fi
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
-
-	# Add gksu to gdmsetup menu entry
-	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
-}
-
-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
-
-	# use our own session script
-	rm -f "${D}/etc/X11/gdm/Xsession"
-	exeinto /etc/X11/gdm
-	doexe "${gentoodir}/Xsession"
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe "${gentoodir}/custom.desktop"
-
-	# 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"
-
-	if use pam ; then
-		use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-		dopamd "${gentoodir}"/pam.d/*
-		dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-	fi
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		/usr/share/gdm/defaults.conf
-
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-
-	# Fix old X11R6 paths
-	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-	# Move Gentoo theme in
-	if use branding ; then
-		mv "${WORKDIR}"/gentoo-*  "${D}/usr/share/gdm/themes"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-
-	elog "GDM has changed the location of its configuration file.  Please"
-	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
-	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
-
-	elog "See README.install for more information about the change."
-
-	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
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	# Do restart after gdm.conf move above
-	FIFOFILE=/var/gdm/.gdmfifo
-	PIDFILE=/var/run/gdm.pid
-
-	if [ -w ${FIFOFILE} ] ; then
-		if [ -f ${PIDFILE} ] ; then
-			if kill -0 `cat ${PIDFILE}`; then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	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
-}
diff --git a/gnome-base/gdm/gdm-2.20.8.ebuild b/gnome-base/gdm/gdm-2.20.8.ebuild
deleted file mode 100644
index 297b7f6904f4..000000000000
--- a/gnome-base/gdm/gdm-2.20.8.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.8.ebuild,v 1.1 2008/09/03 23:03:03 eva Exp $
-
-inherit eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.5-gentoo-files"
-
-SRC_URI="${SRC_URI}
-		 mirror://gentoo/${GDM_EXTRA}.tar.bz2
-		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND="dev-libs/dbus-glib
-		 >=dev-libs/glib-2.12
-		 >=x11-libs/gtk+-2.6
-		 >=x11-libs/pango-1.3
-		 >=gnome-base/libglade-2
-		 >=gnome-base/libgnomecanvas-2
-		 >=gnome-base/librsvg-1.1.1
-		 >=dev-libs/libxml2-2.4.12
-		 >=media-libs/libart_lgpl-2.3.11
-		 x11-libs/gksu
-		 x11-libs/libXi
-		 x11-libs/libXau
-		 x11-libs/libX11
-		 x11-libs/libXext
-		 x11-apps/sessreg
-		 x11-libs/libXdmcp
-		 xinerama? ( x11-libs/libXinerama )
-		 sys-auth/consolekit
-		 accessibility? ( x11-libs/libXevie )
-		 afs? ( net-fs/openafs sys-libs/lwp )
-		 dmx? ( x11-libs/libdmx )
-		 gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
-		 pam? (
-			virtual/pam
-			>=sys-auth/pambase-20080318
-		 )
-		 !pam? ( elibc_glibc? ( sys-apps/shadow ) )
-		 remote? ( gnome-extra/zenity )
-		 selinux? ( sys-libs/libselinux )
-		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-		dmx? ( x11-proto/dmxproto )
-		sys-devel/gettext
-		x11-proto/inputproto
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.19
-		>=app-text/scrollkeeper-0.1.4
-		>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-prefetch
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--with-xdmcp=yes
-		--with-pam-prefix=/etc
-		--with-console-kit=yes
-		$(use_enable accessibility xevie)
-		$(use_enable ipv6)
-		$(use_enable remote secureremote)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	if use dmx ; then
-		G2CONF="${G2CONF} --with-dmx=yes"
-	else
-		G2CONF="${G2CONF} --with-dmx=no"
-	fi
-
-	if use gnome-keyring && ! built_with_use gnome-base/gnome-keyring pam; then
-		eerror "You need to build gnome-base/gnome-keyring with USE=\"pam\""
-		eerror "for USE=\"gnome-keyring\" to have any effect on this package."
-	fi
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-
-		if use gnome-keyring && ! built_with_use sys-auth/pambase gnome-keyring; then
-			eerror "You need USE=\"gnome\" in sys-auth/pambase for proper keyring"
-			eerror "unlocking at login time. It will not work properly otherwise."
-		fi
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no"
-		if use elibc_glibc ; then
-			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
-		else
-			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
-		fi
-	fi
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
-
-	# Add gksu to gdmsetup menu entry
-	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
-}
-
-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
-
-	# use our own session script
-	rm -f "${D}/etc/X11/gdm/Xsession"
-	exeinto /etc/X11/gdm
-	doexe "${gentoodir}/Xsession"
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe "${gentoodir}/custom.desktop"
-
-	# 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"
-
-	if use pam ; then
-		use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-		dopamd "${gentoodir}"/pam.d/*
-		dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-	fi
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		/usr/share/gdm/defaults.conf
-
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-
-	# Fix old X11R6 paths
-	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-	# Move Gentoo theme in
-	if use branding ; then
-		mv "${WORKDIR}"/gentoo-*  "${D}/usr/share/gdm/themes"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-
-	elog "GDM has changed the location of its configuration file.  Please"
-	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
-	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
-
-	elog "See README.install for more information about the change."
-
-	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
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	# Do restart after gdm.conf move above
-	FIFOFILE=/var/gdm/.gdmfifo
-	PIDFILE=/var/run/gdm.pid
-
-	if [ -w ${FIFOFILE} ] ; then
-		if [ -f ${PIDFILE} ] ; then
-			if kill -0 `cat ${PIDFILE}`; then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	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
-}
diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml
index 8bbd368196d3..af6e392ac462 100644
--- a/gnome-base/gdm/metadata.xml
+++ b/gnome-base/gdm/metadata.xml
@@ -5,5 +5,7 @@
 <use>
 	<flag name='dmx'>Enables Distributed Multihead X (DMX) support</flag>
 	<flag name='remote'>Enables support for secure remote connections</flag>
+	<flag name='consolekit'>Allow proper handling of removable media according
+	to who is actually present on the machine.</flag>
 </use>
 </pkgmetadata>