New version

4 files changed, 155 insertions, 18 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 80bef3d5cfdd..6f1ded507ff0 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.84 2005/01/08 23:57:29 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.85 2005/03/01 12:51:39 obz Exp $
+
+*gdm-2.6.0.7 (01 Mar 2005)
+
+  01 Mar 2005; Mike Gardiner <obz@gentoo.org> +gdm-2.6.0.7.ebuild:
+  New version
 
   08 Jan 2005; Tom Martin <slarti@gentoo.org> gdm-2.2.5.4-r5.ebuild,
   gdm-2.4.1.7-r1.ebuild, gdm-2.4.4.7-r1.ebuild, gdm-2.6.0.3.ebuild,
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 26d125c3c894..ca6d67bf8da0 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,22 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 eb5c185ed296f52a4105860d87416f22 ChangeLog 11362
-MD5 c4d34959dd6c05056e5852277f76d250 gdm-2.2.5.4-r5.ebuild 4413
-MD5 d979d4d7e5b2ec03f8384d1d8db37f1d gdm-2.4.1.7-r1.ebuild 5270
-MD5 ea62033494a3e02a75bd72d3dbd6c986 gdm-2.4.4.7-r1.ebuild 3410
 MD5 a7405d9c839482fff8b76a3312842a59 gdm-2.6.0.3.ebuild 3371
+MD5 ea62033494a3e02a75bd72d3dbd6c986 gdm-2.4.4.7-r1.ebuild 3410
+MD5 c4d34959dd6c05056e5852277f76d250 gdm-2.2.5.4-r5.ebuild 4413
 MD5 d53dd7b184e898d50c7e5cc31bfd7036 gdm-2.6.0.4-r1.ebuild 3268
+MD5 d18cd0b679fea15179bbc715fff13e69 gdm-2.6.0.7.ebuild 3274
+MD5 d979d4d7e5b2ec03f8384d1d8db37f1d gdm-2.4.1.7-r1.ebuild 5270
+MD5 9bc846470d9657b39ea8d3e5ffb03692 ChangeLog 11469
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 aaea1d63e50c98768949cf44896c9cb5 gdm-2.6.0.6.ebuild 3244
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
 MD5 6392095707ae98912a626cb035796255 files/digest-gdm-2.4.1.7-r1 134
 MD5 25720fd12f8eee788fc5169824a0fe7e files/digest-gdm-2.4.4.7-r1 205
-MD5 6d2d226ffb2ab29992376b5e2e4abe9f files/digest-gdm-2.6.0.3 205
 MD5 5f1a2155fb7d9ac84b228d439df56777 files/digest-gdm-2.6.0.4-r1 137
-MD5 b2d71444a82a418126728e6301dd3389 files/gdm-2.4.1.7-gtk-2.4.patch 5730
-MD5 7dc28411b445f8459abba359b03f36b8 files/gdm-2.4.4-selinux_remove_attr.patch 826
+MD5 6d2d226ffb2ab29992376b5e2e4abe9f files/digest-gdm-2.6.0.3 205
 MD5 2f7f1a2f8ba0b8808f27f0a1f6abdcee files/digest-gdm-2.6.0.6 137
+MD5 c343d16819b3e271f74187954492a212 files/digest-gdm-2.6.0.7 137
+MD5 7dc28411b445f8459abba359b03f36b8 files/gdm-2.4.4-selinux_remove_attr.patch 826
+MD5 b2d71444a82a418126728e6301dd3389 files/gdm-2.4.1.7-gtk-2.4.patch 5730
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.4.1/gnomerc 235
 MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.4.4/Xsession 6198
@@ -37,10 +36,3 @@ MD5 114395565e31f41b44d31d731f1478b0 files/2.2.5/security/console.apps/gdmconfig
 MD5 114395565e31f41b44d31d731f1478b0 files/2.4.1/security/console.apps/gdmconfig 66
 MD5 114395565e31f41b44d31d731f1478b0 files/2.4.4/security/console.apps/gdmconfig 66
 MD5 114395565e31f41b44d31d731f1478b0 files/2.6.0/security/console.apps/gdmconfig 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.14 (GNU/Linux)
-
-iD8DBQFB8fOuroRuSHgZdywRAuOOAJ4tqlferLHNx6ik3ioOmrwpsYGIigCcD+u3
-ffS33Yss+XtoQjPUaNbX420=
-=bMbB
------END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/digest-gdm-2.6.0.7 b/gnome-base/gdm/files/digest-gdm-2.6.0.7
new file mode 100644
index 000000000000..e0efa148ec4e
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.6.0.7
@@ -0,0 +1,2 @@
+MD5 d3c7d5e605fb5a27f59e228d49469fd6 gdm-2.6.0.7.tar.bz2 3345365
+MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
diff --git a/gnome-base/gdm/gdm-2.6.0.7.ebuild b/gnome-base/gdm/gdm-2.6.0.7.ebuild
new file mode 100644
index 000000000000..9df6f2d0614b
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.6.0.7.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.7.ebuild,v 1.1 2005/03/01 12:51:39 obz Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="GNOME2 Display Manager"
+HOMEPAGE="http://www.jirka.org/gdm.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+IUSE="tcpd xinerama selinux ipv6"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gentoo-gdm-theme-r2.tar.bz2"
+MY_V="${PV%.*}"
+
+RDEPEND=">=sys-libs/pam-0.72
+	>=x11-libs/pango-1.4.1
+	>=x11-libs/gtk+-2.4
+	>=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
+	selinux? ( sys-libs/libselinux )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	>=app-text/scrollkeeper-0.3.11
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+G2CONF="${G2CONF} \
+	--sysconfdir=/etc/X11 \
+	--localstatedir=/var \
+	--with-pam-prefix=/etc \
+	--with-xdmcp \
+	`use_enable ipv6` \
+	`use_with tcpd tcp-wrappers` \
+	`use_with xinerama` \
+	`use_with selinux`"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# remove unneeded linker directive for selinux (#41022)
+	epatch ${FILESDIR}/${PN}-2.4.4-selinux_remove_attr.patch
+
+}
+
+src_install() {
+
+	gnome2_src_install \
+		PAM_PREFIX=${D}/etc \
+		sysconfdir=${D}/etc/X11 \
+		localstatedir=${D}/var
+
+	# gdm-binary should be gdm to work with our init (#5598)
+	rm -f ${D}/usr/bin/gdm
+	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
+	dosym /usr/bin/gdm /usr/bin/gdm-binary
+
+	# log, etc.
+	keepdir /var/log/gdm
+	keepdir /var/gdm
+	chown root:gdm ${D}/var/gdm
+	chmod 1770 ${D}/var/gdm
+
+	# use our own session script
+	rm -f ${D}/etc/X11/gdm/Xsession
+	exeinto /etc/X11/gdm
+	doexe ${FILESDIR}/${MY_V}/Xsession
+
+	# add a custom xsession .desktop by default (#44537)
+	exeinto /etc/X11/dm/Sessions
+	doexe ${FILESDIR}/${MY_V}/custom.desktop
+
+	# 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
+	# use Gentoo theme
+	dosed "s:#GraphicalTheme=circles:GraphicalTheme=gentoo-cow:" /etc/X11/gdm/gdm.conf
+
+	# Move Gentoo theme in
+	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	FIFOFILE=/var/gdm/.gdmfifo
+	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'"
+
+}