summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolkmar W. Pogatzki <gentoo@pogatzki.net>2024-02-03 23:46:32 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2024-02-04 09:07:45 +0100
commitc95168b3039c52bd929a082e647d437d62b9e26a (patch)
tree6a063b79f3cc1c1aba85962ac5acd7336da55651 /dev-java
parentapp-text/ronn-ng: add 0.10.1 (diff)
downloadgentoo-c95168b3039c52bd929a082e647d437d62b9e26a.tar.gz
gentoo-c95168b3039c52bd929a082e647d437d62b9e26a.tar.bz2
gentoo-c95168b3039c52bd929a082e647d437d62b9e26a.zip
dev-java/bsf: drop 2.4.0-r3
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35174 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/bsf/bsf-2.4.0-r3.ebuild109
-rw-r--r--dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch35
-rw-r--r--dev-java/bsf/files/bsf-2.4.0-build-properties.xml44
3 files changed, 0 insertions, 188 deletions
diff --git a/dev-java/bsf/bsf-2.4.0-r3.ebuild b/dev-java/bsf/bsf-2.4.0-r3.ebuild
deleted file mode 100644
index ce4e977848a5..000000000000
--- a/dev-java/bsf/bsf-2.4.0-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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 ~x64-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
deleted file mode 100644
index 4e8c4de7b015..000000000000
--- a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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;
- 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,
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
deleted file mode 100644
index 6d716ed00563..000000000000
--- a/dev-java/bsf/files/bsf-2.4.0-build-properties.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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>