reinit the tree, so we can have metadata

6 files changed, 317 insertions, 0 deletions

diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
new file mode 100644
index 000000000000..4c0d61ba00ab
--- /dev/null
+++ b/net-misc/vinagre/Manifest
@@ -0,0 +1,8 @@
+AUX vinagre-3.20.2-freerdp2.patch 1355 SHA256 2b66594f892f568036c1a9aa9798851504c138cdb1de8cc35c84a038079df0ae SHA512 9fbe2c45bdda85226410020154441f25f1010e331c30a6d64eabd302c59408d2097238412f4b75407b0bb65163b3ed7258c280b411f17e4b071c95c27b0b2095 WHIRLPOOL 7a1eb598b1b4ed4eada1e04836fd43c1c6aaa42fc5a19a9583cf5c548ab0b362990d1f576119f37a04a4f087591b4f09a775f7380f01728d6ace42de79c1000d
+AUX vinagre-3.22.0-freerdp2-2.patch 3671 SHA256 67659a4a09ee6ec27d9ad10f101b97cf0990b56a305fbd7221a7bcc9ad46c216 SHA512 167d92664001ee35ba8d2b0e262b7f45ec9488eca604e4a63979c51065c9d1e97701fab9377fb7cd623dd87ed9db8be3361ad306a1f55cce8da234ac13e2a312 WHIRLPOOL 3fa7921cbd2ce2ae541f5af82d83f5145e9e7e9f948eae57d57f118503527ff3fc1c8a685a7a11ce540de5564a928aa6eaa4971a3dd0e3b0015e3c63c882da30
+DIST vinagre-3.22.0.tar.xz 1574984 SHA256 cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f WHIRLPOOL 0053c75b5f007d54ac08b446c0f1c1421d10f9cb688b2d14e4d0f0ace9f629ac1da0cb11368645f8b19d8ce40e2feb648198e95fabeadbbf62f95d74b82d39d1
+EBUILD vinagre-3.22.0-r1.ebuild 1587 SHA256 0b94d78a14ad3b19bf094008da7d8f4d8bf222cb88754c992e091de070195074 SHA512 f8e67898179e8fb8401471e48f55ed392f233cf61a0e28461f84e642cc485fb866cc4922babd030013092a1e91cd41e6df7ffcf1ce2200e5ed3ee125e2b6d1df WHIRLPOOL 8e97701dc130b609c380c84ffa56587586db4d7a6de1b203bb224040076435753d42858635402b3b2050b86bb2b5013f3076dd419d8ae98879b5644121087239
+EBUILD vinagre-3.22.0-r2.ebuild 1641 SHA256 c5ee526e9599893bdc625a9ef11237c402ffe495a3ebc74732235616d19a1dfc SHA512 52a07c86d7381d3a99ea46aedd6f2d3671aef04e63fb80fb6adcb4f08c24c073c4ecdea211b18b595e061d3db682c86921a588ff385390e7620ef9628b24b34f WHIRLPOOL 5f09ea856acc3672d0e77f19e9872ec59bfec94755cf7f0158d842ac7208cd1f6ccb262fc6627cca85aef9a747bbf003209ec6533022edbcc9207b790beb84e7
+MISC ChangeLog 5841 SHA256 d5ccc6e9a06b16a48f99723b1fbff0c90a39feb7dd1542038f2ea79792070915 SHA512 d7e9140e0b06dbc50c99cf815fed9fd8e24dd01d28ee6e943947357012da008c1f8d465e1646f78f42046a89f1aa088a1026377518a3ca976aee022804a1307c WHIRLPOOL 62f058e0201b117abb2ba17e6e1bfb415ee3c65f65f69c7d0868ed5a72677c45dda0797ffaa3b2963d572a7cc40e8b1c663090e0200fc7b630b7c6884306d6f6
+MISC ChangeLog-2015 16610 SHA256 5ec67f9adc73d5551d657140cba404069642e14d03bbee7208c5e987be7ca23e SHA512 d49dc214e08e6dd512bb381066d69a9b4d34fc4504f77b3941676b9be400b3ac7e14ca9911323105a34cecb08a5759fb71d179e5f9cba6205aca1d4f20ce0845 WHIRLPOOL 3bb81111f7145e2a85e5027df902e6b86b2c677c33e3c0d616e9115863a793820a91582914aa30e7099b449395220db7dadf7076420ab9054e776d6c52dbfcda
+MISC metadata.xml 550 SHA256 4c16ded8893ddef7315c408c2a37d55bd189d4d1c44c85af942ccaf141c09597 SHA512 3dbf3930996cc2cd2fd0ced60858094f3628eb08688fbec8d0bbf59880727e18f23402de48e04ef086924543d3d0085c9f75e4b070a5b3f6a4877774ade98840 WHIRLPOOL 06f5e3d44d9ab648bcf3e9cf4c111b70519579bf2df66263d8dae9e1c1b7e31450c05b319c84013d676200f76ac277e47e38774355959e026fb520573f3baf97
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
index 000000000000..4f88ab013e10
--- /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/files/vinagre-3.22.0-freerdp2-2.patch b/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch
new file mode 100644
index 000000000000..6c22b46b2583
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch
@@ -0,0 +1,117 @@
+Fix build issue with freerdp2
+
+Gnome-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=765444
+Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=609474
+
+diff --git c/plugins/rdp/vinagre-rdp-tab.c i/plugins/rdp/vinagre-rdp-tab.c
+index b731f9b20ec910cc..13100de3dc0e07e1 100644
+--- c/plugins/rdp/vinagre-rdp-tab.c
++++ i/plugins/rdp/vinagre-rdp-tab.c
+@@ -476,16 +476,17 @@ frdp_drawing_area_draw (GtkWidget *area,
+   return TRUE;
+ }
+ 
+-static void
++static BOOL
+ frdp_begin_paint (rdpContext *context)
+ {
+   rdpGdi *gdi = context->gdi;
+ 
+   gdi->primary->hdc->hwnd->invalid->null = 1;
+   gdi->primary->hdc->hwnd->ninvalid = 0;
++  return TRUE;
+ }
+ 
+-static void
++static BOOL
+ frdp_end_paint (rdpContext *context)
+ {
+   VinagreRdpTab        *rdp_tab = ((frdpContext *) context)->rdp_tab;
+@@ -495,7 +496,7 @@ frdp_end_paint (rdpContext *context)
+   gint                  x, y, w, h;
+ 
+   if (gdi->primary->hdc->hwnd->invalid->null)
+-    return;
++    return TRUE;
+ 
+   x = gdi->primary->hdc->hwnd->invalid->x;
+   y = gdi->primary->hdc->hwnd->invalid->y;
+@@ -517,6 +518,7 @@ frdp_end_paint (rdpContext *context)
+     {
+       gtk_widget_queue_draw_area (priv->display, x, y, w, h);
+     }
++  return TRUE;
+ }
+ 
+ static BOOL
+@@ -587,15 +589,7 @@ frdp_post_connect (freerdp *instance)
+   rdpGdi               *gdi;
+   int                   stride;
+ 
+-  gdi_init (instance,
+-#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \
+-    !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \
+-    FREERDP_VERSION_MINOR >= 2))
+-                    CLRBUF_24BPP,
+-#else
+-                    CLRBUF_32BPP,
+-#endif
+-                    NULL);
++  gdi_init (instance, PIXEL_FORMAT_BGRA32);
+   gdi = instance->context->gdi;
+ 
+   instance->update->BeginPaint = frdp_begin_paint;
+@@ -934,11 +928,13 @@ frdp_authenticate (freerdp  *instance,
+   return TRUE;
+ }
+ 
+-static BOOL
++static DWORD
+ frdp_certificate_verify (freerdp *instance,
+-                         char    *subject,
+-                         char    *issuer,
+-                         char    *fingerprint)
++                         const char *common_name,
++                         const char *subject,
++                         const char *issuer,
++                         const char *fingerprint,
++                         BOOL host_mismatch)
+ {
+   VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
+   GtkBuilder *builder;
+@@ -968,17 +964,20 @@ frdp_certificate_verify (freerdp *instance,
+   gtk_widget_hide (dialog);
+ 
+ 
+-  return response == GTK_RESPONSE_YES;
++  return (response == GTK_RESPONSE_YES) ? 1 : 0;
+ }
+ 
+ 
+ #if HAVE_FREERDP_1_1
+-static BOOL
++static DWORD
+ frdp_changed_certificate_verify (freerdp *instance,
+-                                 char    *subject,
+-                                 char    *issuer,
+-                                 char    *new_fingerprint,
+-                                 char    *old_fingerprint)
++                                 const char *common_name,
++                                 const char *subject,
++                                 const char *issuer,
++                                 const char *new_fingerprint,
++                                 const char *old_subject,
++                                 const char *old_issuer,
++                                 const char *old_fingerprint)
+ {
+   VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab);
+   GtkBuilder *builder;
+@@ -1023,7 +1022,7 @@ frdp_changed_certificate_verify (freerdp *instance,
+   gtk_widget_hide (dialog);
+ 
+ 
+-  return response == GTK_RESPONSE_YES;
++  return (response == GTK_RESPONSE_YES) ? 1 : 0;
+ }
+ #endif
+ 
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
new file mode 100644
index 000000000000..ff8fb2250832
--- /dev/null
+++ b/net-misc/vinagre/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <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
+      <pkg>net-libs/telepathy-glib</pkg> client</flag>
+  </use>
+</pkgmetadata>
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
index 000000000000..93f549eee1f5
--- /dev/null
+++ b/net-misc/vinagre/vinagre-3.22.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+	gnome-base/gnome-common
+"
+# gnome-base/gnome-common needed for eautoreconf
+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-r2.ebuild b/net-misc/vinagre/vinagre-3.22.0-r2.ebuild
new file mode 100644
index 000000000000..93fecd7376ae
--- /dev/null
+++ b/net-misc/vinagre/vinagre-3.22.0-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+	gnome-base/gnome-common
+"
+# gnome-base/gnome-common needed for eautoreconf
+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
+	eapply "${FILESDIR}"/${PN}-3.22.0-freerdp2-2.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)
+}