Gentoo Archives: gentoo-commits

From: Ole Reifschneider <tranquility@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/
Date: Sat, 02 Apr 2016 16:34:48
Message-Id: 1459612274.5eafb0a7ea63552ffc0e7bb8c6c5232499e17b01.tranquility@gentoo
1 commit: 5eafb0a7ea63552ffc0e7bb8c6c5232499e17b01
2 Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 2 15:51:14 2016 +0000
4 Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 2 15:51:14 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5eafb0a7
7
8 net-misc/vinagre: Bump version to 3.20.0
9
10 Package-Manager: portage-2.2.28
11 Manifest-Sign-Key: 0xE9E568677E8B4D42
12
13 .../{vinagre-9999.ebuild => vinagre-3.20.0.ebuild} | 26 +++++-----------------
14 net-misc/vinagre/vinagre-9999.ebuild | 4 ++--
15 2 files changed, 7 insertions(+), 23 deletions(-)
16
17 diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-3.20.0.ebuild
18 similarity index 74%
19 copy from net-misc/vinagre/vinagre-9999.ebuild
20 copy to net-misc/vinagre/vinagre-3.20.0.ebuild
21 index 1c3d087..0cba5e3 100644
22 --- a/net-misc/vinagre/vinagre-9999.ebuild
23 +++ b/net-misc/vinagre/vinagre-3.20.0.ebuild
24 @@ -1,32 +1,24 @@
25 -# Copyright 1999-2015 Gentoo Foundation
26 +# Copyright 1999-2016 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 # $Id$
29
30 EAPI="5"
31 GCONF_DEBUG="no"
32 -VALA_MIN_API_VERSION="0.18"
33
34 inherit gnome2 linux-info vala
35 -if [[ ${PV} = 9999 ]]; then
36 - inherit gnome2-live
37 -fi
38
39 DESCRIPTION="VNC client for the GNOME desktop"
40 HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
41
42 LICENSE="GPL-3+"
43 SLOT="0"
44 -if [[ ${PV} = 9999 ]]; then
45 - KEYWORDS=""
46 -else
47 - KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
48 -fi
49 +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
50 IUSE="rdp +ssh spice +telepathy zeroconf"
51
52 # cairo used in vinagre-tab
53 # gdk-pixbuf used all over the place
54 RDEPEND="
55 - >=dev-libs/glib-2.28.0:2
56 + >=dev-libs/glib-2.32.0:2
57 >=x11-libs/gtk+-3.9.6:3
58 app-crypt/libsecret
59 >=dev-libs/libxml2-2.6.31:2
60 @@ -49,17 +41,12 @@ DEPEND="${RDEPEND}
61 >=dev-lang/perl-5
62 dev-libs/appstream-glib
63 >=dev-util/intltool-0.50
64 + dev-util/itstool
65 >=sys-devel/gettext-0.17
66 virtual/pkgconfig
67 $(vala_depend)
68 "
69
70 -if [[ ${PV} = 9999 ]]; then
71 - DEPEND+="
72 - app-text/yelp-tools
73 - gnome-base/gnome-common"
74 -fi
75 -
76 pkg_pretend() {
77 # Needed for VNC ssh tunnel, bug #518574
78 CONFIG_CHECK="~IPV6"
79 @@ -72,14 +59,11 @@ src_prepare() {
80 }
81
82 src_configure() {
83 - local myconf=""
84 - [[ ${PV} = 9999 ]] || myconf="ITSTOOL=$(type -P true)"
85 DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
86 gnome2_src_configure \
87 $(use_enable rdp) \
88 $(use_enable ssh) \
89 $(use_enable spice) \
90 $(use_with telepathy) \
91 - $(use_with zeroconf avahi) \
92 - ${myconf}
93 + $(use_with zeroconf avahi)
94 }
95
96 diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild
97 index 1c3d087..5e9377a 100644
98 --- a/net-misc/vinagre/vinagre-9999.ebuild
99 +++ b/net-misc/vinagre/vinagre-9999.ebuild
100 @@ -1,4 +1,4 @@
101 -# Copyright 1999-2015 Gentoo Foundation
102 +# Copyright 1999-2016 Gentoo Foundation
103 # Distributed under the terms of the GNU General Public License v2
104 # $Id$
105
106 @@ -26,7 +26,7 @@ IUSE="rdp +ssh spice +telepathy zeroconf"
107 # cairo used in vinagre-tab
108 # gdk-pixbuf used all over the place
109 RDEPEND="
110 - >=dev-libs/glib-2.28.0:2
111 + >=dev-libs/glib-2.32.0:2
112 >=x11-libs/gtk+-3.9.6:3
113 app-crypt/libsecret
114 >=dev-libs/libxml2-2.6.31:2