diff options
| -rw-r--r-- | dev-java/bsf/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/bsf/bsf-2.3.0-r3.ebuild | 11 | ||||
| -rw-r--r-- | dev-java/bsf/files/bsf-2.3.0-classpath.patch | 14 |
3 files changed, 25 insertions, 6 deletions
diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog index 1ef5ff1a8347..c7bfa21fb2d0 100644 --- a/dev-java/bsf/ChangeLog +++ b/dev-java/bsf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/bsf # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.28 2006/07/22 21:45:50 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.29 2006/08/06 17:35:51 nelchael Exp $ + + 06 Aug 2006; Krzysiek Pawlik <nelchael@gentoo.org> + +files/bsf-2.3.0-classpath.patch, bsf-2.3.0-r3.ebuild: + Add a fix for classpath handling. 22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> bsf-2.3.0-r3.ebuild: ant_src_unpack -> src_unpack diff --git a/dev-java/bsf/bsf-2.3.0-r3.ebuild b/dev-java/bsf/bsf-2.3.0-r3.ebuild index 6a7312fafa62..2d8e7f447f73 100644 --- a/dev-java/bsf/bsf-2.3.0-r3.ebuild +++ b/dev-java/bsf/bsf-2.3.0-r3.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/bsf/bsf-2.3.0-r3.ebuild,v 1.2 2006/07/22 21:45:50 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r3.ebuild,v 1.3 2006/08/06 17:35:51 nelchael Exp $ inherit java-pkg-2 eutils java-ant-2 @@ -26,18 +26,19 @@ DEPEND=">=virtual/jdk-1.4 src_unpack() { unpack ${A} - epatch ${WORKDIR}/bsf-rhino-1.5.patch + epatch "${WORKDIR}/bsf-rhino-1.5.patch" + epatch "${FILESDIR}/${P}-classpath.patch" } src_compile() { - use rhino && cp="${cp}:$(java-pkg_getjars rhino-1.5)" - use jython && cp="${cp}:$(java-pkg_getjars jython)" + has_version dev-java/rhino && cp="${cp}:$(java-pkg_getjars rhino-1.5)" + has_version dev-java/jython && cp="${cp}:$(java-pkg_getjars jython)" cd ${S}/src/taglib eant -Dservlet.jar="$(java-pkg_getjars servletapi-2.3)" compile cd ${S}/src - eant -Dclasspath=${cp} compile $(use_doc javadocs) + eant -Dgentoo.classpath=${cp} compile $(use_doc javadocs) } src_install() { diff --git a/dev-java/bsf/files/bsf-2.3.0-classpath.patch b/dev-java/bsf/files/bsf-2.3.0-classpath.patch new file mode 100644 index 000000000000..8e8321e94185 --- /dev/null +++ b/dev-java/bsf/files/bsf-2.3.0-classpath.patch @@ -0,0 +1,14 @@ +diff -Nru bsf-2.3.0.vanilla/src/bsf/build.xml bsf-2.3.0/src/bsf/build.xml +--- bsf-2.3.0.vanilla/src/bsf/build.xml 2006-08-06 19:25:59.000000000 +0200 ++++ bsf-2.3.0/src/bsf/build.xml 2006-08-06 19:33:04.000000000 +0200 +@@ -208,9 +208,8 @@ + </fileset> + </copy> + +- <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"> ++ <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}" classpath="${bsf.extraclasspath}:${gentoo.classpath}"> + <patternset refid="javac.source.files"/> +- <classpath location="${bsf.extraclasspath}"/> + </javac> + + <!-- ================================================================= --> |