Bump to 2.18.4-r1

	Add gksu to desktop file; bug #191531

Package-Manager: portage-2.1.3.11

5 files changed, 247 insertions, 5 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 3aedef0903ff..5546ee7349ec 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.235 2007/09/22 09:17:39 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.236 2007/10/02 14:40:11 dang Exp $
+
+*gdm-2.18.4-r1 (02 Oct 2007)
+
+  02 Oct 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gdm-2.20.0-gksu.patch, +gdm-2.18.4-r1.ebuild:
+  Bump to 2.18.4-r1
+  	Add gksu to desktop file; bug #191531
 
   22 Sep 2007; Tom Gall <tgall@gentoo.org> gdm-2.18.4.ebuild:
   stable on ppc64
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 10cc73dd08be..a0e0ec84ac8d 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b
 MD5 4fd1e85595162e54a954871024b2858f files/gdm-2.13.0.1-selinux-remove-attr.patch 908
 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 files/gdm-2.13.0.1-selinux-remove-attr.patch 908
@@ -14,6 +17,10 @@ AUX gdm-2.18.0-gdm-dmx-intllibs.patch 289 RMD160 acc5d02c88986577b7c195654a8938f
 MD5 4b146fd7d86a4262bf5085a68267811c files/gdm-2.18.0-gdm-dmx-intllibs.patch 289
 RMD160 acc5d02c88986577b7c195654a8938f016a42d7b files/gdm-2.18.0-gdm-dmx-intllibs.patch 289
 SHA256 ea7e922e1b7bf6a5671b5da0bffbd52375e5924f1f0aebfc0f21dccf3b701a16 files/gdm-2.18.0-gdm-dmx-intllibs.patch 289
+AUX gdm-2.20.0-gksu.patch 545 RMD160 f70c443c94e6a2b8e5360fdb85e5fc571ea3dd8c SHA1 4e175aa7b788f8cd321ae54cddd4683c95b348c3 SHA256 887e827900049eea610952099e8d50ebf07a493534dfda4662cb14ecc6ca68b6
+MD5 6996432b989bdab7fdb23b942a5a1b70 files/gdm-2.20.0-gksu.patch 545
+RMD160 f70c443c94e6a2b8e5360fdb85e5fc571ea3dd8c files/gdm-2.20.0-gksu.patch 545
+SHA256 887e827900049eea610952099e8d50ebf07a493534dfda4662cb14ecc6ca68b6 files/gdm-2.20.0-gksu.patch 545
 DIST gdm-2.16.4.tar.bz2 3139838 RMD160 afccb19cb0e56af9a464fa538de4f59191705142 SHA1 61c9c2f5a29c99aaa85d2b76164540b949b2656b SHA256 0aa32e3b145ce5c6c8d42c7a8bcaa09582737e89de252fa6bda0c55f3af10616
 DIST gdm-2.16.7.tar.bz2 3152229 RMD160 13f3fb2b2b99f9715c06ece437412516af865f56 SHA1 493ed37bfd7ee1619d814401bc1ec73c4be7a802 SHA256 720292a9954f0c95633fa464fd1838c822bd0b2f43f98a8ab37155d57ea4c881
 DIST gdm-2.18.4.tar.bz2 3459899 RMD160 4922af1321f707279c1eb6354d1c56cc39bce20e SHA1 8bf2c8745d7c38f5f08641abed4ca103cad0ecb8 SHA256 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3
@@ -27,14 +34,18 @@ EBUILD gdm-2.16.7.ebuild 4830 RMD160 11e48e57d67e43ae3e6a5bf84d26d56285e43359 SH
 MD5 51a6c2612870d4437e9a89bab6f218da gdm-2.16.7.ebuild 4830
 RMD160 11e48e57d67e43ae3e6a5bf84d26d56285e43359 gdm-2.16.7.ebuild 4830
 SHA256 a1e57d6c0581d3676c8f743a83c85280d43ece6f9b6f11aed8666a41d2b17f96 gdm-2.16.7.ebuild 4830
