version bump for GNOME 2.20

Package-Manager: portage-2.1.3.11

5 files changed, 130 insertions, 5 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index e363a124e134..bc5078bd0942 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.194 2007/09/23 05:31:51 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.195 2007/10/04 16:54:21 compnerd Exp $
+
+*gnome-session-2.20.0 (04 Oct 2007)
+
+  04 Oct 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gnome-session-2.19.2-no-asserts.patch,
+  +gnome-session-2.20.0.ebuild:
+  Version bump for GNOME 2.20
 
   23 Sep 2007; Tom Gall <tgall@gentoo.org> gnome-session-2.18.3.ebuild:
   stable on ppc64
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 778d86714573..8a4c913a96c1 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -14,9 +14,14 @@ AUX gnome-session-2.17.90.1-gentoo-branding.patch 705 RMD160 162b7da162bc9453449
 MD5 d0d31b5693b66d6f6ff272f7e8f6d5f5 files/gnome-session-2.17.90.1-gentoo-branding.patch 705
 RMD160 162b7da162bc94534491f6c0a0c772265268386c files/gnome-session-2.17.90.1-gentoo-branding.patch 705
 SHA256 cbbd369938ac60baa255ef58d642014d1318169631bfbd3cb042efcd560187f5 files/gnome-session-2.17.90.1-gentoo-branding.patch 705
+AUX gnome-session-2.19.2-no-asserts.patch 865 RMD160 c69115c8a6e0821d361c6354c6c05e9cbcdbcbdb SHA1 b3aa320808ac63eef91e5dcac17c3ebe94a0f684 SHA256 84dfd878da8933aed9b9a2d1feed47a7fdf254db542b29b5c6dcc81e8d42f122
+MD5 77c0ec4121e67f4cdad4985a7e22f605 files/gnome-session-2.19.2-no-asserts.patch 865
+RMD160 c69115c8a6e0821d361c6354c6c05e9cbcdbcbdb files/gnome-session-2.19.2-no-asserts.patch 865
+SHA256 84dfd878da8933aed9b9a2d1feed47a7fdf254db542b29b5c6dcc81e8d42f122 files/gnome-session-2.19.2-no-asserts.patch 865
 DIST gentoo-splash.png 78064 RMD160 e75052892920e1c919aae1f6e53853c27b2e063f SHA1 e93c5f77389a5351af9948f7677c5592355cf860 SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179
 DIST gnome-session-2.16.3.tar.bz2 683140 RMD160 d299df401a2bf6c8f5a2c77041db71558e8eec81 SHA1 71874f92a4ddec253ffa7e8b5d4cc07090ac756e SHA256 00135b65275f17343bcfc25f37249d3f6449a3c9243f60b4cd4e3d6b4505b142
 DIST gnome-session-2.18.3.tar.bz2 716092 RMD160 109ad8c913bc4cd67412a0a6521d25af50385e87 SHA1 35170535d20ffdaf02af445104394decc20a52c1 SHA256 87f8dd9b89953e6bfaad98d1b50fd48517334588d0da9d038218751943dfc10a
+DIST gnome-session-2.20.0.tar.bz2 751968 RMD160 c55e17f8fc14c17491626c4305244d24b70ef3d4 SHA1 e27cba0a1b97a118c82c11116ca4115c49682e47 SHA256 bdce51182f6c46aa6a595a7d91bda4e6c78889895b9d3c437af9f26bc379ceba
 EBUILD gnome-session-2.16.3.ebuild 1751 RMD160 652eb9e8fc85496258dd966823e442cdd8f55276 SHA1 1aac5cb4cac1f959e900df9512c53ded06a45d65 SHA256 502b90f43957987e60173058359b0b8d25747b13cc09297d21a892651b2b724c
 MD5 a9ea7d2010cbb09559081d66139ac2e6 gnome-session-2.16.3.ebuild 1751
 RMD160 652eb9e8fc85496258dd966823e442cdd8f55276 gnome-session-2.16.3.ebuild 1751
