Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/vinagre/, net-misc/vinagre/files/
Date: Tue, 28 Jun 2016 20:30:48
Message-Id: 1467145803.9399d0fb110c8d557c95736ddf5e111a917613cd.pacho@gentoo
1 commit: 9399d0fb110c8d557c95736ddf5e111a917613cd
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 28 20:26:16 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 28 20:30:03 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9399d0fb
7
8 net-misc/vinagre: Drop old
9
10 Package-Manager: portage-2.3.0_rc1
11
12 net-misc/vinagre/Manifest | 1 -
13 .../vinagre/files/vinagre-3.16.1-freerdp.patch | 38 -----------
14 net-misc/vinagre/vinagre-3.16.1.ebuild | 73 ----------------------
15 3 files changed, 112 deletions(-)
16
17 diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
18 index 4d61478..be4cc6b 100644
19 --- a/net-misc/vinagre/Manifest
20 +++ b/net-misc/vinagre/Manifest
21 @@ -1,2 +1 @@
22 -DIST vinagre-3.16.1.tar.xz 812964 SHA256 d77c0057e8525efeef8b35839bce07e5451d99f3ef9d156c7f549a4c1ad6483f SHA512 60b83a7eb8f4d49e8825a4116d2de4579373cb4fbcde70c241b43f079debc30f0b5ce38da39ed4a3841724a70798338a7c319c72be0e991b97f70cdc264dfacf WHIRLPOOL 24828f91d545fd8da63f14002b1988a677c37ffc3abd10678467cfe5223ec4adbd4c9cec39e1ad7c4d46e2beb7369109445f7e1c19e5d10b7be6b79533c99a50
23 DIST vinagre-3.18.2.tar.xz 819820 SHA256 65b81299de0b75a9433e5654d5314f347895d5efb7acd3b111e5e8c03f48fbc4 SHA512 5d72cc5fc99a6400ef0135e65bde9bc3687257e22176f18606e8780d7a20860fa226a25e0c2bf2ffa85b58d25fa5c262ab6db1751c6f1a6a6e490a373e19a2b9 WHIRLPOOL 1d84691b203744b16fe18bf9e370554f5459f5ff2fe2d4020c79bf64c833a6c8d565a5cc843fdf398239dae17d028fb3c156f25741ae25e3b8b7de7bbdd27d4c
24
25 diff --git a/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch b/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch
26 deleted file mode 100644
27 index dacce43..0000000
28 --- a/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch
29 +++ /dev/null
30 @@ -1,38 +0,0 @@
31 -From 89cc8bfeaf47a24c57616021915b30bbc4d12d53 Mon Sep 17 00:00:00 2001
32 -From: Nick Andrade <SDNick484@×××××.com>
33 -Date: Sat, 16 May 2015 08:03:29 +0100
34 -Subject: [PATCH] Fix building against newer FreeRDP versions
35 -
36 -https://bugzilla.gnome.org/show_bug.cgi?id=749124
37 ----
38 - plugins/rdp/vinagre-rdp-tab.c | 7 ++++++-
39 - 1 file changed, 6 insertions(+), 1 deletion(-)
40 -
41 -diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
42 -index c4c11f8..690a580 100644
43 ---- a/plugins/rdp/vinagre-rdp-tab.c
44 -+++ b/plugins/rdp/vinagre-rdp-tab.c
45 -@@ -887,7 +887,6 @@ open_freerdp (VinagreRdpTab *rdp_tab)
46 - settings->RdpSecurity = TRUE;
47 - settings->TlsSecurity = TRUE;
48 - settings->NlaSecurity = TRUE;
49 -- settings->DisableEncryption = FALSE;
50 - settings->EncryptionMethods = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
51 - settings->EncryptionLevel = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
52 - #else
53 -@@ -898,6 +897,12 @@ open_freerdp (VinagreRdpTab *rdp_tab)
54 - settings->encryption_method = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
55 - settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
56 - #endif
57 -+#include <freerdp/version.h>
58 -+#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1)
59 -+ settings->UseRdpSecurityLayer = FALSE;
60 -+#else
61 -+ settings->DisableEncryption = FALSE;
62 -+#endif
63 -
64 - /* Set display size */
65 - #if HAVE_FREERDP_1_1
66 ---
67 -2.4.0
68 -
69
70 diff --git a/net-misc/vinagre/vinagre-3.16.1.ebuild b/net-misc/vinagre/vinagre-3.16.1.ebuild
71 deleted file mode 100644
72 index a8dd29d..0000000
73 --- a/net-misc/vinagre/vinagre-3.16.1.ebuild
74 +++ /dev/null
75 @@ -1,73 +0,0 @@
76 -# Copyright 1999-2015 Gentoo Foundation
77 -# Distributed under the terms of the GNU General Public License v2
78 -# $Id$
79 -
80 -EAPI="5"
81 -GCONF_DEBUG="no"
82 -VALA_MIN_API_VERSION="0.18"
83 -
84 -inherit gnome2 linux-info vala
85 -
86 -DESCRIPTION="VNC client for the GNOME desktop"
87 -HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
88 -
89 -LICENSE="GPL-3+"
90 -SLOT="0"
91 -KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
92 -IUSE="rdp +ssh spice +telepathy zeroconf"
93 -
94 -# cairo used in vinagre-tab
95 -# gdk-pixbuf used all over the place
96 -RDEPEND="
97 - >=dev-libs/glib-2.28.0:2
98 - >=x11-libs/gtk+-3.9.6:3
99 - app-crypt/libsecret
100 - >=dev-libs/libxml2-2.6.31:2
101 - >=net-libs/gtk-vnc-0.4.3[gtk3]
102 - x11-libs/cairo:=
103 - x11-libs/gdk-pixbuf:2
104 - x11-themes/hicolor-icon-theme
105 -
106 - rdp? ( net-misc/freerdp )
107 - ssh? ( >=x11-libs/vte-0.20:2.91 )
108 - spice? (
109 - app-emulation/spice-protocol
110 - >=net-misc/spice-gtk-0.5[gtk3] )
111 - telepathy? (
112 - dev-libs/dbus-glib
113 - >=net-libs/telepathy-glib-0.11.6 )
114 - zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
115 -"
116 -DEPEND="${RDEPEND}
117 - >=dev-lang/perl-5
118 - dev-libs/appstream-glib
119 - >=dev-util/intltool-0.50
120 - >=sys-devel/gettext-0.17
121 - virtual/pkgconfig
122 - $(vala_depend)
123 -"
124 -
125 -pkg_pretend() {
126 - # Needed for VNC ssh tunnel, bug #518574
127 - CONFIG_CHECK="~IPV6"
128 - check_extra_config
129 -}
130 -
131 -src_prepare() {
132 - # Fix RDP initialization with recent FreeRDP (from 'master')
133 - epatch "${FILESDIR}"/${PN}-3.16.1-freerdp.patch
134 -
135 - vala_src_prepare
136 - gnome2_src_prepare
137 -}
138 -
139 -src_configure() {
140 - DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
141 - gnome2_src_configure \
142 - $(use_enable rdp) \
143 - $(use_enable ssh) \
144 - $(use_enable spice) \
145 - $(use_with telepathy) \
146 - $(use_with zeroconf avahi) \
147 - ITSTOOL=$(type -P true)
148 -}