new version

1 files changed, 57 insertions, 21 deletions

diff --git a/gnome-base/gdm/gdm-2.2.3.2-r4.ebuild b/gnome-base/gdm/gdm-2.2.5.1.ebuild
index 1e771e3d419d..3a36f8ec8819 100644
--- a/gnome-base/gdm/gdm-2.2.3.2-r4.ebuild
+++ b/gnome-base/gdm/gdm-2.2.5.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Mikael Hallendal <hallski@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.2.3.2-r4.ebuild,v 1.2 2001/10/07 22:15:58 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.2.5.1.ebuild,v 1.1 2001/11/03 16:26:49 azarah Exp $
 
+MY_V="`echo ${PV} |cut -b -5`"
 S=${WORKDIR}/${P}
 DESCRIPTION="GNOME Display Manager"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/"
 
 DEPEND=">=sys-libs/pam-0.72
@@ -14,7 +15,9 @@ DEPEND=">=sys-libs/pam-0.72
 	>=gnome-base/libglade-0.17-r1
 	>=media-libs/gdk-pixbuf-0.11.0-r1"
 
+
 src_unpack() {
+
 	unpack ${A}
 
 	cd ${S}/daemon
@@ -28,7 +31,8 @@ src_unpack() {
 	rm gdm.conf.in.orig
 }
 
-src_compile() {                           
+src_compile() {
+
 	CFLAGS="${CFLAGS} `gnome-config --cflags libglade`"
 
 	./configure --host=${CHOST} 					\
@@ -40,32 +44,36 @@ src_compile() {
 	emake || die
 }
 
-src_install() {                               
-	make DESTDIR=${D}						\
+src_install() {
+
+	make prefix=${D}/usr						\
 	     sysconfdir=${D}/etc/X11					\
 	     localstatedir=${D}/var/lib					\
+	     PAM_PREFIX=${D}/etc					\
 	     install || die
 
-	rm -rf ${D}/etc/X11/pam.d
+	rm -f ${D}/etc/pam.d/gdm
 
 	# log
-	dodir /var
-	dodir /var/lib
-	dodir /var/lib/gdm
+	mkdir -p ${D}/var/lib/gdm
 	chown gdm:gdm ${D}/var/lib/gdm
 	chmod 750 ${D}/var/lib/gdm
   
 	# pam startup
 	dodir /etc/pam.d
-	cd ${FILESDIR}/2.2.3/pam.d
 	insinto /etc/pam.d
-	doins gdm
+	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
-	cd ${FILESDIR}/2.2.3
 	exeinto /etc/X11/gdm
-	doexe gnomerc
+	doexe ${FILESDIR}/${MY_V}/gnomerc
 
 	cd ${D}/etc/X11/gdm
 	for i in Init/Default PostSession/Default PreSession/Default gdm.conf
@@ -79,7 +87,7 @@ src_install() {
 	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/X11R6/share/themes/gtk/gtkrc: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" \
 		gdm.conf.orig > gdm.conf
@@ -87,16 +95,44 @@ src_install() {
 	rm gdm.conf.orig
 
 	cd ${S}
-	dodoc AUTHORS COPYING ChangeLog NEWS README* RELEASENOTES TODO
+	
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
 }
 
-pkg_postinst()
-{
-	echo "To make GDM start at boot, edit /etc/rc.d/config/basic and then execute 'rc-update add gdm default'"
+pkg_postinst() {
+
+	# 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=`grep '^ServAuthDir=' /etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`
+	if test x$FIFOFILE = x ; then
+		FIFOFILE=%{localstatedir}/gdm/.gdmfifo
+	else
+	FIFOFILE="$FIFOFILE"/.gdmfifo
+	fi
+	PIDFILE=`grep '^PidFile=' /etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`
+	if test x$PIDFILE = x ; then
+		PIDFILE=/var/run/gdm.pid
+	fi
+	if test -w $FIFOFILE ; then
+		if test -f $PIDFILE ; then
+			if kill -0 `cat $PIDFILE` ; then
+				(echo;echo SOFT_RESTART) >> $FIFOFILE
+			fi
+		fi
+	fi
+
+
+	# Remove this line and next, and uncomment third when
+	# /etc/init.d/xdm has been fixed
+#	echo "To make GDM start at boot, edit /etc/rc.conf and then execute 'rc-update add xdm default'"
 }
 
-pkg_prerm()
-{
-	echo "To remove GDM from startup please execute 'rc-update del xdm default'"
+pkg_prerm() {
+
+	# Remove this line and next two, and uncomment fourth when /etc/init.d/xdm has been fixed 
+	# and /etc/rc.conf updated
+	echo
+#	echo "To remove GDM from startup please execute 'rc-update del xdm default'"
 }