summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/netbeans/ChangeLog8
-rw-r--r--dev-util/netbeans/Manifest4
-rw-r--r--dev-util/netbeans/netbeans-6.5-r2.ebuild (renamed from dev-util/netbeans/netbeans-6.5-r1.ebuild)6
3 files changed, 12 insertions, 6 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 6c8c3bb18234..b59cb8041672 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,12 @@
# 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.93 2008/12/01 15:21:15 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.94 2008/12/03 12:35:38 fordfrog Exp $
+
+*netbeans-6.5-r2 (03 Dec 2008)
+
+ 03 Dec 2008; Miroslav Šulc <fordfrog@gentoo.org> -netbeans-6.5-r1.ebuild,
+ +netbeans-6.5-r2.ebuild:
+ Fixed runtime linkage to java-ws-tools-2
01 Dec 2008; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.5-r1.ebuild:
Netbeans still depends on com.sun packages so added dependency on
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index c886db3d98a6..5aab6adaa0ae 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -20,6 +20,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-r1.ebuild 42186 RMD160 fb4e1d33d1f3aa367d69c4ba7453d3e9ef494a38 SHA1 963e477214ecbdc207be0b4e0c16c9541aba7b61 SHA256 98ed240c730d2a6512fb65307006f6ec155c38220b3bb003a14d122864748a14
-MISC ChangeLog 16843 RMD160 055900e096dfd1125904432a8732e18bc6923ea0 SHA1 b2be900f6ccd08683fee4dffe02d786237c8b2d9 SHA256 a45f7c2d6e85f7b5a8d029b9b92e1181f5ab95e9a6e092da61bc28410fdfa66c
+EBUILD netbeans-6.5-r2.ebuild 42191 RMD160 a375bdeb98c9eb7934f52bccdfc31e0bc2a58ed6 SHA1 69fc2e2c8d9b76d3ce525d8bac49b1ede7f1af28 SHA256 9db6b689a5f78ee92b162e559744bfec0d91eec4dc43be30ca9cfa021d9c6f22
+MISC ChangeLog 17023 RMD160 5510cc570cfece1650fa8a6d64d053032359b8ff SHA1 7ec710d281843da6d9314fa37da90e6e15d81bbd SHA256 7a7f59f2020867ad5a13197d35d05862941fbbfedffe44120dedc45b3a831ef5
MISC metadata.xml 1301 RMD160 963030ae8c98e8baeb1e6913a2c0569cc089c5cd SHA1 e99fd059abfb66933036184b2868af4de7c76240 SHA256 10553ba9aa39b0858b0cf4c14af24624fe682848165789e04ddabd748d988ada
diff --git a/dev-util/netbeans/netbeans-6.5-r1.ebuild b/dev-util/netbeans/netbeans-6.5-r2.ebuild
index 4caab619c8f8..2c6b622bd850 100644
--- a/dev-util/netbeans/netbeans-6.5-r1.ebuild
+++ b/dev-util/netbeans/netbeans-6.5-r2.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-r1.ebuild,v 1.6 2008/12/01 15:21:15 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r2.ebuild,v 1.1 2008/12/03 12:35:38 fordfrog Exp $
EAPI="2"
WANT_SPLIT_ANT="true"
@@ -179,7 +179,6 @@ DEPEND=">=virtual/jdk-1.5
>=dev-java/jakarta-oro-2:2.0
>=dev-java/javacc-3.2:0
>=dev-java/jaxb-2:2
- >=dev-java/jaxb-tools-2:2
>=dev-java/jdbc-mysql-5.1:0
>=dev-java/jdbc-postgresql-8.3_p603:0
>=dev-java/jsch-0.1.24:0
@@ -225,6 +224,7 @@ DEPEND=">=virtual/jdk-1.5
# no use flag
# >=dev-java/jna-3:0
# netbeans_modules_ide
+# >=dev-java/jaxb-tools-2:2
# >=dev-java/ini4j-0.2.6:0
# netbeans_modules_java
# >=dev-java/appframework-1:0
@@ -965,7 +965,7 @@ symlink_extjars() {
dosyminstjar ${targetdir} fastinfoset fastinfoset.jar FastInfoset.jar
# http.jar
dosyminstjar ${targetdir} jax-ws-2 jax-ws.jar jaxws-rt.jar
- dosyminstjar ${targetdir} jaxb-tools-2 jaxb-tools.jar jaxws-tools.jar
+ dosyminstjar ${targetdir} jax-ws-tools-2 jax-ws-tools.jar jaxws-tools.jar
# mimepull.jar
# resolver.jar
dosyminstjar ${targetdir} saaj saaj.jar saaj-impl.jar