New version 'n cleanup

5 files changed, 79 insertions, 51 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 6f44506fbc04..487be92f6246 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2003/04/03 21:55:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.33 2003/05/13 17:50:08 foser Exp $
+
+*gdm-2.4.1.4 (13 May 2003)
+
+  13 May 2003; foser <foser@gentoo.org> gdm-2.4.1.4.ebuild :
+  New version, gnome2 eclass gdm a little
 
 *gdm-2.4.1.3 (04 Feb 2003)
 
diff --git a/gnome-base/gdm/files/digest-gdm-2.2.5.4-r5 b/gnome-base/gdm/files/digest-gdm-2.2.5.4-r5
deleted file mode 100644
index 48eb54b0a3ed..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.2.5.4-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 958a589c378f2eae2167bbbd3abdea3b gdm-2.2.5.4.tar.bz2 1586241
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.1.4 b/gnome-base/gdm/files/digest-gdm-2.4.1.4
new file mode 100644
index 000000000000..797693859fe3
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.4.1.4
@@ -0,0 +1,2 @@
+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
index 62992644a18b..47714f6557fd 100644
--- a/gnome-base/gdm/gdm-2.4.0.12-r2.ebuild
+++ b/gnome-base/gdm/gdm-2.4.0.12-r2.ebuild
@@ -1,9 +1,10 @@
 # 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.3 2003/02/13 12:06:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.0.12-r2.ebuild,v 1.4 2003/05/13 17:50:08 foser Exp $
 
 inherit eutils gnome.org
 
+NOMIRROR="1"
 DESCRIPTION="GNOME2 Display Manager"
 HOMEPAGE="http://www.gnome.org/"
 
diff --git a/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild b/gnome-base/gdm/gdm-2.4.1.4.ebuild
index 42a3e3acf84e..36656566d02a 100644
--- a/gnome-base/gdm/gdm-2.2.5.4-r5.ebuild
+++ b/gnome-base/gdm/gdm-2.4.1.4.ebuild
@@ -1,27 +1,33 @@
 # 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.2.5.4-r5.ebuild,v 1.16 2003/02/13 12:06:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.1.4.ebuild,v 1.1 2003/05/13 17:50:08 foser Exp $
 
-DESCRIPTION="GNOME Display Manager"
+inherit eutils gnome2
+
+DESCRIPTION="GNOME2 Display Manager"
 HOMEPAGE="http://www.gnome.org/"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 LICENSE="GPL-2"
-IUSE="nls gnome"
-
+IUSE=""
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gentoo-gdm-theme.tar.bz2"
 MY_V="`echo ${PV} |cut -b -5`"
 
-DEPEND=">=sys-libs/pam-0.72
+RDEPEND=">=sys-libs/pam-0.72
 	>=sys-apps/tcp-wrappers-7.6
-	>=gnome-base/gnome-libs-1.4.1.2-r1
-	>=gnome-base/libglade-0.17-r1
-	>=media-libs/gdk-pixbuf-0.11.0-r1"
-
-RDEPEND="${DEPEND}
-	>=x11-base/xfree-4.2.0-r3
-	gnome? ( >=gnome-base/gnome-core-1.4.0.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}
+	>=app-text/scrollkeeper-0.3.11
+	>=x11-base/xfree-4.2.0-r3"
 
 src_unpack() {
 	unpack ${A}
@@ -30,32 +36,35 @@ src_unpack() {
 	cp gdm.h gdm.h.orig
 	sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \
 		gdm.h.orig > gdm.h
-	rm gdm.h.orig
+	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 \
+	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 gdm.conf.in.orig
+
+	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
+	sed -e "s:scrollkeeper-update.*::g" \
+		Makefile.old > Makefile
 	rm Makefile.old
 	cd ${S}
 
@@ -65,12 +74,17 @@ src_install() {
 		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 750 ${D}/var/lib/gdm
+	chown gdm:gdm ${D}/var/lib/gdm
+	chmod 0750 ${D}/var/lib/gdm
   
 	# pam startup
 	dodir /etc/pam.d
@@ -91,10 +105,10 @@ src_install() {
 	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
+		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
@@ -104,6 +118,7 @@ src_install() {
 	    -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
@@ -118,43 +133,50 @@ src_install() {
 	# (bash users only though :( )
 	dosed "s:#!/bin/sh:#!/bin/bash --login:g" /etc/X11/gdm/PreSession/Default
 
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
+	# 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 /etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ]
+	#support for new session stuff
+	if [ -d ${ROOT}/etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ]
 	then
-		mv -f /etc/X11/gdm/Sessions /etc/X11/gdm/Sessions.old
+		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
+	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=`grep '^ServAuthDir=' /etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`
-	if test x$FIFOFILE = x ; then
-		FIFOFILE=%{localstatedir}/gdm/.gdmfifo
+	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
+		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
+	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 test -w $FIFOFILE ; then
-		if test -f $PIDFILE ; then
-			if kill -0 `cat $PIDFILE` ; then
-				(echo;echo SOFT_RESTART) >> $FIFOFILE
+	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
+	# Unmerge nukes sometimes
 	if [ ! -d ${ROOT}/var/lib/gdm ]
 	then
 		mkdir -p ${ROOT}/var/lib/gdm
@@ -171,10 +193,9 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
+	gnome2_scrollkeeper_update
 
-	echo
+	echo ""
 	einfo "To remove GDM from startup please execute"
 	einfo "'rc-update del xdm default'"
 }