bump to 2.20.4

Package-Manager: portage-2.1.4.4

3 files changed, 216 insertions, 6 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index d97c2b1cd478..e5adc342a3ea 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.263 2008/03/02 10:17:19 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.264 2008/03/22 21:57:21 eva Exp $
+
+*gdm-2.20.4 (22 Mar 2008)
+
+  22 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> +gdm-2.20.4.ebuild:
+  bump to 2.20.4
 
   02 Mar 2008; Mart Raudsepp <leio@gentoo.org>
   -files/gdm-2.13.0.7-gdm-dmx-intllibs.patch, -files/gdm-2.16.2-gksu.patch,
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index eaedf815815f..31291a8dbea1 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -8,17 +8,19 @@ AUX gdm-2.20.2-gksu.patch 544 RMD160 044068ec9c0fac089dcfa8b62597741d6bf6a4ac SH
 AUX gdm-2.20.3-logging.patch 646 RMD160 d7494ad8f39d82f72673d59466cc29b8b5c26bfc SHA1 7c00f8c4501d13368f4a25cf34422108356f8761 SHA256 8266a532731609401915a605866e071ba8cbdf25e6425a0a2701427d15f532ce
 DIST gdm-2.18.4.tar.bz2 3459899 RMD160 4922af1321f707279c1eb6354d1c56cc39bce20e SHA1 8bf2c8745d7c38f5f08641abed4ca103cad0ecb8 SHA256 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3
 DIST gdm-2.20.3.tar.bz2 3891861 RMD160 b6aace3153a9ba7adf4ed968ede9da19c3d706cb SHA1 de66323b890f2e65a33bb72c5937d1c95ee5bd89 SHA256 0d1c8e76fbebb2ba2b71c3adac3e7f6193971f75739978f81447e4127b898500
+DIST gdm-2.20.4.tar.bz2 3906797 RMD160 127b75a03192efe96785045dd8029c4ba0e91238 SHA1 2e8f4c088bfbf56aa145ac3214e8ee86683a70da SHA256 adb64d70d9c2bf87a2f67520f40bba29bd76726baee21440f8b24cf3f6336061
 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.18.4-r1.ebuild 5270 RMD160 eeeaef4112a3747dc03e080454d3f6982d8cf2d1 SHA1 d8189d066c4b4a4d65c440ab35ec33b6e525564c SHA256 b92d95a5dfded625a4aae29c9aef7c0963988a2963f279035f23e08295edd61f
 EBUILD gdm-2.18.4.ebuild 5171 RMD160 9e6e507bff078543f0201737f82f656566cd28a9 SHA1 69440f226d1ba377c86b2e5c5d4017b9f5501dc0 SHA256 5aeb00c4a500025cb4eed2606b71ffa217483645ecfd12ba7a2823e54a7a2cc8
 EBUILD gdm-2.20.3.ebuild 5522 RMD160 dad76fb801e1312bf3affb2fd3ac4366d6d02c46 SHA1 1839b1f627638ae6e96d91376463b309c0e118a3 SHA256 6c131444e3cc7ced1618652a4487bfff8d650851cd29e914b2fc94e138747bcd
-MISC ChangeLog 35586 RMD160 d78ff2a9699065461d06c3d94ae6f9859cbdad2e SHA1 284146f3d211224bb05becebc01b84a705c9b053 SHA256 65e42b901e37694ae5aa32b4d8c86c878e312e191eed867853647dab90c5d8bd
+EBUILD gdm-2.20.4.ebuild 5464 RMD160 9c8f1a0ddc4ece60d775fb6737fe9b3f1a0bdce0 SHA1 1d015c691f6d4ce342049d29ae334b40b24c7b9e SHA256 afb7c7be2d01785bfd7157ec5f478394cb4f3d7cc604022e9a9e2ecc7053a7eb
+MISC ChangeLog 35704 RMD160 18cbad3f720264b911e8697bfac39d2849b6b0f5 SHA1 3aeea371c4346e6a76d85c295a7039eb525c04a5 SHA256 3267bde64adc55ebf2865bc40bb558955d3303f53b4e6541403f4b680fd2faf6
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkfUcy8ACgkQkeYb6olFHJdx2ACfVXNj/01FyXkeOgDQU5WrSpgZ
-rNIAn34Gp2DUAY7e9d0MutL8BdMHQ0SM
-=8aIR
+iD8DBQFH5YDa1fmVwcYIWAYRAopZAJ4s9ZuoML39ohtylbpB28tVZRn7sQCfYQ3Q
+0h7Jsk+bpPkn6q0XJcs+Snc=
+=25WQ
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-2.20.4.ebuild b/gnome-base/gdm/gdm-2.20.4.ebuild
new file mode 100644
index 000000000000..b9c9f2768795
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.20.4.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.4.ebuild,v 1.1 2008/03/22 21:57:21 eva Exp $
+
+inherit autotools 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_LIBC="elibc_glibc"
+IUSE="accessibility afs branding dmx ipv6 pam remote selinux tcpd xinerama $IUSE_LIBC"
+
+# 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="dev-libs/dbus-glib
+		 >=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
+		 x11-libs/gksu
+		 x11-libs/libXi
+		 x11-libs/libXau
+		 x11-libs/libX11
+		 x11-libs/libXext
+		 x11-apps/sessreg
+		 x11-libs/libXdmcp
+		 xinerama? ( x11-libs/libXinerama )
+		 sys-auth/consolekit
+		 accessibility? ( x11-libs/libXevie )
+		 afs? ( net-fs/openafs sys-libs/lwp )
+		 dmx? ( x11-libs/libdmx )
+		 pam? ( virtual/pam )
+		 !pam? ( elibc_glibc? ( sys-apps/shadow ) )
+		 remote? ( gnome-extra/zenity )
+		 selinux? ( sys-libs/libselinux )
+		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+		dmx? ( x11-proto/dmxproto )
+		sys-devel/gettext
+		x11-proto/inputproto
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.19
+		>=app-text/scrollkeeper-0.1.4
+		>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-prefetch
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--with-xdmcp=yes
+		--with-pam-prefix=/etc
+		--with-console-kit=yes
+		$(use_enable accessibility xevie)
+		$(use_enable ipv6)
+		$(use_enable remote secureremote)
+		$(use_with selinux)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with xinerama)"
+
+	if use dmx ; then
+		G2CONF="${G2CONF} --with-dmx=yes"
+	else
+		G2CONF="${G2CONF} --with-dmx=no"
+	fi
+
+	if use pam; then
+		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
+	else
+		G2CONF="${G2CONF} --enable-console-helper=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"
+
+	# Add gksu to gdmsetup menu entry
+	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
+
+	# Fix compile errors
+	#epatch "${FILESDIR}/${PN}-2.20.3-logging.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"
+
+	if use pam ; then
+		sed -i "s:system-auth:system-local-login:g" "${gentoodir}"/pam.d/*
+		dopamd "${gentoodir}"/pam.d/*
+		dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
+	fi
+
+	# 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/conf.d/xdm"
+	elog "and then execute 'rc-update add xdm default'."
+
+	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 "See README.install for more information about the change."
+
+	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
+}