cleanup

7 files changed, 2 insertions, 633 deletions

diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 541a30e14d6e..6268f6ce0958 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,15 +1,9 @@
-MD5 b29e1cbd6831bd5726cbdf1d0ed394ca ChangeLog 5823
-MD5 1e307282c598c77f93166258b128c764 gdm-2.4.0.12-r2.ebuild 5234
-MD5 236edfef767f08d60351e21f7e3399ef gdm-2.4.1.3.ebuild 5173
-MD5 f24198de511fc9600104758b34dec9fa gdm-2.4.1.4.ebuild 5001
 MD5 265d31c48d895a3f20a1ac13785a56e4 gdm-2.2.5.4-r5.ebuild 4526
+MD5 b29e1cbd6831bd5726cbdf1d0ed394ca ChangeLog 5823
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 485a7a57af0804643943acd742cea282 gdm-2.4.1.6.ebuild 4802
-MD5 eb587fbb1046cbcced16c62d3fcb8c46 files/digest-gdm-2.4.1.4 134
-MD5 e630dae2e336b72763cc29724733521b files/digest-gdm-2.4.0.12-r2 135
-MD5 c79124e44042c78678b00ae44cbbbcc7 files/digest-gdm-2.4.1.3 134
-MD5 91f7b8aac4f6e16eba07dfe459b9263f files/gdm-startDM.sh.patch 308
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
+MD5 91f7b8aac4f6e16eba07dfe459b9263f files/gdm-startDM.sh.patch 308
 MD5 56240f76c07fea3245d9c6bb19066474 files/digest-gdm-2.4.1.6 134
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.4.0/gnomerc 235
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.0.12-r2 b/gnome-base/gdm/files/digest-gdm-2.4.0.12-r2
deleted file mode 100644
index 1bbb96b49631..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.4.0.12-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8aa6e503d4f74de8df32dee28df9a0de gdm-2.4.0.12.tar.bz2 1708764
-MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.1.3 b/gnome-base/gdm/files/digest-gdm-2.4.1.3
deleted file mode 100644
index e31c618a11fa..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.4.1.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 448769257c5bda3cda48e63869825173 gdm-2.4.1.3.tar.bz2 1810919
-MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.1.4 b/gnome-base/gdm/files/digest-gdm-2.4.1.4
deleted file mode 100644
index 797693859fe3..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.4.1.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f1c0272f879abb8d8d412b1d45be5b6c gdm-2.4.1.4.tar.bz2 1952546
-MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423
diff --git a/gnome-base/gdm/gdm-2.4.0.12-r2.ebuild b/gnome-base/gdm/gdm-2.4.0.12-r2.ebuild
deleted file mode 100644
index 7796977365b1..000000000000
--- a/gnome-base/gdm/gdm-2.4.0.12-r2.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.0.12-r2.ebuild,v 1.6 2003/09/06 23:51:37 msterret Exp $
-
-inherit eutils gnome.org
-
-NOMIRROR="1"
-DESCRIPTION="GNOME2 Display Manager"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-LICENSE="GPL-2"
-IUSE="nls"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme.tar.bz2"
-MY_V="`echo ${PV} |cut -b -5`"
-
-RDEPEND=">=sys-libs/pam-0.72
-	>=sys-apps/tcp-wrappers-7.6
-	>=app-text/scrollkeeper-0.3.11
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/librsvg-2.0.1
-	>=dev-libs/libxml2-2.4.24
-	>=gnome-base/libgnome-2.0.4
-	>=gnome-base/libgnomeui-2.0.5
-	>=gnome-base/libgnomecanvas-2.0.4
-	>=gnome-base/ORBit2-2.4.1"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=x11-base/xfree-4.2.0-r3"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/daemon
-	cp gdm.h gdm.h.orig
-	sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \
-		gdm.h.orig > gdm.h
-	rm -f gdm.h.orig
-
-	cd ${S}/config
-	cp gdm.conf.in gdm.conf.in.orig
-	sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \
-		-e "s:=circles:=gentoo-emergence:" \
-		-e "s:command=/usr/X11R6/bin/X:command=/usr/X11R6/bin/X -nolisten tcp:" \
-		gdm.conf.in.orig > gdm.conf.in
-
-	rm -f gdm.conf.in.orig
-
-	# Make the config use the Gentoo theme
-}
-
-src_compile() {
-	local myconf=""
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc/X11 \
-		--localstatedir=/var/lib \
-		--with-pam-prefix=/etc \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	cd omf-install
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" \
-		Makefile.old > Makefile
-	rm Makefile.old
-	cd ${S}
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11 \
-		localstatedir=${D}/var/lib \
-		PAM_PREFIX=${D}/etc \
-		install || die
-
-	# We need to move gdm-binary to gdm, else our xdm script
-	# have problems stopping gdm (bug #5598)
-	rm -f ${D}/usr/bin/gdm
-	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
-
-	rm -f ${D}/etc/pam.d/gdm
-
-	# log
-	dodir /var/lib/gdm
-	chown gdm:gdm ${D}/var/lib/gdm
-	chmod 0750 ${D}/var/lib/gdm
-
-	# pam startup
-	dodir /etc/pam.d
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${MY_V}/pam.d/gdm
-	doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig
-
-	# pam security
-	dodir /etc/security/console.apps
-	insinto /etc/security/console.apps
-	doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
-
-	# gnomerc
-	dodir /etc/X11/gdm
-	exeinto /etc/X11/gdm
-	doexe ${FILESDIR}/${MY_V}/gnomerc
-
-	cd ${D}/etc/X11/gdm
-	for i in Init/Default PostSession/Default PreSession/Default gdm.conf
-	do
-		cp ${i} ${i}.orig
-		sed -e s:/usr/bin/X11:/usr/X11R6/bin:g \
-			${i}.orig > ${i}
-		rm ${i}.orig
-	done
-
-	cd ${D}/etc/X11/gdm
-	cp gdm.conf gdm.conf.orig
-
-	sed -e "s:0=/usr/X11R6/bin/X:0=/usr/X11R6/bin/X -dpi 100 -nolisten tcp dpms vt7:g" \
-	    -e "s:GtkRC=/opt/gnome/share/themes/Default/gtk/gtkrc:GtkRC=/usr/share/themes/Default/gtk/gtkrc:g" \
-	    -e "s:BackgroundColor=#007777:BackgroundColor=#2a3f5b:g" \
-	    -e "s:TitleBar=true:TitleBar=false:g" \
-		-e "s:Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:g" \
-		gdm.conf.orig > gdm.conf
-
-	rm gdm.conf.orig
-
-	cd ${S}
-
-	# Support for new session stuff
-	rm -rf ${D}/etc/X11/gdm/Sessions
-	dosym ../Sessions /etc/X11/gdm/Sessions
-
-	# Make sure the users environment are set properly
-	# (bash users only though :( )
-	dosed "s:#!/bin/sh:#!/bin/bash --login:g" /etc/X11/gdm/PreSession/Default
-
-	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-emergence  ${D}/usr/share/gdm/themes
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
-}
-
-pkg_preinst() {
-	#support for new session stuff
-	if [ -d ${ROOT}/etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ]
-	then
-		mv -f ${ROOT}/etc/X11/gdm/Sessions ${ROOT}/etc/X11/gdm/Sessions.old
-	fi
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-
-	# Attempt to restart GDM softly by use of the fifo.  Wont work on older
-	# then 2.2.3.1 versions but should work nicely on later upgrades.
-	# FIXME: this is just way too complex
-	FIFOFILE="${ROOT}`grep '^ServAuthDir=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`"
-	if [ -z "${FIFOFILE}" ]
-	then
-		FIFOFILE=${ROOT}/var/lib/gdm/.gdmfifo
-	else
-		FIFOFILE=${FIFOFILE}/.gdmfifo
-	fi
-	PIDFILE="${ROOT}`grep '^PidFile=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`"
-	if [ -z "${PIDFILE}" ]
-	then
-		PIDFILE=${ROOT}/var/run/gdm.pid
-	fi
-	if [ -w ${FIFOFILE} ]
-	then
-		if [ -f ${PIDFILE} ]
-		then
-			if kill -0 `cat ${PIDFILE}`
-			then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	fi
-
-	# Unmerge nukes sometimes
-	if [ ! -d ${ROOT}/var/lib/gdm ]
-	then
-		mkdir -p ${ROOT}/var/lib/gdm
-		chown gdm.gdm ${ROOT}/var/lib/gdm
-		chmod 0750 ${ROOT}/var/lib/gdm
-	fi
-	touch ${ROOT}/var/lib/gdm/.keep
-
-	echo ""
-	einfo "To make GDM start at boot, edit /etc/rc.conf (or /etc/conf.d/basic)"
-	einfo "and then execute 'rc-update add xdm default'."
-	einfo ""
-	einfo "Note that you need xfree-4.1.0-r4 or later."
-}
-
-pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-
-	echo ""
-	einfo "To remove GDM from startup please execute"
-	einfo "'rc-update del xdm default'"
-}
-
diff --git a/gnome-base/gdm/gdm-2.4.1.3.ebuild b/gnome-base/gdm/gdm-2.4.1.3.ebuild
deleted file mode 100644
index 1b7b6cc075e3..000000000000
--- a/gnome-base/gdm/gdm-2.4.1.3.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.1.3.ebuild,v 1.10 2003/09/06 23:51:37 msterret Exp $
-
-inherit eutils gnome.org
-
-DESCRIPTION="GNOME2 Display Manager"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha amd64"
-LICENSE="GPL-2"
-IUSE="nls"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme.tar.bz2"
-MY_V="`echo ${PV} |cut -b -5`"
-
-RDEPEND=">=sys-libs/pam-0.72
-	>=sys-apps/tcp-wrappers-7.6
-	>=app-text/scrollkeeper-0.3.11
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=gnome-base/librsvg-2
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=x11-base/xfree-4.2.0-r3"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/daemon
-	cp gdm.h gdm.h.orig
-	sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \
-		gdm.h.orig > gdm.h
-	rm -f gdm.h.orig
-
-	# Make Gentoo theme default
-	cd ${S}/config
-	cp gdm.conf.in gdm.conf.in.orig
-	sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \
-		-e "s:=circles:=gentoo-emergence:" \
-		-e "s:command=/usr/X11R6/bin/X:command=/usr/X11R6/bin/X -nolisten tcp:" \
-		gdm.conf.in.orig > gdm.conf.in
-
-	rm -f gdm.conf.in.orig
-}
-
-src_compile() {
-	local myconf=""
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc/X11 \
-		--localstatedir=/var/lib \
-		--with-pam-prefix=/etc \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	cd omf-install
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" \
-		Makefile.old > Makefile
-	rm Makefile.old
-	cd ${S}
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11 \
-		localstatedir=${D}/var/lib \
-		PAM_PREFIX=${D}/etc \
-		install || die
-
-	# We need to move gdm-binary to gdm, else our xdm script
-	# have problems stopping gdm (bug #5598)
-	rm -f ${D}/usr/bin/gdm
-	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
-
-	rm -f ${D}/etc/pam.d/gdm
-
-	# log
-	dodir /var/lib/gdm
-	chown gdm:gdm ${D}/var/lib/gdm
-	chmod 0750 ${D}/var/lib/gdm
-
-	# pam startup
-	dodir /etc/pam.d
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${MY_V}/pam.d/gdm
-	doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig
-
-	# pam security
-	dodir /etc/security/console.apps
-	insinto /etc/security/console.apps
-	doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
-
-	# gnomerc
-	dodir /etc/X11/gdm
-	exeinto /etc/X11/gdm
-	doexe ${FILESDIR}/${MY_V}/gnomerc
-
-	cd ${D}/etc/X11/gdm
-	for i in Init/Default PostSession/Default PreSession/Default gdm.conf
-	do
-		cp ${i} ${i}.orig
-		sed -e s:/usr/bin/X11:/usr/X11R6/bin:g \
-			${i}.orig > ${i}
-		rm ${i}.orig
-	done
-
-	cd ${D}/etc/X11/gdm
-	cp gdm.conf gdm.conf.orig
-
-	sed -e "s:0=/usr/X11R6/bin/X:0=/usr/X11R6/bin/X -dpi 100 -nolisten tcp dpms vt7:g" \
-	    -e "s:GtkRC=/opt/gnome/share/themes/Default/gtk/gtkrc:GtkRC=/usr/share/themes/Default/gtk/gtkrc:g" \
-	    -e "s:BackgroundColor=#007777:BackgroundColor=#2a3f5b:g" \
-	    -e "s:TitleBar=true:TitleBar=false:g" \
-		-e "s:Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:g" \
-		gdm.conf.orig > gdm.conf
-
-	rm gdm.conf.orig
-
-	cd ${S}
-
-	# Support for new session stuff
-	rm -rf ${D}/etc/X11/gdm/Sessions
-	dosym ../Sessions /etc/X11/gdm/Sessions
-
-	# Make sure the users environment are set properly
-	# (bash users only though :( )
-	dosed "s:#!/bin/sh:#!/bin/bash --login:g" /etc/X11/gdm/PreSession/Default
-
-	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-emergence  ${D}/usr/share/gdm/themes
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
-}
-
-pkg_preinst() {
-	#support for new session stuff
-	if [ -d ${ROOT}/etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ]
-	then
-		mv -f ${ROOT}/etc/X11/gdm/Sessions ${ROOT}/etc/X11/gdm/Sessions.old
-	fi
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-
-	# Attempt to restart GDM softly by use of the fifo.  Wont work on older
-	# then 2.2.3.1 versions but should work nicely on later upgrades.
-	# FIXME: this is just way too complex
-	FIFOFILE="${ROOT}`grep '^ServAuthDir=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`"
-	if [ -z "${FIFOFILE}" ]
-	then
-		FIFOFILE=${ROOT}/var/lib/gdm/.gdmfifo
-	else
-		FIFOFILE=${FIFOFILE}/.gdmfifo
-	fi
-	PIDFILE="${ROOT}`grep '^PidFile=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`"
-	if [ -z "${PIDFILE}" ]
-	then
-		PIDFILE=${ROOT}/var/run/gdm.pid
-	fi
-	if [ -w ${FIFOFILE} ]
-	then
-		if [ -f ${PIDFILE} ]
-		then
-			if kill -0 `cat ${PIDFILE}`
-			then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	fi
-
-	# Unmerge nukes sometimes
-	if [ ! -d ${ROOT}/var/lib/gdm ]
-	then
-		mkdir -p ${ROOT}/var/lib/gdm
-		chown gdm.gdm ${ROOT}/var/lib/gdm
-		chmod 0750 ${ROOT}/var/lib/gdm
-	fi
-	touch ${ROOT}/var/lib/gdm/.keep
-
-	echo ""
-	einfo "To make GDM start at boot, edit /etc/rc.conf (or /etc/conf.d/basic)"
-	einfo "and then execute 'rc-update add xdm default'."
-	einfo ""
-	einfo "Note that you need xfree-4.1.0-r4 or later."
-}
-
-pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-
-	echo ""
-	einfo "To remove GDM from startup please execute"
-	einfo "'rc-update del xdm default'"
-}
diff --git a/gnome-base/gdm/gdm-2.4.1.4.ebuild b/gnome-base/gdm/gdm-2.4.1.4.ebuild
deleted file mode 100644
index 17186d0d20ed..000000000000
--- a/gnome-base/gdm/gdm-2.4.1.4.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.1.4.ebuild,v 1.6 2003/09/06 23:51:37 msterret Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME2 Display Manager"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha hppa amd64"
-LICENSE="GPL-2"
-IUSE=""
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme.tar.bz2"
-MY_V="`echo ${PV} |cut -b -5`"
-
-RDEPEND=">=sys-libs/pam-0.72
-	>=sys-apps/tcp-wrappers-7.6
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=gnome-base/librsvg-2
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=app-text/scrollkeeper-0.3.11
-	>=x11-base/xfree-4.2.0-r3"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/daemon
-	cp gdm.h gdm.h.orig
-	sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \
-		gdm.h.orig > gdm.h
-	rm -f gdm.h.orig
-
-	# Make Gentoo theme default
-	cd ${S}/config
-	cp gdm.conf.in gdm.conf.in.orig
-	sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \
-		-e "s:=circles:=gentoo-emergence:" \
-		-e "s:command=/usr/X11R6/bin/X:command=/usr/X11R6/bin/X -nolisten tcp:" \
-		gdm.conf.in.orig > gdm.conf.in
-
-	rm -f gdm.conf.in.orig
-}
-
-src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc/X11 \
-		--localstatedir=/var/lib \
-		--with-pam-prefix=/etc \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	cd omf-install
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" \
-		Makefile.old > Makefile
-	rm Makefile.old
-	cd ${S}
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11 \
-		localstatedir=${D}/var/lib \
-		PAM_PREFIX=${D}/etc \
-		install || die
-
-	# We need to move gdm-binary to gdm, else our xdm script
-	# have problems stopping gdm (bug #5598)
-	rm -f ${D}/usr/bin/gdm
-	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
-
-	rm -f ${D}/etc/pam.d/gdm
-
-	# log
-	dodir /var/lib/gdm
-	chown gdm:gdm ${D}/var/lib/gdm
-	chmod 0750 ${D}/var/lib/gdm
-
-	# pam startup
-	dodir /etc/pam.d
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${MY_V}/pam.d/gdm
-	doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig
-
-	# pam security
-	dodir /etc/security/console.apps
-	insinto /etc/security/console.apps
-	doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
-
-	# gnomerc
-	dodir /etc/X11/gdm
-	exeinto /etc/X11/gdm
-	doexe ${FILESDIR}/${MY_V}/gnomerc
-
-	cd ${D}/etc/X11/gdm
-	for i in Init/Default PostSession/Default PreSession/Default gdm.conf
-	do
-		cp ${i} ${i}.orig
-		sed -e s:/usr/bin/X11:/usr/X11R6/bin:g \
-			${i}.orig > ${i}
-		rm ${i}.orig
-	done
-
-	cd ${D}/etc/X11/gdm
-	cp gdm.conf gdm.conf.orig
-
-	sed -e "s:0=/usr/X11R6/bin/X:0=/usr/X11R6/bin/X -dpi 100 -nolisten tcp dpms vt7:g" \
-	    -e "s:GtkRC=/opt/gnome/share/themes/Default/gtk/gtkrc:GtkRC=/usr/share/themes/Default/gtk/gtkrc:g" \
-	    -e "s:BackgroundColor=#007777:BackgroundColor=#2a3f5b:g" \
-	    -e "s:TitleBar=true:TitleBar=false:g" \
-		-e "s:Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:g" \
-		gdm.conf.orig > gdm.conf
-
-	rm gdm.conf.orig
-
-	cd ${S}
-
-	# Support for new session stuff
-	rm -rf ${D}/etc/X11/gdm/Sessions
-	dosym ../Sessions /etc/X11/gdm/Sessions
-
-	# Make sure the users environment are set properly
-	# (bash users only though :( )
-	dosed "s:#!/bin/sh:#!/bin/bash --login:g" /etc/X11/gdm/PreSession/Default
-
-	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-emergence  ${D}/usr/share/gdm/themes
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
-}
-
-pkg_preinst() {
-	#support for new session stuff
-	if [ -d ${ROOT}/etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ]
-	then
-		mv -f ${ROOT}/etc/X11/gdm/Sessions ${ROOT}/etc/X11/gdm/Sessions.old
-	fi
-}
-
-pkg_postinst() {
-	gnome2_scrollkeeper_update
-
-	# Attempt to restart GDM softly by use of the fifo.  Wont work on older
-	# then 2.2.3.1 versions but should work nicely on later upgrades.
-	# FIXME: this is just way too complex
-	FIFOFILE="${ROOT}`grep '^ServAuthDir=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`"
-	if [ -z "${FIFOFILE}" ]
-	then
-		FIFOFILE=${ROOT}/var/lib/gdm/.gdmfifo
-	else
-		FIFOFILE=${FIFOFILE}/.gdmfifo
-	fi
-	PIDFILE="${ROOT}`grep '^PidFile=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`"
-	if [ -z "${PIDFILE}" ]
-	then
-		PIDFILE=${ROOT}/var/run/gdm.pid
-	fi
-	if [ -w ${FIFOFILE} ]
-	then
-		if [ -f ${PIDFILE} ]
-		then
-			if kill -0 `cat ${PIDFILE}`
-			then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	fi
-
-	# Unmerge nukes sometimes
-	if [ ! -d ${ROOT}/var/lib/gdm ]
-	then
-		mkdir -p ${ROOT}/var/lib/gdm
-		chown gdm.gdm ${ROOT}/var/lib/gdm
-		chmod 0750 ${ROOT}/var/lib/gdm
-	fi
-	touch ${ROOT}/var/lib/gdm/.keep
-
-	echo ""
-	einfo "To make GDM start at boot, edit /etc/rc.conf (or /etc/conf.d/basic)"
-	einfo "and then execute 'rc-update add xdm default'."
-	einfo ""
-	einfo "Note that you need xfree-4.1.0-r4 or later."
-}
-
-pkg_postrm() {
-	gnome2_scrollkeeper_update
-
-	echo ""
-	einfo "To remove GDM from startup please execute"
-	einfo "'rc-update del xdm default'"
-}