Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/
Date: Fri, 28 Apr 2017 07:11:39
Message-Id: 1493363493.9ada0f1cd117361576518982f097c5fa4de9f300.jer@gentoo
1 commit: 9ada0f1cd117361576518982f097c5fa4de9f300
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 28 07:11:04 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 28 07:11:33 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ada0f1c
7
8 net-misc/tigervnc: Make USE=nls dependencies conditional (bug #616742).
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 net-misc/tigervnc/tigervnc-1.7.1-r3.ebuild | 10 +++++-----
13 1 file changed, 5 insertions(+), 5 deletions(-)
14
15 diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r3.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r3.ebuild
16 index 620c8578065..70f9de6670b 100644
17 --- a/net-misc/tigervnc/tigervnc-1.7.1-r3.ebuild
18 +++ b/net-misc/tigervnc/tigervnc-1.7.1-r3.ebuild
19 @@ -26,6 +26,7 @@ CDEPEND="virtual/jpeg:0
20 >=x11-libs/libXtst-1.0.99.2
21 >=x11-libs/fltk-1.3.1
22 gnutls? ( net-libs/gnutls:= )
23 + nls? ( virtual/libiconv )
24 pam? ( virtual/pam )
25 server? (
26 dev-lang/perl
27 @@ -43,10 +44,10 @@ CDEPEND="virtual/jpeg:0
28 )"
29
30 RDEPEND="${CDEPEND}
31 - java? ( >=virtual/jre-1.5:* )
32 - !net-misc/vnc
33 !net-misc/tightvnc
34 - !net-misc/xf4vnc"
35 + !net-misc/vnc
36 + !net-misc/xf4vnc
37 + java? ( >=virtual/jre-1.5:* )"
38
39 DEPEND="${CDEPEND}
40 amd64? ( dev-lang/nasm )
41 @@ -55,8 +56,7 @@ DEPEND="${CDEPEND}
42 >=x11-proto/xextproto-7.2.99.901
43 >=x11-proto/xproto-7.0.31
44 x11-libs/libXfont2
45 - virtual/libiconv
46 - sys-devel/gettext
47 + nls? ( sys-devel/gettext )
48 java? ( >=virtual/jdk-1.5 )
49 server? (
50 virtual/pkgconfig