Remove obsolete smproxy. Resolves bug #98646.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 156 insertions, 2 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 6bd7951d22ca..650629ecb2d4 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.105 2005/07/22 02:09:20 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.106 2005/07/25 20:37:43 leonardop Exp $
+
+*gnome-session-2.10.0-r3 (25 Jul 2005)
+
+  25 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-session-2.10.0-r3.ebuild,
+  files/gnome-session-2.10.0-no_smproxy.patch:
+  New revision. Added upstream patch to remove gnome-smproxy, causing
+  problems such as bug #98646. See
+  http://bugzilla.gnome.org/show_bug.cgi?id=309506
 
   21 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
   gnome-session-2.10.0-r2.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 96bfda74abb9..6dfb7f862c1f 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,13 +1,16 @@
-MD5 1403856722ad00c130fa573d9665b0e2 ChangeLog 13901
+MD5 2af7439d5e2428cc5f46a0ce36bed449 ChangeLog 14234
+MD5 e5228f3ba16807c83dfbb85e47859fd7 gnome-session-2.10.0-r3.ebuild 2134
 MD5 ff1888a46c8b9d5130b256973c167847 gnome-session-2.10.0-r2.ebuild 1992
 MD5 c9b685052085b1c022785575a65aa502 gnome-session-2.8.1.ebuild 1580
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 4499ec98ae9a50f5de83b8ce43411a80 gnome-session-2.10.0.ebuild 1586
 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464
 MD5 1472ffe4555c4aab66d8359a4031544d files/gnome-session-2.10.0-schema_defaults.patch 648
+MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r3 134
 MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0 134
 MD5 20d1fd1924d8b4f8aed2a43547bd77db files/digest-gnome-session-2.8.1 133
 MD5 ef9c116121d03af45e5f6f00050da2d6 files/gnome-session-2.10.0-esd_switch.patch 1910
 MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r2 134
 MD5 9c41a7c69837eba927f8d546d3c13b8d files/gnome-session-2.6-schema_defaults.patch 1484
 MD5 b6e2c49cdafa0d5d8fe9ab4e28f5fc3d files/gnome-session-2.8.1-hide_splash.patch 1469
