Version bump, bug #160813. Same slot as 2.3.0, seems fine. Uses rhino-1.6 instead of 1.5. Renamed jython flag to python, added tcl flag which adds jacl support. Added examples flag. Added bsf launcher for commandline use.

Package-Manager: portage-2.1.2.7

7 files changed, 147 insertions, 74 deletions

diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog
index 462a244db7e1..576af183fe72 100644
--- a/dev-java/bsf/ChangeLog
+++ b/dev-java/bsf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/bsf
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.40 2007/04/15 20:03:45 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.41 2007/05/08 23:22:33 caster Exp $
+
+*bsf-2.4.0 (08 May 2007)
+
+  08 May 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/bsf-2.4.0-build-properties.xml, -bsf-2.3.0-r2.ebuild,
+  +bsf-2.4.0.ebuild:
+  Version bump, bug #160813. Same slot as 2.3.0, seems fine. Uses rhino-1.6
+  instead of 1.5. Renamed jython flag to python, added tcl flag which adds
+  jacl support. Added examples flag. Added bsf launcher for commandline use.
 
   15 Apr 2007; Markus Rothe <corsair@gentoo.org> bsf-2.3.0-r5.ebuild:
   Stable on ppc64
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index dabf67006827..95634c15e05f 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -6,27 +6,32 @@ AUX bsf-2.3.0-no-autodetection.patch 762 RMD160 074dfff0a02a512b83c7ae5733c2396b
 MD5 2835e321add71eb74f381035c1d61753 files/bsf-2.3.0-no-autodetection.patch 762
 RMD160 074dfff0a02a512b83c7ae5733c2396ba4f7882f files/bsf-2.3.0-no-autodetection.patch 762
 SHA256 4032e0397409aa0ad498999545aaef74c565775848bb4a62fe5566d4d5e54df6 files/bsf-2.3.0-no-autodetection.patch 762
+AUX bsf-2.4.0-build-properties.xml 1984 RMD160 d36e22db74057f1987e02134c59f496c4f3974ee SHA1 4692764eed3f6f3f72a1b6286274f99289e33390 SHA256 517b97081b13f4ac597a56c1d09d4a4961edca316429becf5fe3d440b3770c12
+MD5 51394bcb287c7601b89dc83b45e6166a files/bsf-2.4.0-build-properties.xml 1984
+RMD160 d36e22db74057f1987e02134c59f496c4f3974ee files/bsf-2.4.0-build-properties.xml 1984
+SHA256 517b97081b13f4ac597a56c1d09d4a4961edca316429becf5fe3d440b3770c12 files/bsf-2.4.0-build-properties.xml 1984
 DIST bsf-rhino-1.5.patch.bz2 10818 RMD160 18d4d1f4153855679766c1b60679459c2937797b SHA1 1404c3fcb8427831a65116e045221aaf841a36fe SHA256 62afe966897b6f136a6f38f61a8959871c48ef8552a12fd96ce22c0dfab5d9ad
 DIST bsf-src-2.3.0.tar.gz 1035181 RMD160 24d378bca1f68950b9b2699192c3138fb2bff7e4 SHA1 7c69c14f8f54d671fb8b32cad3e5f289ba41b814 SHA256 ed0caf3567d7c084f21c0f0ce38077384c8e4afc80a1df7a2095a53ada777503
-EBUILD bsf-2.3.0-r2.ebuild 1589 RMD160 142644a707b19b76c35a2d71ece8af50e6b6e34a SHA1 78319bfc619faca798f2a4e4ef938472d9652d32 SHA256 3c06e01bbd691794f4719224fd75ada3e3907a3b694031bcbe46739240bb3078
-MD5 06dcd654784659d12af3acf0454b8af6 bsf-2.3.0-r2.ebuild 1589
-RMD160 142644a707b19b76c35a2d71ece8af50e6b6e34a bsf-2.3.0-r2.ebuild 1589
-SHA256 3c06e01bbd691794f4719224fd75ada3e3907a3b694031bcbe46739240bb3078 bsf-2.3.0-r2.ebuild 1589
+DIST bsf-src-2.4.0.tar.gz 299749 RMD160 e087f8e5c3c291bb34b637f06fbf04f9a0f2535b SHA1 23422d907d085797fcbdf81296237e608a77e54f SHA256 5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9
 EBUILD bsf-2.3.0-r5.ebuild 1777 RMD160 80e3cd29ac8bc61af14253baf60cf2ab8eeb4f52 SHA1 9853ade36f25400da96f824f7bec45d29c0c5661 SHA256 c48cfa354880fe256fd4895704435495f1c5282eba9bd7511621227cb2eb40fb
 MD5 f29e0309bacf7210cef651e76a100ac0 bsf-2.3.0-r5.ebuild 1777
 RMD160 80e3cd29ac8bc61af14253baf60cf2ab8eeb4f52 bsf-2.3.0-r5.ebuild 1777
 SHA256 c48cfa354880fe256fd4895704435495f1c5282eba9bd7511621227cb2eb40fb bsf-2.3.0-r5.ebuild 1777
