Bump for gnome-3.4 and enable optional spice support (untested). Drop old.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

7 files changed, 43 insertions, 623 deletions

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index a9300d302a66..78719c02078f 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/vinagre
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.78 2012/05/05 03:20:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.79 2012/05/20 05:12:32 tetromino Exp $
+
+*vinagre-3.4.2 (20 May 2012)
+
+  20 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -vinagre-3.2.1.ebuild, -files/vinagre-3.2.1-authenticate-button.patch,
+  -files/vinagre-3.2.1-hold-slave-pty-open.patch,
+  -files/vinagre-3.2.1-implicit-function-declarations.patch,
+  +vinagre-3.4.2.ebuild, metadata.xml:
+  Bump for gnome-3.4 and enable optional spice support (untested). Drop old.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> vinagre-2.30.3.ebuild,
   vinagre-3.2.1.ebuild, vinagre-3.2.2.ebuild:
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 3901ff653bd5..38c1971fe4f8 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,12 +1,23 @@
-AUX vinagre-3.2.1-authenticate-button.patch 1285 RMD160 1f39448204f2e97ae4d17858f1464c1848ba049f SHA1 778747908175e69aeed33c4601084359995568e1 SHA256 3764fcdaf42af4e256190f7f505f764d5b2e18c2b41a4eab7d6761c287f32c3f
-AUX vinagre-3.2.1-hold-slave-pty-open.patch 5844 RMD160 ba9bf2505a1ffdc47e7b619e3598e535e7070262 SHA1 0ca314d0949f792c8f3c11c42142536df5524cc8 SHA256 57f1f3b57e0df7598c883d73301b88b5e624cc1ee13b7898f66e2c8727b693e2
-AUX vinagre-3.2.1-implicit-function-declarations.patch 13361 RMD160 a1e767ebcd3a22a619e995a4a7b80f3b5f03f069 SHA1 d87bfa699de58a7e07576ebaddc93f795d777196 SHA256 881d90805831119c1655cec02c0225708413c5313f938cd3890c059aca015197
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vinagre-2.30.3.tar.bz2 2447388 RMD160 5602393b2dbd8f94e3bd6ea2be5b1843b4d5482c SHA1 17eaf74fa49eeda85fc6cd9e2db7a11720c45e34 SHA256 28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4
-DIST vinagre-3.2.1.tar.xz 2519612 RMD160 ef077d804ffc0377862a36e6398a23fd137938b3 SHA1 d19005f9e63196e7da864b28824186cfab342297 SHA256 077dc011d048e9ed7a683ed74dc027c5c7e47d0b95b99acb493bf99fff22369c
 DIST vinagre-3.2.2-patches-0.tar.xz 5464 RMD160 ce7a28962169cd7b1d381084355619bb55b0e727 SHA1 9305fbf20e7d462d1182676d3b40d2de90f52168 SHA256 1dfcba6c966143d5d3ad4dd4a900e07a92e1e087cc17c98e089498e8fee77576
 DIST vinagre-3.2.2.tar.xz 2518832 RMD160 7002d3c5aa6ed472173ad08241f0195dcb12da78 SHA1 c52760a3f7a8f66de730442c85b38c688ecb1420 SHA256 1533cc447177f8d6c9cfe45d61b05904efbf66c86b86b4c332e972ff965d76bd
+DIST vinagre-3.4.2.tar.xz 2503232 RMD160 925ec545204838788af180d4b2c87686f7b817e9 SHA1 e701eea80e154818820ac99ee5e3bf49aae6392c SHA256 31dfc98fef91cf692a90880377f8abf95dcf6a7d3512441655bc66b969f50d85
 EBUILD vinagre-2.30.3.ebuild 1668 RMD160 02c67c218c85a8f1e93df7b24745c13919af9cdf SHA1 60b34d6cb73d4b19fff56fbc0f87ae27ad4fdf4f SHA256 4be8196dc2a182233a02f97ddab1c2a46912b0ae4825f5e2b398e0626b82f020
-EBUILD vinagre-3.2.1.ebuild 1966 RMD160 b418c0590d634bbcd77ea2f56dc7bd8b1f86607b SHA1 9c029a4e2316040c3faac0ffdf4b9a089be19767 SHA256 9f436b326c9fc1956d3a2590ec649d6a158292231594dbdcc3f6d33134d70943
 EBUILD vinagre-3.2.2.ebuild 1796 RMD160 b88c8c15bd4217db39d4192ecae8f49d5e1072f5 SHA1 e8de320413db381e6b1dce21a13dea98ad293de0 SHA256 774f51d08718cffeaac0f05d9f8dd56062411b82097ef24caeb7c1391b7ac4f8
