dev-util/netbeans: fixed jdk dependency

Package-Manager: portage-2.1.10.18/cvs/Linux x86_64

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 145c0d741a1d8cb9639892148811e252919be376..66447ef1a10bd241a4786bbd5c3fcb689f250f42 100644 (file)
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/netbeans
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.156 2011/08/22 12:22:11 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.157 2011/09/16 19:58:43 fordfrog Exp $
+
+  16 Sep 2011; Miroslav Šulc <fordfrog@gentoo.org> netbeans-7.0.1.ebuild:
+  Building NetBeans is supported only with JDK 1.6
 
   22 Aug 2011; Miroslav Šulc <fordfrog@gentoo.org> -netbeans-7.0.ebuild:
   Removed obsolete version

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 8bdbfa5e183aae4e6acbe9a0864e91707a4ee4e2..cdc50f9a8ed53a74ddb2dae75e63ba285c0b29d2 100644 (file)
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -30,6 +30,6 @@ EBUILD netbeans-6.8-r1.ebuild 43136 RMD160 1ed63a12ce46beb4838913c8f65690aaec9d2
 EBUILD netbeans-6.9-r2.ebuild 46059 RMD160 a76d01fb0de80eb5151602e6d7abcf9108b96a29 SHA1 1e8de42b3a199b922e8d1ebe1ca84e8e685a8ed0 SHA256 85f98f30743b35af4bfa9d16706c9c9ebd4d7b0d6c5bb0d385a21b1e1c76326d
 EBUILD netbeans-6.9-r3.ebuild 47312 RMD160 46785d484ca8ae6fb3593f43a3bb9fb0e4c91f2b SHA1 d56cb739b6851485809b3b86fda1388682408456 SHA256 1c06cbc5f876129bb4b1c9af05d0cf4f52dfb219b5136b0c8222f3e987ae4282
 EBUILD netbeans-6.9.1.ebuild 49397 RMD160 7c445a74eeb28d950321ae931f0a3b5ba1ab871c SHA1 29c689461640e577bb9dff56e4089ed60d81041f SHA256 39eb01abe8cefbb903c70716d4ebf4de7d77022ad0d182a4f944d72ad454e609
-EBUILD netbeans-7.0.1.ebuild 6816 RMD160 d5e1cca9ed991f54343a7119aa905e956cda6d63 SHA1 6c99effd58d99bef2be65a996ce648024de6e903 SHA256 8f5b9bb4bb6131725410be79e6f138dbd6e8a64ae283fa40fd1a2d72279396ac
-MISC ChangeLog 29282 RMD160 89644f4af3903e8e4e83806fa9c5c5827de0910a SHA1 ce069a0c8bb63412286596f49e49cb789976ddc3 SHA256 7477ff3c6f376f51ba2ad3231fecd4de5deada34a80d5808d5db996c59d713cf
+EBUILD netbeans-7.0.1.ebuild 6814 RMD160 2cf7618c1c1c8cb22268d079993d9b8144bd1089 SHA1 26ced459d47510f6eb3bf8f402b0e66957d7cf95 SHA256 d54a27f221fe5ee2f7064d0a6be29992bb52f97176c8f769908c245c9fb86492
+MISC ChangeLog 29409 RMD160 6fc4c821a064efc40dd7cd5c19efd8a70c052fb4 SHA1 09ad82cac26b47700c7da0842c00e7e1e195729b SHA256 38069e99fe34c9351d4df71de9b11cbf247326ae6d399ebd9fcf62b05bcb5823
 MISC metadata.xml 1322 RMD160 04ba87bda7c1a2322721b78b5e071760be5686f7 SHA1 2a9a7b60c4da843a985ab38c0e5deb8654a62952 SHA256 2edbcc66e3e4449c48a6aae87e223c396acaf0a81483d2f7106ebf7a909c2af5

diff --git a/dev-util/netbeans/netbeans-7.0.1.ebuild b/dev-util/netbeans/netbeans-7.0.1.ebuild
index 7deffc3439bec3d72d9a915abe71a256e546065c..4a7eb36aaf9f69a9e18c766d44f6d7a830b9efff 100644 (file)
--- a/dev-util/netbeans/netbeans-7.0.1.ebuild
+++ b/dev-util/netbeans/netbeans-7.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-7.0.1.ebuild,v 1.1 2011/08/05 10:33:33 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-7.0.1.ebuild,v 1.2 2011/09/16 19:58:43 fordfrog Exp $
 
 EAPI="4"
 inherit eutils java-pkg-2 java-ant-2
@@ -90,7 +90,7 @@ IUSE_LINGUAS="
 IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
 S="${WORKDIR}"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND="virtual/jdk:1.6
        dev-java/javahelp:0"
 RDEPEND=">=virtual/jdk-1.6
        ~dev-java/netbeans-harness-${PV}