From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/bsf/Manifest | 5 - dev-java/bsf/bsf-2.4.0-r2.ebuild | 107 ---------------------- dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch | 35 ------- dev-java/bsf/files/bsf-2.4.0-build-properties.xml | 44 --------- dev-java/bsf/metadata.xml | 21 ----- 5 files changed, 212 deletions(-) delete mode 100644 dev-java/bsf/Manifest delete mode 100644 dev-java/bsf/bsf-2.4.0-r2.ebuild delete mode 100644 dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch delete mode 100644 dev-java/bsf/files/bsf-2.4.0-build-properties.xml delete mode 100644 dev-java/bsf/metadata.xml (limited to 'dev-java/bsf') diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest deleted file mode 100644 index bfd19426542a..000000000000 --- a/dev-java/bsf/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX bsf-2.4.0-PyJavaInstance.patch 1650 BLAKE2B ceb772a69d454d1d85e05486d28d13824724813e7875f731a165aaf97bdd7f0c006baa927e849f82de7fa16228c3de5847f8d59013142f8df4823a951b42c785 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e -AUX bsf-2.4.0-build-properties.xml 1984 BLAKE2B 6db0c1ca7f899e95a0728d61b79ef6c0a1320ee747b5479c9c50a7bd258dc7fee0b6b569e3813f323cbc694d405f9af1d269dd5370ac82e6eca2bde5072d905d SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679 -DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43 -EBUILD bsf-2.4.0-r2.ebuild 2713 BLAKE2B 36f4a13e7af9b0c02106346cd6927ca94d05cbbdd52e9fb396b789b5f1b1123232793ba2c821b1b8d620707c658d8002612bc1a35d3a4113242085e8cfcde736 SHA512 a639398a172fc896f123832b0ea5f5026c565a779f9848eb9361d77379cd61ac404ac2a6fb03f27dcf61a6e083e24980ba0a06679bb4f56ce437c7b993f036d6 -MISC metadata.xml 903 BLAKE2B 65b2684054dd53636f1fddfa7b83c5fc9bf9c10253f12d426a8641fbf431418c24acaf6762e02159f5a2f3e1bd3c16fe97d4b44093ff04a518a79d2645f11515 SHA512 f55f803d1d0fc7a1ce20ea5d46ee89afe46b738362a2b78adfd5f6a4e9d09360f3522de148c56a9b2fae9370df1ed003611d7b68b8ba8e2e4cd7ff5683696abf diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild deleted file mode 100644 index ba7669ffd2c1..000000000000 --- a/dev-java/bsf/bsf-2.4.0-r2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ppc64 x86 ~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=" - 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.6" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.6" - -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 deleted file mode 100644 index bef35c168e48..000000000000 --- a/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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, 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-java/bsf/metadata.xml b/dev-java/bsf/metadata.xml deleted file mode 100644 index 688e2583cfb6..000000000000 --- a/dev-java/bsf/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - java@gentoo.org - Java - - - -Bean Scripting Framework (BSF) is a set of Java classes which provides -scripting language support within Java applications, and access to Java -objects and methods from scripting languages. BSF allows one to write -JSPs in languages other than Java while providing access to the Java -class library. In addition, BSF permits any Java application to be -implemented in part (or dynamically extended) by a language that is -embedded within it. This is achieved by providing an API that permits -calling scripting language engines from within Java, as well as an -object registry that exposes Java objects to these scripting language -engines. - - -- cgit v1.2.3