[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-ide/

[Miroslav Šulc]

commit:     51b76db4fb25c6a7dde2956be143c6ad6028a90a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 15:46:20 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 15:48:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b76db4

dev-java/netbeans-ide: restricted to jdk 1.8 in netbeans slot 8.2

Package-Manager: portage-2.3.2

 dev-java/netbeans-ide/netbeans-ide-8.2.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild 
b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
index 8c51a8f..30d7004 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
@@ -87,7 +87,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
-CDEPEND="~dev-java/netbeans-harness-${PV}
+CDEPEND="virtual/jdk:1.8
+       ~dev-java/netbeans-harness-${PV}
        ~dev-java/netbeans-platform-${PV}
        >=dev-java/antlr-4.5:4
        dev-java/commons-compress:0
@@ -120,15 +121,13 @@ CDEPEND="~dev-java/netbeans-harness-${PV}
 #      dev-java/jaxb:2 upstream version contains more stuff so websvccommon 
does not compile with ours
 #      dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
 #      dev-java/trilead-ssh2:0 in overlay
-DEPEND=">=virtual/jdk-1.7
+DEPEND="${CDEPEND}
        app-arch/unzip
        dev-java/commons-codec:0
-       ${CDEPEND}
        dev-java/javacc:0
        dev-java/javahelp:0
        dev-java/jna:0"
-RDEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
-       ${CDEPEND}"
+RDEPEND="${CDEPEND}"
 
 INSTALL_DIR="/usr/share/${PN}-${SLOT}"