-MISC ChangeLog 4912 RMD160 e21f2fba244cc2c9b57c7914dd392c47b9c53f1d SHA1 067a0fb5461d35984b497a52d4d6274f89f2b6fc SHA256 617bea0495d1c1cd7cc26414ca9b3cfcd5c084ee05b9409072d115555c455e26
-MD5 e1b9cd00cb4ee57ce90f5c4c54cba161 ChangeLog 4912
-RMD160 e21f2fba244cc2c9b57c7914dd392c47b9c53f1d ChangeLog 4912
-SHA256 617bea0495d1c1cd7cc26414ca9b3cfcd5c084ee05b9409072d115555c455e26 ChangeLog 4912
+EBUILD bsf-2.4.0.ebuild 1946 RMD160 5d9bb4ae989c6fd601587cc3b335b59659810b2a SHA1 808160eeb26da2b486dee69f8cb96911c0368e03 SHA256 8291e7a4ee1a9ebfcc8ff91611e140c51ff36a823bdffcd1abd6e8688930d99a
+MD5 c37cb4b899886235e853ece5082c8e27 bsf-2.4.0.ebuild 1946
+RMD160 5d9bb4ae989c6fd601587cc3b335b59659810b2a bsf-2.4.0.ebuild 1946
+SHA256 8291e7a4ee1a9ebfcc8ff91611e140c51ff36a823bdffcd1abd6e8688930d99a bsf-2.4.0.ebuild 1946
+MISC ChangeLog 5301 RMD160 4851dff69819f8049ef46f614bb2b021b4ec6bbe SHA1 64e7dfe169e7ab0a56b3d537caea2c61e6861a9a SHA256 9b0b30a28dfda7a8d43a0431570b1f524aeacada2824ffeb1272cdbb30c1762a
+MD5 109973cf3b420f47a15ae2089b15ccbc ChangeLog 5301
+RMD160 4851dff69819f8049ef46f614bb2b021b4ec6bbe ChangeLog 5301
+SHA256 9b0b30a28dfda7a8d43a0431570b1f524aeacada2824ffeb1272cdbb30c1762a ChangeLog 5301
 MISC metadata.xml 829 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e SHA1 b4c3798c8d0e0ce8dd99884e47f15a7a09be2aba SHA256 12ff3afd1cc82efa3392c06b9bc411bd50318d1b2180b9765d723a51a7922e10
 MD5 2a5c0decd09ba5a48289b129458bf44c metadata.xml 829
 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e metadata.xml 829
 SHA256 12ff3afd1cc82efa3392c06b9bc411bd50318d1b2180b9765d723a51a7922e10 metadata.xml 829
-MD5 acc51178000478a121155b2958e2d811 files/digest-bsf-2.3.0-r2 491
-RMD160 82ebc43e7da7ba54c8c82c7ab2bfcd1661e5f3fb files/digest-bsf-2.3.0-r2 491
-SHA256 86c62d16b61f6ffbea891ea0403e91b69d2c423d209d14a10f3434b46d07eb0c files/digest-bsf-2.3.0-r2 491
 MD5 acc51178000478a121155b2958e2d811 files/digest-bsf-2.3.0-r5 491
 RMD160 82ebc43e7da7ba54c8c82c7ab2bfcd1661e5f3fb files/digest-bsf-2.3.0-r5 491
 SHA256 86c62d16b61f6ffbea891ea0403e91b69d2c423d209d14a10f3434b46d07eb0c files/digest-bsf-2.3.0-r5 491
