netbeans-6.7_beta-r5: Added dependency on dev-java/glassfish-deployment-api and updated to latest dev-util/jay USE flag change

3 files changed, 16 insertions, 7 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 6e4729825f5f..45af9aad9b12 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/netbeans
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.111 2009/05/08 16:49:26 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.112 2009/05/13 13:34:48 fordfrog Exp $
+
+*netbeans-6.7_beta-r5 (13 May 2009)
+
+  13 May 2009; Miroslav Šulc <fordfrog@gentoo.org>
+  -netbeans-6.7_beta-r4.ebuild, +netbeans-6.7_beta-r5.ebuild:
+  Added dependency on dev-java/glassfish-deployment-api and updated to
+  latest dev-util/jay USE flag change
 
   08 May 2009; Miroslav Šulc <fordfrog@gentoo.org>
   netbeans-6.7_beta-r4.ebuild:
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 5a1f56f3c28d..24f9158ef576 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -24,6 +24,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 15127 RMD160 4197f51f7ea021f28b52baab5e14e3c339a3a61b SHA1 c820a49082aa073b5515d8ea204fee24df054040 SHA256 6ef719e19de09aff5e02fd21de7c065f68f75084e5e6d2368f25ff0d3c6c78fd
 EBUILD netbeans-6.5-r4.ebuild 39591 RMD160 aeda3cbba875f25e1223bf5ccac8aa937bc910db SHA1 6ca138e59d05bbf9c98fde6d9fb359f4bb2974cf SHA256 faf9d88505cae8d9b098a2501cb36eaf9d7490db5fbc56f1c293778939d1ff66
-EBUILD netbeans-6.7_beta-r4.ebuild 41326 RMD160 5e3b6c6510d4db252284388374c8559aa7266466 SHA1 07715863b74a3ede9141533b2d64fb07d1416ab0 SHA256 d6e3613f0dff46221536ba287bf14d057a1701b2e3d47a4fae6a13662dd13369
-MISC ChangeLog 20058 RMD160 708ce236ace86148cf99506a94ca6b7a69b3b6aa SHA1 eaf07649063f00d416490e8d5e55ebfdd009a0f9 SHA256 b28921ab21db90ce4a944991c5ac5f7acca15f54a468e3f1576819ba7d2fe35c
+EBUILD netbeans-6.7_beta-r5.ebuild 41533 RMD160 006c8d782ad19f5917de97ab92a3b4db617670bb SHA1 4b28c54b4b8b6e8c14493d9e83390cd253e403d7 SHA256 b4e9ff6208912784c150a48f0755df5b72fc6dff9f386869e740ec1344f70c73
+MISC ChangeLog 20319 RMD160 4c4660e82a3775748b955d5be575fc3fc1468c60 SHA1 a90a1ce0aeb1185faad650ae0d8ee05b5e6910c8 SHA256 617dd5ed5232a9af871e6a6171df36cce09ce5674f7b863871dd4b32e7cb95d8
 MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9
diff --git a/dev-util/netbeans/netbeans-6.7_beta-r4.ebuild b/dev-util/netbeans/netbeans-6.7_beta-r5.ebuild
index b2fe838cc37a..7ef3c5a16841 100644
--- a/dev-util/netbeans/netbeans-6.7_beta-r4.ebuild
+++ b/dev-util/netbeans/netbeans-6.7_beta-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r4.ebuild,v 1.2 2009/05/08 16:49:26 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r5.ebuild,v 1.1 2009/05/13 13:34:48 fordfrog Exp $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -69,6 +69,7 @@ RDEPEND=">=virtual/jdk-1.5
 		>=dev-java/commons-io-1.1:1
 		>=dev-java/commons-logging-1.1:0
 		>=dev-java/commons-validator-1.3:0
+		dev-java/glassfish-deployment-api:1.2
 		>=dev-java/httpunit-1.6:0
 		dev-java/jakarta-jstl:0
 		>=dev-java/jakarta-oro-2:2.0
@@ -142,7 +143,7 @@ RDEPEND=">=virtual/jdk-1.5
 		dev-java/joda-time:0
 		dev-java/jruby:0
 		dev-java/jvyamlb:0
-		dev-util/jay:0
+		dev-util/jay:0[java]
 	)"
 
 DEPEND=">=virtual/jdk-1.5
@@ -157,6 +158,7 @@ DEPEND=">=virtual/jdk-1.5
 	>=dev-java/swing-layout-1:1
 	netbeans_modules_enterprise? (
 		>=dev-java/commons-fileupload-1:0
+		dev-java/glassfish-deployment-api:1.2
 		>=dev-java/httpunit-1.6:0
 		dev-java/jakarta-jstl:0
 		dev-java/tomcat-servlet-api:2.3
@@ -461,7 +463,6 @@ src_prepare () {
 		fi
 
 		if use netbeans_modules_enterprise ; then
-			sed -e "/j2eeapis\/external\/jsr88javax\.jar/d" -i ${tmpfile} || die
 			sed -e "/j2ee\.sun\.appsrv81\/external\/appservapis-2\.0\.58\.3\.jar/d" -i ${tmpfile} || die
 			sed -e "/j2ee\.sun\.appsrv81\/external\/org-netbeans-modules-j2ee-sun-appsrv81\.jar/d" -i ${tmpfile} || die
 			sed -e "/libs\.glassfish_logging\/external\/glassfish-logging-2\.0\.jar/d" -i ${tmpfile} || die
@@ -781,6 +782,7 @@ place_unpack_symlinks() {
 	dosymcompilejar "libs.junit4/external" junit-4 junit.jar junit-4.5.jar
 
 	if use netbeans_modules_enterprise ; then
+		dosymcompilejar "j2eeapis/external" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
 		dosymcompilejar "libs.commons_fileupload/external" commons-fileupload commons-fileupload.jar commons-fileupload-1.0.jar
 		dosymcompilejar "libs.httpunit/external" httpunit httpunit.jar httpunit-1.6.2.jar
 		dosymcompilejar "web.jstl11/external" jakarta-jstl jstl.jar jstl-1.1.2.jar
@@ -870,7 +872,7 @@ symlink_extjars() {
 		dosyminstjar ${targetdir} httpunit httpunit.jar httpunit-1.6.2.jar
 		dosyminstjar ${targetdir} jakarta-jstl jstl.jar jstl.jar
 		dosyminstjar ${targetdir} jakarta-jstl standard.jar standard.jar
-		# jsr88javax.jar
+		dosyminstjar ${targetdir} glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
 		# servlet2.5-jsp2.1-api.jar
 		# shale-remoting-1.0.4.jar
 		targetdir="enterprise5/modules/ext/spring"