2.16.2; gksu dep for menu entry

(Portage version: 2.1.2_rc1-r4)

4 files changed, 221 insertions, 1 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 37fc3ef213c9..f1d62af711f1 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,22 @@
 # 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.184 2006/11/01 10:36:25 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.185 2006/11/06 21:51:48 dang Exp $
+
+  06 Nov 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gdm-2.16.2-gksu.patch, +gdm-2.16.2.ebuild:
+  2.16.2; gksu dep for menu entry
+
+*gdm-2.16.2 (06 Nov 2006)
+
+  06 Nov 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gdm-2.16.2-gksu.patch, +gdm-2.16.2.ebuild:
+  2.16.2; gksu dep for menu entry
+
+  06 Nov 2006; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
+  Bump to 2.16.2
+  	- Assorted bug fixes
+  	- Combo lists supported
+  	- Add dep on gksu so menu entry works
 
   01 Nov 2006; Mart Raudsepp <leio@gentoo.org>
   -files/gdm-2.4.4-selinux_remove_attr.patch,
diff --git a/gnome-base/gdm/files/digest-gdm-2.16.2 b/gnome-base/gdm/files/digest-gdm-2.16.2
new file mode 100644
index 000000000000..9ec09c7395b4
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.16.2
@@ -0,0 +1,9 @@
+MD5 3a5d77c6cc59fb1eecf898abcbb7eb25 gdm-2.16.2.tar.bz2 3137531
+RMD160 18ab2777a2fd5b6086a075483caf5ed138436666 gdm-2.16.2.tar.bz2 3137531
+SHA256 7ab98b0c0342d8aa1a37412a31b9920f629056cedf5faf496a177ba960eb205a gdm-2.16.2.tar.bz2 3137531
+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.16.2-gksu.patch b/gnome-base/gdm/files/gdm-2.16.2-gksu.patch
new file mode 100644
index 000000000000..704cd5066a1e
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.16.2-gksu.patch
@@ -0,0 +1,14 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN gdm-2.16.1.orig/gui/gdmsetup.desktop.in.in gdm-2.16.1/gui/gdmsetup.desktop.in.in
+--- gdm-2.16.1.orig/gui/gdmsetup.desktop.in.in	2006-04-17 14:38:19.000000000 -0400
++++ gdm-2.16.1/gui/gdmsetup.desktop.in.in	2006-11-06 15:44:18.000000000 -0500
+@@ -3,8 +3,8 @@ Encoding=UTF-8
+ _Name=Login Window
+ _GenericName=Login Window Preferences
+ _Comment=Configure the login window (GNOME Display Manager)
+-TryExec=@sbindir@/gdmsetup
+-Exec=gdmsetup
++TryExec=@sbindir@/gdmsetup
++Exec=gksu gdmsetup
+ Icon=gdm-setup
+ StartupNotify=true
+ Terminal=false
diff --git a/gnome-base/gdm/gdm-2.16.2.ebuild b/gnome-base/gdm/gdm-2.16.2.ebuild
new file mode 100644
index 000000000000..c7e7f22674c5
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.16.2.ebuild
@@ -0,0 +1,181 @@
+# 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.16.2.ebuild,v 1.1 2006/11/06 21:51:48 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 ~hppa ~ia64 ~ppc ~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-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomecanvas-2
+	>=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 )"
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/dmxproto
+	x11-libs/gksu
+	sys-devel/gettext
+	>=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"
+	else
+		G2CONF="${G2CONF} --enable-console-helper=no \
+			--enable-authentication-scheme=shadow"
+	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.13.0.7-gdm-dmx-intllibs.patch
+
+	# Add gksu to gdmsetup menu entry
+	epatch ${FILESDIR}/${P}-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
+	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	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."
+
+	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
+		einfo "You had /etc/X11/gdm/gdm.conf which is the old configuration"
+		einfo "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
+
+	einfo "To remove GDM from startup please execute"
+	einfo "'rc-update del xdm default'"
+}