Revbump to fix bug #141647 by proper control of optional dependencies via USE flags. Added xalan dependency.

(Portage version: 2.1.2_rc4-r5)

4 files changed, 97 insertions, 2 deletions

diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog
index afb0decff230..10ef5e4802b3 100644
--- a/dev-java/bsf/ChangeLog
+++ b/dev-java/bsf/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2006/12/07 22:36:53 flameeyes Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.33 2007/01/08 00:37:14 caster Exp $
+
+*bsf-2.3.0-r4 (08 Jan 2007)
+
+  08 Jan 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/bsf-2.3.0-no-autodetection.patch, +bsf-2.3.0-r4.ebuild:
+  Revbump to fix bug #141647 by proper control of optional dependencies via
+  USE flags. Added xalan dependency.
 
   07 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> bsf-2.3.0-r3.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-java/bsf/bsf-2.3.0-r4.ebuild b/dev-java/bsf/bsf-2.3.0-r4.ebuild
new file mode 100644
index 000000000000..bf3d882588b1
--- /dev/null
+++ b/dev-java/bsf/bsf-2.3.0-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 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-r4.ebuild,v 1.1 2007/01/08 00:37:14 caster Exp $
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Bean Script Framework"
+HOMEPAGE="http://jakarta.apache.org/bsf/"
+SRC_URI="http://cvs.apache.org/dist/jakarta/${PN}/v${PV}rc1/src/${PN}-src-${PV}.tar.gz
+	mirror://gentoo/bsf-rhino-1.5.patch.bz2"
+LICENSE="Apache-1.1"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc jython rhino source"
+
+COMMON_DEP="
+	jython? ( >=dev-java/jython-2.1-r5 )
+	rhino? ( =dev-java/rhino-1.5* )
+	dev-java/xalan
+	=dev-java/servletapi-2.3*"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	source? ( app-arch/zip )
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${WORKDIR}/bsf-rhino-1.5.patch"
+	epatch "${FILESDIR}/${P}-classpath.patch"
+	epatch "${FILESDIR}/${P}-no-autodetection.patch"
+}
+
+src_compile() {
+	local cp="$(java-pkg_getjars xalan)"
+	local antflags="-Dxalan.present=true"
+	if use rhino; then
+		antflags="${antflags} -Drhino.present=true"
+		cp="${cp}:$(java-pkg_getjars rhino-1.5)"
+	fi
+	if use jython; then
+		antflags="${antflags} -Djython.present=true"
+		cp="${cp}:$(java-pkg_getjars jython)"
+	fi
+
+	cd ${S}/src/taglib
+	eant -Dservlet.jar="$(java-pkg_getjars servletapi-2.3)" compile
+
+	cd ${S}/src
+	eant -Dgentoo.classpath=${cp} ${antflags} compile $(use_doc javadocs)
+}
+
+src_install() {
+	java-pkg_dojar src/build/lib/bsf.jar
+
+	use doc && java-pkg_dohtml -r src/build/javadocs/*
+	if use source; then
+		java-pkg_dosrc src/bsf/src/* src/bsf_debug/src/*
+		java-pkg_dosrc src/jsdb/src/* src/taglib/src/org
+	fi
+}
diff --git a/dev-java/bsf/files/bsf-2.3.0-no-autodetection.patch b/dev-java/bsf/files/bsf-2.3.0-no-autodetection.patch
new file mode 100644
index 000000000000..364e17787fdf
--- /dev/null
+++ b/dev-java/bsf/files/bsf-2.3.0-no-autodetection.patch
@@ -0,0 +1,19 @@
+--- bsf-2.3.0/src/bsf/build.xml	2007-01-08 00:59:26.000000000 +0100
++++ bsf-2.3.0/src/bsf/build.xml	2007-01-08 01:00:45.000000000 +0100
+@@ -110,6 +110,7 @@
+     <!-- ================================================================= -->
+     <!-- Determines what optional components are available                 -->
+     <!-- ================================================================= -->
++	<!--
+     <available property="jacl.present"
+                classname="tcl.lang.JACL"/>
+ 
+@@ -133,7 +134,7 @@
+ 
+     <available property="xalan.present"
+                classname="org.apache.xalan.xslt.EnvironmentCheck"/>
+-
++	-->
+     <uptodate property="javac.notRequired"
+               targetfile="${build.lib}/${name}.jar">
+       <srcfiles dir="${src.dir}">
diff --git a/dev-java/bsf/files/digest-bsf-2.3.0-r4 b/dev-java/bsf/files/digest-bsf-2.3.0-r4
new file mode 100644
index 000000000000..3c966492a8ca
--- /dev/null
+++ b/dev-java/bsf/files/digest-bsf-2.3.0-r4
@@ -0,0 +1,6 @@
+MD5 db5d0f665631f91a13d721f8756df36f bsf-rhino-1.5.patch.bz2 10818
+RMD160 18d4d1f4153855679766c1b60679459c2937797b bsf-rhino-1.5.patch.bz2 10818
+SHA256 62afe966897b6f136a6f38f61a8959871c48ef8552a12fd96ce22c0dfab5d9ad bsf-rhino-1.5.patch.bz2 10818
+MD5 78bae3747ca5734bb7554eed6868b7da bsf-src-2.3.0.tar.gz 1035181
+RMD160 24d378bca1f68950b9b2699192c3138fb2bff7e4 bsf-src-2.3.0.tar.gz 1035181
+SHA256 ed0caf3567d7c084f21c0f0ce38077384c8e4afc80a1df7a2095a53ada777503 bsf-src-2.3.0.tar.gz 1035181