gnome-base/gdm: bump to 2.18.1

Package-Manager: portage-2.1.2.4

4 files changed, 215 insertions, 15 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index b2c5af79cfc9..95d90aea34e5 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.204 2007/03/27 03:14:52 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.205 2007/04/21 00:08:46 remi Exp $
+
+*gdm-2.18.1 (20 Apr 2007)
+
+  20 Apr 2007; Remi Cardona <remi@gentoo.org> +gdm-2.18.1.ebuild:
+  bump to 2.18.1
 
 *gdm-2.18.0 (27 Mar 2007)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 944eaa4aa5c1..f0289544e1a4 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,6 +1,3 @@
------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
@@ -22,6 +19,7 @@ DIST gdm-2.14.9.tar.bz2 3046665 RMD160 f043ed11a8b174556b114e52dc50daa5432e68bb
 DIST gdm-2.16.1.tar.bz2 3130299 RMD160 2aa56bf08be354778b9f0c55cbd441b2a354ac2f SHA1 2a684d194cea825a6fc14be551d7d33e373ef55c SHA256 9733a12aacf6995dc630daf108c357c5d906fdda30de05cd9b5c26a83cf3d5f6
 DIST gdm-2.16.4.tar.bz2 3139838 RMD160 afccb19cb0e56af9a464fa538de4f59191705142 SHA1 61c9c2f5a29c99aaa85d2b76164540b949b2656b SHA256 0aa32e3b145ce5c6c8d42c7a8bcaa09582737e89de252fa6bda0c55f3af10616
 DIST gdm-2.18.0.tar.bz2 3461709 RMD160 6f23c30cdd51e4c71e9464808844156938b37316 SHA1 62d059c101b127c13f8e6fa8d9b117ab40fd4534 SHA256 6619ef1ba04f4408f181b1a6c1d8a86f791706e22e0e2803153dbd5554a18053
+DIST gdm-2.18.1.tar.bz2 3460665 RMD160 cb2296bc61eccd6dfa8df8ad071a14e58f8dd80d SHA1 70b902ff810a69109746c135dd095db34982a9d0 SHA256 347a555305f9f19089d032685dfec1cb5a8ebae970b1c2d0e0929cd83c2c5ffd
 DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 SHA1 0b41c955ec8980c011b856aa653102da485dd20c SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
 EBUILD gdm-2.14.11.ebuild 4564 RMD160 55b7c5066663777851310b8fb759dbcaf5b15fd5 SHA1 c0cc9ba4a56b5dd1538c08861576de479f6d43b3 SHA256 ccd7f32e5127bac44d10e74c24b82e49f7f1b2738426e19b40930315f4aee8a6
@@ -44,10 +42,14 @@ EBUILD gdm-2.18.0.ebuild 5006 RMD160 6fdf7be92e764cd835c4684d07b215684ebd2989 SH
 MD5 2c5be8c8b1d7e0496578bf8671079e92 gdm-2.18.0.ebuild 5006
 RMD160 6fdf7be92e764cd835c4684d07b215684ebd2989 gdm-2.18.0.ebuild 5006
 SHA256 58497b869c605918928a9b585caf4b16584a72b2fe29965e739bbf7e36579c2c gdm-2.18.0.ebuild 5006
