[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/

[Jeroen Roovers]

commit:     9ada0f1cd117361576518982f097c5fa4de9f300
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 07:11:04 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 07:11:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ada0f1c

net-misc/tigervnc: Make USE=nls dependencies conditional (bug #616742).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-misc/tigervnc/tigervnc-1.7.1-r3.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r3.ebuild 
b/net-misc/tigervnc/tigervnc-1.7.1-r3.ebuild
index 620c8578065..70f9de6670b 100644
--- a/net-misc/tigervnc/tigervnc-1.7.1-r3.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.7.1-r3.ebuild
@@ -26,6 +26,7 @@ CDEPEND="virtual/jpeg:0
        >=x11-libs/libXtst-1.0.99.2
        >=x11-libs/fltk-1.3.1
        gnutls? ( net-libs/gnutls:= )
+       nls? ( virtual/libiconv )
        pam? ( virtual/pam )
        server? (
                dev-lang/perl
@@ -43,10 +44,10 @@ CDEPEND="virtual/jpeg:0
        )"
 
 RDEPEND="${CDEPEND}
-       java? ( >=virtual/jre-1.5:* )
-       !net-misc/vnc
        !net-misc/tightvnc
-       !net-misc/xf4vnc"
+       !net-misc/vnc
+       !net-misc/xf4vnc
+       java? ( >=virtual/jre-1.5:* )"
 
 DEPEND="${CDEPEND}
        amd64? ( dev-lang/nasm )
@@ -55,8 +56,7 @@ DEPEND="${CDEPEND}
        >=x11-proto/xextproto-7.2.99.901
        >=x11-proto/xproto-7.0.31
        x11-libs/libXfont2
-       virtual/libiconv
-       sys-devel/gettext
+       nls? ( sys-devel/gettext )
        java? ( >=virtual/jdk-1.5 )
        server? (
                virtual/pkgconfig