[gentoo-commits] repo/gentoo:master commit in: dev-java/bsf/, dev-java/bsf/files/

["Florian Schmaus" <flow@gentoo.org>]

commit:     b9d7cce3cc7466fe80b1715cbc1c6c7d3ce66099
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Mar 27 10:12:13 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 12:12:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9d7cce3

dev-java/bsf: min java 1.8:*

Bug: https://bugs.gentoo.org/836266
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24769
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/bsf/bsf-2.4.0-r3.ebuild                  | 109 ++++++++++++++++++++++
 dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch |   4 +-
 2 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/dev-java/bsf/bsf-2.4.0-r3.ebuild b/dev-java/bsf/bsf-2.4.0-r3.ebuild
new file mode 100644
index 000000000000..3310d4809efd
--- /dev/null
+++ b/dev-java/bsf/bsf-2.4.0-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bean Script Framework"
+HOMEPAGE="https://commons.apache.org/proper/commons-bsf/"
+SRC_URI="mirror://apache/commons/bsf/source/${PN}-src-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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="
+	python? (
+		dev-java/jython:2.7
+	)
+	javascript? (
+		dev-java/rhino:1.6
+	)
+	tcl? (
+		dev-java/jacl:0
+	)
+	dev-java/xalan:0
+	dev-java/commons-logging:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_prepare() {
+	default
+	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.
+	eapply "${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
+
+	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
index bef35c168e48..4e8c4de7b015 100644
--- a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
+++ b/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/src/org/apache/bsf/engines/jython/JythonEngine.java.orig	2015-07-04 08:00:17.120000000 +0000
++++ b/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;