Bump to 2.20.9. provide sound scripts, bug #248253. Fix parallel build issue, bug #217037. Fix underquoted variables in XSession, bug #242216.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 115 insertions, 46 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 5b76983e55b3..355f1368a777 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,14 @@
 # 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.282 2008/11/13 19:45:00 ranger Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.283 2009/01/05 23:32:43 eva Exp $
+
+*gdm-2.20.9 (05 Jan 2009)
+
+  05 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gdm-2.20.9-parallel-make.patch, -gdm-2.20.6.ebuild,
+  +gdm-2.20.9.ebuild:
+  Bump to 2.20.9. provide sound scripts, bug #248253. Fix parallel build
+  issue, bug #217037. Fix underquoted variables in XSession, bug #242216.
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> gdm-2.20.7.ebuild:
   Marking gdm-2.20.7 ppc64 stable for bug 236971
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 99097f527b5f..af2dc652e69c 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,16 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b
 AUX gdm-2.20.2-gksu.patch 544 RMD160 044068ec9c0fac089dcfa8b62597741d6bf6a4ac SHA1 7672aa94ea512cf50740466c6bc072fa236c7d01 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d
 AUX gdm-2.20.3-logging.patch 646 RMD160 d7494ad8f39d82f72673d59466cc29b8b5c26bfc SHA1 7c00f8c4501d13368f4a25cf34422108356f8761 SHA256 8266a532731609401915a605866e071ba8cbdf25e6425a0a2701427d15f532ce
+AUX gdm-2.20.9-parallel-make.patch 1499 RMD160 aaca98cd72b464aec043b2aeb51973f9ab3c9a33 SHA1 1718004f16455a3f3c957b40b2391c563988681e SHA256 c8d04d1cae1c2bac16bf3f41fd481eacf5f4a3962f661996f93da39d4161bb0d
 DIST gdm-2.20.3.tar.bz2 3891861 RMD160 b6aace3153a9ba7adf4ed968ede9da19c3d706cb SHA1 de66323b890f2e65a33bb72c5937d1c95ee5bd89 SHA256 0d1c8e76fbebb2ba2b71c3adac3e7f6193971f75739978f81447e4127b898500
 DIST gdm-2.20.5-gentoo-files.tar.bz2 3214 RMD160 a075aa94fc3f6f2947bddf46f008979d62cc94d3 SHA1 9654caf36a91a83ffb5d4e53078a70e8c29a0b61 SHA256 47716f35eb1c6875e9c8e42120ff5f65da806aa06f15a48b082a6f5e5a94da83
-DIST gdm-2.20.6.tar.bz2 3912940 RMD160 f507e3004488a908e357822e2fdc6ee4b04ad802 SHA1 f86c0289641da6732957fb52fea05fefd595d5d2 SHA256 bd7ed0be76ddf718d885e4081ea0180a1cb4d4ab588743fb4c4ea349892cb036
 DIST gdm-2.20.7.tar.bz2 3978969 RMD160 1b9321a81aa5984e76715fec9ce7e01f161b8bcb SHA1 349a5a2e60a3e2e229afe99e1342f75e321e53e9 SHA256 84a71eae8a52c89e3044afa69424b8a7e79210024334eb7c23f25bdfa16ca825
 DIST gdm-2.20.8.tar.bz2 3932232 RMD160 c7ddaa03ee698541cea21ca27ebb99b1cdf258aa SHA1 f806b171d0eea6b62238655b6670434f019214ae SHA256 cef608d263866003f573a9b80d29c635a74ee73343d3f45bb381cf50b5c52894
