7 files changed, 130 insertions, 222 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index dae1f5378855..bb7e204b2eda 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.44 2003/11/17 11:37:40 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.45 2003/11/23 17:48:38 foser Exp $
+
+*gdm-2.4.4.5 (23 Nov 2003)
+
+  23 Nov 2003; foser <foser@gentoo.org> gdm-2.4.4.5.ebuild, files/2.4.4/* :
+  Cleaned up ebuild
+  Moved tcp-wrappers to DEP
+  Temporary removed gentoo theme
+  Now use our own Xsession file to source .bash_profile, needed for keychain
+  Added libart_lgpl dep
 
 *gdm-2.4.1.7-r1 (17 Nov 2003)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 489c3ec11d52..0138d54e314f 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,23 +1,23 @@
-MD5 8cd31b5540060b186a316b20e25b25aa gdm-2.4.1.6.ebuild 4807
-MD5 3237dec3ad41d01cf4278ce2de5562d2 ChangeLog 6370
+MD5 f075593261e81dd3b64060099e1c4c24 gdm-2.4.4.5.ebuild 2521
 MD5 265d31c48d895a3f20a1ac13785a56e4 gdm-2.2.5.4-r5.ebuild 4526
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 e9ce865541c5ed36dae3548244fc8ea4 gdm-2.4.1.7.ebuild 4805
 MD5 729c7808be2ce0805f69ff6ea0b45d46 gdm-2.4.1.7-r1.ebuild 5224
+MD5 37b6e483a62d3a942daf7a616ae99fc4 ChangeLog 6656
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 8cd31b5540060b186a316b20e25b25aa gdm-2.4.1.6.ebuild 4807
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
-MD5 56240f76c07fea3245d9c6bb19066474 files/digest-gdm-2.4.1.6 134
-MD5 91f7b8aac4f6e16eba07dfe459b9263f files/gdm-startDM.sh.patch 308
-MD5 6392095707ae98912a626cb035796255 files/digest-gdm-2.4.1.7 134
 MD5 6392095707ae98912a626cb035796255 files/digest-gdm-2.4.1.7-r1 134
+MD5 56240f76c07fea3245d9c6bb19066474 files/digest-gdm-2.4.1.6 134
+MD5 3f9ff674c1629cb397ab0eb0894cc7e3 files/digest-gdm-2.4.4.5 65
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
-MD5 2a4dc345919a4094ead16d7a122e40bf files/2.4.0/gnomerc 235
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.4.1/gnomerc 235
-MD5 89cc8ab9525284af6babcb9c86122443 files/2.2.5/pam.d/gdmconfig 288
+MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.4.4/Xsession 6198
 MD5 d0cb338160e3be8790524af8071cc4df files/2.2.5/pam.d/gdm 380
-MD5 89cc8ab9525284af6babcb9c86122443 files/2.4.0/pam.d/gdmconfig 288
-MD5 d0cb338160e3be8790524af8071cc4df files/2.4.0/pam.d/gdm 380
-MD5 89cc8ab9525284af6babcb9c86122443 files/2.4.1/pam.d/gdmconfig 288
+MD5 89cc8ab9525284af6babcb9c86122443 files/2.2.5/pam.d/gdmconfig 288
 MD5 d0cb338160e3be8790524af8071cc4df files/2.4.1/pam.d/gdm 380
+MD5 89cc8ab9525284af6babcb9c86122443 files/2.4.1/pam.d/gdmconfig 288
+MD5 2edddb54af0c3c979b9ef73ba52deb4a files/2.4.4/pam.d/gdm 425
+MD5 6c45b586e2cf16cf89ab544197b12bae files/2.4.4/pam.d/gdm-autologin 406
+MD5 89cc8ab9525284af6babcb9c86122443 files/2.4.4/pam.d/gdmconfig 288
 MD5 114395565e31f41b44d31d731f1478b0 files/2.2.5/security/console.apps/gdmconfig 66
-MD5 114395565e31f41b44d31d731f1478b0 files/2.4.0/security/console.apps/gdmconfig 66
 MD5 114395565e31f41b44d31d731f1478b0 files/2.4.1/security/console.apps/gdmconfig 66
+MD5 114395565e31f41b44d31d731f1478b0 files/2.4.4/security/console.apps/gdmconfig 66
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.1.7 b/gnome-base/gdm/files/digest-gdm-2.4.1.7
deleted file mode 100644
index e979694dda52..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.4.1.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fd45b8d069355f019c08b3964a71f342 gdm-2.4.1.7.tar.bz2 2088490
-MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.4.5 b/gnome-base/gdm/files/digest-gdm-2.4.4.5
new file mode 100644
index 000000000000..1e30232a7b74
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.4.4.5
@@ -0,0 +1 @@
+MD5 eae456b3a59154e55d69263aad5e8a54 gdm-2.4.4.5.tar.bz2 2394913
diff --git a/gnome-base/gdm/files/gdm-startDM.sh.patch b/gnome-base/gdm/files/gdm-startDM.sh.patch
deleted file mode 100644
index f851eec74af3..000000000000
--- a/gnome-base/gdm/files/gdm-startDM.sh.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- startDM.sh.orig	2002-11-07 10:34:16.000000000 +0200
-+++ startDM.sh	2002-11-07 10:37:38.000000000 +0200
-@@ -6,6 +6,9 @@
- 
- source /etc/init.d/functions.sh
- 
-+# We need to source /etc/profile for stuff like $LANG to work
-+# bug #10190.
-+source /etc/profile
- 
- if [ -e ${svcdir}/options/xdm/service ]
- then
diff --git a/gnome-base/gdm/gdm-2.4.1.7.ebuild b/gnome-base/gdm/gdm-2.4.1.7.ebuild
deleted file mode 100644
index 0aef64324db6..000000000000
--- a/gnome-base/gdm/gdm-2.4.1.7.ebuild
+++ /dev/null
@@ -1,194 +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.7.ebuild,v 1.1 2003/11/01 17:20:49 solar 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() {
-
-	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'."
-}
-
-pkg_postrm() {
-	gnome2_scrollkeeper_update
-
-	echo ""
-	einfo "To remove GDM from startup please execute"
-	einfo "'rc-update del xdm default'"
-}
diff --git a/gnome-base/gdm/gdm-2.4.4.5.ebuild b/gnome-base/gdm/gdm-2.4.4.5.ebuild
new file mode 100644
index 000000000000..74920cdcc87f
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.4.4.5.ebuild
@@ -0,0 +1,106 @@
+# 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.4.5.ebuild,v 1.1 2003/11/23 17:48:38 foser Exp $
+
+inherit gnome2
+
+DESCRIPTION="GNOME2 Display Manager"
+HOMEPAGE="http://www.jirka.org/gdm.html"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+LICENSE="GPL-2"
+IUSE="tcpd xinerama"
+
+MY_V="`echo ${PV} |cut -b -5`"
+
+RDEPEND=">=sys-libs/pam-0.72
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2
+	>=gnome-base/librsvg-2
+	>=media-libs/libart_lgpl-2.3.11
+	>=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
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+G2CONF="${G2CONF} \
+	--sysconfdir=/etc/X11 \
+	--with-pam-prefix=/etc \
+	--with-xdmcp \
+	`use_with tcpd tcp-wrappers` \
+	`use_with xinerama`"
+
+src_install() {
+
+	gnome2_src_install PAM_PREFIX=${D}/etc sysconfdir=${D}/etc/X11
+
+	# gdm-binary should be gdm to work with our init (#5598)
+	rm -f ${D}/usr/bin/gdm
+	cp ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
+
+	# log, etc.
+	dodir /var/lib/gdm
+	chown gdm.gdm ${D}/var/lib/gdm
+	chmod 750 ${D}/var/lib/gdm
+
+	# use our own session script
+	rm -f ${D}/etc/X11/gdm/Xsession
+	exeinto /etc/X11/gdm
+	doexe ${FILESDIR}/${MY_V}/Xsession
+
+	# We replace the pam stuff by our own
+	rm -f ${D}/etc/pam.d/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
+	doins ${FILESDIR}/${MY_V}/pam.d/gdm-autologin
+
+	# pam security
+	dodir /etc/security/console.apps
+	insinto /etc/security/console.apps
+	doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
+
+	# use graphical greeter local
+	dosed "s:#Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:" /etc/X11/gdm/gdm.conf
+
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	FIFOFILE=/var/lib/gdm/.gdminfo
+	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
+
+	einfo "To make GDM start at boot, edit /etc/rc.conf"
+	einfo "and then execute 'rc-update add xdm default'."
+
+}
+
+pkg_postrm() {
+
+	gnome2_pkg_postrm
+
+	einfo "To remove GDM from startup please execute"
+	einfo "'rc-update del xdm default'"
+
+}