diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2008-11-22 18:11:25 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2008-11-22 18:11:25 +0000 |
| commit | b0e7e01882ad1c5a5639e448a4597d14cd326811 (patch) | |
| tree | f11cd10d5c50877265669f9fd7fa95f33e94c48e /dev-util/netbeans | |
| parent | add ~amd64, bug #243056 (diff) | |
| download | gentoo-2-b0e7e01882ad1c5a5639e448a4597d14cd326811.tar.gz gentoo-2-b0e7e01882ad1c5a5639e448a4597d14cd326811.tar.bz2 gentoo-2-b0e7e01882ad1c5a5639e448a4597d14cd326811.zip | |
netbeans compiles fine even with JDK 1.6 so I dropped the restriction on JDK, also commons-fileupload linking fixed
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64)
Diffstat (limited to 'dev-util/netbeans')
| -rw-r--r-- | dev-util/netbeans/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-util/netbeans/netbeans-6.5-r1.ebuild (renamed from dev-util/netbeans/netbeans-6.5.ebuild) | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index f8b379669dd8..9dc5f0ef782a 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/netbeans # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.87 2008/11/21 01:13:48 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.88 2008/11/22 18:11:25 fordfrog Exp $ + +*netbeans-6.5-r1 (22 Nov 2008) + + 22 Nov 2008; Miroslav Šulc <fordfrog@gentoo.org> -netbeans-6.5.ebuild, + +netbeans-6.5-r1.ebuild: + netbeans compiles fine even with JDK 1.6 so I dropped the restriction on + JDK, also commons-fileupload linking fixed *netbeans-6.5 (21 Nov 2008) diff --git a/dev-util/netbeans/netbeans-6.5.ebuild b/dev-util/netbeans/netbeans-6.5-r1.ebuild index 5542dbe9b5f9..ed599915a948 100644 --- a/dev-util/netbeans/netbeans-6.5.ebuild +++ b/dev-util/netbeans/netbeans-6.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5.ebuild,v 1.1 2008/11/21 01:13:48 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r1.ebuild,v 1.1 2008/11/22 18:11:25 fordfrog Exp $ EAPI="2" WANT_SPLIT_ANT="true" @@ -152,7 +152,7 @@ RDEPEND=">=virtual/jdk-1.5 # dev-java/toplink-essentials:0 -DEPEND="=virtual/jdk-1.5* +DEPEND=">=virtual/jdk-1.5 app-arch/unzip >=dev-java/ant-core-1.7.1_beta2 >=dev-java/ant-nodeps-1.7.1 @@ -440,7 +440,7 @@ src_unpack () { } src_compile() { - local antflags="-Dstop.when.broken.modules=true" + local antflags="-Dstop.when.broken.modules=true -Dpermit.jdk6.builds=true" if use debug; then antflags="${antflags} -Dbuild.compiler.debug=true" @@ -827,7 +827,7 @@ symlink_extjars() { if use netbeans_modules_j2ee ; then targetdir="/enterprise5/modules/ext" - dosyminstjar ${targetdir} commons-fileupload commons-fileupload commons-fileupload-1.0.jar + dosyminstjar ${targetdir} commons-fileupload commons-fileupload.jar commons-fileupload-1.0.jar # glassfish-jspparser-2.0.jar # glassfish-logging-2.0.jar dosyminstjar ${targetdir} httpunit httpunit.jar httpunit-1.6.2.jar |