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

Package-Manager: portage-2.1.2_rc4-r5

5 files changed, 112 insertions, 16 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/Manifest b/dev-java/bsf/Manifest
index a42f16cbe7d2..a923844286bf 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bsf-2.3.0-classpath.patch 667 RMD160 a1cc82b3166ddb81412549cd5963bde4d071548d SHA1 08b93525ccab82c4ab9cd3e7a628b86e0ab4b09f SHA256 c265a5d44d1630b049d9a0c32b51a71efcb5cb27d8671fdca350af4deb24d074
 MD5 bd886816ca8081772505b2550a366f92 files/bsf-2.3.0-classpath.patch 667
 RMD160 a1cc82b3166ddb81412549cd5963bde4d071548d files/bsf-2.3.0-classpath.patch 667
 SHA256 c265a5d44d1630b049d9a0c32b51a71efcb5cb27d8671fdca350af4deb24d074 files/bsf-2.3.0-classpath.patch 667
+AUX bsf-2.3.0-no-autodetection.patch 762 RMD160 074dfff0a02a512b83c7ae5733c2396ba4f7882f SHA1 9d04279428065c53b894e33dbd4430637eb2379a SHA256 4032e0397409aa0ad498999545aaef74c565775848bb4a62fe5566d4d5e54df6
+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
 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
@@ -15,10 +16,14 @@ EBUILD bsf-2.3.0-r3.ebuild 1492 RMD160 61d179dda6e133ebfc8eab53a9e67df378c563e6
 MD5 aff056f9aee7e7588d76e5384c32e85f bsf-2.3.0-r3.ebuild 1492
 RMD160 61d179dda6e133ebfc8eab53a9e67df378c563e6 bsf-2.3.0-r3.ebuild 1492
 SHA256 0666ce630eefe89166d408bc14ef4eb4b7d1223a218a53e3c706be41d8ceac2b bsf-2.3.0-r3.ebuild 1492
-MISC ChangeLog 3724 RMD160 552607c74b607fa0e30e215825287bc22121daa7 SHA1 a49876887eaea255bc76ada63710a60317fe1ad9 SHA256 21d7820676daba5a2d42aab1532682a901bc639bedf9d2c079a4a34057a63c71
-MD5 cbd45d31173eb9b0aeb6140abce6b37d ChangeLog 3724
-RMD160 552607c74b607fa0e30e215825287bc22121daa7 ChangeLog 3724
-SHA256 21d7820676daba5a2d42aab1532682a901bc639bedf9d2c079a4a34057a63c71 ChangeLog 3724
+EBUILD bsf-2.3.0-r4.ebuild 1728 RMD160 bf991fff7c7eba93f8cadec2ccb6c24fb47b0a6f SHA1 55b056ad2ef7b362d78ec74e2dbf7d7ee86d5b89 SHA256 b480a8df5660922941c11609c5942eb528010c65831e3ca2b270a180ec7dd391
+MD5 b8d7bf916502de5267307b854740d2c8 bsf-2.3.0-r4.ebuild 1728
+RMD160 bf991fff7c7eba93f8cadec2ccb6c24fb47b0a6f bsf-2.3.0-r4.ebuild 1728
+SHA256 b480a8df5660922941c11609c5942eb528010c65831e3ca2b270a180ec7dd391 bsf-2.3.0-r4.ebuild 1728
+MISC ChangeLog 3980 RMD160 1b2f9492745b85160babb0f5782c9f0f0b44fe99 SHA1 a7e3b87aca6fc3dd255038d4b24415c036c62622 SHA256 2f61eb373ecb4dc34e093321826bf38cc9d179f84afa9a8465dc37c620bd62fd
+MD5 a6b22ef35e8064b33ae15621fd8368a7 ChangeLog 3980
+RMD160 1b2f9492745b85160babb0f5782c9f0f0b44fe99 ChangeLog 3980
+SHA256 2f61eb373ecb4dc34e093321826bf38cc9d179f84afa9a8465dc37c620bd62fd ChangeLog 3980
 MISC metadata.xml 829 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e SHA1 b4c3798c8d0e0ce8dd99884e47f15a7a09be2aba SHA256 12ff3afd1cc82efa3392c06b9bc411bd50318d1b2180b9765d723a51a7922e10
 MD5 2a5c0decd09ba5a48289b129458bf44c metadata.xml 829
 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e metadata.xml 829
@@ -29,10 +34,6 @@ SHA256 86c62d16b61f6ffbea891ea0403e91b69d2c423d209d14a10f3434b46d07eb0c files/di
 MD5 acc51178000478a121155b2958e2d811 files/digest-bsf-2.3.0-r3 491
 RMD160 82ebc43e7da7ba54c8c82c7ab2bfcd1661e5f3fb files/digest-bsf-2.3.0-r3 491
 SHA256 86c62d16b61f6ffbea891ea0403e91b69d2c423d209d14a10f3434b46d07eb0c files/digest-bsf-2.3.0-r3 491
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFeJeMAiZjviIA2XgRAuiPAKD0RV0u3AFO3r3LtOPvgqH93X/mxQCg7NoZ
-OpmGPdaA6j1WPWa91+XSGSA=
-=sdPO
------END PGP SIGNATURE-----
+MD5 acc51178000478a121155b2958e2d811 files/digest-bsf-2.3.0-r4 491
+RMD160 82ebc43e7da7ba54c8c82c7ab2bfcd1661e5f3fb files/digest-bsf-2.3.0-r4 491
+SHA256 86c62d16b61f6ffbea891ea0403e91b69d2c423d209d14a10f3434b46d07eb0c files/digest-bsf-2.3.0-r4 491
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