+EBUILD gdm-2.18.4-r1.ebuild 5231 RMD160 6f5bff83310210bd7aef77dd874a36016c63ae64 SHA1 f5f17944baad973b76e1e42094f767b12e708297 SHA256 9eab334ecf09b10b2915686ce80326298a9d40ffbf924197303fce2b7a412b9a
+MD5 4b2211b346dd9b2a50ee8c9fa55fcf08 gdm-2.18.4-r1.ebuild 5231
+RMD160 6f5bff83310210bd7aef77dd874a36016c63ae64 gdm-2.18.4-r1.ebuild 5231
+SHA256 9eab334ecf09b10b2915686ce80326298a9d40ffbf924197303fce2b7a412b9a gdm-2.18.4-r1.ebuild 5231
 EBUILD gdm-2.18.4.ebuild 5140 RMD160 df97d8a3c426ac30382d459dedfe81a4e7932585 SHA1 a9ac5f57af4e4bdaed108e830beba9c8b8c5f0b9 SHA256 c603663f255f8a893136bcefd3e4949f672d88366a3184b6ff6c3bba64b80912
 MD5 618d088f61c62fa08295488517f29eb9 gdm-2.18.4.ebuild 5140
 RMD160 df97d8a3c426ac30382d459dedfe81a4e7932585 gdm-2.18.4.ebuild 5140
 SHA256 c603663f255f8a893136bcefd3e4949f672d88366a3184b6ff6c3bba64b80912 gdm-2.18.4.ebuild 5140
-MISC ChangeLog 31390 RMD160 18bf2f27ae4de039da6492e498e7e6e88c194e93 SHA1 36993d9bd9a68710a28485f8bf9f8cdef711d053 SHA256 615dbfae6be4e4128d4433575f0af8efda50e205c7c8cb0a1c6a2ae050f02339
-MD5 7db6d97eb0f4b1b1e65b0e697e4996cd ChangeLog 31390
-RMD160 18bf2f27ae4de039da6492e498e7e6e88c194e93 ChangeLog 31390
-SHA256 615dbfae6be4e4128d4433575f0af8efda50e205c7c8cb0a1c6a2ae050f02339 ChangeLog 31390
+MISC ChangeLog 31587 RMD160 a8464d9b74faa57b49f2622bf89392db2cbe0aea SHA1 5d03883d14cfa54509af081086f55aace4e4814d SHA256 a1e3f5197e37ebf9a72d74b2ecccccf1a8f1b6fbc5493301cbd872f3deafedb2
+MD5 7bb7c1439e3917432878f2f0d514c479 ChangeLog 31587
+RMD160 a8464d9b74faa57b49f2622bf89392db2cbe0aea ChangeLog 31587
+SHA256 a1e3f5197e37ebf9a72d74b2ecccccf1a8f1b6fbc5493301cbd872f3deafedb2 ChangeLog 31587
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -48,3 +59,13 @@ SHA256 ce9e9e188f04b6e2057146e034b6777c85c58675ea9375c7ec849c2e72347f10 files/di
 MD5 3e6bf5ebdcc90e0393b3faf0e5266b82 files/digest-gdm-2.18.4 768
 RMD160 6b04302e4e48ce4082c1f95736fb33eed85aaaa4 files/digest-gdm-2.18.4 768
 SHA256 7b96b8ecaed329a7d641ef04c3abbe23fcfa956a4bb665307725ab9f7364c752 files/digest-gdm-2.18.4 768
