gnome 2.18.0

Package-Manager: portage-2.1.2.2

6 files changed, 150 insertions, 8 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 1d8e0e808b21..a35d092f4459 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,14 @@
 # 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.174 2007/03/16 01:34:19 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.175 2007/03/27 03:32:24 dang Exp $
+
+*gnome-session-2.18.0 (27 Mar 2007)
+
+  27 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gnome-session-2.17.90.1-gentoo-branding.patch,
+  +files/gnome-session-2.17.90-no-asserts.patch,
+  +gnome-session-2.18.0.ebuild:
+  gnome 2.18.0
 
 *gnome-session-2.16.3 (16 Mar 2007)
 
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 518c5ef88c36..0f5501482474 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -21,11 +21,20 @@ AUX gnome-session-2.14.0-no_libnotify.patch 782 RMD160 81f1222e31740cf20332d7317
 MD5 9d2dced7d4f7bad481996be5eb94eb10 files/gnome-session-2.14.0-no_libnotify.patch 782
 RMD160 81f1222e31740cf20332d731702e53391ab3c104 files/gnome-session-2.14.0-no_libnotify.patch 782
 SHA256 837bd0ba7214d62c0ed5c6adf456c4dadf108b05688efb29b5dcf9699f39797d files/gnome-session-2.14.0-no_libnotify.patch 782
+AUX gnome-session-2.17.90-no-asserts.patch 851 RMD160 828f9db04813d4d56b3fac7519eb0aa0b06faf8b SHA1 ca1ee37a4ddab9e66ad0edafabc9ceb584309859 SHA256 3827ae4759285376ca593a3844c1a8037e76064c0891b5b94f6cc57dd9452196
+MD5 c2d130e2199a78bc91f5152ece386d79 files/gnome-session-2.17.90-no-asserts.patch 851
+RMD160 828f9db04813d4d56b3fac7519eb0aa0b06faf8b files/gnome-session-2.17.90-no-asserts.patch 851
+SHA256 3827ae4759285376ca593a3844c1a8037e76064c0891b5b94f6cc57dd9452196 files/gnome-session-2.17.90-no-asserts.patch 851
+AUX gnome-session-2.17.90.1-gentoo-branding.patch 705 RMD160 162b7da162bc94534491f6c0a0c772265268386c SHA1 c17b429a1d0b1d7f043ae1d6c88ab4f7894c983d SHA256 cbbd369938ac60baa255ef58d642014d1318169631bfbd3cb042efcd560187f5
+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
 DIST gentoo-splash.png 78064 RMD160 e75052892920e1c919aae1f6e53853c27b2e063f SHA1 e93c5f77389a5351af9948f7677c5592355cf860 SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179
 DIST gnome-session-2.14.2.tar.bz2 661986 RMD160 4b394290ffa8b20aeed714a65acac42212d4841b SHA1 25668704f0926b754793781f080d6148393c1764 SHA256 6a256c93a123c50401f71bfb1a9ce6b0d28ffadabd1234e7c15e06915f30bb4a
 DIST gnome-session-2.16.1.tar.bz2 677501 RMD160 99ea2540b00aebc97bcd9a51387e4f621060401a SHA1 cdbd003624c3dfa9e9fd3dfc6022d9890c310219 SHA256 6d6d21c6b9a4a2fe7bc288e8fdf36159444370973b4aa71dfc4c48bc0ad7cdf3
 DIST gnome-session-2.16.2.tar.bz2 681853 RMD160 aedb9906c7968080b5e5db044097c9294112d09a SHA1 37cbad34ce329c2109e5336bfe83a26f8ef44987 SHA256 7422d116b666080f73c2b8c49c18b1fca8455b2e0f9d0add67d8eb80417fc668
 DIST gnome-session-2.16.3.tar.bz2 683140 RMD160 d299df401a2bf6c8f5a2c77041db71558e8eec81 SHA1 71874f92a4ddec253ffa7e8b5d4cc07090ac756e SHA256 00135b65275f17343bcfc25f37249d3f6449a3c9243f60b4cd4e3d6b4505b142
