diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2009-05-20 22:16:57 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2009-05-20 22:16:57 +0000 |
| commit | 462748bcd17c3828183af5e2bc22a54bb4620d9c (patch) | |
| tree | aedfbdce5e9f70781fc9b6d6e6c17bed11df9a86 /dev-util/netbeans | |
| parent | Version bump. (diff) | |
| download | historical-462748bcd17c3828183af5e2bc22a54bb4620d9c.tar.gz historical-462748bcd17c3828183af5e2bc22a54bb4620d9c.tar.bz2 historical-462748bcd17c3828183af5e2bc22a54bb4620d9c.zip | |
netbeans-6.7_beta-r6: Fixed bug #270368 (problem with installation of php cluster when installed javacup does not contain CUPTask ant task)
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'dev-util/netbeans')
| -rw-r--r-- | dev-util/netbeans/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/netbeans/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/netbeans/netbeans-6.7_beta-r6.ebuild | 15 |
3 files changed, 13 insertions, 13 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index 8543cdbe4600..0d155734a8cc 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,11 @@ # 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.114 2009/05/19 12:26:49 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.115 2009/05/20 22:16:57 fordfrog Exp $ + + 20 May 2009; Miroslav Šulc <fordfrog@gentoo.org> + netbeans-6.7_beta-r6.ebuild: + Fixed bug #270368 (problem with installation of php cluster when installed + javacup does not contain CUPTask ant task) 19 May 2009; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.7_beta-r6.ebuild: diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest index def68ac0ba4b..d0378b7cd508 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 41745 RMD160 a63db3d6eae5367f3bb02e19766b3c00b324a84c SHA1 dfdb32cd2f22df5ac6dbbd05fbba2131a25a46dc SHA256 c379aa595cbb50173dfeabfe440b854cd93b27c88b7ef2707abb1712854971c8 -MISC ChangeLog 20641 RMD160 fcafbd54cef7dfd76ac03146ba59387a3750e5de SHA1 0fea8faf421b0967e9cc7634c35b261b7a28bfc9 SHA256 e7b290ce7de8661810313def771a0dd795ab15bfaff7f769c646a67dae3f7de9 +EBUILD netbeans-6.7_beta-r6.ebuild 41710 RMD160 a04a01170f145509bf351efe5b82ca69ffd70eda SHA1 eea3347a6f661cd42c3e989f6206dccdbef1e3bf SHA256 5d8f59f55f2c88e0b737b363627bc6c4a1d98b0965aafa2b034aa4c0a5bc0e13 +MISC ChangeLog 20847 RMD160 b32574d7b4ea459fe7f6b8b9c60290e414e3de90 SHA1 6d1103b3f6cb15cff259bfe22c403b741a83fc3e SHA256 5089367a7643654c82f6d1fc03a1033c0e9e03b698c59e87d39c9083a6f89046 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 41b8491c46bc..34fb2b1c3bb7 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.2 2009/05/19 12:26:49 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.7_beta-r6.ebuild,v 1.3 2009/05/20 22:16:57 fordfrog Exp $ EAPI="2" WANT_SPLIT_ANT="true" @@ -134,7 +134,7 @@ RDEPEND=">=virtual/jdk-1.5 >=dev-java/proguard-4.2:0 ) netbeans_modules_php? ( - dev-java/javacup:0 + >=dev-java/javacup-0.11a_beta20060608:0 ) netbeans_modules_ruby? ( dev-java/asm:3 @@ -201,7 +201,7 @@ DEPEND=">=virtual/jdk-1.5 >=dev-java/proguard-4.2:0 ) netbeans_modules_php? ( - dev-java/javacup:0 + >=dev-java/javacup-0.11a_beta20060608:0 ) netbeans_modules_ruby? ( dev-java/bytelist:0 @@ -603,13 +603,8 @@ src_compile() { heap="-Xmx1g" fi - 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) + 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) local locales="" for lang in ${IUSE_LINGUAS} ; do |