diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-09 15:59:47 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-09 15:59:47 +0000 |
| commit | 09e2b0ac9fada346acb901396eb68d9395a89e98 (patch) | |
| tree | baa894c1813c34de8796c43220ad7dee4901447a /dev-java/bsf | |
| parent | fix deps, small cleanups (diff) | |
| download | historical-09e2b0ac9fada346acb901396eb68d9395a89e98.tar.gz historical-09e2b0ac9fada346acb901396eb68d9395a89e98.tar.bz2 historical-09e2b0ac9fada346acb901396eb68d9395a89e98.zip | |
fix deps, small cleanups
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-java/bsf')
| -rw-r--r-- | dev-java/bsf/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/bsf/bsf-2.3.0-r2.ebuild | 17 |
2 files changed, 13 insertions, 9 deletions
diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog index adb2a2022e7b..1822bb74b269 100644 --- a/dev-java/bsf/ChangeLog +++ b/dev-java/bsf/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/bsf # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.25 2005/05/05 16:43:40 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.26 2005/07/09 15:59:47 axxo Exp $ + + 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> bsf-2.3.0-r2.ebuild: + fix deps, small cleanups 05 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -bsf-2.3.0-r1.ebuild, bsf-2.3.0-r2.ebuild: diff --git a/dev-java/bsf/bsf-2.3.0-r2.ebuild b/dev-java/bsf/bsf-2.3.0-r2.ebuild index 0cc8fa419d8d..9658fbd436ff 100644 --- a/dev-java/bsf/bsf-2.3.0-r2.ebuild +++ b/dev-java/bsf/bsf-2.3.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r2.ebuild,v 1.16 2005/05/05 16:43:40 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r2.ebuild,v 1.17 2005/07/09 15:59:47 axxo Exp $ inherit java-pkg eutils @@ -12,14 +12,15 @@ SLOT="2.3" KEYWORDS="x86 ppc sparc amd64 ppc64" IUSE="doc jikes jython rhino source" -DEPEND=">=virtual/jdk-1.4 - dev-java/ant-core - jikes? ( >=dev-java/jikes-1.18 ) - source? ( app-arch/zip )" RDEPEND=">=virtual/jre-1.4 jython? ( >=dev-java/jython-2.1-r5 ) rhino? ( =dev-java/rhino-1.5* ) =dev-java/servletapi-2.3*" +DEPEND=">=virtual/jdk-1.4 + dev-java/ant-core + jikes? ( >=dev-java/jikes-1.18 ) + source? ( app-arch/zip ) + ${RDEPEND}" src_unpack() { unpack ${A} @@ -28,14 +29,14 @@ src_unpack() { } src_compile() { - use rhino && cp="${cp}:$(java-config -p rhino-1.5)" - use jython && cp="${cp}:$(java-config -p jython)" + use rhino && cp="${cp}:$(java-pkg_getjars rhino-1.5)" + use jython && cp="${cp}:$(java-pkg_getjars jython)" # karltk: fix this use jikes && antflags="${antflags} -Dbuild.compiler=jikes" cd ${S}/src/taglib - ant ${antflags} -Dservlet.jar="$(java-config -p servletapi-2.3)" compile || die "Failed to build taglib" + ant ${antflags} -Dservlet.jar="$(java-pkg_getjars servletapi-2.3)" compile || die "Failed to build taglib" cd ${S}/src ant ${antflags} -Dclasspath=${cp} compile || die "Failed to build main package" |