netbeans-6.7_rc1: Fixed compilation error when jvyamlb.jar was missing

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

3 files changed, 10 insertions, 7 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 1e1bb7630b2e..3b0c94fcf0e8 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,9 @@
 # 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.117 2009/06/01 21:40:23 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.118 2009/06/02 11:44:58 fordfrog Exp $
+
+  02 Jun 2009; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.7_rc1.ebuild:
+  Fixed compilation error when jvyamlb.jar was missing
 
 *netbeans-6.7_rc1 (01 Jun 2009)
 
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index e8ad7227d657..1e0fe46a1441 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_rc1.ebuild 42122 RMD160 b5c24847a0550700e42c96aa72b95e9deb380c78 SHA1 40c5cc5caf58302f4ec8fdbcad45ed4451c8a030 SHA256 f4cdf5c172abcf26af4a44d100d48a93fe9f659985daedc5ce5497107f9d18b7
-MISC ChangeLog 21451 RMD160 0a4abce9c44468fcae60f3bb1453495c9bb45aae SHA1 0614871ca96d8e9cdc9958ec796b18dd1b98d511 SHA256 283d985d22a9e5af2343d7277470649a3951cf5af7f9af6c244e3936cfc9d7bb
+EBUILD netbeans-6.7_rc1.ebuild 42122 RMD160 b40aa2f457e3eabe02129da6eebf2ed945b2ce77 SHA1 7978afcaf9e5721298d53be4f15cacb3c84361ff SHA256 25c7cc7b40f5328124f3117fa362bbb8fd4b65c00585cb21d2a1ce082e0c656c
+MISC ChangeLog 21584 RMD160 45cab70a9e1d183d87f50dd71864ea4887338973 SHA1 7ed47c39e3376206b7becfcccf6654e88f0a861b SHA256 250397d01b0f10f9ca34144f5e9c64a7ceb8a053e495eff0c9d76e5a6ceba570
 MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9
diff --git a/dev-util/netbeans/netbeans-6.7_rc1.ebuild b/dev-util/netbeans/netbeans-6.7_rc1.ebuild
index 8f9fb0083c37..06b73eeef0bc 100644
--- a/dev-util/netbeans/netbeans-6.7_rc1.ebuild
+++ b/dev-util/netbeans/netbeans-6.7_rc1.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_rc1.ebuild,v 1.1 2009/06/01 21:40:23 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_rc1.ebuild,v 1.2 2009/06/02 11:44:58 fordfrog Exp $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -194,6 +194,7 @@ DEPEND=">=virtual/jdk-1.5
 		>=dev-java/jdbc-postgresql-8.3_p603:0
 		>=dev-java/jsch-0.1.39:0
 		dev-java/jsr173:0
+		dev-java/jvyamlb:0
 		dev-java/lucene:2.4
 		>=dev-java/sac-1.3:0
 		dev-java/sun-jaf:0
@@ -219,7 +220,6 @@ DEPEND=">=virtual/jdk-1.5
 		>=dev-java/javacup-0.11a_beta20060608:0
 	)
 	netbeans_modules_ruby? (
-		dev-java/jvyamlb:0
 		dev-util/jay:0
 	)"
 
@@ -506,6 +506,7 @@ src_prepare () {
 			filter_file "libs.bugtracking/external/org.eclipse.mylyn.commons.net_3.1.1.jar" ${tmpfile}
 			filter_file "libs.bugtracking/external/org.eclipse.mylyn.tasks.core_3.1.1.jar" ${tmpfile}
 			filter_file "libs.bugzilla/external/org.eclipse.mylyn.bugzilla.core_3.1.1.jar" ${tmpfile}
+			filter_file "libs.bytelist/external/bytelist-0.1.jar" ${tmpfile}
 			filter_file "libs.ini4j/external/ini4j-0.4.1.jar" ${tmpfile}
 			filter_file "libs.svnClientAdapter/external/svnClientAdapter-1.6.0.jar" ${tmpfile}
 			filter_file "libs.swingx/external/swingx-0.9.5.jar" ${tmpfile}
@@ -564,7 +565,6 @@ src_prepare () {
 		fi
 
 		if use netbeans_modules_ruby ; then
-			filter_file "libs.bytelist/external/bytelist-0.1.jar" ${tmpfile}
 			filter_file "libs.jrubyparser/external/jruby-parser-0.1.jar" ${tmpfile}
 			filter_file "o.kxml2/external/kxml2-2.3.0.jar" ${tmpfile}
 			filter_file "o.rubyforge.debugcommons/external/debug-commons-java-0.10.0.jar" ${tmpfile}
@@ -828,6 +828,7 @@ place_unpack_symlinks() {
 		dosymcompilejar "libs.bugtracking/external" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
 		dosymcompilejar "libs.bugtracking/external" commons-lang-2.1 commons-lang.jar commons-lang-2.3.jar
 		dosymcompilejar "libs.jsch/external" jsch jsch.jar jsch-0.1.41.jar
+		dosymcompilejar "libs.jvyamlb/external" jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
 		dosymcompilejar "libs.svnClientAdapter/external" subversion svn-javahl.jar svnjavahl-1.6.0.jar
 		dosymcompilejar "libs.lucene/external" lucene-2.4 lucene-core.jar lucene-core-2.3.2.jar
 		dosymcompilejar "css.visual/external" sac sac.jar sac-1.3.jar
@@ -867,7 +868,6 @@ place_unpack_symlinks() {
 	fi
 
 	if use netbeans_modules_ruby ; then
-		dosymcompilejar "libs.jvyamlb/external" jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
 		dosymcompilejar "libs.yydebug/external" jay yydebug.jar yydebug-1.0.2.jar
 	fi