net-misc/vinagre: Be compatible with freerdp-2 (#590166)

Package-Manager: portage-2.3.2

diff --git a/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch b/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch
new file mode 100644 (file)
index 0000000..4f88ab0
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch
@@ -0,0 +1,39 @@
+From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Fri, 22 Apr 2016 14:54:09 -0700
+Subject: [PATCH] handle new freerdp pkgconfig name
+
+freerdp has now changed its pkgconfig name to 'freerdp2' -
+https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming
+we can build against both 1 and 2, we should handle both names.
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 585c016..362951d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"])
+ 
+ # Whether to enable support for RDP.
+ RDP_DEPS="freerdp x11"
++RDP_2_DEPS="freerdp2 x11"
+ AC_ARG_ENABLE([rdp],
+   [AS_HELP_STRING([--disable-rdp],
+     [Disable Remote Desktop Protocol (RDP) support])])
+@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"],
+     [have_rdp=yes
+      PKG_CHECK_EXISTS(freerdp >= 1.1,
+        [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
+-    [have_rdp=no])],
++    [PKG_CHECK_EXISTS([$RDP_2_DEPS],
++       [have_rdp=yes
++        RDP_DEPS=$RDP_2_DEPS
++        AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])],
+   [have_rdp=no])
+ 
+ AS_IF([test "x$have_rdp" = "xyes"],
+-- 
+2.7.3
+

diff --git a/net-misc/vinagre/vinagre-3.20.2-r1.ebuild b/net-misc/vinagre/vinagre-3.20.2-r1.ebuild
new file mode 100644 (file)
index 0000000..61ec299
--- /dev/null
+++ b/net-misc/vinagre/vinagre-3.20.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools gnome2 linux-info 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="rdp +ssh spice +telepathy zeroconf"
+
+# cairo used in vinagre-tab
+# gdk-pixbuf used all over the place
+RDEPEND="
+       >=dev-libs/glib-2.32.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
+
+       rdp? ( >=net-misc/freerdp-1.1:= )
+       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 )
+       zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
+"
+DEPEND="${RDEPEND}
+       >=dev-lang/perl-5
+       dev-libs/appstream-glib
+       >=dev-util/intltool-0.50
+       dev-util/itstool
+       >=sys-devel/gettext-0.17
+       virtual/pkgconfig
+       $(vala_depend)
+"
+
+pkg_pretend() {
+       # Needed for VNC ssh tunnel, bug #518574
+       CONFIG_CHECK="~IPV6"
+       check_extra_config
+}
+
+src_prepare() {
+       # https://bugzilla.gnome.org/show_bug.cgi?id=765444
+       eapply "${FILESDIR}"/${PN}-3.20.2-freerdp2.patch
+       vala_src_prepare
+       eautoreconf
+       gnome2_src_prepare
+}
+
+src_configure() {
+       gnome2_src_configure \
+               $(use_enable rdp) \
+               $(use_enable ssh) \
+               $(use_enable spice) \
+               $(use_with telepathy) \
+               $(use_with zeroconf avahi)
+}

diff --git a/net-misc/vinagre/vinagre-3.22.0-r1.ebuild b/net-misc/vinagre/vinagre-3.22.0-r1.ebuild
new file mode 100644 (file)
index 0000000..e3ba81d
--- /dev/null
+++ b/net-misc/vinagre/vinagre-3.22.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools gnome2 linux-info 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="rdp +ssh spice +telepathy zeroconf"
+
+# cairo used in vinagre-tab
+# gdk-pixbuf used all over the place
+RDEPEND="
+       >=dev-libs/glib-2.32.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
+
+       rdp? ( >=net-misc/freerdp-1.1:= )
+       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 )
+       zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
+"
+DEPEND="${RDEPEND}
+       $(vala_depend)
+       app-text/yelp-tools
+       dev-libs/appstream-glib
+       >=dev-util/intltool-0.50
+       >=sys-devel/gettext-0.17
+       virtual/pkgconfig
+"
+
+pkg_pretend() {
+       # Needed for VNC ssh tunnel, bug #518574
+       CONFIG_CHECK="~IPV6"
+       check_extra_config
+}
+
+src_prepare() {
+       # https://bugzilla.gnome.org/show_bug.cgi?id=765444
+       eapply "${FILESDIR}"/${PN}-3.20.2-freerdp2.patch
+       vala_src_prepare
+       eautoreconf
+       gnome2_src_prepare
+}
+
+src_configure() {
+       gnome2_src_configure \
+               $(use_enable rdp) \
+               $(use_enable ssh) \
+               $(use_enable spice) \
+               $(use_with telepathy) \
+               $(use_with zeroconf avahi)
+}