+MD5 b3685e6ab1ec8736038735270ae11fb5 files/gnome-session-2.10.0-no_smproxy.patch 2103
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.10.0-r3 b/gnome-base/gnome-session/files/digest-gnome-session-2.10.0-r3
new file mode 100644
index 000000000000..c3bc29871e81
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.10.0-r3
@@ -0,0 +1,2 @@
+MD5 cbeb2db49dac11bf8088e6b025265fff gnome-session-2.10.0.tar.bz2 796754
+MD5 f02a80d3f1435547a479312c15cc1030 gentoo-splash.png 78064
diff --git a/gnome-base/gnome-session/files/gnome-session-2.10.0-no_smproxy.patch b/gnome-base/gnome-session/files/gnome-session-2.10.0-no_smproxy.patch
new file mode 100644
index 000000000000..525c71bbeeef
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.10.0-no_smproxy.patch
@@ -0,0 +1,61 @@
+diff -NurdB gnome-session-2.10.0/Makefile.am gnome-session-2.10.0-patched/Makefile.am
+--- gnome-session-2.10.0/Makefile.am	2004-10-06 20:28:43.000000000 -0500
++++ gnome-session-2.10.0-patched/Makefile.am	2005-07-25 14:48:44.000000000 -0500
+@@ -1,7 +1,6 @@
+ SUBDIRS =			\
+ 	po 			\
+ 	gnome-session		\
+-	smproxy 		\
+ 	man
+ 
+ EXTRA_DIST =			\
+diff -NurdB gnome-session-2.10.0/README gnome-session-2.10.0-patched/README
+--- gnome-session-2.10.0/README	2004-10-12 11:42:25.000000000 -0500
++++ gnome-session-2.10.0-patched/README	2005-07-25 14:49:42.000000000 -0500
+@@ -2,16 +2,13 @@
+ ===================
+ 
+ 	This package is free software and is part of the
+-GNOME 2.0 project.
++GNOME project.
+ 
+ 	Contained here are
+ 	   * the GNOME session manager
+ 	   * the GNOME session manager configuration program
+ 	     and several other session management related
+ 	     utilities.  
+-	   * the GNOME session manager proxy, which handles
+-	     basic session management for applications that
+-	     do not support XSM. 
+ 
+ You may download updates to the package from:
+    ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-session
+diff -NurdB gnome-session-2.10.0/configure.in gnome-session-2.10.0-patched/configure.in
+--- gnome-session-2.10.0/configure.in	2005-03-07 06:35:25.000000000 -0500
++++ gnome-session-2.10.0-patched/configure.in	2005-07-25 14:48:37.000000000 -0500
+@@ -59,8 +59,6 @@
+ 
+ PKG_CHECK_MODULES(GNOME_SESSION, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $ESOUND_MODULE)
+ 
+-PKG_CHECK_MODULES(SMPROXY, libgnome-2.0)
+-
+ dnl gconf checks
+ AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+ 
+@@ -376,7 +374,6 @@
+ man/default.session.5
+ man/gnome-session.1
+ po/Makefile.in
+-smproxy/Makefile
+ man/Makefile
+ ])
+ 
+diff -NurdB gnome-session-2.10.0/man/Makefile.am gnome-session-2.10.0-patched/man/Makefile.am
+--- gnome-session-2.10.0/man/Makefile.am	2002-12-09 18:35:30.000000000 -0500
++++ gnome-session-2.10.0-patched/man/Makefile.am	2005-07-25 14:50:07.000000000 -0500
+@@ -1,5 +1,4 @@
+ man_MANS =			\
+-	gnome-smproxy.1		\
+ 	gnome-session-save.1	\
+ 	session-properties.1	\
+ 	gnome-wm.1		\
diff --git a/gnome-base/gnome-session/gnome-session-2.10.0-r3.ebuild b/gnome-base/gnome-session/gnome-session-2.10.0-r3.ebuild
new file mode 100644
index 000000000000..73b208194a80
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.10.0-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2005 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.10.0-r3.ebuild,v 1.1 2005/07/25 20:37:43 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI} mirror://gentoo/gentoo-splash.png"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="esd ipv6"
+
+RDEPEND=">=x11-libs/gtk+-2.3.1
+	esd? ( >=media-sound/esound-0.2.26 )
+	>=gnome-base/libgnomeui-2.2
+	>=sys-apps/tcp-wrappers-7.6
+	>=gnome-base/gconf-2
+	gnome-base/gnome-keyring"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.17
+	dev-util/intltool
+	!gnome-base/gnome-core"
+# gnome-base/gnome-core overwrite /usr/bin/gnome-session
+
+G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable esd)"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+USE_DESTDIR="1"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd ${S}
+
+	# Patch for logout dialog and automatic session save now reverted. See bug
+	# #95745. Patch to set the Gentoo splash by default in the gconf key
+	# (#42687)
+	epatch ${FILESDIR}/${P}-schema_defaults.patch
+
+	# Implement switch to enable/disable esound support. See bug #6920.
+	epatch ${FILESDIR}/${P}-esd_switch.patch
+
+	# Remove smproxy. See bug #98646.
+	epatch ${FILESDIR}/${P}-no_smproxy.patch
+
+	# Hide the splash after defaults have been loaded, a temp workaround
+	# for http://bugzilla.gnome.org/show_bug.cgi?id=116814
+	epatch ${FILESDIR}/${PN}-2.8.1-hide_splash.patch
+
+	export WANT_AUTOMAKE=1.7
+	cp aclocal.m4 old_macros.m4
+	einfo "Running aclocal"
+	aclocal -I . || die "aclocal failed"
+	einfo "Running autoconf"
+	autoconf || die "autoconf failed"
+	einfo "Running automake"
+	automake || die "automake failed"
+	einfo "Running libtoolize"
+	libtoolize --copy --force
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe ${FILESDIR}/Gnome
+
+	# Our own splash for world domination
+	insinto /usr/share/pixmaps/splash/
+	doins ${DISTDIR}/gentoo-splash.png
+
+}