diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-03-29 17:48:38 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-03-29 17:48:38 +0000 |
| commit | 7553edcf00b7456fed2307f5bb989d8339812024 (patch) | |
| tree | 5b2bb8cfc03b86732e9970eda6420623cd0c9717 /dev-util/netbeans | |
| parent | Use ln instead of dosym as dosym seems to be making the build fail. (diff) | |
| download | gentoo-2-7553edcf00b7456fed2307f5bb989d8339812024.tar.gz gentoo-2-7553edcf00b7456fed2307f5bb989d8339812024.tar.bz2 gentoo-2-7553edcf00b7456fed2307f5bb989d8339812024.zip | |
Migrate to EAPI 2 for bug #239835.
(Portage version: 2.2_rc27/cvs/Linux i686)
Diffstat (limited to 'dev-util/netbeans')
| -rw-r--r-- | dev-util/netbeans/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/netbeans/netbeans-5.5.1-r1.ebuild | 10 | ||||
| -rw-r--r-- | dev-util/netbeans/netbeans-6.5-r4.ebuild | 8 |
3 files changed, 15 insertions, 9 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index 943f6e315067..be1cae82c5d9 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/netbeans # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.102 2009/03/24 19:24:24 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.103 2009/03/29 17:48:38 betelgeuse Exp $ + + 29 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> + netbeans-5.5.1-r1.ebuild, netbeans-6.5-r4.ebuild: + Migrate to EAPI 2 for bug #239835. 24 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> netbeans-5.5.1-r1.ebuild: diff --git a/dev-util/netbeans/netbeans-5.5.1-r1.ebuild b/dev-util/netbeans/netbeans-5.5.1-r1.ebuild index d30e3f9f1fdf..6b3e8bf077a9 100644 --- a/dev-util/netbeans/netbeans-5.5.1-r1.ebuild +++ b/dev-util/netbeans/netbeans-5.5.1-r1.ebuild @@ -1,8 +1,8 @@ # 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-5.5.1-r1.ebuild,v 1.9 2009/03/24 19:24:24 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5.1-r1.ebuild,v 1.10 2009/03/29 17:48:38 betelgeuse Exp $ -EAPI=1 +EAPI="2" JAVA_PKG_IUSE="doc" WANT_ANT_TASKS="ant-nodeps ant-trax" @@ -39,7 +39,7 @@ COMMON_DEPEND=" >=dev-java/xml-commons-1.0_beta2" RDEPEND=">=virtual/jre-1.5 - dev-java/antlr:0 + >=dev-java/antlr-2.7.7:0[java] dev-java/commons-beanutils:1.7 dev-java/commons-collections dev-java/commons-digester @@ -104,7 +104,9 @@ JAVA_PKG_BSFIX="off" src_unpack () { unpack "${FILE_IDE}" use cxx && unpack_extra ${FILE_CPP} cpp - cd "${S}" +} + +java_prepare() { find -name "*.jar" | grep "/test/" | xargs rm -v find -name "*.class" -delete diff --git a/dev-util/netbeans/netbeans-6.5-r4.ebuild b/dev-util/netbeans/netbeans-6.5-r4.ebuild index 459d7aeab470..3ef486ca24da 100644 --- a/dev-util/netbeans/netbeans-6.5-r4.ebuild +++ b/dev-util/netbeans/netbeans-6.5-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.5-r4.ebuild,v 1.2 2008/12/31 03:25:35 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.5-r4.ebuild,v 1.3 2009/03/29 17:48:38 betelgeuse Exp $ EAPI="2" WANT_SPLIT_ANT="true" @@ -80,7 +80,7 @@ RDEPEND=">=virtual/jdk-1.5 >=dev-util/subversion-1.5:0[java] ) netbeans_modules_j2ee? ( - >=dev-java/antlr-2.7.6:0 + >=dev-java/antlr-2.7.7:0[java] >=dev-java/asm-3.1:3 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 @@ -96,7 +96,7 @@ RDEPEND=">=virtual/jdk-1.5 ) netbeans_modules_java? ( >=dev-java/ant-1.7:0 - >=dev-java/antlr-2.7.6:0 + >=dev-java/antlr-2.7.7:0[java] dev-java/asm:2.2 >=dev-java/beansbinding-1.2.1:0 >=dev-java/cglib-2.1:2.1 |