Add missing rdesktop support and make it optional, bug 435552.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 26 insertions, 22 deletions

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index 78719c02078f..05517272cf7a 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,10 @@
 # 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.79 2012/05/20 05:12:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.80 2012/10/25 21:39:22 eva Exp $
+
+  25 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org> vinagre-3.4.2.ebuild,
+  metadata.xml:
+  Add missing rdesktop support and make it optional, bug 435552.
 
 *vinagre-3.4.2 (20 May 2012)
 
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 38c1971fe4f8..1d3acc0d5b6c 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST vinagre-2.30.3.tar.bz2 2447388 RMD160 5602393b2dbd8f94e3bd6ea2be5b1843b4d5482c SHA1 17eaf74fa49eeda85fc6cd9e2db7a11720c45e34 SHA256 28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4
-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.2.ebuild 1796 RMD160 b88c8c15bd4217db39d4192ecae8f49d5e1072f5 SHA1 e8de320413db381e6b1dce21a13dea98ad293de0 SHA256 774f51d08718cffeaac0f05d9f8dd56062411b82097ef24caeb7c1391b7ac4f8
-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
+DIST vinagre-2.30.3.tar.bz2 2447388 SHA256 28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4
+DIST vinagre-3.2.2-patches-0.tar.xz 5464 SHA256 1dfcba6c966143d5d3ad4dd4a900e07a92e1e087cc17c98e089498e8fee77576
+DIST vinagre-3.2.2.tar.xz 2518832 SHA256 1533cc447177f8d6c9cfe45d61b05904efbf66c86b86b4c332e972ff965d76bd
+DIST vinagre-3.4.2.tar.xz 2503232 SHA256 31dfc98fef91cf692a90880377f8abf95dcf6a7d3512441655bc66b969f50d85
+EBUILD vinagre-2.30.3.ebuild 1668 SHA256 4be8196dc2a182233a02f97ddab1c2a46912b0ae4825f5e2b398e0626b82f020 SHA512 45be1c1a86b9b2a8a4c588ca7abf8e160f0645ec867b8cdc46594b3797e0121d2fa6a35255f4f32e9b1d13d36631dac5a231a30cef1d2c69734bf2fb53811511 WHIRLPOOL b1e165bf8836ab2c72792cc198484b3a0cfe22f58196085f3fd3d295d0c904bec812c583d4960a4fc6f3d63c95149a7d54dc96175cf72073561f374a02e14dfc
+EBUILD vinagre-3.2.2.ebuild 1796 SHA256 774f51d08718cffeaac0f05d9f8dd56062411b82097ef24caeb7c1391b7ac4f8 SHA512 c11c4993bb0646a156c842c0e73e099205199cb109411cdd2ea9c86357ebfb83ea1e0b9fa28eb88fc0414bcc015d5127c04390380b2d823dec500d73487bc00d WHIRLPOOL dab987e16493c78f0749e9f5da31e6cff6e817fa579f373ca8cc955cf6dc2d66af395400a830cb0efd1d02a067171c5be30e91f246dfa10f824b9e5aa7382ba8
+EBUILD vinagre-3.4.2.ebuild 1706 SHA256 8724d061d2dbd15acdba01c69fcc6dc98033ef12eb81e286dd68cffc06122ce3 SHA512 0ff457dc99ea02235cb626f3b16a81dfecb840a421aef5cf5bc98cc9afbc04d9a910b7b5eb2817eae924842d8875769c1fb5da5cf2727067dd2d24546cab62d4 WHIRLPOOL 990c7c4a1e775d943f32278109587e93039e4eadd284350bb30e1fe558f449484610af560e21d4d7a35919c04139ef9dc52687af03932530d36a65c9f7275b2e
+MISC ChangeLog 11235 SHA256 2ce4657a29196cb0334c56f17c1c58143224d2357c2aa842e91bdcd128c7359a SHA512 caa02c80b1942fdafff3da50ebc077c614f4462af8de2e40831432c887ef206ddda113956146cc8cb7b605940def968d568ef55f8d7537ba167e00b19b65aff2 WHIRLPOOL a3e399bda95d1ea8a0db01dc06b14bd247ef55a17dad47eafc7932b8a2bbbcfbd3a0716d9662018268726d147426948e492c15e1ac9d8080a07d0b09dca0a8bb
+MISC metadata.xml 633 SHA256 83cd9005e63c22cf048fdb24edf71c8ba524bc2e9cbbe52d9bb3d2e343957a7c SHA512 aacfe0669add041bc9f895220e797c4b96eef0eff2d32a362c7b19c2d747d56e89cf826965d32099cb549904ccdc60f52d00d5252c95789f02f132931305cf45 WHIRLPOOL 6bee9e578d2c6f4b788e8ea71a1ce35c08e72208198990cee2418da0f05753ed9721ed4b60361cc50eda041262b83481bd36e26aa919303316520ba69732f54a
 -----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
+iEYEAREIAAYFAlCJsYsACgkQ1fmVwcYIWAYxewCfQQwP8WtWlJujvacYcLYW6fU7
+y/QAmwafw02S1GaxrYsR/2ff409Tq0ki
+=0Zwp
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
index 9eb806818612..061a17642564 100644
--- a/net-misc/vinagre/metadata.xml
+++ b/net-misc/vinagre/metadata.xml
@@ -5,6 +5,8 @@
 	<use>
 		<flag name="applet">Enable vinagre applet for
 			<pkg>gnome-base/gnome-panel</pkg></flag>
+		<flag name="rdp">Enable access to Windows RDP protocol using
+			<pkg>net-misc/rdesktop</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
diff --git a/net-misc/vinagre/vinagre-3.4.2.ebuild b/net-misc/vinagre/vinagre-3.4.2.ebuild
index c2435e6816ed..00fa7d9e9373 100644
--- a/net-misc/vinagre/vinagre-3.4.2.ebuild
+++ b/net-misc/vinagre/vinagre-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # 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.4.2.ebuild,v 1.1 2012/05/20 05:12:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.4.2.ebuild,v 1.2 2012/10/25 21:39:22 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/projects/vinagre/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="avahi +ssh spice +telepathy test"
+IUSE="avahi rdp +ssh spice +telepathy test"
 
 # cairo used in vinagre-tab
 # gdk-pixbuf used all over the place
@@ -28,6 +28,7 @@ RDEPEND=">=dev-libs/glib-2.28.0:2
 	x11-themes/gnome-icon-theme
 
 	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
+	rdp? ( net-misc/rdesktop )
 	ssh? ( >=x11-libs/vte-0.20:2.90 )
 	spice? ( >=net-misc/spice-gtk-0.5[gtk3] )
 	telepathy? (
@@ -47,16 +48,17 @@ DEPEND="${RDEPEND}
 #	app-text/yelp-tools
 #	gnome-base/gnome-common
 
-pkg_setup() {
+src_configure() {
 	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
 	G2CONF="${G2CONF}
 		VALAC=$(type -P valac-0.12)
 		--disable-schemas-compile
-		--enable-rdp
 		$(use_with avahi)
+		$(use_enable rdp)
 		$(use_enable ssh)
 		$(use_enable spice)
 		$(use_with telepathy)"
+	gnome2_src_configure
 }
 
 src_install() {