summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2008-11-22 18:11:25 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2008-11-22 18:11:25 +0000
commitc72d3f1c4c5401f6078e847d1d6abbb462bd2c52 (patch)
tree95c99226c272cea29131e4d45eb21e982a302a52 /dev-util/netbeans
parentadd ~amd64, bug #243056 (diff)
downloadhistorical-c72d3f1c4c5401f6078e847d1d6abbb462bd2c52.tar.gz
historical-c72d3f1c4c5401f6078e847d1d6abbb462bd2c52.tar.bz2
historical-c72d3f1c4c5401f6078e847d1d6abbb462bd2c52.zip
netbeans compiles fine even with JDK 1.6 so I dropped the restriction on JDK, also commons-fileupload linking fixed
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64
Diffstat (limited to 'dev-util/netbeans')
-rw-r--r--dev-util/netbeans/ChangeLog9
-rw-r--r--dev-util/netbeans/Manifest4
-rw-r--r--dev-util/netbeans/netbeans-6.5-r1.ebuild (renamed from dev-util/netbeans/netbeans-6.5.ebuild)8
3 files changed, 14 insertions, 7 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/Manifest b/dev-util/netbeans/Manifest
index 507ed75a68a9..1d7d10d851af 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -19,6 +19,6 @@ DIST netbeans-c++-5_5_1-linux.bin 9247744 RMD160 56c91ab483207b1d90554049263a2f2
EBUILD netbeans-3.6-r1.ebuild 3140 RMD160 ccfc3af6a20cad06d1a41965ea607322ff123cd9 SHA1 26281fb533e287171dc8d9408e63b4e8d8b9a646 SHA256 94a9463eb85659b0a3d224a4e7e1d071125f55c2d361db6a32221391a46746bb
EBUILD netbeans-5.5.1-r1.ebuild 15099 RMD160 04b79404ad0eaca06cbd4876303e4ab6e4075066 SHA1 6dba903332599c913458d58a75a1419a6bffa49f SHA256 461c16d7ca7227dfe90409c4fd15001b99dabaf66efa2b68e4b8a614d8c5885d
EBUILD netbeans-5.5.1.ebuild 14760 RMD160 c64a8ece4df62f4463500ab18fc781af867cdc8c SHA1 fc06f712d63079157d66defba1c3f45f8f5cef81 SHA256 19315a7fae7d98583abc8373464d7d34fc1d34f4e09e8668bab6a7c021ab1757
-EBUILD netbeans-6.5.ebuild 39718 RMD160 2d9a06acd62dd4f42e16630a81fcd7465eb5284a SHA1 2ddb99eaf4031f6693180313d34bfb94745e6c05 SHA256 5e995867319a51000cbedf198d93459ab249c0d22f62ccf5b153295ad5c0083c
-MISC ChangeLog 15667 RMD160 e9a3b63d444758c5eea0239dad569389eb55c6cb SHA1 703285013088e2fb73faa65c24443776268616c6 SHA256 9c7627fff90223c90684d83703f804d932dae3efd549952835948bc1ea860bae
+EBUILD netbeans-6.5-r1.ebuild 39751 RMD160 db2887f16b5b4d8d0cbecedbe66c42fd3ac2dec6 SHA1 531d5c6bb64b8d1dafbe4bee4ba2574a85343961 SHA256 ef1fb785fea8b1ff790768910b947c01a007f7540063c4335a28e988116b5b72
+MISC ChangeLog 15921 RMD160 f0331adf769122187ca0b608d79d8dc1dbc377b3 SHA1 7d8275a8f42492a9281c1e7208d4233e34fa027c SHA256 0aea70c53c573870dff6f7b47dee629f47ac548d5bc568429305f9e2ac89a6a7
MISC metadata.xml 1301 RMD160 963030ae8c98e8baeb1e6913a2c0569cc089c5cd SHA1 e99fd059abfb66933036184b2868af4de7c76240 SHA256 10553ba9aa39b0858b0cf4c14af24624fe682848165789e04ddabd748d988ada
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