Version bump. Fix autorestart loop when session-saving is enabled, bug #277989. Clean up old revision. Fix locales installation.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 28 insertions, 4 deletions

diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index d0625ca81fb8..9bd8409cd60c 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.124 2009/05/18 21:28:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.125 2009/08/02 10:52:31 eva Exp $
+
+*vino-2.26.2-r1 (02 Aug 2009)
+
+  02 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org> -vino-2.26.1.ebuild,
+  +vino-2.26.2-r1.ebuild, +files/vino-2.26.2-autorestart-loop.patch:
+  Version bump. Fix autorestart loop when session-saving is enabled, bug
+  #277989. Clean up old revision. Fix locales installation.
 
 *vino-2.26.2 (18 May 2009)
 
diff --git a/net-misc/vino/files/vino-2.26.2-autorestart-loop.patch b/net-misc/vino/files/vino-2.26.2-autorestart-loop.patch
new file mode 100644
index 000000000000..a2bce1871ce6
--- /dev/null
+++ b/net-misc/vino/files/vino-2.26.2-autorestart-loop.patch
@@ -0,0 +1,14 @@
+# Disallow vino-server to register into the session since it is auto-started.
+# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=277989
+# Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=579355
+--- a/server/vino-server.desktop.in.in	2009-03-23 22:17:35.647373307 +0100
++++ b/server/vino-server.desktop.in.in	2009-03-23 22:17:53.079875343 +0100
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Remote Desktop
+ _Comment=GNOME Remote Desktop Server
+-Exec=@LIBEXECDIR@/vino-server
++Exec=@LIBEXECDIR@/vino-server --sm-disable
+ Icon=preferences-desktop-remote-desktop
+ OnlyShowIn=GNOME;
+ Terminal=false
diff --git a/net-misc/vino/vino-2.26.1.ebuild b/net-misc/vino/vino-2.26.2-r1.ebuild
index 07d8e72b457d..f256f179b86c 100644
--- a/net-misc/vino/vino-2.26.1.ebuild
+++ b/net-misc/vino/vino-2.26.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.26.1.ebuild,v 1.4 2009/05/16 13:25:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.26.2-r1.ebuild,v 1.1 2009/08/02 10:52:31 eva Exp $
 
 EAPI="2"
 
@@ -58,6 +58,9 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix build issue on fbsd, upstream bug #577831
-	epatch "${FILESDIR}/${P}-fbsd-fix.patch"
+	# Fix autorestart loop, bug #277989
+	epatch "${FILESDIR}/${P}-autorestart-loop.patch"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
 }