+DIST gdm-2.20.9-gentoo-files.tar.bz2 3472 RMD160 b69f79bee41e73321e39554eed2f086d1e767510 SHA1 1ac3766205ef185acfc1be6329a6fcb944dfe35c SHA256 01c51c85e6b8236e785db84c083fda17035f15c13a2c75a9bd6b473139d9f45a
+DIST gdm-2.20.9.tar.bz2 4034232 RMD160 923ec2c14eb153cc93c2291220b0f50f147dcd32 SHA1 b826a14f1f7bbb16d0f4c32c659eb499fefaf956 SHA256 c5c9a3b818f84656cf087da9312106b9aa5cc9d44fa8b4f45bd04799651bb5cd
 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.20.3.ebuild 5524 RMD160 00e95bcda06fd71d8cdf5792e9b9844589f55ca8 SHA1 5b499d45a07c065fd0681131fb9d7099ae820a08 SHA256 fdea28f1995f7559e9d8017a13e27450b33122235d63b955835413defb378b23
-EBUILD gdm-2.20.6.ebuild 6188 RMD160 c009da76bc5013b1f8a52e1ef60b70395af2dfca SHA1 e690da89068cfb12d47c78c33248a91a77e65eb0 SHA256 19ad83c9bae07605a4c2e4357d5ef3a8c6b89a24df8b473adb7b739ee3ed2f31
 EBUILD gdm-2.20.7.ebuild 6178 RMD160 e911bf4cc1dd74231a855a54524fd6368d0383f1 SHA1 06cd537541b0a47832cff1afb689ef1f4e7063a0 SHA256 a7d986cdc9365ee170deba46eb018fc7ce07c655d77e8e979629d17880ef6346
 EBUILD gdm-2.20.8.ebuild 6183 RMD160 08a7d477af0d830605c3367615a5ca6cecfcffff SHA1 fa02c4b9b75946cd986fcbb775b49312756320d1 SHA256 c526c51b73842baecd8f28b0ceb9a64ccbad25d7e9870cb8697dfd5cfd6823ad
-MISC ChangeLog 37998 RMD160 b60243fee22f11db2b4dab0a4e1f37aea449dc59 SHA1 0321dae428c8e83de80faba79543c3487dc5f5f1 SHA256 6d1939aefcbc42b03cd884d65d04a526d9fd71518acaaf8bcef60f9222113203
+EBUILD gdm-2.20.9.ebuild 6354 RMD160 9f7303536e52992765c658b058d3754f38eb7c26 SHA1 711ba143f1c89b2ee1f2e89912d3a1bfdb0473ff SHA256 e09c52d2bb2b1614305ea491cb981dc83dace57caea17a68e58c2a02b4d6f26c
+MISC ChangeLog 38307 RMD160 12ef8cc69c72e2abe14a9483e66bc633e3de921d SHA1 5f52dd8a19ffb3aa876c1861e4ec508e669bd037 SHA256 d690893e1286a69f9e900fd07ef2f9ff595cbac2f449f045149998d942506a96
 MISC metadata.xml 316 RMD160 dd83f53b0fed42e9f805b80b04b3282b9845b31a SHA1 c9f36ef8bdecb74248a488aff5830b7b90b31ad6 SHA256 5a3f796b987e8e41016027fa87ca834f30449050b71b95e6ea91e6e37e4daa98
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklimKAACgkQ1fmVwcYIWAZ+/ACgwqmhrQMEIcbHN48XWB9qFPq7
+WVEAoJ46xlxXXyNl2BXRE5jyu/6IQKr4
+=h99m
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch b/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch
new file mode 100644
index 000000000000..3327e967d51f
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch
@@ -0,0 +1,42 @@
+--- a/gui/Makefile.am	2009-01-04 16:51:19.000000000 +0100
++++ b/gui/Makefile.am	2009-01-04 16:52:10.000000000 +0100
+@@ -263,7 +263,7 @@
+ Gladedir = $(datadir)/gdm
+ Glade_DATA = gdmsetup.glade gdmchooser.glade gdmphotosetup.glade
+ 
+-install-data-local:
++install-data-hook:
+ 	-test -z "$(DESTDIR)$(bindir)/gdmXnest" || rm -f $(DESTDIR)$(bindir)/gdmXnest
+ 	$(LN_S) -f gdmXnestchooser $(DESTDIR)$(bindir)/gdmXnest
+ 
+--- a/gui/Makefile.in	2009-01-04 16:51:39.000000000 +0100
++++ b/gui/Makefile.in	2009-01-04 16:52:52.000000000 +0100
+@@ -1222,7 +1225,9 @@
+ info-am:
+ 
+ install-data-am: install-GladeDATA install-SettingsDATA \
+-	install-SystemDATA install-data-local
++	install-SystemDATA
++	@$(NORMAL_INSTALL)
++	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
+ install-dvi: install-dvi-recursive
+ 
+@@ -1275,7 +1280,7 @@
+ 	html-am info info-am install install-GladeDATA \
+ 	install-SettingsDATA install-SystemDATA install-am \
+ 	install-binPROGRAMS install-data install-data-am \
+-	install-data-local install-dvi install-dvi-am install-exec \
++	install-data-hook install-dvi install-dvi-am install-exec \
+ 	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-libexecPROGRAMS install-man \
+ 	install-pdf install-pdf-am install-ps install-ps-am \
+@@ -1295,7 +1300,7 @@
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-install-data-local:
++install-data-hook:
+ 	-test -z "$(DESTDIR)$(bindir)/gdmXnest" || rm -f $(DESTDIR)$(bindir)/gdmXnest
+ 	$(LN_S) -f gdmXnestchooser $(DESTDIR)$(bindir)/gdmXnest
+ 
diff --git a/gnome-base/gdm/gdm-2.20.6.ebuild b/gnome-base/gdm/gdm-2.20.9.ebuild
index 94ea1bb2e03d..6c39b276259e 100644
--- a/gnome-base/gdm/gdm-2.20.6.ebuild
+++ b/gnome-base/gdm/gdm-2.20.9.ebuild
@@ -1,64 +1,64 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.6.ebuild,v 1.1 2008/05/15 22:11:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.9.ebuild,v 1.1 2009/01/05 23:32:43 eva Exp $
 