@@ -25,10 +30,14 @@ EBUILD gnome-session-2.18.3.ebuild 1878 RMD160 3695fa18b8060c136770c3d12c7835758
 MD5 e19ab4e0a308c754904bc12e1180c344 gnome-session-2.18.3.ebuild 1878
 RMD160 3695fa18b8060c136770c3d12c783575832526f5 gnome-session-2.18.3.ebuild 1878
 SHA256 9ee282ab4188cd6f4360e045cb23236723e79bbaec306828d72a50fd92555bbd gnome-session-2.18.3.ebuild 1878
-MISC ChangeLog 26013 RMD160 a03c4377f5671eab05ed7d6841d8968fe70a784c SHA1 b5dea96fc414dabb83048589542f5f3dc9314bfe SHA256 30b55245897c0c1cfab87625a81cfcb0d0869df83683ce8962d4ba9fd42eaf65
-MD5 9fbc8647fc0862b74a991bd799b1c3ba ChangeLog 26013
-RMD160 a03c4377f5671eab05ed7d6841d8968fe70a784c ChangeLog 26013
-SHA256 30b55245897c0c1cfab87625a81cfcb0d0869df83683ce8962d4ba9fd42eaf65 ChangeLog 26013
+EBUILD gnome-session-2.20.0.ebuild 1927 RMD160 d41e79ca963fc372bf0301167a4f73e3f3ec1d44 SHA1 6bc8e68e426f51d15e0cae0fa3d5255cc770faf4 SHA256 4c04d23c9cd297f3dca582f73421beb05ef6322bd84fcfe259d78c065f7701a5
+MD5 fc9c52a894bf899b56d0cb0553a7b7f9 gnome-session-2.20.0.ebuild 1927
+RMD160 d41e79ca963fc372bf0301167a4f73e3f3ec1d44 gnome-session-2.20.0.ebuild 1927
+SHA256 4c04d23c9cd297f3dca582f73421beb05ef6322bd84fcfe259d78c065f7701a5 gnome-session-2.20.0.ebuild 1927
+MISC ChangeLog 26220 RMD160 dec1a9b31fbbf01735b5d1933c2b89da64e77a39 SHA1 b726126d978696218c3b22443dd6f5827ff11b1c SHA256 487f44692cec59ceb5ade6455e49c58bb620497f2b8d7fd5f84ddfec65a9081b
+MD5 f6b07fb8aaf4ba04407a4cbb73f3635d ChangeLog 26220
+RMD160 dec1a9b31fbbf01735b5d1933c2b89da64e77a39 ChangeLog 26220
+SHA256 487f44692cec59ceb5ade6455e49c58bb620497f2b8d7fd5f84ddfec65a9081b ChangeLog 26220
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -39,3 +48,6 @@ SHA256 2307fcbc4e3382c813cc47016fe63e76e24c4a83fff49e49910b07629a1f4e1b files/di
 MD5 1eff3222acc4ddecca7f5367f14ebf26 files/digest-gnome-session-2.18.3 494
 RMD160 2923d437f4dade39690f5ad28b20a2060b7f4c5d files/digest-gnome-session-2.18.3 494
 SHA256 44013a993ea72e139d1affd772f3e54060a49ddc4a1310be533e6dd5e154a4e2 files/digest-gnome-session-2.18.3 494