+MD5 bfe4069e5824d399c3138acaf0ba1353 files/digest-bsf-2.4.0 241
+RMD160 011b799310b4d6770b18f77f1ed4f875a13e862d files/digest-bsf-2.4.0 241
+SHA256 69fb1a164c9bab1377bed9bc002cf8f4e6e23b41bda33adaf8a950ab612df4d5 files/digest-bsf-2.4.0 241
diff --git a/dev-java/bsf/bsf-2.3.0-r2.ebuild b/dev-java/bsf/bsf-2.3.0-r2.ebuild
deleted file mode 100644
index 4326363be9f7..000000000000
--- a/dev-java/bsf/bsf-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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-r2.ebuild,v 1.18 2006/10/05 15:13:27 gustavoz Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="Bean Script Framework"
-HOMEPAGE="http://jakarta.apache.org/bsf/"
-SRC_URI="http://cvs.apache.org/dist/jakarta/bsf/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="x86 ppc amd64 ppc64"
-IUSE="doc jikes jython rhino source"
-
-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}
-
-	epatch ${WORKDIR}/bsf-rhino-1.5.patch
-}
-
-src_compile() {
-	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-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"
-	if use doc ; then
-		ant ${antflags} javadocs || die
-	fi
-}
-
-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/bsf-2.4.0.ebuild b/dev-java/bsf/bsf-2.4.0.ebuild
new file mode 100644
index 000000000000..5f45a5183f37
--- /dev/null
+++ b/dev-java/bsf/bsf-2.4.0.ebuild
@@ -0,0 +1,74 @@
+# 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.4.0.ebuild,v 1.1 2007/05/08 23:22:33 caster Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Bean Script Framework"
+HOMEPAGE="http://jakarta.apache.org/bsf/"
+SRC_URI="mirror://apache/jakarta/bsf/source/${PN}-src-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="python rhino tcl"
+
+COMMON_DEP="dev-java/commons-logging
+	dev-java/xalan
+	python? ( >=dev-java/jython-2.1-r5 )
+	rhino? ( =dev-java/rhino-1.6* )
+	tcl? ( dev-java/jacl )"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v lib/*.jar || die
+	rm samples/*/*.class || die
+
+	java-ant_ignore-system-classes
+	java-ant_rewrite-classpath
+
+	# somebody forgot to add them to source tarball... fetched from svn
+	cp "${FILESDIR}/${P}-build-properties.xml" build-properties.xml || die
+}
+
+src_compile() {
+	local pkgs="commons-logging,xalan"
+	local antflags="-Dxalan.present=true"
+	if use python; then
+		antflags="${antflags} -Djython.present=true"
+		pkgs="${pkgs},jython"
+	fi
+	if use rhino; then
+		antflags="${antflags} -Drhino.present=true"
+		pkgs="${pkgs},rhino-1.6"
+	fi
+	if use tcl; then
+		antflags="${antflags} -Djacl.present=true"
+		pkgs="${pkgs},jacl"
+	fi
+
+
+	local cp="$(java-pkg_getjars ${pkgs})"
+	eant -Dgentoo.classpath="${cp}" ${antflags} jar
+	# stupid clean
+	mv build/lib/${PN}.jar ${S} || die
+	use doc && eant -Dgentoo.classpath="${cp}" ${antflags} javadocs
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	java-pkg_dolauncher ${PN} --main org.apache.bsf.Main
+
+	dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt || die
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/bsf/files/bsf-2.4.0-build-properties.xml b/dev-java/bsf/files/bsf-2.4.0-build-properties.xml
new file mode 100644
index 000000000000..6d716ed00563
--- /dev/null
+++ b/dev-java/bsf/files/bsf-2.4.0-build-properties.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="props">
+    <property name="project.name" value="bsf"/>
+    <property name="project.fullName" value="Bean Scripting Framework"/>
+    <property name="project.version" value="2.4.0"/>
+    <property name="project.debug" value="on"/>
+    <property name="project.deprecation" value="on"/>
+
+    <property name="build.file" value="build.xml"/>
+    <property name="build.properties.file" value="build-properties.xml"/>
+    <property name="build.dir" value="build"/>
+    <property name="build.dest" value="build/classes"/>
+    <property name="build.lib" value="build/lib"/>
+    <property name="build.lib.win32" value="build/lib/win32"/>
+    <property name="build.samples" value="build/samples"/>
+    <property name="build.samples.calc" value="build/samples/calc"/>
+    <property name="build.samples.scriptedui" value="build/samples/scriptedui"/>
+    <property name="build.samples.xsl" value="build/samples/xsl"/>
+    <property name="build.javadocs" value="build/javadocs"/>
+    <property name="build.tests" value="build/testcases" />
+
+    <property name="dist.dir" value="dist"/>
+    <property name="dist.dir.root" value="${dist.dir}/${project.name}-${project.version}"/>
+    <property name="dist.bin.file" value="${dist.dir}/${project.name}-bin-${project.version}"/>
+    <property name="dist.src.file" value="${dist.dir}/${project.name}-src-${project.version}"/>
+
+    <property name="packages" value="org.apache.*"/>
+
+    <property name="samples.dir" value="samples"/>
+
+    <property name="site.src" location="xdocs"/>
+    <property name="site.dest" location="docs"/>
+    <property name="site.projectFile" value="stylesheets/project.xml"/>
+
+    <property name="source.level" value="1.4" />
+
+    <property name="src.dir" value="src"/>
+
+    <property name="templ.path" location="xdocs/stylesheets"/>
+
+    <property name="tests.dir" value="test"/>
+
+    <property name="velocity.props" location="${site.src}/velocity.properties"/>
+</project>
diff --git a/dev-java/bsf/files/digest-bsf-2.3.0-r2 b/dev-java/bsf/files/digest-bsf-2.3.0-r2
deleted file mode 100644
index 3c966492a8ca..000000000000
--- a/dev-java/bsf/files/digest-bsf-2.3.0-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-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
diff --git a/dev-java/bsf/files/digest-bsf-2.4.0 b/dev-java/bsf/files/digest-bsf-2.4.0
new file mode 100644
index 000000000000..432747b08de4
--- /dev/null
+++ b/dev-java/bsf/files/digest-bsf-2.4.0
@@ -0,0 +1,3 @@
+MD5 7e58b2a009c0f70ab36bbef420b25c07 bsf-src-2.4.0.tar.gz 299749
+RMD160 e087f8e5c3c291bb34b637f06fbf04f9a0f2535b bsf-src-2.4.0.tar.gz 299749
+SHA256 5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9 bsf-src-2.4.0.tar.gz 299749