did some cleanup, introduced support for the source useflag.

Package-Manager: portage-2.0.51.21

5 files changed, 23 insertions, 92 deletions

diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog
index 4493fd0c0b65..adb2a2022e7b 100644
--- a/dev-java/bsf/ChangeLog
+++ b/dev-java/bsf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/bsf
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.24 2005/04/03 09:08:09 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.25 2005/05/05 16:43:40 luckyduck Exp $
+
+  05 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -bsf-2.3.0-r1.ebuild,
+  bsf-2.3.0-r2.ebuild:
+  did some cleanup, introduced support for the source useflag.
 
   03 Apr 2005; <SeJo@gentoo.org> bsf-2.3.0-r2.ebuild:
   added ppc keyword
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index af5bea4b920e..30c8430df6b7 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 06c393927927d7e78da5a23f8e77648b ChangeLog 2728
-MD5 b1f89e81ba39808c243bfcebf27dd824 bsf-2.3.0-r1.ebuild 1677
-MD5 90f28067c55760d23765e35768d461dd bsf-2.3.0-r2.ebuild 1611
+MD5 4b6f5eab14054d1288969036b6d91898 bsf-2.3.0-r2.ebuild 1578
+MD5 3e5342c8943a398bbc249ee71142aa22 ChangeLog 2894
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCT7JzMXMsRNMHhmARApgVAKCa91A4IZgYYMSKBzyaC2Dyy6c6xgCfc2CS
-eQfktZGcbcs8MW8yYGvj+QQ=
-=UUoI
+iD8DBQFCek1V06ebR+OMO78RAkiGAJ9m0SHhSEcDlx96AYfsv8zLIasTQwCdFcOK
+pMFvNPXhDEuUV7mrMeEEIgE=
+=EAV8
 -----END PGP SIGNATURE-----
diff --git a/dev-java/bsf/bsf-2.3.0-r1.ebuild b/dev-java/bsf/bsf-2.3.0-r1.ebuild
deleted file mode 100644
index d36e636c1d18..000000000000
--- a/dev-java/bsf/bsf-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.9 2005/03/23 12:08:45 axxo Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="Bean Script Framework"
-HOMEPAGE="http://jakarta.apache.org/bsf/"
-SRC_URI="http://cvs.apache.org/dist/jakarta/bsf/v2.3.0rc1/src/bsf-src-2.3.0.tar.gz mirror://gentoo/bsf-rhino-1.5.patch.bz2"
-LICENSE="Apache-1.1"
-SLOT="2.3"
-KEYWORDS="x86"
-IUSE="doc jython rhino"
-# karltk: Is this really an RDEPEND, or just a CDEPEND?
-RDEPEND="=www-servers/tomcat-5*"
-DEPEND="${REPEND}
-	jython? ( >=dev-java/jython-2.1-r5 )
-	rhino? ( =dev-java/rhino-1.5* )
-	>=dev-java/ant-core-1.5.4"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${WORKDIR}/bsf-rhino-1.5.patch
-
-	cd ${S}/src/build/lib
-	java-pkg_jar-from rhino-1.5 || die "Missing rhino"
-	java-pkg_jar-from jython || die "Missing jython"
-}
-
-src_compile() {
-	# This ebuild is sensitive to the system classpath, so we need to start with a 
-	# pristine one.
-	export CLASSPATH=
-
-	# karltk: this is dirty. should be fixed when we overhaul tomcat
-	# and the entire servlet/java server pages system
-	local cp=/opt/tomcat5/common/lib/servlet-api.jar
-	cp="${cp}:/opt/tomcat5/common/lib/jsp-api.jar"
-
-
-	cp="${cp}:$(java-config -p rhino-1.5)"
-	cp="${cp}:$(java-config -p jython)"
-
-	local antflags=
-
-	# karltk: fix this
-#	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	cd src
-	export CLASSPATH=${cp}
-	ant ${antflags} compile || die
-	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/*
-}
diff --git a/dev-java/bsf/bsf-2.3.0-r2.ebuild b/dev-java/bsf/bsf-2.3.0-r2.ebuild
index 42352acd759b..0cc8fa419d8d 100644
--- a/dev-java/bsf/bsf-2.3.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.3.0-r2.ebuild
@@ -1,44 +1,33 @@
 # Copyright 1999-2005 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.15 2005/04/03 09:08:09 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r2.ebuild,v 1.16 2005/05/05 16:43:40 luckyduck Exp $
 
 inherit java-pkg eutils
 
 DESCRIPTION="Bean Script Framework"
 HOMEPAGE="http://jakarta.apache.org/bsf/"
-SRC_URI="http://cvs.apache.org/dist/jakarta/bsf/v2.3.0rc1/src/bsf-src-2.3.0.tar.gz mirror://gentoo/bsf-rhino-1.5.patch.bz2"
+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 sparc amd64 ppc64"
-IUSE="doc jython rhino jikes"
+IUSE="doc jikes jython rhino source"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	jikes? ( >=dev-java/jikes-1.18 )
+	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4
 	jython? ( >=dev-java/jython-2.1-r5 )
 	rhino? ( =dev-java/rhino-1.5* )
-	=dev-java/servletapi-2.3*
-	>=dev-java/ant-core-1.5.4"
-DEPEND=">=virtual/jdk-1.4
-	jikes? ( >=dev-java/jikes-1.18 )
-	${RDEPEND}"
-
+	=dev-java/servletapi-2.3*"
 
 src_unpack() {
 	unpack ${A}
 
 	epatch ${WORKDIR}/bsf-rhino-1.5.patch
-
-	cd ${S}/src/build/lib
-	if use rhino; then
-		java-pkg_jar-from rhino-1.5 || die "Missing rhino"
-	fi
-
-	if use jython; then
-		java-pkg_jar-from jython || die "Missing jython"
-	fi
-
 }
 
 src_compile() {
-
 	use rhino && cp="${cp}:$(java-config -p rhino-1.5)"
 	use jython && cp="${cp}:$(java-config -p jython)"
 
@@ -59,4 +48,8 @@ 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/digest-bsf-2.3.0-r1 b/dev-java/bsf/files/digest-bsf-2.3.0-r1
deleted file mode 100644
index 96df1e737c76..000000000000
--- a/dev-java/bsf/files/digest-bsf-2.3.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 78bae3747ca5734bb7554eed6868b7da bsf-src-2.3.0.tar.gz 1035181
-MD5 db5d0f665631f91a13d721f8756df36f bsf-rhino-1.5.patch.bz2 10818