-MISC ChangeLog 27327 RMD160 d6cf51810ade6983cca3594df22eac868197df1e SHA1 9ff1dd0745804cf5ca5bd56d15f669fa8c8224dd SHA256 088af422f63c77a26e31db5e9788acf8f97a4f1b2c74cf78713891d099169869
-MD5 53d103204769c985c72e3242a1e13884 ChangeLog 27327
-RMD160 d6cf51810ade6983cca3594df22eac868197df1e ChangeLog 27327
-SHA256 088af422f63c77a26e31db5e9788acf8f97a4f1b2c74cf78713891d099169869 ChangeLog 27327
+EBUILD gdm-2.18.1.ebuild 5006 RMD160 bcdb4f2184c309c10b138a35b154a33aaf790de4 SHA1 f400f89716d81f6b61f230fd8f88cdbb3057ef52 SHA256 c8ef0e4f45d24d8b1a721725f5ed5fcd0f2a797a61fd5128a135c913ddb804f6
+MD5 6fbd696d16c9a729121e7701dc76f422 gdm-2.18.1.ebuild 5006
+RMD160 bcdb4f2184c309c10b138a35b154a33aaf790de4 gdm-2.18.1.ebuild 5006
+SHA256 c8ef0e4f45d24d8b1a721725f5ed5fcd0f2a797a61fd5128a135c913ddb804f6 gdm-2.18.1.ebuild 5006
+MISC ChangeLog 27438 RMD160 b270da01d24e182c6b8402c1ea81cf9b5c904d36 SHA1 5ba24eebe21196af5dde352f293d51f9ff2a146d SHA256 2182c0db4e7ed6c4bc0115319c2287bba007099310da8ba2295d4dda545f62cd
+MD5 c8dcbbd41c5d85dc8aa15a5fbf21a82a ChangeLog 27438
+RMD160 b270da01d24e182c6b8402c1ea81cf9b5c904d36 ChangeLog 27438
+SHA256 2182c0db4e7ed6c4bc0115319c2287bba007099310da8ba2295d4dda545f62cd ChangeLog 27438
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -67,10 +69,6 @@ SHA256 478e805bb9947c6bac808c2c14f07c5432ec8d5c10457182a9907437e8965207 files/di
 MD5 5add51bccd3ea2203e0648e2832f54a0 files/digest-gdm-2.18.0 768
 RMD160 08b97b7b212d660796e6123338b6c1c0f6eaf93f files/digest-gdm-2.18.0 768
 SHA256 b0d5917269c8b1d484d6e2becc7ada5aeb968a29db6b2f56aa83e77d802915ea files/digest-gdm-2.18.0 768
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGCIvSomPajV0RnrERAp0SAJ4pR4iNCSwof7WDJpntd9wcrvNXxACePVmb
-mNXSjbaEddf9sRMGqfYB5Mg=
-=7Hzh
------END PGP SIGNATURE-----
+MD5 f47639a8f0e28c9e24bca062f2f08f5c files/digest-gdm-2.18.1 768
+RMD160 a275011b375b73781d52f5e4728ef67a0c92374c files/digest-gdm-2.18.1 768
+SHA256 13e3acbec47fc19c4da29c5e3c9c3549bffa89029527d3962264420905a783d1 files/digest-gdm-2.18.1 768
diff --git a/gnome-base/gdm/files/digest-gdm-2.18.1 b/gnome-base/gdm/files/digest-gdm-2.18.1
new file mode 100644
index 000000000000..4957e004fdb5
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.18.1
@@ -0,0 +1,9 @@
+MD5 a80e26d98adbe485aac0f9aee64b92b1 gdm-2.18.1.tar.bz2 3460665
+RMD160 cb2296bc61eccd6dfa8df8ad071a14e58f8dd80d gdm-2.18.1.tar.bz2 3460665
+SHA256 347a555305f9f19089d032685dfec1cb5a8ebae970b1c2d0e0929cd83c2c5ffd gdm-2.18.1.tar.bz2 3460665
+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.18.1.ebuild b/gnome-base/gdm/gdm-2.18.1.ebuild
new file mode 100644
index 000000000000..792b25482218
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.18.1.ebuild
@@ -0,0 +1,188 @@
+# 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.1.ebuild,v 1.1 2007/04/21 00:08:46 remi 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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="accessibility branding 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/${GDM_EXTRA}.tar.bz2
+		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
+
+RDEPEND="pam?	(
+					virtual/pam
+					sys-auth/consolekit
+				)
+	!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/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
+			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
+		)
+	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
+	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 \
+						  --enable-authentication-scheme=shadow \
+						  --with-console-kit=no"
+	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
+}
+
+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
+
+	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
+
+	if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
+		einfo "To remove GDM from startup please execute"
+		einfo "'rc-update del xdm default'"
+	fi
+}