From b7420ce5955cc6906047069136ad31fe57c93ae8 Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Tue, 19 May 2009 12:26:49 +0000 Subject: netbeans-6.7_beta-r6: Added javacup to ANT_TASKS when building php module Package-Manager: portage-2.1.6.13/cvs/Linux x86_64 --- dev-util/netbeans/ChangeLog | 6 +++++- dev-util/netbeans/Manifest | 4 ++-- dev-util/netbeans/netbeans-6.7_beta-r6.ebuild | 12 +++++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) (limited to 'dev-util') diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index 6d06d56efce1..8543cdbe4600 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,10 @@ # 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.113 2009/05/16 11:20:41 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.114 2009/05/19 12:26:49 fordfrog Exp $ + + 19 May 2009; Miroslav Šulc + netbeans-6.7_beta-r6.ebuild: + Added javacup to ANT_TASKS when building php module *netbeans-6.7_beta-r6 (16 May 2009) diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest index 193aa5e90ebe..def68ac0ba4b 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-r6.ebuild 41667 RMD160 17b020c9088aa7ce4bb7f31c0adf2252356959aa SHA1 bbf50387cc19d8e8e5bc4a59e3dee1116578352a SHA256 282ae5c523d9b1f5bf37178a9b174caab38a344d14c20705eb3fcd4a802f25a2 -MISC ChangeLog 20503 RMD160 06e67ff619d326a026ad48a66479c62f229d0a56 SHA1 2c6c575b399e750ea0342daa68400b0bbd144b5b SHA256 e8beb17cac1161366aae9d1381fe3b329c1ae06cc0ff61401236631474fc54fd +EBUILD netbeans-6.7_beta-r6.ebuild 41745 RMD160 a63db3d6eae5367f3bb02e19766b3c00b324a84c SHA1 dfdb32cd2f22df5ac6dbbd05fbba2131a25a46dc SHA256 c379aa595cbb50173dfeabfe440b854cd93b27c88b7ef2707abb1712854971c8 +MISC ChangeLog 20641 RMD160 fcafbd54cef7dfd76ac03146ba59387a3750e5de SHA1 0fea8faf421b0967e9cc7634c35b261b7a28bfc9 SHA256 e7b290ce7de8661810313def771a0dd795ab15bfaff7f769c646a67dae3f7de9 MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9 diff --git a/dev-util/netbeans/netbeans-6.7_beta-r6.ebuild b/dev-util/netbeans/netbeans-6.7_beta-r6.ebuild index d76a65dfbf8f..41b8491c46bc 100644 --- a/dev-util/netbeans/netbeans-6.7_beta-r6.ebuild +++ b/dev-util/netbeans/netbeans-6.7_beta-r6.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-r6.ebuild,v 1.1 2009/05/16 11:20:41 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r6.ebuild,v 1.2 2009/05/19 12:26:49 fordfrog Exp $ EAPI="2" WANT_SPLIT_ANT="true" @@ -602,8 +602,14 @@ src_compile() { else heap="-Xmx1g" fi - ANT_TASKS="ant-nodeps ant-trax" ANT_OPTS="${heap} -Djava.awt.headless=true" \ - eant ${antflags} ${clusters} -f nbbuild/build.xml ${build_target} $(use_doc build-javadoc) + + ANT_TASKS="ant-nodeps ant-trax" + if use netbeans_modules_php ; then + ANT_TASKS="${ANT_TASKS} javacup" + fi + + ANT_OPTS="${heap} -Djava.awt.headless=true" eant ${antflags} ${clusters} \ + -f nbbuild/build.xml ${build_target} $(use_doc build-javadoc) local locales="" for lang in ${IUSE_LINGUAS} ; do -- cgit v1.2.3-65-gdbad