Major fixes that allows compiling again

diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog
index fe4263a33117bc7ca7d283b11eaa1c80d35d2a9e..8ae5fbc849331cdd06a3c6d40671da1dcaa55ccc 100644 (file)
--- a/dev-java/bsf/ChangeLog
+++ b/dev-java/bsf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/bsf
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.13 2004/10/29 03:13:56 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.14 2004/11/16 00:08:14 karltk Exp $
+
+  16 Nov 2004; <karltk@gentoo.org> bsf-2.3.0-r2.ebuild:
+  Added jikes support, better and sensible jdk/jre dependencies, fortified
+  servletapi dependant parts, should unmask on x86, as -r1 is completely broken.
 
   28 Oct 2004; Jason Wever <weeve@gentoo.org> bsf-2.3.0-r2.ebuild:
   Added ~sparc keyword.

diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index 7e3d4f860ef25cc55f25b2fecb08f6a1138686bd..ee79f8fd214c70f1bf88286f4eea49d5e58e5430 100644 (file)
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,6 +1,6 @@
-MD5 7fe4d76dd1f5c20f4e5c2e735ceffafd ChangeLog 1674
-MD5 2a5c0decd09ba5a48289b129458bf44c metadata.xml 829
+MD5 f08066565a81100b55b39d1c83ddffc0 bsf-2.3.0-r2.ebuild 1590
 MD5 f8d9dc4d1e7783298197fedd3bd4afa2 bsf-2.3.0-r1.ebuild 1664
-MD5 c0046140c99bd97b82309bcaccef7108 bsf-2.3.0-r2.ebuild 1510
-MD5 2d349b974ef57925e6b968aa654645b3 files/digest-bsf-2.3.0-r2 133
+MD5 712db9cf9b3d4687e855aff62d78f087 ChangeLog 1888
+MD5 2a5c0decd09ba5a48289b129458bf44c metadata.xml 829
 MD5 2d349b974ef57925e6b968aa654645b3 files/digest-bsf-2.3.0-r1 133
+MD5 2d349b974ef57925e6b968aa654645b3 files/digest-bsf-2.3.0-r2 133

diff --git a/dev-java/bsf/bsf-2.3.0-r2.ebuild b/dev-java/bsf/bsf-2.3.0-r2.ebuild
index b97a1fb4e9c08962c94354c830fa6ef38cffd20f..935222e5f86065f8fdf6962f83653732c3f2390e 100644 (file)
--- 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-2004 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.5 2004/10/29 03:13:56 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r2.ebuild,v 1.6 2004/11/16 00:08:14 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -10,11 +10,16 @@ SRC_URI="http://cvs.apache.org/dist/jakarta/bsf/v2.3.0rc1/src/bsf-src-2.3.0.tar.
 LICENSE="Apache-1.1"
 SLOT="2.3"
 KEYWORDS="~x86 ~ppc ~sparc"
-IUSE="doc jython rhino"
-DEPEND="jython? ( >=dev-java/jython-2.1-r5 )
+IUSE="doc jython rhino jikes"
+RDEPEND=">=virtual/jre-1.4
+       jython? ( >=dev-java/jython-2.1-r5 )
        rhino? ( >=dev-java/rhino-1.4 )
        =dev-java/servletapi-2.3*
        >=dev-java/ant-1.5.4"
+DEPEND=">=virtual/jdk-1.4
+       jikes? ( >=dev-java/jikes-1.18 )
+       ${RDEPEND}"
+
 
 src_unpack() {
        unpack ${A}
@@ -29,26 +34,22 @@ src_unpack() {
        if use jython; then
                java-pkg_jar-from jython || die "Missing jython"
        fi
+
 }
 
 src_compile() {
-       # This ebuild is sensitive to the system classpath, so we need to start with a
-       # pristine one.
-       export CLASSPATH=
-
-       local cp=$(java-config -p servletapi-2.3)
 
        use rhino && cp="${cp}:$(java-config -p rhino)"
        use jython && cp="${cp}:$(java-config -p jython)"
 
-       local antflags=
-
        # karltk: fix this
-#      use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+       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"
 
-       cd src
-       export CLASSPATH=${cp}
-       ant ${antflags} compile || die
+       cd ${S}/src
+       ant ${antflags} -Dclasspath=${cp} compile || die "Failed to build main package"
        if use doc ; then
                ant ${antflags} javadocs || die
        fi