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

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     92f2f4f84639b691335dda01c0127212296fee9e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 15:45:44 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 15:48:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f2f4f8

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

Package-Manager: portage-2.3.2

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

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild
index 5af83e3..9fa6e87 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2.ebuild
@@ -47,7 +47,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
-CDEPEND="~dev-java/netbeans-ide-${PV}
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-ide-${PV}
 	~dev-java/netbeans-harness-${PV}
 	~dev-java/netbeans-ide-${PV}
 	~dev-java/netbeans-java-${PV}
@@ -60,14 +61,12 @@ CDEPEND="~dev-java/netbeans-ide-${PV}
 	dev-java/commons-logging:0
 	dev-java/glassfish-deployment-api:1.2
 	dev-java/jsr181:0"
-DEPEND=">=virtual/jdk-1.7
+DEPEND="${CDEPEnd}
 	app-arch/unzip
-	${CDEPEND}
 	dev-java/javahelp:0
 	>=dev-java/junit-4.4:4
 	dev-java/tomcat-servlet-api:2.3"
-RDEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
-	${CDEPEND}
+RDEPEND="${CDEPEND}
 	>=dev-java/antlr-2.7.7-r7:0
 	dev-java/bsf:2.3
 	dev-java/cglib:3