EAPI 5 bump. dev-java/jython SLOT bump from :0 to :2.7. Patch to add missing imports due to jython:2.7 move. Drop ppc+ppc64. Fix bug 553892.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 158 insertions, 3 deletions

diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog
index c3f4a5b5459f..4bdac85047a3 100644
--- a/dev-java/bsf/ChangeLog
+++ b/dev-java/bsf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/bsf
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.58 2011/12/31 13:27:47 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.59 2015/07/04 08:26:22 monsieurp Exp $
+
+*bsf-2.4.0-r2 (04 Jul 2015)
+
+  04 Jul 2015; Patrice Clement <monsieurp@gentoo.org> +bsf-2.4.0-r2.ebuild,
+  +files/bsf-2.4.0-PyJavaInstance.patch:
+  EAPI 5 bump. dev-java/jython SLOT bump from :0 to :2.7. Patch to add missing
+  imports due to jython:2.7 move. Drop ppc+ppc64. Fix bug 553892.
 
   31 Dec 2011; Ralph Sennhauser <sera@gentoo.org> bsf-2.4.0-r1.ebuild:
   Drop ia64 support #345433
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index 4dedc18916af..c0f6a9ae3195 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,5 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX bsf-2.4.0-PyJavaInstance.patch 1650 SHA256 0996789ba490c7d5b4b3b318c4cd99a32b2da39c6c1da88171ee28e6de3b5c00 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e WHIRLPOOL 7a0c0c1e07e5fc1a92647dcd0d51a54f31a05f8c3bdb96c53180f649598ab0db7d1f14cd9eaecf2ecca544edda04f10c261d44ff75a705803dc49d1ffc960183
 AUX bsf-2.4.0-build-properties.xml 1984 SHA256 517b97081b13f4ac597a56c1d09d4a4961edca316429becf5fe3d440b3770c12 SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679 WHIRLPOOL e61433d19cac575366316bf387c26cc5b645ddb63b1d60724ad082ea2cfef0b302af56420c270f50eed69228feb374e655545058871f2f6671fb3f342f6bfdbc
 DIST bsf-src-2.4.0.tar.gz 299749 SHA256 5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43 WHIRLPOOL 95ef77a21ad3ac013d354222655b3d4ff42ef7cd154f8529d8798c6b226385adc231edc5daa1bf2575111765fe2ae376d9071c496da050ab9ce73a569330ee84
 EBUILD bsf-2.4.0-r1.ebuild 2636 SHA256 6611ef3aa402f01f0f8c2d717727c485e48c913f4fb7e6cd6a68575e35e7ad3a SHA512 86dc7c6969a6a1d74bdb87dec7a56829cf082681c63d82bfd15a0704c0625732d315dae7b4d986727eab1b50519779daeca66314d550c6358f257fed34d0c0aa WHIRLPOOL eedf3403c18a7c9fc9a47119f48ad62329395ac8f322f3b943face2fa111ccd183b0db0deef7d69ff25f6e89eabf0df467d98fa4a1da19e16229f270605d40c4
-MISC ChangeLog 7373 SHA256 657b27acb2c58f25d60fdd523dd24da7367c7ccaf7f6dcd7626480d71108f702 SHA512 18a3021af4089fe4e028fd04dab024f317298fa671c3e06bb387a5529b7fdab22cb9d25f950de8a93ad7184f51634c0cffe85f1a148b2242e87bca63be8bacf4 WHIRLPOOL 313d94ae02e4e1f32bba3db83280c89a68fe18e3375a2ab13696cf90cb20bd047e924f62128933d845f7476bafef4b672e09f97a105bd638dde58b172b835de7
+EBUILD bsf-2.4.0-r2.ebuild 2838 SHA256 dbf5a0f1055b7bf5f455ef47fc650e860e4239b4926fd2741e2bb82d6168bf1c SHA512 7a68f18f5cfc7c201c38b0bdaf6ca58e833160841f24a5fb49993bd43f2ef1a9d439f70b385696a79248fe2e42a09cfe263be8818f8b116a90f67a966a11303e WHIRLPOOL 423512b1e9e7a032c40d89342f1b6d27a116cfe69934b3e8b5a46e6f6a5cf758c899623e021490377cd8504dd32677b91d2636111734f89b460b396c9b6db26f
+MISC ChangeLog 7670 SHA256 85a563947ca6c1431c83e2868a8408172825f3ef77f30cf4bb5380af5899e15d SHA512 f24715dd759e056a0a7f5aa9e56726d63bbb3ec352d08915ba3205128a2148d03ead681daf137444531b50a0846cb88fa072e915efa8788884da742008263a05 WHIRLPOOL 858085fd10e26cbb86d3cec71241584027cf84cbaf52c26f059e7e37da450bf3ed7c49cbfb1d15b2371f864bbbc1b7177894fb63460d3f252f4b42365b68d8d4
 MISC metadata.xml 829 SHA256 12ff3afd1cc82efa3392c06b9bc411bd50318d1b2180b9765d723a51a7922e10 SHA512 7a0bbed6cc9090e5193e35dfb5a61bef40d6989c8d9277ed43802553fb81df9e84d339a33836365b02c5489219113d8f837a3cc6d82f24564d008b3853d79461 WHIRLPOOL 5d3d5e1f7d8df90752c019de9ebd5ff0490c64622c5ce10aa1eec9607699577df6b2ea6822fb91b67b508ca23ed0e19b95c1b443e278b0516fa4930c032a46a9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVl6cTAAoJEJGRpfGTSRu4xYIH/1GwA3AeTdAoFfN3btxBjt3M
