Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: updated UI, libpeas and gobject-introspection usage was removed, some parts were rewritten in vala.

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

6 files changed, 624 insertions, 21 deletions

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index 527d3763091d..88eee948aaae 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/vinagre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.75 2011/08/19 14:33:38 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.76 2011/11/07 05:04:22 tetromino Exp $
+
+*vinagre-3.2.1 (07 Nov 2011)
+
+  07 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -vinagre-3.0.2.ebuild, +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, metadata.xml:
+  Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: updated UI,
+  libpeas and gobject-introspection usage was removed, some parts were
+  rewritten in vala.
 
 *vinagre-3.0.2 (19 Aug 2011)
 
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
new file mode 100644
index 000000000000..f9fafefbe982
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.2.1-authenticate-button.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 000000000000..68af7119cd6e
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.2.1-hold-slave-pty-open.patch
@@ -0,0 +1,183 @@
+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
new file mode 100644
index 000000000000..1cc28a2c5e62
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.2.1-implicit-function-declarations.patch
@@ -0,0 +1,375 @@
+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 3a088515351d..64dc860ce962 100644
--- a/net-misc/vinagre/metadata.xml
+++ b/net-misc/vinagre/metadata.xml
@@ -5,8 +5,6 @@
 	<use>
 		<flag name="applet">Enable vinagre applet for
 			<pkg>gnome-base/gnome-panel</pkg></flag>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
 		<flag name="ssh">Enable ssh plugin using <pkg>x11-libs/vte</pkg></flag>
 		<flag name="telepathy">Enable access to remote desktop via a
 			<pkg>net-libs/telepathy-glib</pkg> client</flag>
diff --git a/net-misc/vinagre/vinagre-3.0.2.ebuild b/net-misc/vinagre/vinagre-3.2.1.ebuild
index c774849e796a..2e0bfc645213 100644
--- a/net-misc/vinagre/vinagre-3.0.2.ebuild
+++ b/net-misc/vinagre/vinagre-3.2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.0.2.ebuild,v 1.1 2011/08/19 14:33:38 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.2.1.ebuild,v 1.1 2011/11/07 05:04:22 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 virtualx
+inherit autotools eutils gnome2
 
 DESCRIPTION="VNC Client for the GNOME Desktop"
 HOMEPAGE="http://www.gnome.org/projects/vinagre/"
@@ -14,25 +14,27 @@ HOMEPAGE="http://www.gnome.org/projects/vinagre/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="applet avahi +introspection +ssh +telepathy test"
+IUSE="avahi +ssh +telepathy test"
 
-RDEPEND=">=dev-libs/glib-2.25.11:2
+# cairo used in vinagre-tab
+# gdk-pixbuf used all over the place
+RDEPEND=">=dev-libs/glib-2.28.0:2
 	>=x11-libs/gtk+-3.0.3:3
-	>=dev-libs/libpeas-0.7.2[gtk]
+	>=gnome-base/gnome-keyring-1
 	>=dev-libs/libxml2-2.6.31:2
 	>=net-libs/gtk-vnc-0.4.3[gtk3]
-	>=gnome-base/gnome-keyring-1
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
 	x11-themes/gnome-icon-theme
 
-	applet? ( >=gnome-base/gnome-panel-2.91 )
 	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
 	ssh? ( >=x11-libs/vte-0.20:2.90 )
 	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
 	>=dev-util/pkgconfig-0.16
@@ -46,29 +48,30 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
 	# Spice support?
 	G2CONF="${G2CONF}
+		VALAC=$(type -p valac-0.12)
 		--disable-schemas-compile
 		--disable-scrollkeeper
 		--disable-spice
 		--enable-rdp
-		$(use_with applet panelapplet)
 		$(use_with avahi)
-		$(use_enable introspection)
 		$(use_enable ssh)
 		$(use_with telepathy)"
 }
 
-src_compile() {
-	# Dbus is needed for introspection because it runs vinagre.
-	# Hence, we need X. But that's okay, because dbus auto-exits after a while.
-	# Also, we need the schemas from data/ to run the app for introspection.
-	local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}"
-	${updater} --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR=${S}/data Xemake || die
+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
 
-	# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed
+	# Remove its own installation of DOCS that go to $PN instead of $P and aren't ecompressed
 	rm -rf "${ED}"/usr/share/doc/vinagre
 }