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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 34 insertions, 10 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/Manifest b/net-misc/vino/Manifest
index 29d90b5b8942..3eee8cc51102 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 AUX vino-2.26.1-fbsd-fix.patch 797 RMD160 dfe383c8aa1333eff1bbc7f3356230a528e40089 SHA1 27d23ab58355a24771fdd395ee084e84c9f4f57b SHA256 c851aadaec7165ab842316a94896a937c573b1dd3b68251bcc2dddcf0f1c7c7a
+AUX vino-2.26.2-autorestart-loop.patch 588 RMD160 a0bba32d1416cfc36d67aea5db9b557063c4518a SHA1 e0c59939d7a36e295bbc1fbe03f9efa0c6e0d1b6 SHA256 e4c09b2a68a803eadb1b91f710ff6a9870a28cafef7856eb844806aec53c853e
 DIST vino-2.24.1.tar.bz2 674201 RMD160 f434d1f9259fa9fc1fd66d09e13329d1b47bab52 SHA1 54aa94364bafcf4d33295b6bdf50e4bcd40c6fe2 SHA256 4522c3969b64330b893de9a3257b4f7462975644b5e6cc57e9113d1f0c9c4a77
-DIST vino-2.26.1.tar.bz2 711760 RMD160 641b4412d542e748543775bc301f11a20d92e41d SHA1 f386fde6634de280f6c8062e7888fe984470a7a3 SHA256 06720448e4c95101868dc07bc6719a4879a9a7a830847cf4f69b731bfc8d3c52
 DIST vino-2.26.2.tar.bz2 724845 RMD160 ab6c3a0f3e677f7b3fa4c0956e2246870a84077f SHA1 8e5c7bbe9900e954ed3096743ffba4e7640be508 SHA256 b42580887d91ed2ffc1f2e8e05f4dd0f7304abd98a04139bdb9a674022dd6913
 EBUILD vino-2.24.1.ebuild 1539 RMD160 018ce1964df25d6dff41301c3abf5d092023fc47 SHA1 e752e11e8a5ade840005d0bb495d1cb17223115f SHA256 0ff63958ebe8874001add62b73daa4d3c99c5e679595706c8c1b365d217784c9
-EBUILD vino-2.26.1.ebuild 1676 RMD160 f806be9b8c145238ead47e1569d67f0c0b27e2ce SHA1 4299cc44105eb92b4247c2cc771dd92cc5119fe0 SHA256 6ea91d6da114ceb414bc6942e3d93faa3ef0ce5ddbadc7bcfd014b5d8006730c
+EBUILD vino-2.26.2-r1.ebuild 1808 RMD160 63c5e636db271b202ae9ec3d1642b9b7a8a91f17 SHA1 693f0b6ae06950cf58cbcd0f32394a988f572407 SHA256 327ff7e63dfb18a9f0c7683e75101e527d16192ee61c90133f979cedaf6ea85b
 EBUILD vino-2.26.2.ebuild 1540 RMD160 75b3161a75c78e492b7f9621011461b7ef0eef36 SHA1 49ed7aa29e30825dd5906208e60a7b4aa71e81ce SHA256 5b7e2aadc5fdf66d81730a59d2dde0618d2fbab4d370fb525f43abb1a2564fd8
-MISC ChangeLog 14615 RMD160 1a19a7c375c086d880b40b7fa911daf6741ce4ee SHA1 7714527fff4eb9edd3a37da2e4bcde05b607fbe8 SHA256 61c546c14626535a61dcf93fef413b9c73acfe8ca6b385b985994a1c31f151da
+MISC ChangeLog 14924 RMD160 f9bb460561c2d111c7855162620e7426fa696531 SHA1 4db8309572a4784fa494b493f7d39ea4bd89d7e3 SHA256 31825126f41977bb1c069103a55adbb6ddb32f3f5ce4d3cb2081cc713d696bbc
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoR0ukACgkQ1fmVwcYIWAYH6wCfbXkxS5lCcH4D2wmbGurGqYtt
-xpcAoM2Tnn6CvXE7nKOspPgI5gYuKtLu
-=DsZn
+iEYEARECAAYFAkp1b/YACgkQ1fmVwcYIWAY1qACeLEx+k8iihs6ushmhz1wROPxY
+Wu0AniOSaaObpgNVVgYiuRRunyJ79v/l
+=z1wb
 -----END PGP SIGNATURE-----
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"
 }