New version, 2.6.0.4

5 files changed, 155 insertions, 6 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 41ac005cefdc..501627e7ff62 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.71 2004/08/21 01:37:19 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.72 2004/08/22 07:46:20 obz Exp $
+
+*gdm-2.6.0.4 (22 Aug 2004)
+
+  22 Aug 2004; Mike Gardiner <obz@gentoo.org> +gdm-2.6.0.4.ebuild:
+  New version, 2.6.0.4
 
   20 Aug 2004; Tom Gall <tgall@gentoo.org> gdm-2.6.0.3.ebuild:
   stable on ppc64, bug #58191
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index e5c7fa8ab352..8eed55025da4 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,15 +1,17 @@
-MD5 8a3a892802e8fc56c67ae4d1e416e8cf ChangeLog 9800
+MD5 df856cab880416be7f3ec5cbf1490161 gdm-2.6.0.3.ebuild 3381
+MD5 bf4c39edd0c28adfccb8247fe0b068d7 gdm-2.4.4.7-r1.ebuild 3427
 MD5 35366f1ca77e222f08da145690671bc7 gdm-2.2.5.4-r5.ebuild 4427
 MD5 6dcf2c48a2846433f8abf94aa493f074 gdm-2.4.1.7-r1.ebuild 5284
-MD5 bf4c39edd0c28adfccb8247fe0b068d7 gdm-2.4.4.7-r1.ebuild 3427
-MD5 df856cab880416be7f3ec5cbf1490161 gdm-2.6.0.3.ebuild 3381
+MD5 5dc560921b86c635d710d4a9c26db27e gdm-2.6.0.4.ebuild 3380
+MD5 4dca9678c149afc20daf9e73c09b191f ChangeLog 9917
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 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 b2d71444a82a418126728e6301dd3389 files/gdm-2.4.1.7-gtk-2.4.patch 5730
+MD5 0b62c844bea1344057d5fa674cac3458 files/digest-gdm-2.6.0.4 205
 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
diff --git a/gnome-base/gdm/files/digest-gdm-2.6.0.4 b/gnome-base/gdm/files/digest-gdm-2.6.0.4
new file mode 100644
index 000000000000..68f2450e2b4a
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.6.0.4
@@ -0,0 +1,3 @@
+MD5 3a6986217d4db2afd24fcdbf3b9af722 gdm-2.6.0.4.tar.bz2 3217512
+MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423
+MD5 e0dcf60fc342ed1862f0fff26da984b2 gentoo-gdm-theme-r1.tar.bz2 54186
diff --git a/gnome-base/gdm/gdm-2.6.0.4.ebuild b/gnome-base/gdm/gdm-2.6.0.4.ebuild
new file mode 100644
index 000000000000..532520770dcf
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.6.0.4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2004 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.4.ebuild,v 1.1 2004/08/22 07:46:20 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"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gentoo-gdm-theme.tar.bz2
+	mirror://gentoo/gentoo-gdm-theme-r1.tar.bz2"
+MY_V="`echo ${PV} |cut -b -5`"
+
+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_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.
+	dodir /var/log/gdm
+	dodir /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-cow  ${D}/usr/share/gdm/themes
+	mv ${WORKDIR}/gentoo-emergence  ${D}/usr/share/gdm/themes
+
+	dodoc ABOUT-NLS AUTHORS COPYING 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'"
+
+}
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 90fbbd048940..7d1626c2e676 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,5 +1,5 @@
 MD5 a47da1e81fdb23f1b90b99eb9985b3e8 gnome-2.6.2-r1.ebuild 4219
-MD5 0b09d4870706e1f47c77a9186b8bfd9e gnome-2.6.3_pre0.ebuild 4231
+MD5 26c9bcffd0893235008f0ef944897741 gnome-2.6.3_pre0.ebuild 4231
 MD5 8e2735e5d17f484f64a993802bd1bbc4 gnome-2.6.1_rc1.ebuild 3887
 MD5 8a6b244abaa40ac400b8f3390a4920d0 gnome-2.6.ebuild 3762
 MD5 2fe803743f19c25a33184caaba050e9c gnome-1.4-r3.ebuild 545