+MD5 3baa3907962976bcec67247971e1fb8d files/digest-gnome-session-2.20.0 494
+RMD160 d2cd0caffd0cdbe5efa8cf198d5541e8b4e82bff files/digest-gnome-session-2.20.0 494
+SHA256 169a9cfbc0fda44ee9737306597248dd7c2cc8531eb9243436b347b0e958400e files/digest-gnome-session-2.20.0 494
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.20.0 b/gnome-base/gnome-session/files/digest-gnome-session-2.20.0
new file mode 100644
index 000000000000..0f9ec80e3d0c
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.20.0
@@ -0,0 +1,6 @@
+MD5 f02a80d3f1435547a479312c15cc1030 gentoo-splash.png 78064
+RMD160 e75052892920e1c919aae1f6e53853c27b2e063f gentoo-splash.png 78064
+SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179 gentoo-splash.png 78064
+MD5 3ef5601a46ee6c382bf6288ced8b06a5 gnome-session-2.20.0.tar.bz2 751968
+RMD160 c55e17f8fc14c17491626c4305244d24b70ef3d4 gnome-session-2.20.0.tar.bz2 751968
+SHA256 bdce51182f6c46aa6a595a7d91bda4e6c78889895b9d3c437af9f26bc379ceba gnome-session-2.20.0.tar.bz2 751968
diff --git a/gnome-base/gnome-session/files/gnome-session-2.19.2-no-asserts.patch b/gnome-base/gnome-session/files/gnome-session-2.19.2-no-asserts.patch
new file mode 100644
index 000000000000..eb61c89f2ab6
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.19.2-no-asserts.patch
@@ -0,0 +1,31 @@
+--- gnome-session/main.c	2007-01-22 20:15:57.000000000 -0600
++++ gnome-session/main.c	2007-01-22 20:17:57.000000000 -0600
+@@ -572,7 +572,6 @@
+   GError *err;
+   int status;
+   char *display_str;
+-  char **versions;
+   GConfClient *gconf_client;
+   GOptionContext *goption_context;
+   gboolean dbus_daemon_owner;
+@@ -580,20 +579,6 @@
+   if (getenv ("GSM_VERBOSE_DEBUG"))
+     gsm_set_verbose (TRUE);
+ 
+-  /* Help eradicate the critical warnings in unstable releases of GNOME */
+-  versions = g_strsplit (VERSION, ".", 3);
+-  if (versions && versions [0] && versions [1])
+-    {
+-      int major;
+-      major = atoi (versions [1]);
+-      if ((major % 2) != 0)
+-	{
+-          g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
+-	  g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
+-	}
+-    }
+-  g_strfreev (versions);
+-      
+   set_lang();
+   set_gtk1_theme_rcfile ();
+ 
diff --git a/gnome-base/gnome-session/gnome-session-2.20.0.ebuild b/gnome-base/gnome-session/gnome-session-2.20.0.ebuild
new file mode 100644
index 000000000000..5eaad3221db3
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.20.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.20.0.ebuild,v 1.1 2007/10/04 16:54:21 compnerd Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+		 branding? ( mirror://gentoo/gentoo-splash.png )"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="branding esd ipv6 tcpd"
+
+RDEPEND=">=dev-libs/glib-2.13
+		 >=x11-libs/gtk+-2.3.1
+		 x11-libs/libXau
+		 x11-apps/xdpyinfo
+		 >=gnome-base/libgnomeui-2.2
+		 >=gnome-base/control-center-2.15.4
+		 >=x11-libs/libnotify-0.2.1
+		 >=gnome-base/gconf-2
+		 >=gnome-base/gnome-keyring-0.5.1
+		 || (
+				>=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
+			)
+		 esd? ( >=media-sound/esound-0.2.26 )
+		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+		  x11-apps/xrdb
+		>=sys-devel/gettext-0.10.40
+		>=dev-util/pkgconfig-0.17
+		>=dev-util/intltool-0.35
+		!gnome-base/gnome-core"
+
+# gnome-base/gnome-core overwrite /usr/bin/gnome-session
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	# TODO: convert libnotify to a configure option
+	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable esd) $(use_enable tcpd tcp-wrappers)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Patch for Gentoo Branding (bug #42687)
+	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
+
+	# Get rid of random asserts in tons of programs due to development versions
+	epatch "${FILESDIR}/${PN}-2.19.2-no-asserts.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	# Our own splash for world domination
+	if use branding ; then
+		insinto /usr/share/pixmaps/splash/
+		doins "${DISTDIR}/gentoo-splash.png"
+	fi
+}