+N5FZeHBTOEZR/XhIC7hCNZnwPrh493D2elTgdfhPxmZHEKlRBR4vIpTnsc5RxB2G
+p7NvFi1QLt34K9RLoncyXGUhcKSQoBov7izL4vd5W6o6HpQpMXd125GtVCdwdz3K
+S5YiF7OtoRjfDOr6YtLCjRLzRF0XGRs24D3UlKYNQbWSlS/7u7AmOr34nzML2AUE
+vhg/HB0k2r4v1b6D41wXv0LftAeYH/FMntszH2ANlE9HG/iWmbyHKQztZhwgek+y
+lYkLUfUSsIyjLDFvm0UyTFTjQdI165NEY4qmq+qrYIsHltn6m5cVtviYWpa4fhs=
+=GwoI
+-----END PGP SIGNATURE-----
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
new file mode 100644
index 000000000000..e38d9670d14a
--- /dev/null
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 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-r2.ebuild,v 1.1 2015/07/04 08:26:22 monsieurp Exp $
+
+EAPI="5"
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Bean Script Framework"
+HOMEPAGE="http://commons.apache.org/bsf/"
+SRC_URI="mirror://apache/jakarta/bsf/source/${PN}-src-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# If you add new ones, add them to ant-apache-bsf too for use dependencies
+IUSE="javascript python tcl"
+
+CDEPEND="dev-java/commons-logging:0
+	dev-java/xalan:0
+	python? ( dev-java/jython:2.7 )
+	javascript? ( dev-java/rhino:1.6 )
+	tcl? ( dev-java/jacl:0 )"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+java_prepare() {
+	rm -v lib/*.jar || die
+	rm samples/*/*.class || die
+
+	java-ant_ignore-system-classes
+
+	# somebody forgot to add them to source tarball... fetched from svn
+	cp "${FILESDIR}/${P}-build-properties.xml" build-properties.xml || die
+
+	# Silence javadoc.
+	java-ant_xml-rewrite -f build.xml -c \
+		-e javadoc \
+		-a failonerror \
+		-v no
+
+	# http://bugs.jython.org/issue1814
+	# Also, bsf is an old project (2011) and hasn't officially taken the leap to
+	# jython-2.7. This patch fixes the issue.
+	epatch "${FILESDIR}"/${P}-PyJavaInstance.patch
+}
+
+src_compile() {
+	local pkgs="commons-logging,xalan"
+	local antflags="-Dxalan.present=true"
+
+	if use python; then
+		antflags="${antflags} -Djython.present=true"
+		pkgs="${pkgs},jython-2.7"
+	fi
+	if use javascript; 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
+
+	java-pkg_register-optional-dependency bsh,groovy-1,jruby
+}
+
+pkg_postinst() {
+	elog "Support for python, javascript, and tcl is controlled via USE flags."
+	elog "Also, following languages can be supported just by installing"
+	elog "respective package with USE=\"bsf\": BeanShell (dev-java/bsh),"
+	elog "Groovy (dev-java/groovy) and JRuby (dev-java/jruby)"
+}
diff --git a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
new file mode 100644
index 000000000000..bef35c168e48
--- /dev/null
+++ b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
@@ -0,0 +1,35 @@
+--- src/org/apache/bsf/engines/jython/JythonEngine.java.orig	2015-07-04 08:00:17.120000000 +0000
++++ src/org/apache/bsf/engines/jython/JythonEngine.java	2015-07-04 08:04:55.230000000 +0000
+@@ -26,7 +26,7 @@
+ import org.apache.bsf.util.BSFFunctions;
+ import org.python.core.Py;
+ import org.python.core.PyException;
+-import org.python.core.PyJavaInstance;
++import org.python.core.PyJavaType;
+ import org.python.core.PyObject;
+ import org.python.util.InteractiveInterpreter;
+ 
+@@ -110,8 +110,9 @@
+           
+           Object result = interp.eval ("bsf_temp_fn()");
+           
+-          if (result != null && result instanceof PyJavaInstance)
+-              result = ((PyJavaInstance)result).__tojava__(Object.class);
++          if (result != null && result instanceof PyJavaType)
++              //result = ((PyJavaInstance)result).__tojava__(Object.class);
++              result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class);
+           return result;
+       } catch (PyException e) {
+           throw new BSFException (BSFException.REASON_EXECUTION_ERROR,
+@@ -126,8 +127,9 @@
+ 		      Object script) throws BSFException {
+ 	try {
+ 	  Object result = interp.eval (byteify(script.toString ()));
+-	  if (result != null && result instanceof PyJavaInstance)
+-		result = ((PyJavaInstance)result).__tojava__(Object.class);
++	  if (result != null && result instanceof PyJavaType)
++        //result = ((PyJavaInstance)result).__tojava__(Object.class);
++        result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class);
+ 	  return result;
+ 	} catch (PyException e) {
+ 	  throw new BSFException (BSFException.REASON_EXECUTION_ERROR,