move /etc/X11/Sessions/Gnome to gnome-core

5 files changed, 26 insertions, 144 deletions

diff --git a/gnome-base/gdm/files/digest-gdm-2.2.5.1 b/gnome-base/gdm/files/digest-gdm-2.2.5.1
deleted file mode 100644
index 3ce1074ccf72..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.2.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 17742a33f27505b942697403a16de289 gdm-2.2.5.1.tar.bz2 1449984
diff --git a/gnome-base/gdm/files/digest-gdm-2.2.5.2 b/gnome-base/gdm/files/digest-gdm-2.2.5.2
deleted file mode 100644
index 4ec952917c34..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.2.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38cf7ef60b63b281d19622571a4c7a03 gdm-2.2.5.2.tar.bz2 1499136
diff --git a/gnome-base/gdm/files/digest-gdm-2.2.5.4-r4 b/gnome-base/gdm/files/digest-gdm-2.2.5.4-r4
new file mode 100644
index 000000000000..59e421922621
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.2.5.4-r4
@@ -0,0 +1 @@
+MD5 958a589c378f2eae2167bbbd3abdea3b gdm-2.2.5.4.tar.bz2 1593344
diff --git a/gnome-base/gdm/gdm-2.2.5.1.ebuild b/gnome-base/gdm/gdm-2.2.5.1.ebuild
deleted file mode 100644
index 3a36f8ec8819..000000000000
--- a/gnome-base/gdm/gdm-2.2.5.1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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.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.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=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"
-
-
-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 gdm.h.orig
-
-	cd ${S}/config
-	cp gdm.conf.in gdm.conf.in.orig
-	sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" gdm.conf.in.orig > gdm.conf.in
-	rm gdm.conf.in.orig
-}
-
-src_compile() {
-
-	CFLAGS="${CFLAGS} `gnome-config --cflags libglade`"
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc/X11				\
-		    --localstatedir=/var/lib				\
-		    --with-pam-prefix=/etc || die
-
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc/X11					\
-	     localstatedir=${D}/var/lib					\
-	     PAM_PREFIX=${D}/etc					\
-	     install || die
-
-	rm -f ${D}/etc/pam.d/gdm
-
-	# log
-	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
-	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" \
-		gdm.conf.orig > gdm.conf
-
-	rm gdm.conf.orig
-
-	cd ${S}
-	
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
-}
-
-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() {
-
-	# 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'"
-}
-
diff --git a/gnome-base/gdm/gdm-2.2.5.2.ebuild b/gnome-base/gdm/gdm-2.2.5.4-r4.ebuild
index 8fbb0319ff56..68514779fada 100644
--- a/gnome-base/gdm/gdm-2.2.5.2.ebuild
+++ b/gnome-base/gdm/gdm-2.2.5.4-r4.ebuild
@@ -1,7 +1,7 @@
 # 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.5.2.ebuild,v 1.1 2001/11/25 22:34:23 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.2.5.4-r4.ebuild,v 1.1 2002/01/27 14:01:33 azarah Exp $
 
 MY_V="`echo ${PV} |cut -b -5`"
 S=${WORKDIR}/${P}
@@ -15,6 +15,10 @@ DEPEND=">=sys-libs/pam-0.72
 	>=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 )"
+
 
 src_unpack() {
 
@@ -32,9 +36,6 @@ src_unpack() {
 }
 
 src_compile() {
-
-	CFLAGS="${CFLAGS} `gnome-config --cflags libglade`"
-
 	./configure --host=${CHOST} 					\
 		    --prefix=/usr					\
 		    --sysconfdir=/etc/X11				\
@@ -45,6 +46,11 @@ src_compile() {
 }
 
 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					\
@@ -95,11 +101,24 @@ src_install() {
 	rm gdm.conf.orig
 
 	cd ${S}
+
+	#support for new session stuff
+	rm -rf ${D}/etc/X11/gdm/Sessions
+	dosym ../Sessions /etc/X11/gdm/Sessions
 	
 	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
 }
 
+pkg_preinst() {
+	#support for new session stuff
+	if [ -d /etc/X11/gdm/Sessions ] ; then
+		mv -f /etc/X11/gdm/Sessions /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.
@@ -133,6 +152,8 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+        echo ">>> Updating Scrollkeeper database..."
+        scrollkeeper-update >/dev/null 2>&1
 
 	echo
 	echo "**********************************************"