minor fixes

5 files changed, 56 insertions, 12 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 7815adbaf0af..9e01151708c3 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.54 2004/03/17 01:11:59 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.55 2004/04/02 17:39:47 foser Exp $
+
+*gdm-2.4.4.7-r1 (02 Apr 2004)
+
+  02 Apr 2004; foser <foser@gentoo.org> gdm-2.4.4.7-r1.ebuild :
+  Add custom desktop session (#44537)
+  Re-enable installation of the old gentoo theme
 
   16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> gdm-2.4.4.7.ebuild:
   Added ~mips keyword.
diff --git a/gnome-base/gdm/files/2.4.4/custom.desktop b/gnome-base/gdm/files/2.4.4/custom.desktop
new file mode 100644
index 000000000000..ea737608cd31
--- /dev/null
+++ b/gnome-base/gdm/files/2.4.4/custom.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+# The names/descriptions should really be better
+Name=Custom Session
+Comment=This starts a custom session
+Exec=custom
+# The "custom" Exec is a very special one and is handled specially in
+# the Xsession script and just runs "~/.xsession" directly
+Icon=
+Type=Application
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.4.5 b/gnome-base/gdm/files/digest-gdm-2.4.4.5
deleted file mode 100644
index 1e30232a7b74..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.4.4.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eae456b3a59154e55d69263aad5e8a54 gdm-2.4.4.5.tar.bz2 2394913
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.4.7-r1 b/gnome-base/gdm/files/digest-gdm-2.4.4.7-r1
new file mode 100644
index 000000000000..7ef6c2e96fc1
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.4.4.7-r1
@@ -0,0 +1,3 @@
+MD5 a3d2f243c4f42e2542bda8cb5fb9a7c5 gdm-2.4.4.7.tar.bz2 2430455
+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.4.4.5.ebuild b/gnome-base/gdm/gdm-2.4.4.7-r1.ebuild
index 625ed5a788cd..6da62591b0cb 100644
--- a/gnome-base/gdm/gdm-2.4.4.5.ebuild
+++ b/gnome-base/gdm/gdm-2.4.4.7-r1.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.4.5.ebuild,v 1.2 2003/12/06 21:59:49 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.4.7-r1.ebuild,v 1.1 2004/04/02 17:39:47 foser Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="GNOME2 Display Manager"
 HOMEPAGE="http://www.jirka.org/gdm.html"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 LICENSE="GPL-2"
-IUSE="tcpd xinerama"
 
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+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
@@ -22,10 +24,12 @@ RDEPEND=">=sys-libs/pam-0.72
 	>=dev-libs/libxml2-2.4.12
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-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 )"
 
@@ -34,7 +38,18 @@ G2CONF="${G2CONF} \
 	--with-pam-prefix=/etc \
 	--with-xdmcp \
 	`use_with tcpd tcp-wrappers` \
-	`use_with xinerama`"
+	`use_with xinerama` \
+	`use_with selinux`"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# remove unneeded linker directive for selinux (#41022)
+	epatch ${FILESDIR}/${PN}-${MY_V}-selinux_remove_attr.patch
+
+}
 
 src_install() {
 
@@ -42,7 +57,8 @@ src_install() {
 
 	# gdm-binary should be gdm to work with our init (#5598)
 	rm -f ${D}/usr/bin/gdm
-	cp ${D}/usr/bin/gdm-binary ${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/lib/gdm
@@ -54,6 +70,10 @@ src_install() {
 	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
 
@@ -71,6 +91,12 @@ src_install() {
 
 	# 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