-inherit autotools eutils pam gnome2
+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 ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE_LIBC="elibc_glibc"
 IUSE="accessibility afs branding dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
 
 # Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.5-gentoo-files"
+GDM_EXTRA="${PN}-2.20.9-gentoo-files"
 
 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 )
-		 gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
-		 pam? (
-			virtual/pam
-			>=sys-auth/pambase-20080318
-		 )
-		 !pam? ( elibc_glibc? ( sys-apps/shadow ) )
-		 remote? ( gnome-extra/zenity )
-		 selinux? ( sys-libs/libselinux )
-		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+	>=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 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
+	pam? (
+		virtual/pam
+		>=sys-auth/pambase-20080318 )
+	!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"
+	dmx? ( x11-proto/dmxproto )
+	xinerama? ( x11-proto/xineramaproto )
+	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"
 
@@ -70,6 +70,7 @@ pkg_setup() {
 		--with-xdmcp=yes
 		--with-pam-prefix=/etc
 		--with-console-kit=yes
+		SOUND_PROGRAM=/usr/bin/gdmplay
 		$(use_enable accessibility xevie)
 		$(use_enable ipv6)
 		$(use_enable remote secureremote)
@@ -116,6 +117,9 @@ src_unpack() {
 
 	# Add gksu to gdmsetup menu entry
 	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
+
+	# Fix parallel install, bug #217037
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
 }
 
 src_install() {
@@ -146,6 +150,9 @@ src_install() {
 	exeinto /etc/X11/dm/Sessions
 	doexe "${gentoodir}/custom.desktop"
 
+	# add a custom sound playing script (#248253)
+	dobin "${gentoodir}/gdmplay"
+
 	# avoid file collision, bug #213118
 	rm -f "${D}/usr/share/xsessions/gnome.desktop"