+DIST gnome-session-2.18.0.tar.bz2 707392 RMD160 c12e91cb49cd8314f9dbca69981fe93f65ece9fb SHA1 ab01a84f9ad78db85028192698cd1d6157fd8163 SHA256 4a1ce73fedcfae94673eeef2655937ff6c9ebc2f52ba817466659d2b583df330
 EBUILD gnome-session-2.14.2.ebuild 2128 RMD160 a382bbd551611b7f713ef53724c7fcd3590745db SHA1 cc685bd48de6f18291ffc804cbf219b0d7c0df7d SHA256 70a14501458006c126ffa5373d88dd929436787ae9374ff2758b184d5f45dc02
 MD5 eaea706173ad4796bbe9ac7de3faf718 gnome-session-2.14.2.ebuild 2128
 RMD160 a382bbd551611b7f713ef53724c7fcd3590745db gnome-session-2.14.2.ebuild 2128
@@ -42,10 +51,14 @@ EBUILD gnome-session-2.16.3.ebuild 1816 RMD160 1bea4b635c46d8977275ac9cd09dc684d
 MD5 02b8da46f291b47ffc22faeb39c65b4e gnome-session-2.16.3.ebuild 1816
 RMD160 1bea4b635c46d8977275ac9cd09dc684d903a73d gnome-session-2.16.3.ebuild 1816
 SHA256 35d5d8013a3957d0a840d6418a4c73430d89b5dcc4309c0ab4f1fa9493cf401f gnome-session-2.16.3.ebuild 1816
-MISC ChangeLog 23070 RMD160 2ebe8996b7ff611b4092fad095c02deb9c85748f SHA1 8369307eb1869d4dfe2628b782e36a7af0ad72e0 SHA256 d7779adf0692afd8e51f960d5dee0b58e27ff3c4ad7460b97f938867fef99002
-MD5 2613dbde7d1b636486c011c11837947a ChangeLog 23070
-RMD160 2ebe8996b7ff611b4092fad095c02deb9c85748f ChangeLog 23070
-SHA256 d7779adf0692afd8e51f960d5dee0b58e27ff3c4ad7460b97f938867fef99002 ChangeLog 23070
+EBUILD gnome-session-2.18.0.ebuild 1948 RMD160 570ecd0101df1680e0ff81a61e17da612a40c62b SHA1 003a0e7691ba68664ce1c0ceb1839649eab72ce6 SHA256 9756515cf895a9c3248008b3f09101f4cbcf64eaa8beba9939a7825e48cca55b
+MD5 c48afc15018fb2d41a499ab133776d14 gnome-session-2.18.0.ebuild 1948
+RMD160 570ecd0101df1680e0ff81a61e17da612a40c62b gnome-session-2.18.0.ebuild 1948
+SHA256 9756515cf895a9c3248008b3f09101f4cbcf64eaa8beba9939a7825e48cca55b gnome-session-2.18.0.ebuild 1948
+MISC ChangeLog 23311 RMD160 1d5c034b64c56fce999f0f4678575fb6a438dc8e SHA1 b30677c6c1f7a14be50f26f3beffa667afa22791 SHA256 1ba7874f2fa2c5909e982be14f75abfb4f22c3a097b1d301b28e898b7930d333
+MD5 2a89b5bda65b97764b04995fb5e8b9ff ChangeLog 23311
+RMD160 1d5c034b64c56fce999f0f4678575fb6a438dc8e ChangeLog 23311
+SHA256 1ba7874f2fa2c5909e982be14f75abfb4f22c3a097b1d301b28e898b7930d333 ChangeLog 23311
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -62,10 +75,13 @@ SHA256 b9df23faf6b740ab502b95c8b731e37b77c73b0104e0bd4bf55b62f2a31f4a28 files/di
 MD5 2807c8e0eba9353d3d1ada4cb1e64fa1 files/digest-gnome-session-2.16.3 494
 RMD160 75810917ad9fbf1a569a5d0e7156240298c1922c files/digest-gnome-session-2.16.3 494
 SHA256 2307fcbc4e3382c813cc47016fe63e76e24c4a83fff49e49910b07629a1f4e1b files/digest-gnome-session-2.16.3 494
