a lot of DEPEND/RDEPEND fixes. most to accomodate freedesktop.org xserver project.

4 files changed, 224 insertions, 3 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index e6fa196b139c..dae1f5378855 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.43 2003/11/15 02:53:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.44 2003/11/17 11:37:40 spider Exp $
+
+*gdm-2.4.1.7-r1 (17 Nov 2003)
+
+  17 Nov 2003; <spider@gentoo.org> gdm-2.4.1.7-r1.ebuild:
+  Added runtime dependency on virtual/x11, 
+  moved tcp-wrappers from hard dep to use tcpd? ()
+  added xinerama USE flag
+  added X USE flag for xdmcp. 
+  Removed static dependency on xfree (new freedesktop.org x11 works too)
 
   14 Nov 2003; Aron Griffis <agriffis@gentoo.org> gdm-2.4.1.6.ebuild:
   Stable on ia64
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index d6656fe8c6c6..bb0c7fa2cf38 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,9 +1,9 @@
 MD5 8cd31b5540060b186a316b20e25b25aa gdm-2.4.1.6.ebuild 4807
-MD5 16ec17a5998112a0d3f5ab3d14a05bd7 ChangeLog 6057
+MD5 3237dec3ad41d01cf4278ce2de5562d2 ChangeLog 6370
 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 df10ac9bcc1888b815a6f4a2c124c8d5 gdm-2.4.1.7-r1.ebuild 5206
+MD5 b23a00e5b2615f0b8ddfb1041a94254d gdm-2.4.1.7-r1.ebuild 5209
 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
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.1.7-r1 b/gnome-base/gdm/files/digest-gdm-2.4.1.7-r1
new file mode 100644
index 000000000000..e979694dda52
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.4.1.7-r1
@@ -0,0 +1,2 @@
+MD5 fd45b8d069355f019c08b3964a71f342 gdm-2.4.1.7.tar.bz2 2088490
+MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423
diff --git a/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild b/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild
new file mode 100644
index 000000000000..f1810dcd7272
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild
@@ -0,0 +1,210 @@
+# 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-r1.ebuild,v 1.1 2003/11/17 11:37:40 spider 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
+	tcpd? ( >=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
+	virtual/x11"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=app-text/scrollkeeper-0.3.11
+	X? ( virtual/x11
+		xinerama? ( virtual/x11 ) )"
+
+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() {
+	myconf=""
+	if [ `use X` ]; then
+		myconf="${myconf} --with-xdmcp=yes"
+		use xinerama \
+			&& myconf="${myconf} --with-xinerama=yes" \
+			|| myconf="${myconf} --with-xinerama=no"
+	else
+		myconf="${myconf} --with-xdmcp=no --with-xinerama=no"
+	fi
+
+	use tcpd \
+		&& myconf="${myconf} --with-tcp-wrappers=yes" \
+		|| myconf="${myconf} --with-tcp-wrappers=no"
+
+	./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'"
+}