-MISC ChangeLog 10690 RMD160 b38618b703de8fea10c741c6e410b3ac522202e0 SHA1 a08226046b702c298ddd335a9618bd73ef43934e SHA256 266e320e5e1485467c8741d5f2b3ec7db2af3e84e190cc838d4ca52251e02a5a
-MISC metadata.xml 455 RMD160 4637ed030737d6199bc4f6bf2309143dc8b3a4cc SHA1 ce58f3517d847b72ebae6255e9d8b1735c1dfce8 SHA256 f12c35b694137f5c63e64100a6c9160c75f3529a9a270c2772c8fba08e660b57
+EBUILD vinagre-3.4.2.ebuild 1649 RMD160 ce141c28650a634efd91ab771ce3de00156c210a SHA1 f1b782860645bc3714988ee1a41456b66a34d8a8 SHA256 1272cd6667a603757204118e4edfa2a001b4a7369befff18d38b5fcbe31139fc
+MISC ChangeLog 11083 RMD160 00d3cf406213c55ead6bbd38c8f6d0862210aa4d SHA1 74344c6c4156c2bc73e2cefd7c1bbcf2db829f89 SHA256 1afa78b7d74daa8be61ad02d197f2edab00f779d1a3a4a27a27752e1c8d47aeb
+MISC metadata.xml 531 RMD160 7a793f1cbac611ceb7c5e4a7be7265032e5939d9 SHA1 1e2c1a5f82fec0a34541525ddeb956b0eecdf9e8 SHA256 2d3945f2ba8d847d3eb2455273502ddaf8c678c46f6f9a4b5a1e6465d1aa8b93
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPuH1FAAoJEJ0WA1zPCt1hBXQH/A1Hz+PG4ncZcKNkTSLvldlR
+a8cRAZ1ObLFJSvrUfAvgZXFeJW/FeXT7yjiUQ1rjgf21G7tQJ+jvvF4R7pAyf0iU
+lGD+HaUp8GFQUfvxeqzQMDHPTI6k+8dlEsJSMjTRVyPleNwt4djOMHVPDeWyOa9k
+iyB5lEAkN6KnppVV6C+edgLM3hKL1Usmhslzb+U80u3WlINbIYzUjfz7hI5Nvi91
+tYb3ZDJ9mLoUFSDPndskZHLB2+DXHx7QUWH5i9o97tZGsdf+EQ7nRhyKbloc3GX3
+TX6w2eVCPNYqsldJV8/FA3ZjJVW7RcvmomUBxXoSG7V36lziYbge2rgTwhECnR0=
+=wlyF
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vinagre/files/vinagre-3.2.1-authenticate-button.patch b/net-misc/vinagre/files/vinagre-3.2.1-authenticate-button.patch
deleted file mode 100644
index f9fafefbe982..000000000000
--- a/net-misc/vinagre/files/vinagre-3.2.1-authenticate-button.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0408bf44fec68ca9ef67c861c08b6f8746897e5a Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Tue, 1 Nov 2011 20:05:48 +0100
-Subject: [PATCH] =?UTF-8?q?Use=20a=20button-sized=20image=20on=20=E2=80=98Au?=
- =?UTF-8?q?thenticate=E2=80=99=20button?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Jens Georg noticed that the ‘Authenticate’ button used an image that was
-very large, causing it to expand too much horizontally. The image was
-incorrectly set to be Gtk.IconSize.DIALOG, which should have been
-Gtk.IconSize.BUTTON.
----
- vinagre/vinagre-utils.vala |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/vinagre/vinagre-utils.vala b/vinagre/vinagre-utils.vala
-index da10035..fcc5ea8 100644
---- a/vinagre/vinagre-utils.vala
-+++ b/vinagre/vinagre-utils.vala
-@@ -121,7 +121,7 @@ namespace Vinagre.Utils {
- 
-         var ok_button = xml.get_object ("ok_button") as Button;
-         var image = new Image.from_stock (Stock.DIALOG_AUTHENTICATION,
--                                          IconSize.DIALOG);
-+                                          IconSize.BUTTON);
-         ok_button.image = image;
- 
-         var username_entry = xml.get_object ("username_entry") as Entry;
--- 
-1.7.7.2
-
diff --git a/net-misc/vinagre/files/vinagre-3.2.1-hold-slave-pty-open.patch b/net-misc/vinagre/files/vinagre-3.2.1-hold-slave-pty-open.patch
deleted file mode 100644
index 68af7119cd6e..000000000000
--- a/net-misc/vinagre/files/vinagre-3.2.1-hold-slave-pty-open.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 642858f2bd8d4ba82c628fd80fc75a8b1e591033 Mon Sep 17 00:00:00 2001
-From: Tristan Schmelcher <tristan_schmelcher@alumni.uwaterloo.ca>
-Date: Tue, 18 Oct 2011 17:59:39 +0200
-Subject: [PATCH] Hold the slave PTY open, so that SSH does not fail
-
-Optionally hold the slave PTY open in the parent. Needed to prevent EIO
-from read() on the master if exec'ing a program that enumerates and
-closes open fds before opening /dev/tty (ssh). Partially fixes bug
-644432.
----
- vinagre/pty_open.c    |   27 +++++++++++++++++++++++----
- vinagre/pty_open.h    |    3 ++-
- vinagre/vinagre-ssh.c |   12 +++++++++---
- 3 files changed, 34 insertions(+), 8 deletions(-)
-
-diff --git a/vinagre/pty_open.c b/vinagre/pty_open.c
-index a535809..a299146 100644
---- a/vinagre/pty_open.c
-+++ b/vinagre/pty_open.c
-@@ -404,9 +404,10 @@ _pty_fork_on_pty_name(const char *path, int parent_fd, char **env_add,
- 		      const char *directory,
- 		      int columns, int rows, 
- 		      int *stdin_fd, int *stdout_fd, int *stderr_fd, 
-+		      int *held_fd,
- 		      pid_t *child, gboolean reapchild, gboolean login)
- {
--	int fd, i;
-+	int fd, hold_fd, i;
- 	char c;
- 	int ready_a[2] = { 0, 0 };
- 	int ready_b[2] = { 0, 0 };
-@@ -416,6 +417,17 @@ _pty_fork_on_pty_name(const char *path, int parent_fd, char **env_add,
- 	int stdout_pipe[2];
- 	int stderr_pipe[2];
- 
-+	/* Optionally hold the slave PTY open in the parent. Needed to prevent
-+	 * EIO from read() on the master if exec'ing a program that enumerates
-+	 * and closes open fds before opening /dev/tty (ssh). Partially fixes
-+	 * bug 644432. */
-+	if (held_fd) {
-+		hold_fd = open(path, O_RDWR|O_NOCTTY);
-+		if (hold_fd == -1) {
-+			return -1;
-+		}
-+	}
-+
- 	/* Open pipes for synchronizing between parent and child. */
- 	if (_pty_pipe_open_bi(&ready_a[0], &ready_a[1],
- 			      &ready_b[0], &ready_b[1]) == -1) {
-@@ -457,6 +469,7 @@ _pty_fork_on_pty_name(const char *path, int parent_fd, char **env_add,
- 		close(stdin_pipe[1]);
- 		close(stdout_pipe[0]);
- 		close(stderr_pipe[0]);
-+		if (held_fd) close(hold_fd);
- 
- 		if(reapchild) {
- 			close(pid_pipe[0]);
-@@ -575,6 +588,7 @@ _pty_fork_on_pty_name(const char *path, int parent_fd, char **env_add,
- 		*stdin_fd = stdin_pipe[1];
- 		*stdout_fd = stdout_pipe[0];
- 		*stderr_fd = stderr_pipe[0];
-+		if (held_fd) *held_fd = hold_fd;
- 
- 		return 0;
- 		break;
-@@ -603,6 +617,7 @@ _pty_fork_on_pty_name(const char *path, int parent_fd, char **env_add,
- 	close(ready_b[1]);
-  bail_ready:
- 	*child = -1;
-+	if (held_fd) close(hold_fd);
- 	return -1;
- }
- 
-@@ -716,7 +731,8 @@ static int
- _pty_open_unix98(pid_t *child, guint flags, char **env_add,
- 			   const char *command, char **argv,
- 			   const char *directory, int columns, int rows,
--			   int *stdin_fd, int *stdout_fd, int *stderr_fd)
-+			   int *stdin_fd, int *stdout_fd, int *stderr_fd,
-+			   int *held_fd)
- {
- 	int fd;
- 	char *buf;
-@@ -736,6 +752,7 @@ _pty_open_unix98(pid_t *child, guint flags, char **env_add,
- 						  argv, directory,
- 						  columns, rows,
- 						  stdin_fd, stdout_fd, stderr_fd, 
-+						  held_fd,
- 						  child, 
- 						  flags & PTY_REAP_CHILD, 
- 						  flags & PTY_LOGIN_TTY) != 0) {
-@@ -773,13 +790,15 @@ int
- pty_open(pid_t *child, guint flags, char **env_add, 
- 	 const char *command, char **argv, const char *directory,
- 	 int columns, int rows,
--	 int *stdin_fd, int *stdout_fd, int *stderr_fd)
-+	 int *stdin_fd, int *stdout_fd, int *stderr_fd,
-+	 int *held_fd)
- {
- 	int ret = -1;
- 	if (ret == -1) {
- 		ret = _pty_open_unix98(child, flags, env_add, command, 
- 						 argv, directory, columns, rows,
--						 stdin_fd, stdout_fd, stderr_fd);
-+						 stdin_fd, stdout_fd, stderr_fd,
-+						 held_fd);
- 	}
- 	return ret;
- }
-diff --git a/vinagre/pty_open.h b/vinagre/pty_open.h
-index 2e482e1..9a3e026 100644
---- a/vinagre/pty_open.h
-+++ b/vinagre/pty_open.h
-@@ -59,7 +59,8 @@ enum {
- int pty_open(pid_t *child, guint flags, char **env_add,
- 	     const char *command, char **argv, const char *directory,
- 	     int columns, int rows,
--	     int *stdin_fd, int *stdout_fd, int *stderr_fd);
-+	     int *stdin_fd, int *stdout_fd, int *stderr_fd,
-+	     int *held_fd);
- 
- G_END_DECLS
- 
-diff --git a/vinagre/vinagre-ssh.c b/vinagre/vinagre-ssh.c
-index c5b3427..8bfa507 100644
---- a/vinagre/vinagre-ssh.c
-+++ b/vinagre/vinagre-ssh.c
-@@ -173,13 +173,15 @@ spawn_ssh (char *args[],
-            int *stdin_fd,
-            int *stdout_fd,
-            int *stderr_fd,
-+           int *held_fd,
-            GError **error)
- {
- #ifdef USE_PTY
-   *tty_fd = pty_open(pid, PTY_REAP_CHILD, NULL,
- 		     args[0], args, NULL,
- 		     300, 300, 
--		     stdin_fd, stdout_fd, stderr_fd);
-+		     stdin_fd, stdout_fd, stderr_fd,
-+		     held_fd);
-   if (*tty_fd == -1)
-     {
-       g_set_error_literal (error,
-@@ -207,6 +209,7 @@ spawn_ssh (char *args[],
-       return FALSE;
-     }
-   *pid = gpid;
-+  if (held_fd) *held_fd = -1; /* Not applicable here. */
- #endif
-   
-   return TRUE;
-@@ -728,7 +731,7 @@ vinagre_ssh_connect (GtkWindow *parent,
- 		     gint *tty,
- 		     GError **error)
- {
--  int tty_fd, stdin_fd, stdout_fd, stderr_fd;
-+  int tty_fd, stdin_fd, stdout_fd, stderr_fd, held_fd;
-   GPid pid;
-   gchar *user, *host, **args;
-   gboolean res;
-@@ -758,7 +761,7 @@ vinagre_ssh_connect (GtkWindow *parent,
-   args = setup_ssh_commandline (host, port, user, extra_arguments, command);
-   if (!spawn_ssh (args,
- 		  &pid,
--		  &tty_fd, &stdin_fd, &stdout_fd, &stderr_fd,
-+		  &tty_fd, &stdin_fd, &stdout_fd, &stderr_fd, &held_fd,
- 		  error))
-     {
-       g_strfreev (args);
-@@ -772,6 +775,9 @@ vinagre_ssh_connect (GtkWindow *parent,
-   else
-     res = handle_login (parent, host, port, user, tty_fd, stdout_fd, stderr_fd, error);
- 
-+  /* ssh has opened the PTY slave by now, so we can close it */
-+  if (held_fd != -1) close(held_fd);
-+
-   g_strfreev (args);
-   g_free (user);
-   g_free (host);
--- 
-1.7.7.2
-
diff --git a/net-misc/vinagre/files/vinagre-3.2.1-implicit-function-declarations.patch b/net-misc/vinagre/files/vinagre-3.2.1-implicit-function-declarations.patch
deleted file mode 100644
index 1cc28a2c5e62..000000000000
--- a/net-misc/vinagre/files/vinagre-3.2.1-implicit-function-declarations.patch
+++ /dev/null
@@ -1,375 +0,0 @@
-From a72e3da5c6c28633c7d9db640c10f181aac425ce Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Fri, 30 Sep 2011 14:01:45 -0400
-Subject: [PATCH] Fix vinagre_dirs_*, vinagre_utils_* implicit function
- declarations
-
-Fix numerous vinagre_utils_* and vinagre_dirs_* implicit function
-declarations by generating a header (vinagre/vinagre-vala.h) from the
-vala source, and including it in half the .c files in the source tree.
-
-Add the vinagre-vala.h to dist_noinst_DATA to make sure it goes in the
-release tarballs, and to BUILT_SOURCES to ensure that it gets generated
-before the C sources that #include it are compiled.
-
-Unfortunately, automake does not support per-target VALAFLAGS. We cannot
-simply add a "--header vinagre/vinagre-vala.h" option to AM_VALAFLAGS
-or VALAFLAGS because if we ever use a .vala file in another target (such
-as one of the vinagre plugins), vinagre-vala.h will get clobbered.
-
-The only way to prevent valac from running multiple times and safely
-support parallel make without adding a ticking time bomb that could
-clobber vinagre-vala.h is to manually write a stamp target for the vala
-sources used in libvinagre, and manually pass a --header argument to
-valac in the rule for the stamp.
-
-Pick "libvinagre_vala.stamp" as the name for it to avoid potential
-collisions with automake's vala stamp naming conventions. And make sure
-to add the stamp to dist_noinst_DATA so that people who download the
-source tarball aren't forced to use vala to build vinagre.
-
-Also, add an explicit rule for generating vinagre-vala.h for those who
-do not have it and are building from git (otherwise, make fill fail due
-to vinagre-vala.h's presence in dist_noinst_DATA).
----
- Makefile.am                                   |   29 ++++++++++++++++++++++--
- plugins/rdp/vinagre-rdp-tab.c                 |    1 +
- plugins/spice/vinagre-spice-connection.c      |    1 +
- plugins/spice/vinagre-spice-tab.c             |    1 +
- plugins/vnc/vinagre-vnc-connection.c          |    1 +
- plugins/vnc/vinagre-vnc-tab.c                 |    1 +
- vinagre/vinagre-bookmarks-migration.c         |    1 +
- vinagre/vinagre-bookmarks-ui.c                |    1 +
- vinagre/vinagre-bookmarks.c                   |    1 +
- vinagre/vinagre-cache-prefs.c                 |    1 +
- vinagre/vinagre-commands.c                    |    1 +
- vinagre/vinagre-connect.c                     |    1 +
- vinagre/vinagre-connection.c                  |    1 +
- vinagre/vinagre-notebook.c                    |    1 +
- vinagre/vinagre-options.c                     |    2 +
- vinagre/vinagre-reverse-vnc-listener-dialog.c |    1 +
- vinagre/vinagre-reverse-vnc-listener.c        |    1 +
- vinagre/vinagre-ssh.c                         |    1 +
- vinagre/vinagre-tab.c                         |    1 +
- vinagre/vinagre-tube-handler.c                |    1 +
- vinagre/vinagre-window.c                      |    1 +
- 21 files changed, 47 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 6c6b90a..05c2412 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -84,6 +84,10 @@ noinst_vinagreh_headers = \
- # The main library
- noinst_LTLIBRARIES = libvinagre.la
- 
-+libvinagre_vala_sources = \
-+	vinagre/vinagre-dirs.vala \
-+	vinagre/vinagre-utils.vala
-+
- handwritten_sources = \
- 	vinagre/view/autoDrawer.c \
- 	vinagre/view/drawer.c \
-@@ -97,14 +101,12 @@ handwritten_sources = \
- 	vinagre/vinagre-connect.c \
- 	vinagre/vinagre-connection.c \
- 	vinagre/vinagre-debug.c \
--	vinagre/vinagre-dirs.vala \
- 	vinagre/vinagre-notebook.c \
- 	vinagre/vinagre-prefs.c \
- 	vinagre/vinagre-reverse-vnc-listener.c \
- 	vinagre/vinagre-reverse-vnc-listener-dialog.c \
- 	vinagre/vinagre-static-extension.c \
- 	vinagre/vinagre-tab.c \
--	vinagre/vinagre-utils.vala \
- 	vinagre/vinagre-window.c \
- 	vinagre/vinagre-ssh.c \
- 	vinagre/vinagre-cache-prefs.c \
-@@ -120,7 +122,8 @@ handwritten_sources += \
- endif
- 
- libvinagre_la_SOURCES = \
--	$(handwritten_sources)
-+	$(handwritten_sources) \
-+	$(libvinagre_vala_sources:.vala=.c)
- 
- if VINAGRE_HAVE_AVAHI
- libvinagre_la_SOURCES += \
-@@ -223,6 +226,24 @@ libvnc_la_SOURCES = \
- libvnc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
- libvnc_la_LIBADD = $(VNC_LIBS)
- 
-+# Ensure vinagre-vala.h is available immediately since C sources #include it
-+BUILT_SOURCES = \
-+	vinagre/vinagre-vala.h
-+
-+# We have to write an explicit rule instead of just adding --header AM_VALAFLAGS
-+# or VALAFLAGS because automake does not support per-target VALAFLAGS, so if in
-+# the future we use a .vala file in a plugin, vinagre-vala.h will get clobbered.
-+libvinagre_vala.stamp: $(libvinagre_vala_sources)
-+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) --header vinagre/vinagre-vala.h -C $(libvinagre_vala_sources)
-+	$(AM_V_at)touch $@
-+
-+# Automake doesn't have an implicit rule to generate headers from vala
-+vinagre/vinagre-vala.h $(libvinagre_vala_sources:.vala=.c): $(srcdir)/libvinagre_vala.stamp
-+	@if test -f $@; then :; else \
-+	  rm -f $(srcdir)/libvinagre_vala.stamp; \
-+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libvinagre_vala.stamp; \
-+	fi
-+
- iconthemedir = $(datadir)/icons/hicolor
- mimeicon16dir = $(iconthemedir)/16x16/mimetypes
- mimeicon22dir = $(iconthemedir)/22x22/mimetypes
-@@ -328,6 +349,8 @@ dist-changelog:
- 
- dist_noinst_DATA = \
- 	$(noinst_vinagreh_headers) \
-+	vinagre/vinagre-vala.h \
-+	libvinagre_vala.stamp \
- 	$(noinst_plugin_headers) \
- 	ChangeLog.pre-git \
- 	data/vinagre-mime.xml.in \
-diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
-index d7647dd..389b678 100644
---- a/plugins/rdp/vinagre-rdp-tab.c
-+++ b/plugins/rdp/vinagre-rdp-tab.c
-@@ -30,6 +30,7 @@
- 
- #include "vinagre-rdp-tab.h"
- #include "vinagre-rdp-connection.h"
-+#include "vinagre-vala.h"
- 
- #define VINAGRE_RDP_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_RDP_TAB, VinagreRdpTabPrivate))
- 
-diff --git a/plugins/spice/vinagre-spice-connection.c b/plugins/spice/vinagre-spice-connection.c
-index 869096c..0bbe4e2 100644
---- a/plugins/spice/vinagre-spice-connection.c
-+++ b/plugins/spice/vinagre-spice-connection.c
-@@ -25,6 +25,7 @@
- #include <vinagre/vinagre-cache-prefs.h>
- 
- #include "vinagre-spice-connection.h"
-+#include "vinagre-vala.h"
- 
- struct _VinagreSpiceConnectionPrivate
- {
-diff --git a/plugins/spice/vinagre-spice-tab.c b/plugins/spice/vinagre-spice-tab.c
-index 7781c98..a194632 100644
---- a/plugins/spice/vinagre-spice-tab.c
-+++ b/plugins/spice/vinagre-spice-tab.c
-@@ -32,6 +32,7 @@
- #include "vinagre-spice-tab.h"
- #include "vinagre-spice-connection.h"
- #include "vinagre-spice-tunnel.h"
-+#include "vinagre-vala.h"
- 
- #define VINAGRE_SPICE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_SPICE_TAB, VinagreSpiceTabPrivate))
- 
-diff --git a/plugins/vnc/vinagre-vnc-connection.c b/plugins/vnc/vinagre-vnc-connection.c
-index 2182743..6856112 100644
---- a/plugins/vnc/vinagre-vnc-connection.c
-+++ b/plugins/vnc/vinagre-vnc-connection.c
-@@ -25,6 +25,7 @@
- #include <vinagre/vinagre-cache-prefs.h>
- 
- #include "vinagre-vnc-connection.h"
-+#include "vinagre-vala.h"
- 
- struct _VinagreVncConnectionPrivate
- {
-diff --git a/plugins/vnc/vinagre-vnc-tab.c b/plugins/vnc/vinagre-vnc-tab.c
-index 914cdea..10bed13 100644
---- a/plugins/vnc/vinagre-vnc-tab.c
-+++ b/plugins/vnc/vinagre-vnc-tab.c
-@@ -29,6 +29,7 @@
- #include "vinagre-vnc-tab.h"
- #include "vinagre-vnc-connection.h"
- #include "vinagre-vnc-tunnel.h"
-+#include "vinagre-vala.h"
- 
- #define VINAGRE_VNC_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_VNC_TAB, VinagreVncTabPrivate))
- 
-diff --git a/vinagre/vinagre-bookmarks-migration.c b/vinagre/vinagre-bookmarks-migration.c
-index 3fae66b..1289c01 100644
---- a/vinagre/vinagre-bookmarks-migration.c
-+++ b/vinagre/vinagre-bookmarks-migration.c
-@@ -36,6 +36,7 @@
- #include "vinagre-bookmarks-migration.h"
- #include "vinagre-bookmarks.h"
- #include "vinagre-plugins-engine.h"
-+#include "vinagre-vala.h"
- 
- static void
- fill_xml (GSList *list, xmlTextWriter *writer)
-diff --git a/vinagre/vinagre-bookmarks-ui.c b/vinagre/vinagre-bookmarks-ui.c
-index 5f37aa2..fdc5e0a 100644
---- a/vinagre/vinagre-bookmarks-ui.c
-+++ b/vinagre/vinagre-bookmarks-ui.c
-@@ -25,6 +25,7 @@
- #include "vinagre-bookmarks-ui.h"
- #include "vinagre-bookmarks-tree.h"
- #include "vinagre-plugins-engine.h"
-+#include "vinagre-vala.h"
- 
- static void
- control_save_button_visibility (GtkEntry *ed, GtkWidget *bt)
-diff --git a/vinagre/vinagre-bookmarks.c b/vinagre/vinagre-bookmarks.c
-index 968be99..ae130d7 100644
---- a/vinagre/vinagre-bookmarks.c
-+++ b/vinagre/vinagre-bookmarks.c
-@@ -30,6 +30,7 @@
- #include "vinagre-bookmarks-migration.h"
- #include "vinagre-connection.h"
- #include "vinagre-plugins-engine.h"
-+#include "vinagre-vala.h"
- 
- struct _VinagreBookmarksPrivate
- {
-diff --git a/vinagre/vinagre-cache-prefs.c b/vinagre/vinagre-cache-prefs.c
-index 4330d74..532281d 100644
---- a/vinagre/vinagre-cache-prefs.c
-+++ b/vinagre/vinagre-cache-prefs.c
-@@ -21,6 +21,7 @@
- #include <config.h>
- #include <glib/gi18n.h>
- #include "vinagre-cache-prefs.h"
-+#include "vinagre-vala.h"
- 
- static GKeyFile *keyfile = NULL;
- static char* filename = NULL;
-diff --git a/vinagre/vinagre-commands.c b/vinagre/vinagre-commands.c
-index fefd40b..e9dd12b 100644
---- a/vinagre/vinagre-commands.c
-+++ b/vinagre/vinagre-commands.c
-@@ -39,6 +39,7 @@
- #include "vinagre-cache-prefs.h"
- #include "vinagre-plugins-engine.h"
- #include "vinagre-reverse-vnc-listener-dialog.h"
-+#include "vinagre-vala.h"
- 
- void
- vinagre_cmd_direct_connect (VinagreConnection *conn,
-diff --git a/vinagre/vinagre-connect.c b/vinagre/vinagre-connect.c
-index 9b78de9..038a87b 100644
---- a/vinagre/vinagre-connect.c
-+++ b/vinagre/vinagre-connect.c
-@@ -36,6 +36,7 @@
- #include "vinagre-prefs.h"
- #include "vinagre-cache-prefs.h"
- #include "vinagre-plugins-engine.h"
-+#include "vinagre-vala.h"
- 
- typedef struct {
-   GtkBuilder *xml;
-diff --git a/vinagre/vinagre-connection.c b/vinagre/vinagre-connection.c
-index 2bb6245..60a9c1b 100644
---- a/vinagre/vinagre-connection.c
-+++ b/vinagre/vinagre-connection.c
-@@ -27,6 +27,7 @@
- #include "vinagre-connection.h"
- #include "vinagre-bookmarks.h"
- #include "vinagre-plugins-engine.h"
-+#include "vinagre-vala.h"
- 
- struct _VinagreConnectionPrivate
- {
-diff --git a/vinagre/vinagre-notebook.c b/vinagre/vinagre-notebook.c
-index e7bd82f..498cc07 100644
---- a/vinagre/vinagre-notebook.c
-+++ b/vinagre/vinagre-notebook.c
-@@ -26,6 +26,7 @@
- 
- #include "vinagre-dnd.h"
- #include "vinagre-prefs.h"
-+#include "vinagre-vala.h"
- 
- #define VINAGRE_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_NOTEBOOK, VinagreNotebookPrivate))
- 
-diff --git a/vinagre/vinagre-options.c b/vinagre/vinagre-options.c
-index 25a68d5..67a27af 100644
---- a/vinagre/vinagre-options.c
-+++ b/vinagre/vinagre-options.c
-@@ -23,6 +23,8 @@
- #include "vinagre-connection.h"
- #include "vinagre-window.h"
- #include "vinagre-commands.h"
-+#include "vinagre-options.h"
-+#include "vinagre-vala.h"
- 
- const GOptionEntry all_options [] =
- {
-diff --git a/vinagre/vinagre-reverse-vnc-listener-dialog.c b/vinagre/vinagre-reverse-vnc-listener-dialog.c
-index 9f649b9..02c7ccc 100644
---- a/vinagre/vinagre-reverse-vnc-listener-dialog.c
-+++ b/vinagre/vinagre-reverse-vnc-listener-dialog.c
-@@ -44,6 +44,7 @@
- #include "vinagre-prefs.h"
- #include "vinagre-reverse-vnc-listener-dialog.h"
- #include "vinagre-reverse-vnc-listener.h"
-+#include "vinagre-vala.h"
- 
- typedef struct
- {
-diff --git a/vinagre/vinagre-reverse-vnc-listener.c b/vinagre/vinagre-reverse-vnc-listener.c
-index ab314f5..7f6e0a0 100644
---- a/vinagre/vinagre-reverse-vnc-listener.c
-+++ b/vinagre/vinagre-reverse-vnc-listener.c
-@@ -37,6 +37,7 @@
- #include "vinagre-commands.h"
- #include "vinagre-reverse-vnc-listener.h"
- #include "plugins/vnc/vinagre-vnc-connection.h"
-+#include "vinagre-vala.h"
- 
- struct _VinagreReverseVncListenerPrivate
- {
-diff --git a/vinagre/vinagre-ssh.c b/vinagre/vinagre-ssh.c
-index 8bfa507..0e17f38 100644
---- a/vinagre/vinagre-ssh.c
-+++ b/vinagre/vinagre-ssh.c
-@@ -22,6 +22,7 @@
- #include <config.h>
- 
- #include "vinagre-ssh.h"
-+#include "vinagre-vala.h"
- #include "pty_open.h"
- 
- #ifdef G_OS_WIN32
-diff --git a/vinagre/vinagre-tab.c b/vinagre/vinagre-tab.c
-index 041de8f..d0c7453 100644
---- a/vinagre/vinagre-tab.c
-+++ b/vinagre/vinagre-tab.c
-@@ -31,6 +31,7 @@
- #include "vinagre-prefs.h"
- #include "view/autoDrawer.h"
- #include "vinagre-plugins-engine.h"
-+#include "vinagre-vala.h"
- 
- #define VINAGRE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_TAB, VinagreTabPrivate))
- 
-diff --git a/vinagre/vinagre-tube-handler.c b/vinagre/vinagre-tube-handler.c
-index 5932382..2116df8 100644
---- a/vinagre/vinagre-tube-handler.c
-+++ b/vinagre/vinagre-tube-handler.c
-@@ -40,6 +40,7 @@
- #include "vinagre-protocol.h"
- #include "vinagre-plugins-engine.h"
- #include "plugins/vnc/vinagre-vnc-connection.h"
-+#include "vinagre-vala.h"
- 
- G_DEFINE_TYPE (VinagreTubeHandler, vinagre_tube_handler, G_TYPE_OBJECT);
- 
-diff --git a/vinagre/vinagre-window.c b/vinagre/vinagre-window.c
-index 92c20b3..8cb98d1 100644
---- a/vinagre/vinagre-window.c
-+++ b/vinagre/vinagre-window.c
-@@ -41,6 +41,7 @@
- #include "vinagre-window-private.h"
- #include "vinagre-bookmarks-entry.h"
- #include "vinagre-plugins-engine.h"
-+#include "vinagre-vala.h"
- 
- #ifdef VINAGRE_HAVE_AVAHI
- #include "vinagre-mdns.h"
--- 
-1.7.7.2
-
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
index 64dc860ce962..9eb806818612 100644
--- a/net-misc/vinagre/metadata.xml
+++ b/net-misc/vinagre/metadata.xml
@@ -6,6 +6,7 @@
 		<flag name="applet">Enable vinagre applet for
 			<pkg>gnome-base/gnome-panel</pkg></flag>
 		<flag name="ssh">Enable ssh plugin using <pkg>x11-libs/vte</pkg></flag>
+		<flag name="spice">Enable access to SPICE-enabled virtual machines</flag>
 		<flag name="telepathy">Enable access to remote desktop via a
 			<pkg>net-libs/telepathy-glib</pkg> client</flag>
 	</use>
diff --git a/net-misc/vinagre/vinagre-3.2.1.ebuild b/net-misc/vinagre/vinagre-3.4.2.ebuild
index 9d99df4fb3c3..c2435e6816ed 100644
--- a/net-misc/vinagre/vinagre-3.2.1.ebuild
+++ b/net-misc/vinagre/vinagre-3.4.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.2.1.ebuild,v 1.2 2012/05/05 03:20:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.4.2.ebuild,v 1.1 2012/05/20 05:12:32 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="VNC Client for the GNOME Desktop"
 HOMEPAGE="http://www.gnome.org/projects/vinagre/"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/projects/vinagre/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="avahi +ssh +telepathy test"
+IUSE="avahi +ssh spice +telepathy test"
 
 # cairo used in vinagre-tab
 # gdk-pixbuf used all over the place
@@ -29,46 +29,36 @@ RDEPEND=">=dev-libs/glib-2.28.0:2
 
 	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
 	ssh? ( >=x11-libs/vte-0.20:2.90 )
+	spice? ( >=net-misc/spice-gtk-0.5[gtk3] )
 	telepathy? (
 		dev-libs/dbus-glib
 		>=net-libs/telepathy-glib-0.11.6 )
 "
 DEPEND="${RDEPEND}
-	dev-lang/vala:0.12
-	gnome-base/gnome-common
 	>=dev-lang/perl-5
-	virtual/pkgconfig
+	dev-lang/vala:0.12
+	dev-libs/libxml2
 	>=dev-util/intltool-0.40
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
+	dev-util/itstool
 	>=sys-devel/gettext-0.17
-	test? ( ~app-text/docbook-xml-dtd-4.3 )"
+	virtual/pkgconfig
+	test? ( app-text/gnome-doc-utils )"
+# eautoreconf needds:
+#	app-text/yelp-tools
+#	gnome-base/gnome-common
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	# Spice support?
 	G2CONF="${G2CONF}
-		VALAC=$(type -p valac-0.12)
+		VALAC=$(type -P valac-0.12)
 		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-spice
 		--enable-rdp
 		$(use_with avahi)
 		$(use_enable ssh)
+		$(use_enable spice)
 		$(use_with telepathy)"
 }
 
-src_prepare() {
-	# Useful patches from upstream, will be in next release
-	epatch "${FILESDIR}/${P}-hold-slave-pty-open.patch"
-	epatch "${FILESDIR}/${P}-authenticate-button.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=660531
-	epatch "${FILESDIR}/${PN}-3.2.1-implicit-function-declarations.patch"
-	eautoreconf
-	gnome2_src_prepare
-}
-
 src_install() {
 	gnome2_src_install