+MD5 d2e7e695dcf36838f58e3164c78ee991 files/digest-gnome-session-2.18.0 494
+RMD160 ff5fd1d393ef4cf13586bf06ec2a3f19e2befb08 files/digest-gnome-session-2.18.0 494
+SHA256 0f0d7fe9b8b9e6a98ad498071a09faaeb28b28d6bea7fdb550ebd1014afc623b files/digest-gnome-session-2.18.0 494
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF+fOrkeYb6olFHJcRAotnAKCY8gRucHa+62eOZpYcA4drpfNEZACg/PJo
-K/tU+vipYiJaf1E0gWHufYY=
-=HPyB
+iD8DBQFGCI/uomPajV0RnrERAtm6AJ9pusHpnoUXrJFNVMpBJPiR3zqmoACfaoFE
+NaOli0cxXlmxYA4ic0+LSgQ=
+=Qa7p
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.18.0 b/gnome-base/gnome-session/files/digest-gnome-session-2.18.0
new file mode 100644
index 000000000000..7c130ef8287e
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.18.0
@@ -0,0 +1,6 @@
+MD5 f02a80d3f1435547a479312c15cc1030 gentoo-splash.png 78064
+RMD160 e75052892920e1c919aae1f6e53853c27b2e063f gentoo-splash.png 78064
+SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179 gentoo-splash.png 78064
+MD5 830dbabe74474da49018889d27eefaae gnome-session-2.18.0.tar.bz2 707392
+RMD160 c12e91cb49cd8314f9dbca69981fe93f65ece9fb gnome-session-2.18.0.tar.bz2 707392
+SHA256 4a1ce73fedcfae94673eeef2655937ff6c9ebc2f52ba817466659d2b583df330 gnome-session-2.18.0.tar.bz2 707392
diff --git a/gnome-base/gnome-session/files/gnome-session-2.17.90-no-asserts.patch b/gnome-base/gnome-session/files/gnome-session-2.17.90-no-asserts.patch
new file mode 100644
index 000000000000..e69d0039c28c
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.17.90-no-asserts.patch
@@ -0,0 +1,31 @@
+--- gnome-session/main.c.orig	2007-01-22 20:15:57.000000000 -0600
++++ gnome-session/main.c	2007-01-22 20:17:57.000000000 -0600
+@@ -322,7 +322,6 @@
+   GError *err;
+   int status;
+   char *display_str;
+-  char **versions;
+   GConfClient *gconf_client;
+   GOptionContext *goption_context;
+   gboolean dbus_daemon_owner;
+@@ -330,20 +329,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)
+-	{
+-	  putenv ("G_DEBUG=fatal_criticals");
+-	  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/files/gnome-session-2.17.90.1-gentoo-branding.patch b/gnome-base/gnome-session/files/gnome-session-2.17.90.1-gentoo-branding.patch
new file mode 100644
index 000000000000..37c41303c427
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.17.90.1-gentoo-branding.patch
@@ -0,0 +1,11 @@
+--- data/gnome-session.schemas.in	2007-01-24 15:12:52.000000000 -0600
++++ data/gnome-session.schemas.in	2007-01-24 15:13:10.000000000 -0600
+@@ -50,7 +50,7 @@
+          <applyto>/apps/gnome-session/options/splash_image</applyto>
+          <owner>gnome</owner>
+          <type>string</type>
+-         <default>splash/gnome-splash.png</default>
++         <default>splash/gentoo-splash.png</default>
+          <locale name="C">
+             <short>Preferred Image to use for login splash screen</short>
+             <long>This is a relative path value based off the $datadir/pixmaps/ directory.  Sub-directories and image names are valid values. Changing this value will effect the next session login.</long>
diff --git a/gnome-base/gnome-session/gnome-session-2.18.0.ebuild b/gnome-base/gnome-session/gnome-session-2.18.0.ebuild
new file mode 100644
index 000000000000..e0cb20bee991
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.18.0.ebuild
@@ -0,0 +1,70 @@
+# 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.18.0.ebuild,v 1.1 2007/03/27 03:32:24 dang 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.6
+		 >=x11-libs/gtk+-2.3.1
+		 x11-libs/libXau
+		 x11-apps/xdpyinfo
+		 >=gnome-base/libgnomeui-2.2
+		  =gnome-base/gnome-desktop-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.17.90-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
+}