fix sed paths to /usr/share/gdm/defaults.conf, add einfo about the change. thanks to agaffney and Kumba for reporting.

Package-Manager: portage-2.1.1_pre1-r4

4 files changed, 199 insertions, 5 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 2a1bc35b4ede..7b7e256fc651 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.168 2006/06/12 23:05:37 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.169 2006/06/29 03:13:40 allanonjl Exp $
+
+*gdm-2.14.9-r1 (29 Jun 2006)
+
+  29 Jun 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +gdm-2.14.9-r1.ebuild:
+  fix sed paths to /usr/share/gdm/defaults.conf, add einfo about the change.
+  thanks to agaffney and Kumba for reporting.
 
 *gdm-2.14.9 (12 Jun 2006)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index d81b95d968bf..5ebae71103c4 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -46,6 +46,10 @@ EBUILD gdm-2.14.8.ebuild 4243 RMD160 2ba9d2215192084cca5582f5456bdb314378c5be SH
 MD5 f9b50031ca1596037eb51e745c681d35 gdm-2.14.8.ebuild 4243
 RMD160 2ba9d2215192084cca5582f5456bdb314378c5be gdm-2.14.8.ebuild 4243
 SHA256 f1d4bc7049ee16b9bf56e2b87b78fe00732bd885f1e70d75936c643b001df819 gdm-2.14.8.ebuild 4243
+EBUILD gdm-2.14.9-r1.ebuild 4570 RMD160 1abdc8a21a208ee185e37b7431fb3fb75e311f52 SHA1 d76e0b150e0ca278d1e2d9b8fe78d642e68b88c3 SHA256 6bc8be6a0eaed0ee52bc03f35c543a3143418ddc2a8cdc26a7d15ae1ee9af3cb
+MD5 68d38abe38ae065a68b34581197b3a1f gdm-2.14.9-r1.ebuild 4570
+RMD160 1abdc8a21a208ee185e37b7431fb3fb75e311f52 gdm-2.14.9-r1.ebuild 4570
+SHA256 6bc8be6a0eaed0ee52bc03f35c543a3143418ddc2a8cdc26a7d15ae1ee9af3cb gdm-2.14.9-r1.ebuild 4570
 EBUILD gdm-2.14.9.ebuild 4243 RMD160 708592d0861fa2ee467b1b8e16e7d12f38416334 SHA1 952a88b4741127133862993d0c83b68a44c51c3d SHA256 e978ff4ddbaf72b63bb035d6b9ae06fc5c4ff45feb4d8f06e0ce3946176c72d2
 MD5 af217ffb8fbecff3db79538d547ab2ae gdm-2.14.9.ebuild 4243
 RMD160 708592d0861fa2ee467b1b8e16e7d12f38416334 gdm-2.14.9.ebuild 4243
@@ -66,10 +70,10 @@ EBUILD gdm-2.8.0.8.ebuild 3993 RMD160 3e2082237a978e4bb59776830726c40504c62e4e S
 MD5 c4b1aeb6ac925985eb7f4f08c0835eec gdm-2.8.0.8.ebuild 3993
 RMD160 3e2082237a978e4bb59776830726c40504c62e4e gdm-2.8.0.8.ebuild 3993
 SHA256 0deb3a4c356511965d7197031b267c425e6ddda8b9c5bea48663c9beaa654731 gdm-2.8.0.8.ebuild 3993
-MISC ChangeLog 22073 RMD160 977b8f1d81f9d67b7a918c3fbeccda9aeedb3102 SHA1 c146412a34963599977b1ffb374c6b02c7b6283c SHA256 2ed729751d300706a382c8acd36cf5a95d737d36d8675bde79365546b48a0655
-MD5 7e433008c11e03fd827d07e8cef99329 ChangeLog 22073
-RMD160 977b8f1d81f9d67b7a918c3fbeccda9aeedb3102 ChangeLog 22073
-SHA256 2ed729751d300706a382c8acd36cf5a95d737d36d8675bde79365546b48a0655 ChangeLog 22073
+MISC ChangeLog 22308 RMD160 badc4ef7d4270714bea86be352559edc8b14c747 SHA1 fd4b06d1bef1cff63a5ef19b41bdbfa2a96ce597 SHA256 0db25d4b4d6a50f0fb5464caad191c4b9a1954f94aee73d63192ace4352b014b
+MD5 b0524fe1e522cfba2e999ceb9f4309e3 ChangeLog 22308
+RMD160 badc4ef7d4270714bea86be352559edc8b14c747 ChangeLog 22308
+SHA256 0db25d4b4d6a50f0fb5464caad191c4b9a1954f94aee73d63192ace4352b014b ChangeLog 22308
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -80,6 +84,9 @@ SHA256 eaca95dab3626ff54e83fa30089e99169150fcd7eeda81bff313b6a3886beebe files/di
 MD5 ea4fc423e9d653330920d389a43122f0 files/digest-gdm-2.14.9 768
 RMD160 71291a8c33d020c4d3766e41dd8a243fa159a41e files/digest-gdm-2.14.9 768
 SHA256 34ff0a74b881c8f694b858c4918511a843ad6b4c650f58d1007aeb9ab75d6bf7 files/digest-gdm-2.14.9 768
+MD5 ea4fc423e9d653330920d389a43122f0 files/digest-gdm-2.14.9-r1 768
+RMD160 71291a8c33d020c4d3766e41dd8a243fa159a41e files/digest-gdm-2.14.9-r1 768
+SHA256 34ff0a74b881c8f694b858c4918511a843ad6b4c650f58d1007aeb9ab75d6bf7 files/digest-gdm-2.14.9-r1 768
 MD5 6b95da6d4ca477ed00d5c30d142a7147 files/digest-gdm-2.2.5.4-r5 241
 RMD160 16efdcfca9892db66b724607b3c744fe5ee93db1 files/digest-gdm-2.2.5.4-r5 241
 SHA256 abe4d784a03cce322c289f7ab49e93307c112886e90d2a60d683b7e280bf741a files/digest-gdm-2.2.5.4-r5 241
