New version for GNOME 2.28.

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

5 files changed, 129 insertions, 8 deletions

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index 0647b0add9c1..dccc27b33385 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/vinagre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.44 2009/10/28 20:43:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.45 2009/10/29 22:47:09 eva Exp $
+
+*vinagre-2.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +vinagre-2.28.1.ebuild, +files/vinagre-2.28.1-avahi-sigsegv.patch,
+  metadata.xml:
+  New version for GNOME 2.28.
 
   28 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
   -vinagre-2.26.1.ebuild, vinagre-2.26.2.ebuild:
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index a9943c37bcb0..4a63dc5cf468 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -3,16 +3,19 @@ Hash: SHA1
 
 AUX vinagre-2.24.2-optional-avahi.patch 11154 RMD160 3d54bc47fe815451cb464f65826f6fdb866a9589 SHA1 1d0f7479c83bd649cb2c75e173a0217df1352bda SHA256 31e4642955b3871bdd20b2cccc5e28536f5a402eaab4980c055de58eb799e857
 AUX vinagre-2.26.1-optional-applet.patch 1784 RMD160 7f1453843ae2084e26d18b267e896480692d7c72 SHA1 5834e139a159f79b9c7d13683278d5b9f0a4e209 SHA256 dcb0171c15fb9cb86a337e96adece439ea2b43e5d619dc72b859f6870a5eca3d
+AUX vinagre-2.28.1-avahi-sigsegv.patch 1129 RMD160 bc737c24be987c0dffee9435153176cc587e06c7 SHA1 65dfadf67b9051b88d5202f906bfb6980b828200 SHA256 8e6f376343bbe9e0bc55cc335075e57bd9139cd36c470eae6a4b20b7a3c14a46
 DIST vinagre-2.24.2.tar.bz2 1450774 RMD160 880302151d827067d97486043aa07a23f2047e34 SHA1 3073f3a6b64594ea28252f79f01a0a52241e2ec6 SHA256 57b4be4c8bfeeb1493e96b728ec6a4ac29b3e01217b03ce9b194e1932f538959
 DIST vinagre-2.26.2.tar.bz2 1445532 RMD160 45a362eb516bf45f55c99ff05ba5d285a2a5624b SHA1 b5b27ae33882c6d9a57dd2fe1e4e43b2dfd202e0 SHA256 8a1e86dff5e1c14bb53f8f5ee579c7ddaaf532d5d7b1f66a2b5a239a65a15fb5
+DIST vinagre-2.28.1.tar.bz2 1888223 RMD160 18812bf060328935351b6a4bd931cb62043e4109 SHA1 0ef0f876559cf41e70b25e9fdbdd291271822c68 SHA256 774276784b3f097faf165dff37d1e9372098db5570421f4e213fa3c8e9808ad4
 EBUILD vinagre-2.24.2-r1.ebuild 1421 RMD160 88ed5e5f5329c60455fc71b360210ff7ad49b0b6 SHA1 6567c7f2922a097e046518a87cdcab0eedc22c9e SHA256 967450902714e94a6f39f8ac74aa0644eb67149202eeda331caadab9114ea986
 EBUILD vinagre-2.26.2.ebuild 1494 RMD160 bce887b7c7de805e2c7ba9dcb163bfc858ae4803 SHA1 6c41b641b2e59cc7c14bea8ba3e9d0c6ed58a6f6 SHA256 0a474dcc0c4a9ad60a903078ee7a7d60619b326e1e176966ce4cd20c40a2309d
