Remove redundant versions and stale patches

Package-Manager: portage-2.1.4.4

6 files changed, 17 insertions, 441 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index da7be54291f0..d97c2b1cd478 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.262 2008/02/04 04:40:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.263 2008/03/02 10:17:19 leio Exp $
+
+  02 Mar 2008; Mart Raudsepp <leio@gentoo.org>
+  -files/gdm-2.13.0.7-gdm-dmx-intllibs.patch, -files/gdm-2.16.2-gksu.patch,
+  -gdm-2.20.1.ebuild, -gdm-2.20.2.ebuild:
+  Remove redundant versions and stale patches
 
   04 Feb 2008; Jeroen Roovers <jer@gentoo.org> gdm-2.20.3.ebuild:
   Stable for HPPA (bug #208366).
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index aaf8a915b1ce..a06c99b6525f 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,20 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b
-AUX gdm-2.13.0.7-gdm-dmx-intllibs.patch 894 RMD160 a53dfd904b01ac6e265bf8ac23db69e476c4695a SHA1 835c5f990608df12aa1039f1efa04c961a2213b0 SHA256 d90f0004ccb88efb00498fcec0a1839cb1a167e5a30d1369dc234a1d7c8068f6
-AUX gdm-2.16.2-gksu.patch 584 RMD160 2a5a15de412910c1f30c22bcd78190b2cb75921c SHA1 5918109f2ad28e909bc5488d25deacb932a98163 SHA256 3208bc0025bb9e02104bb1b1dd6a3de550a4cd6e0be6546c3bae60ab5af08f8d
 AUX gdm-2.18.0-gdm-dmx-intllibs.patch 289 RMD160 acc5d02c88986577b7c195654a8938f016a42d7b SHA1 768b4afce9c698e3bd896301c4328efc73c38124 SHA256 ea7e922e1b7bf6a5671b5da0bffbd52375e5924f1f0aebfc0f21dccf3b701a16
 AUX gdm-2.20.0-gksu.patch 545 RMD160 f70c443c94e6a2b8e5360fdb85e5fc571ea3dd8c SHA1 4e175aa7b788f8cd321ae54cddd4683c95b348c3 SHA256 887e827900049eea610952099e8d50ebf07a493534dfda4662cb14ecc6ca68b6
 AUX gdm-2.20.2-gksu.patch 544 RMD160 044068ec9c0fac089dcfa8b62597741d6bf6a4ac SHA1 7672aa94ea512cf50740466c6bc072fa236c7d01 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d
 AUX gdm-2.20.3-logging.patch 646 RMD160 d7494ad8f39d82f72673d59466cc29b8b5c26bfc SHA1 7c00f8c4501d13368f4a25cf34422108356f8761 SHA256 8266a532731609401915a605866e071ba8cbdf25e6425a0a2701427d15f532ce
 DIST gdm-2.18.4.tar.bz2 3459899 RMD160 4922af1321f707279c1eb6354d1c56cc39bce20e SHA1 8bf2c8745d7c38f5f08641abed4ca103cad0ecb8 SHA256 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3
-DIST gdm-2.20.1.tar.bz2 3774217 RMD160 edf3b12d948bb06e53e017d94610ec85680eb364 SHA1 3d3e41ef1d3f808598f28d57166facee47e2addc SHA256 b916867853c0e4ef5b8e76a58baa28ff666fd3da741438c595b5f23d031501d7
-DIST gdm-2.20.2.tar.bz2 3892711 RMD160 19d3bf99853391685a1d16b848c1d27a94502395 SHA1 4e2ad85df9ef61fa304c9a28cf7416a4121db12a SHA256 5e0b3b66b8a9d84ddbe22f03f02a9ce05bdcf77e72973e0fdf44eac6e12a6d04
 DIST gdm-2.20.3.tar.bz2 3891861 RMD160 b6aace3153a9ba7adf4ed968ede9da19c3d706cb SHA1 de66323b890f2e65a33bb72c5937d1c95ee5bd89 SHA256 0d1c8e76fbebb2ba2b71c3adac3e7f6193971f75739978f81447e4127b898500
 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.18.4-r1.ebuild 5273 RMD160 506202364efc3036d4e2b71e13f2fe1617f9e0a3 SHA1 5802a3c93d37f80ff968b822b3174ca346403140 SHA256 11d8f3b10c48c02aec301d63e0b94e7f6c78fb5f9f65f3e9feac15dfb199015c
 EBUILD gdm-2.18.4.ebuild 5171 RMD160 9e6e507bff078543f0201737f82f656566cd28a9 SHA1 69440f226d1ba377c86b2e5c5d4017b9f5501dc0 SHA256 5aeb00c4a500025cb4eed2606b71ffa217483645ecfd12ba7a2823e54a7a2cc8
-EBUILD gdm-2.20.1.ebuild 5493 RMD160 b1c2d9bde1efc3c6927c09e07cb297d3798872c2 SHA1 79515dcef441aaecc642808f8001a4ca91242b14 SHA256 d69a47ef7c0aee5b09352322b006dc7b23882eec689749da14e819b474a4fd37
-EBUILD gdm-2.20.2.ebuild 5463 RMD160 3aaf82626a6844e48cff4885f091291a8eb2780e SHA1 88461436e504741a96e0c6aa4d381b54fc4cb4fb SHA256 f67f79e3bd3db43c1dbe71ec29f299d65367f3423d052d515dd592c451860676
 EBUILD gdm-2.20.3.ebuild 5522 RMD160 dad76fb801e1312bf3affb2fd3ac4366d6d02c46 SHA1 1839b1f627638ae6e96d91376463b309c0e118a3 SHA256 6c131444e3cc7ced1618652a4487bfff8d650851cd29e914b2fc94e138747bcd
-MISC ChangeLog 35373 RMD160 043f671e990d623d40ee4234614d546fefd01444 SHA1 0d98e45edaf1050ad81364d33621492fc193396e SHA256 349e12cafc9c382299b9890f781c13005cb815566bbe16d0795c79ae07678158
+MISC ChangeLog 35586 RMD160 d78ff2a9699065461d06c3d94ae6f9859cbdad2e SHA1 284146f3d211224bb05becebc01b84a705c9b053 SHA256 65e42b901e37694ae5aa32b4d8c86c878e312e191eed867853647dab90c5d8bd
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfKfnkACgkQkeYb6olFHJdstwCfSuasgPz+DtvZGCDNADorjLI4
+QfQAnj7wOUelc5aAx9MZGK54aV0lZ7MA
+=Bme+
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-2.13.0.7-gdm-dmx-intllibs.patch b/gnome-base/gdm/files/gdm-2.13.0.7-gdm-dmx-intllibs.patch
deleted file mode 100644
index 7aac378042e2..000000000000
--- a/gnome-base/gdm/files/gdm-2.13.0.7-gdm-dmx-intllibs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.7.orig/utils/gdm-dmx-reconnect-proxy.c gdm-2.13.0.7/utils/gdm-dmx-reconnect-proxy.c
---- gdm-2.13.0.7.orig/utils/gdm-dmx-reconnect-proxy.c	2006-01-18 18:33:17.000000000 -0500
-+++ gdm-2.13.0.7/utils/gdm-dmx-reconnect-proxy.c	2006-01-31 15:59:04.000000000 -0500
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <glib.h>
- #include <glib/gi18n.h>
-+#include <locale.h>
- 
- #include <X11/Xlib.h>
- #include <X11/extensions/dmxext.h>
-diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.7.orig/utils/Makefile.am gdm-2.13.0.7/utils/Makefile.am
---- gdm-2.13.0.7.orig/utils/Makefile.am	2006-01-15 16:26:35.000000000 -0500
-+++ gdm-2.13.0.7/utils/Makefile.am	2006-01-31 15:51:20.000000000 -0500
-@@ -52,6 +52,7 @@
- 	gdm-dmx-reconnect-proxy.c
- 
- gdm_dmx_reconnect_proxy_LDADD = \
-+	$(INTLLIBS)		\
- 	$(GLIB_LIBS) \
- 	$(X_EXTRA_LIBS) \
- 	$(X_LIBS) \
diff --git a/gnome-base/gdm/files/gdm-2.16.2-gksu.patch b/gnome-base/gdm/files/gdm-2.16.2-gksu.patch
deleted file mode 100644
index 704cd5066a1e..000000000000
--- a/gnome-base/gdm/files/gdm-2.16.2-gksu.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -up -ruN gdm-2.16.1.orig/gui/gdmsetup.desktop.in.in gdm-2.16.1/gui/gdmsetup.desktop.in.in
---- gdm-2.16.1.orig/gui/gdmsetup.desktop.in.in	2006-04-17 14:38:19.000000000 -0400
-+++ gdm-2.16.1/gui/gdmsetup.desktop.in.in	2006-11-06 15:44:18.000000000 -0500
-@@ -3,8 +3,8 @@ Encoding=UTF-8
- _Name=Login Window
- _GenericName=Login Window Preferences
- _Comment=Configure the login window (GNOME Display Manager)
--TryExec=@sbindir@/gdmsetup
--Exec=gdmsetup
-+TryExec=@sbindir@/gdmsetup
-+Exec=gksu gdmsetup
- Icon=gdm-setup
- StartupNotify=true
- Terminal=false
diff --git a/gnome-base/gdm/gdm-2.20.1.ebuild b/gnome-base/gdm/gdm-2.20.1.ebuild
deleted file mode 100644
index 74f9cce160de..000000000000
--- a/gnome-base/gdm/gdm-2.20.1.ebuild
+++ /dev/null
@@ -1,199 +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.1.ebuild,v 1.10 2008/01/14 07:44:04 compnerd Exp $
-
-inherit autotools eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-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"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding dmx ipv6 pam remote selinux tcpd xinerama $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
-
-SRC_URI="${SRC_URI}
-		 mirror://gentoo/${GDM_EXTRA}.tar.bz2
-		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-# glib dep is because of bug #193061
-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 )
-		 pam? ( virtual/pam )
-		 !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="--with-prefetch=yes               \
-			--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 pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-	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.0-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
-
-	chown root:gdm "${D}/var/gdm"
-	chmod 1770 "${D}/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"
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}/etc/pam.d"
-
-	if use pam ; then
-		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 [ -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.2.ebuild b/gnome-base/gdm/gdm-2.20.2.ebuild
deleted file mode 100644
index bbc369732d71..000000000000
--- a/gnome-base/gdm/gdm-2.20.2.ebuild
+++ /dev/null
@@ -1,198 +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.2.ebuild,v 1.2 2008/01/14 07:44:05 compnerd Exp $
-
-inherit autotools eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-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"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding dmx ipv6 pam remote selinux tcpd xinerama $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
-
-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 )
-		 pam? ( virtual/pam )
-		 !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="--with-prefetch=yes               \
-			--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 pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-	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
-
-	chown root:gdm "${D}/var/gdm"
-	chmod 1770 "${D}/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"
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}/etc/pam.d"
-
-	if use pam ; then
-		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 [ -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
-}