+MD5 3e6bf5ebdcc90e0393b3faf0e5266b82 files/digest-gdm-2.18.4-r1 768
+RMD160 6b04302e4e48ce4082c1f95736fb33eed85aaaa4 files/digest-gdm-2.18.4-r1 768
+SHA256 7b96b8ecaed329a7d641ef04c3abbe23fcfa956a4bb665307725ab9f7364c752 files/digest-gdm-2.18.4-r1 768
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHAlhgomPajV0RnrERAm4oAJ0aHMa6NUB8NwCEBKg0pQb9FnJkrQCeOsVe
+sStczKVSclFYToVURqcfoDo=
+=fWZM
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/digest-gdm-2.18.4-r1 b/gnome-base/gdm/files/digest-gdm-2.18.4-r1
new file mode 100644
index 000000000000..fe223f8fee5a
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.18.4-r1
@@ -0,0 +1,9 @@
+MD5 53e5f5820fa67abf55c37ea7570807b7 gdm-2.18.4.tar.bz2 3459899
+RMD160 4922af1321f707279c1eb6354d1c56cc39bce20e gdm-2.18.4.tar.bz2 3459899
+SHA256 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3 gdm-2.18.4.tar.bz2 3459899
+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/files/gdm-2.20.0-gksu.patch b/gnome-base/gdm/files/gdm-2.20.0-gksu.patch
new file mode 100644
index 000000000000..aa5ad30f6d1d
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.20.0-gksu.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gdm-2.20.0.orig/gui/gdmsetup.desktop.in.in gdm-2.20.0/gui/gdmsetup.desktop.in.in
+--- gdm-2.20.0.orig/gui/gdmsetup.desktop.in.in	2007-09-17 10:45:38.000000000 -0400
++++ gdm-2.20.0/gui/gdmsetup.desktop.in.in	2007-10-02 10:25:39.000000000 -0400
+@@ -3,7 +3,7 @@ Encoding=UTF-8
+ _Name=Login Window
+ _Comment=Configure GDM login window appearance and behavior
+ TryExec=@sbindir@/gdmsetup
+-Exec=@sbindir@/gdmsetup
++Exec=gksu @sbindir@/gdmsetup
+ Icon=gdm-setup
+ StartupNotify=true
+ Terminal=false
diff --git a/gnome-base/gdm/gdm-2.18.4-r1.ebuild b/gnome-base/gdm/gdm-2.18.4-r1.ebuild
new file mode 100644
index 000000000000..740981af7b8e
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.18.4-r1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.18.4-r1.ebuild,v 1.1 2007/10/02 14:40:11 dang Exp $
+
+inherit eutils pam gnome2
+
+DESCRIPTION="GNOME Display Manager"
+HOMEPAGE="http://www.gnome.org/projects/gdm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="accessibility branding ipv6 pam selinux tcpd xinerama elibc_glibc"
+
+# Name of the tarball with gentoo specific files
+GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
+
+SRC_URI="${SRC_URI}
+		 mirror://gentoo/${GDM_EXTRA}.tar.bz2
+		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
+
+# glib dep is because of bug #193061
+RDEPEND="pam?	(
+					virtual/pam
+					sys-auth/consolekit
+				)
+	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
+	>=dev-libs/glib-2.12
+	>=x11-libs/gtk+-2.6
+	>=x11-libs/pango-1.3
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/librsvg-1.1.1
+	>=dev-libs/libxml2-2.4.12
+	>=media-libs/libart_lgpl-2.3.11
+	>=dev-libs/dbus-glib-0.71
+	accessibility? ( x11-libs/libXevie )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	x11-libs/libX11
+	x11-libs/libXdmcp
+	x11-libs/libXi
+	x11-libs/libXext
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libdmx
+	x11-libs/libXau
+	x11-apps/sessreg"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/dmxproto
+	sys-devel/gettext
+	app-admin/eselect
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.3.2
+	>=app-text/scrollkeeper-0.1.4"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+	G2CONF="--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 \
+						  --with-console-kit=yes"
+	else
+		G2CONF="${G2CONF} --enable-console-helper=no \
+						  --with-console-kit=no"
+		if use elibc_glibc; then
+			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
+		else
+			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
+		fi
+	fi
+
+	enewgroup gdm
+	enewuser gdm -1 -1 /var/lib/gdm gdm
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# 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.18.0-gdm-dmx-intllibs.patch
+
+	# Add gksu to gdmsetup menu entry
+	epatch ${FILESDIR}/${PN}-2.20.0-gksu.patch
+}
+
+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
+	if use branding ; then
+		mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "To make GDM start at boot, edit /etc/rc.conf"
+	elog "and then execute 'rc-update add xdm default'."
+	elog
+	elog "GDM has changed the location of its configuration file.  Please"
+	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
+	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
+	elog
+	elog "See README.install for more information about the change."
+	elog
+
+	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
+		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
+		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
+		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
+	fi
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	# Do restart after gdm.conf move above
+	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
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
+		elog "To remove GDM from startup please execute"
+		elog "'rc-update del xdm default'"
+	fi
+}