-MISC ChangeLog 5655 RMD160 b04b31ebc5b07efffb00be9255fde6cd99ac96bd SHA1 bc76a4543520ca0d912d4424757a98311c0ff915 SHA256 df5a3df107b1b18adf8ab4f7d1145da1127dd83b85c4a22f3b480e8ea12eb744
-MISC metadata.xml 308 RMD160 98671a6c211abb386123a7283c03de52fb83ce31 SHA1 e433a25760684d720c93a2a3906194de360133f9 SHA256 f90924ba76600e9f351f122fa48c581797b0b65fea241347205c02aeac722c7e
+EBUILD vinagre-2.28.1.ebuild 1850 RMD160 79c2d68536151fea4626c2dbc96a555ff2021b53 SHA1 8af2d0d91fbd882443d9b25d9c5c2adcf346b042 SHA256 9cba423d7c9224ad70549c23286261026b44111ed29239f6dcc1738d2c323158
+MISC ChangeLog 5856 RMD160 f607402694d189fc9a4ad9a217ae3fc912a31918 SHA1 f06ff43809029ba0e292f87279931dac8ba3b010 SHA256 f42700fbaa896b2f1b4b0f23326d09ae4e7e2e7c8efc629ae975effb34d1af16
+MISC metadata.xml 392 RMD160 a8115d199a804c1b80c7dc76474d38109b579fa0 SHA1 0cec1b85c8b18e61c881bddcf0c0486a7f553178 SHA256 a7f04dbe75f242bb167c82d76ff23b3d01e3b5228d150de6b444c28b57ea6a9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrorPgACgkQ1fmVwcYIWAaLDQCfen5acCCzbXmxmY39EjThMAP0
-kuoAoL7IJF9feS9Dlypuz/y1g+XyXrLF
-=66vI
+iEYEARECAAYFAkrqG3IACgkQ1fmVwcYIWAYQywCgspM2pZK67UYlnlFzxcSjptDa
+ebgAnRdUQzgm5XK4ZKK3lS1OqF2urLb4
+=jpuR
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vinagre/files/vinagre-2.28.1-avahi-sigsegv.patch b/net-misc/vinagre/files/vinagre-2.28.1-avahi-sigsegv.patch
new file mode 100644
index 000000000000..00e86839a71d
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-2.28.1-avahi-sigsegv.patch
@@ -0,0 +1,39 @@
+From cc616f47a2d2abd7a0e80a168843fe29a29a93a3 Mon Sep 17 00:00:00 2001
+From: Jonh Wendell <wendell@bani.com.br>
+Date: Wed, 21 Oct 2009 15:14:53 +0200
+Subject: [PATCH] Fix a crash in Remote Desktop Viewer
+
+---
+ vinagre/vinagre-fav.c |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/vinagre/vinagre-fav.c b/vinagre/vinagre-fav.c
+index 6ed635a..b4f633e 100644
+--- a/vinagre/vinagre-fav.c
++++ b/vinagre/vinagre-fav.c
+@@ -197,7 +197,7 @@ vinagre_fav_selection_changed_cb (GtkTreeSelection *selection,
+ 				  VinagreFav       *fav)
+ {
+   GtkTreeIter iter;
+-  VinagreBookmarksEntry *entry;
++  VinagreBookmarksEntry *entry = NULL;
+   gboolean avahi;
+ 
+   if (gtk_tree_selection_get_selected (selection, NULL, &iter))
+@@ -207,11 +207,10 @@ vinagre_fav_selection_changed_cb (GtkTreeSelection *selection,
+ 			  ENTRY_COL, &entry,
+                           IS_AVAHI_COL, &avahi,
+ 			  -1);
++      if (avahi)
++	entry = NULL;
+     }
+ 
+-  if (avahi)
+-    entry = NULL;
+-
+   /* Emits the signal saying that user has selected a bookmark */
+   g_signal_emit (G_OBJECT (fav), 
+ 		 signals[FAV_SELECTED],
+-- 
+1.6.5.1
+
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
index ed30b6c12f0e..69df4a3b37ff 100644
--- a/net-misc/vinagre/metadata.xml
+++ b/net-misc/vinagre/metadata.xml
@@ -4,8 +4,8 @@
 <herd>gnome</herd>
 <use>
 	<flag name="applet">Enable vinagre applet for <pkg>gnome-base/gnome-panel</pkg>.</flag>
+	<flag name="telepathy">Enable access to remote desktop via a telepathy client.</flag>
+	<flag name="ssh">Enable ssh plugin.</flag>
 </use>
-<longdescription lang="en">
-</longdescription>
 </pkgmetadata>
 
diff --git a/net-misc/vinagre/vinagre-2.28.1.ebuild b/net-misc/vinagre/vinagre-2.28.1.ebuild
new file mode 100644
index 000000000000..11347b8b2b15
--- /dev/null
+++ b/net-misc/vinagre/vinagre-2.28.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.28.1.ebuild,v 1.1 2009/10/29 22:47:09 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="VNC Client for the GNOME Desktop"
+HOMEPAGE="http://www.gnome.org/projects/vinagre/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="applet avahi +ssh +telepathy test"
+
+RDEPEND=">=dev-libs/glib-2.17.0
+	>=x11-libs/gtk+-2.16
+	>=gnome-base/gconf-2.16
+	>=net-libs/gtk-vnc-0.3.9
+	>=gnome-base/gnome-keyring-1
+	applet? ( >=gnome-base/gnome-panel-2 )
+	avahi? (
+		>=dev-libs/libxml2-2.6.31
+		>=net-dns/avahi-0.6.22[dbus,gtk] )
+	ssh? (
+		>=dev-libs/libxml2-2.6.31
+		>=x11-libs/vte-0.20 )
+	telepathy? ( >=net-libs/telepathy-glib-0.7.31 )"
+
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	>=dev-lang/perl-5
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	test? ( ~app-text/docbook-xml-dtd-4.3 )"
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		$(use_enable avahi)
+		$(use_enable applet)
+		$(use_enable ssh)
+		$(use_enable telepathy)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+
+	# Fix a crash in Remote Desktop Viewer,
+	# patch import from upstream bug #599121.
+	# solves gentoo bug #289977.
+	epatch "${FILESDIR}/${P}-avahi-sigsegv.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+
+	# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed
+	rm -rf "${D}"/usr/share/doc/vinagre
+}