[gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/, net-misc/vinagre/files/

[gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/, net-misc/vinagre/files/

[Gilles Dartiguelongue]

commit:     f2f6baa02bdb6d69581e7480eda67dfe5d1092b8
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 10:35:15 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 13:48:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f2f6baa0

net-misc/vinagre: moved to gentoo-x86

 .../vinagre/files/vinagre-3.16.1-freerdp.patch     | 38 ------------
 net-misc/vinagre/vinagre-3.16.1.ebuild             | 67 ----------------------
 net-misc/vinagre/vinagre-9999.ebuild               | 16 ++++--
 3 files changed, 11 insertions(+), 110 deletions(-)

diff --git a/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch b/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch
deleted file mode 100644
index dacce43..0000000
--- a/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 89cc8bfeaf47a24c57616021915b30bbc4d12d53 Mon Sep 17 00:00:00 2001
-From: Nick Andrade <SDNick484@gmail.com>
-Date: Sat, 16 May 2015 08:03:29 +0100
-Subject: [PATCH] Fix building against newer FreeRDP versions
-
-https://bugzilla.gnome.org/show_bug.cgi?id=749124
----
- plugins/rdp/vinagre-rdp-tab.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
-index c4c11f8..690a580 100644
---- a/plugins/rdp/vinagre-rdp-tab.c
-+++ b/plugins/rdp/vinagre-rdp-tab.c
-@@ -887,7 +887,6 @@ open_freerdp (VinagreRdpTab *rdp_tab)
-   settings->RdpSecurity = TRUE;
-   settings->TlsSecurity = TRUE;
-   settings->NlaSecurity = TRUE;
--  settings->DisableEncryption = FALSE;
-   settings->EncryptionMethods = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
-   settings->EncryptionLevel = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
- #else
-@@ -898,6 +897,12 @@ open_freerdp (VinagreRdpTab *rdp_tab)
-   settings->encryption_method = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
-   settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
- #endif
-+#include <freerdp/version.h>
-+#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1)
-+  settings->UseRdpSecurityLayer = FALSE;
-+#else
-+  settings->DisableEncryption = FALSE;
-+#endif
- 
-   /* Set display size */
- #if HAVE_FREERDP_1_1
--- 
-2.4.0
-

diff --git a/net-misc/vinagre/vinagre-3.16.1.ebuild b/net-misc/vinagre/vinagre-3.16.1.ebuild
deleted file mode 100644
index 033e57e..0000000
--- a/net-misc/vinagre/vinagre-3.16.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.18"
-
-inherit gnome2 vala
-
-DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="avahi rdp +ssh spice +telepathy"
-
-# cairo used in vinagre-tab
-# gdk-pixbuf used all over the place
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.9.6:3
-	app-crypt/libsecret
-	>=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/hicolor-icon-theme
-
-	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
-	rdp? ( net-misc/freerdp )
-	ssh? ( >=x11-libs/vte-0.20:2.91 )
-	spice? (
-		app-emulation/spice-protocol
-		>=net-misc/spice-gtk-0.5[gtk3] )
-	telepathy? (
-		dev-libs/dbus-glib
-		>=net-libs/telepathy-glib-0.11.6 )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-src_prepare() {
-	# Fix RDP initialization with recent FreeRDP (from 'master')
-	epatch "${FILESDIR}"/${PN}-3.16.1-freerdp.patch
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	gnome2_src_configure \
-		$(use_with avahi) \
-		$(use_enable rdp) \
-		$(use_enable ssh) \
-		$(use_enable spice) \
-		$(use_with telepathy) \
-		ITSTOOL=$(type -P true)
-}

diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild
index fde58a6..23ebf40 100644
--- a/net-misc/vinagre/vinagre-9999.ebuild
+++ b/net-misc/vinagre/vinagre-9999.ebuild
@@ -4,9 +4,9 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-VALA_MIN_API_VERSION=0.18
+VALA_MIN_API_VERSION="0.18"
 
-inherit gnome2 vala
+inherit gnome2 linux-info vala
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 fi
-IUSE="avahi rdp +ssh spice +telepathy"
+IUSE="rdp +ssh spice +telepathy zeroconf"
 
 # cairo used in vinagre-tab
 # gdk-pixbuf used all over the place
@@ -35,7 +35,6 @@ RDEPEND="
 	x11-libs/gdk-pixbuf:2
 	x11-themes/hicolor-icon-theme
 
-	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
 	rdp? ( net-misc/freerdp )
 	ssh? ( >=x11-libs/vte-0.20:2.91 )
 	spice? (
@@ -44,6 +43,7 @@ RDEPEND="
 	telepathy? (
 		dev-libs/dbus-glib
 		>=net-libs/telepathy-glib-0.11.6 )
+	zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
 "
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
@@ -60,6 +60,12 @@ if [[ ${PV} = 9999 ]]; then
 		gnome-base/gnome-common"
 fi
 
+pkg_pretend() {
+	# Needed for VNC ssh tunnel, bug #518574
+	CONFIG_CHECK="~IPV6"
+	check_extra_config
+}
+
 src_prepare() {
 	vala_src_prepare
 	gnome2_src_prepare
@@ -70,10 +76,10 @@ src_configure() {
 	[[ ${PV} = 9999 ]] || myconf="ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
 	gnome2_src_configure \
-		$(use_with avahi) \
 		$(use_enable rdp) \
 		$(use_enable ssh) \
 		$(use_enable spice) \
 		$(use_with telepathy) \
+		$(use_with zeroconf avahi) \
 		${myconf}
 }