diff --git a/gnome-base/gdm/files/digest-gdm-2.14.9-r1 b/gnome-base/gdm/files/digest-gdm-2.14.9-r1
new file mode 100644
index 000000000000..a4f7e106abb4
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.14.9-r1
@@ -0,0 +1,9 @@
+MD5 7e46bc3b0a5b08e79f1f2f1b869caf40 gdm-2.14.9.tar.bz2 3046665
+RMD160 f043ed11a8b174556b114e52dc50daa5432e68bb gdm-2.14.9.tar.bz2 3046665
+SHA256 0483dac71c88ca0da5ee85729c0c1dd6793d928109ac79ad56583aa1a5ff43d2 gdm-2.14.9.tar.bz2 3046665
+MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
+RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
+SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
+MD5 146b311aea6ca3b6b9bdbe551cb7c0ae gentoo-gdm-theme-r3.tar.bz2 411703
+RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 gentoo-gdm-theme-r3.tar.bz2 411703
+SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 gentoo-gdm-theme-r3.tar.bz2 411703
diff --git a/gnome-base/gdm/gdm-2.14.9-r1.ebuild b/gnome-base/gdm/gdm-2.14.9-r1.ebuild
new file mode 100644
index 000000000000..e5d6e0c0c69f
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.14.9-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.14.9-r1.ebuild,v 1.1 2006/06/29 03:13:40 allanonjl Exp $
+
+inherit eutils pam gnome2
+
+DESCRIPTION="GNOME Display Manager"
+HOMEPAGE="http://www.gnome.org/projects/gdm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="accessibility ipv6 pam selinux tcpd xinerama"
+
+# Name of the tarball with gentoo specific files
+GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2
+	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
+
+RDEPEND="pam? ( virtual/pam )
+	!pam? ( sys-apps/shadow )
+	>=dev-libs/glib-2.8
+	>=x11-libs/gtk+-2.6
+	>=x11-libs/pango-1.3
+	>=gnome-base/libglade-1.99.2
+	>=gnome-base/libgnomecanvas-1.109
+	>=gnome-base/librsvg-1.1.1
+	>=dev-libs/libxml2-2.4.12
+	>=media-libs/libart_lgpl-2.3.11
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	|| ( (
+			x11-libs/libX11
+			x11-libs/libXdmcp
+			x11-libs/libXi
+			x11-libs/libXext
+			x11-libs/libXinerama
+			x11-libs/libdmx
+			x11-libs/libXau
+			x11-apps/sessreg
+			accessibility? ( x11-libs/libXevie ) )
+		virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( (
+			x11-proto/inputproto
+			x11-proto/dmxproto )
+		virtual/x11 )
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.28
+	sys-devel/gettext
+	>=app-text/gnome-doc-utils-0.3.2
+	>=app-text/scrollkeeper-0.1.4"
+
+DOCS="AUTHORS ChangeLog NEWS README README.install TODO"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+
+pkg_setup() {
+	G2CONF="--disable-scrollkeeper \
+		--sysconfdir=/etc/X11             \
+		--localstatedir=/var              \
+		--with-xdmcp                      \
+		--with-pam-prefix=/etc            \
+		$(use_enable accessibility xevie) \
+		$(use_enable ipv6)                \
+		$(use_with selinux)               \
+		$(use_with tcpd tcp-wrappers)     \
+		$(use_with xinerama)"
+
+	if use pam; then
+		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
+	else
+		G2CONF="${G2CONF} --enable-console-helper=no \
+			--enable-authentication-scheme=shadow"
+	fi
+
+	enewgroup gdm
+	enewuser gdm -1 -1 /var/lib/gdm gdm
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# remove unneeded linker directive for selinux (#41022)
+	epatch "${FILESDIR}"/${PN}-2.13.0.1-selinux-remove-attr.patch
+
+	# Fix missing intllib
+	epatch "${FILESDIR}"/${PN}-2.13.0.7-gdm-dmx-intllibs.patch
+
+	gnome2_omf_fix docs/*/Makefile.in docs/Makefile.in
+}
+
+src_install() {
+	gnome2_src_install
+
+	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
+
+	# gdm-binary should be gdm to work with our init (#5598)
+	rm -f ${D}/usr/sbin/gdm
+	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
+	# our x11's scripts point to /usr/bin/gdm
+	dosym /usr/sbin/gdm-binary /usr/bin/gdm
+
+	# 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 ${gentoodir}/Xsession
+
+	# add a custom xsession .desktop by default (#44537)
+	exeinto /etc/X11/dm/Sessions
+	doexe ${gentoodir}/custom.desktop
+
+	# We replace the pam stuff by our own
+	rm -rf ${D}/etc/pam.d
+
+	dopamd ${gentoodir}/pam.d/*
+	dopamsecurity console.apps ${gentoodir}/security/console.apps/gdmsetup
+
+	# use graphical greeter local
+	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
+		/usr/share/gdm/defaults.conf
+	# list available users
+	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
+	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
+	# Fix old X11R6 paths
+	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
+
+	# Move Gentoo theme in
+	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
+}
+
+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'."
+
+	einfo "GDM has changed the location of its configuration file.  Please"
+	einfo "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
+	einfo "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
+
+	einfo "See README.install for more information about the change."
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	einfo "To remove GDM from startup please execute"
+	einfo "'rc-update del xdm default'"
+}