summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2006-05-14 20:27:38 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2006-05-14 20:27:38 +0000
commitc93552d3da36d320cc4301f80dad70ba301c9bef (patch)
tree50823b09c5c33c24b7c73a92f3ba256ac8e45da9
parentDigests got broken again; add RESTRICT=mirror and use upstream tarballs. Repo... (diff)
downloadgentoo-2-c93552d3da36d320cc4301f80dad70ba301c9bef.tar.gz
gentoo-2-c93552d3da36d320cc4301f80dad70ba301c9bef.tar.bz2
gentoo-2-c93552d3da36d320cc4301f80dad70ba301c9bef.zip
Fixed emerging with LOCALCLASSPATH disabled in /usr/bin/ant. Bug #115888.
(Portage version: 2.1_rc1)
-rw-r--r--dev-java/adaptx/ChangeLog6
-rw-r--r--dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild18
2 files changed, 10 insertions, 14 deletions
diff --git a/dev-java/adaptx/ChangeLog b/dev-java/adaptx/ChangeLog
index 760fdef1343f..55382bd4cb58 100644
--- a/dev-java/adaptx/ChangeLog
+++ b/dev-java/adaptx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/adaptx
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/ChangeLog,v 1.16 2006/05/14 20:24:11 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/ChangeLog,v 1.17 2006/05/14 20:27:38 betelgeuse Exp $
+
+ 14 May 2006; Petteri Räty <betelgeuse@gentoo.org>
+ adaptx-0.9.13_p20041105-r1.ebuild:
+ Fixed emerging with LOCALCLASSPATH disabled in /usr/bin/ant. Bug #115888.
14 May 2006; Petteri Räty <betelgeuse@gentoo.org>
-adaptx-0.9.13_p20041105.ebuild:
diff --git a/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild b/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild
index 2a7eaf6054bb..e128660eb6c4 100644
--- a/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild
+++ b/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild,v 1.11 2006/02/09 01:08:20 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild,v 1.12 2006/05/14 20:27:38 betelgeuse Exp $
inherit java-pkg
@@ -25,23 +25,15 @@ IUSE="doc"
S=${WORKDIR}/adaptx-20041105
-src_unpack() {
- unpack ${A}
- cd ${S}/lib
- java-pkg_jar-from xerces-2 xercesImpl.jar
- java-pkg_jar-from xml-commons xml-apis.jar
- java-pkg_jar-from rhino-1.5
- java-pkg_jar-from gnu-jaxp
- java-pkg_jar-from ant-core ant.jar
- java-pkg_jar-from log4j
-}
-
src_compile() {
+ local classpath="$(java-pkg_getjars \
+ xerces-2,xml-commons,rhino-1.5,gnu-jaxp,log4j)"
+
cd src/
# tried to build sources with jikes but
# failed all the time on different
# plattforms (amd64, x86)
- local antflags="jar"
+ local antflags="jar -Dclasspath=${classpath}"
use doc && antflags="${antflags} javadoc"
ant ${antflags} || die "failed too build"
}