diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-08-23 08:36:09 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-08-23 08:36:09 +0000 |
| commit | 42191c26bdaf3c470c0a74eba873454fc2484cff (patch) | |
| tree | 9de7e20d985a5f21def25e030237fa74fe38689b /app-editors | |
| parent | version bump, ~amd64, bug #152994 (diff) | |
| download | gentoo-2-42191c26bdaf3c470c0a74eba873454fc2484cff.tar.gz gentoo-2-42191c26bdaf3c470c0a74eba873454fc2484cff.tar.bz2 gentoo-2-42191c26bdaf3c470c0a74eba873454fc2484cff.zip | |
Use empty ant classpath so asm doesn't get pulled in there and break building. Prefer 1.5 over 1.4.
(Portage version: 2.1.3)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/jedit/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/jedit/jedit-4.2-r2.ebuild | 15 |
2 files changed, 13 insertions, 8 deletions
diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog index 426952533822..f31dd31eaa0f 100644 --- a/app-editors/jedit/ChangeLog +++ b/app-editors/jedit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/jedit # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.76 2007/06/17 10:48:19 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.77 2007/08/23 08:36:09 betelgeuse Exp $ + + 23 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> jedit-4.2-r2.ebuild: + Use empty ant classpath so asm doesn't get pulled in there and break + building. Prefer 1.5 over 1.4. 17 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> jedit-4.3_pre9.ebuild: Migrate to splitted ant. diff --git a/app-editors/jedit/jedit-4.2-r2.ebuild b/app-editors/jedit/jedit-4.2-r2.ebuild index 0261e2d82721..246ec22ea16b 100644 --- a/app-editors/jedit/jedit-4.2-r2.ebuild +++ b/app-editors/jedit/jedit-4.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2-r2.ebuild,v 1.9 2007/05/29 09:21:24 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2-r2.ebuild,v 1.10 2007/08/23 08:36:09 betelgeuse Exp $ inherit java-pkg-2 eutils java-ant-2 @@ -18,15 +18,14 @@ IUSE="doc" RDEPEND=">=virtual/jre-1.4" # FIXME doesn't like Java 1.6 for some reason DEPEND="|| ( - =virtual/jdk-1.4* =virtual/jdk-1.5* + =virtual/jdk-1.4* ) doc? ( =app-text/docbook-xml-dtd-4.3* >=app-text/docbook-xsl-stylesheets-1.65.1 dev-libs/libxslt - ) - >=dev-java/ant-core-1.5.4" + )" S="${WORKDIR}/jEdit" @@ -46,9 +45,11 @@ src_unpack() { echo "docbook.xsl=${xsl}" >> build.properties fi } -src_compile() { - eant dist $(use_doc javadoc docs-html) -} + +# Fails to build if asm gets pulled in via ant classpath +ANT_TASKS=" " +EANT_BUILD_TARGET="dist" +EANT_DOC_TARGET="javadoc docs-html" src_install() { dodir /usr/share/jedit |