From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sat, 17 Dec 2011 00:28:08 +0000 (+0000)
Subject: Version bump. Includes upstream patch to build plugins into the executable to make... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=890892a82d4de01c699c32aafaf9040eee9014bb;p=gentoo.git

Version bump. Includes upstream patch to build plugins into the executable to make RDP and SSH usable (bug #394817, thanks to Philipp Reinkemeier for reporting).

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

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index 88eee948aaae..9556f2f2aa15 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,14 @@
 # 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.76 2011/11/07 05:04:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.77 2011/12/17 00:28:08 tetromino Exp $
+
+*vinagre-3.2.2 (17 Dec 2011)
+
+  17 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +vinagre-3.2.2.ebuild:
+  Version bump. Includes upstream patch to build plugins into the executable to
+  make RDP and SSH usable (bug #394817, thanks to Philipp Reinkemeier for
+  reporting).
 
 *vinagre-3.2.1 (07 Nov 2011)
 
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 9d516002814f..deee38bad0dc 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -6,14 +6,17 @@ AUX vinagre-3.2.1-hold-slave-pty-open.patch 5844 RMD160 ba9bf2505a1ffdc47e7b619e
 AUX vinagre-3.2.1-implicit-function-declarations.patch 13361 RMD160 a1e767ebcd3a22a619e995a4a7b80f3b5f03f069 SHA1 d87bfa699de58a7e07576ebaddc93f795d777196 SHA256 881d90805831119c1655cec02c0225708413c5313f938cd3890c059aca015197
 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
 EBUILD vinagre-2.30.3.ebuild 1677 RMD160 8dd4e3926bef986e5e052dc536b50076cb57dcde SHA1 f696c0465b1c2dd2248b21d3dcf68a653d4bdd59 SHA256 a9d30bf6cb73ddbdda5340f378c38de81e5e7214f15ccbe0ec67deb258284ac7
 EBUILD vinagre-3.2.1.ebuild 1977 RMD160 df6cb3d2a11c3e056b6be7b354be7ae1ff3a722c SHA1 e2e74bc5284bbb834423a04030d6785238ffac68 SHA256 aa4f3908e9bf510829a2884e2a5e0ce4a36e3c6f32a7d5615affee24232b6706
-MISC ChangeLog 10249 RMD160 b82fac7bddaa646765297c7bd59379dd18c482ca SHA1 51cbb97e3fc04d4acf88b5011aebc604fe50eaa2 SHA256 371f6d7ae70c7f41fabf2b5a17bf030fafee6538a05d57fd9ceabb5ba7f83df7
+EBUILD vinagre-3.2.2.ebuild 1807 RMD160 186486503de74d80e2a877e66d7f1f00cfe4cc7c SHA1 3a673b8f4ef58a301ceaf7a492368fc3086b089b SHA256 7848ebc1fee108c32cd40da24927bdca12adba6c2542de804fd62af30e3f3471
+MISC ChangeLog 10532 RMD160 36115a828641a3f625ab1fc7a07fb18793323534 SHA1 7fc24efeea6d747751f0b06f794c959254596841 SHA256 8e8e4028171834b8573a87c4fa9dcab8531b2671b90db802cab043aeacffdfa8
 MISC metadata.xml 455 RMD160 4637ed030737d6199bc4f6bf2309143dc8b3a4cc SHA1 ce58f3517d847b72ebae6255e9d8b1735c1dfce8 SHA256 f12c35b694137f5c63e64100a6c9160c75f3529a9a270c2772c8fba08e660b57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk63ZtsACgkQdjK8w9WeBnA89wD/SPzniaInJsT0fOwP71hHH7us
-9mQL3kgRTQ77dRybzb4A/iw2h6YHMHyNm5xMlO7ikkhzTX+m3b/lgEL1Srq7roed
-=PxBS
+iF4EAREIAAYFAk7r4h0ACgkQdjK8w9WeBnDBzAEAhGrpLd7gfiVXt2tErRjWvN2J
+x8Vk+HN3Q3kNUj8vxGEBAJ/iRf/8Toun5OK4PXCsqggqryfvxH+TJBCbktfipkDn
+=HIPX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vinagre/vinagre-3.2.2.ebuild b/net-misc/vinagre/vinagre-3.2.2.ebuild
new file mode 100644
index 000000000000..4809ee78ec8d
--- /dev/null
+++ b/net-misc/vinagre/vinagre-3.2.2.ebuild
@@ -0,0 +1,74 @@
+# 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.2.2.ebuild,v 1.1 2011/12/17 00:28:08 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="VNC Client for the GNOME Desktop"
+HOMEPAGE="http://www.gnome.org/projects/vinagre/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-patches-0.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="avahi +ssh +telepathy test"
+
+# 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
+	>=gnome-base/gnome-keyring-1
+	>=dev-libs/libxml2-2.6.31:2
+	>=net-libs/gtk-vnc-0.4.3[gtk3]
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-themes/gnome-icon-theme
+
+	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
+	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
+	>=dev-util/intltool-0.40
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	>=sys-devel/gettext-0.17
+	test? ( ~app-text/docbook-xml-dtd-4.3 )"
+
+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 avahi)
+		$(use_enable ssh)
+		$(use_with telepathy)"
+}
+
+src_prepare() {
+	epatch ../patch/*.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Remove its own installation of DOCS that go to $PN instead of $P and aren't ecompressed
+	rm -rf "${ED}"/usr/share/doc/vinagre
+}