From 11300a8104238529425a7b6651499bf195bf1839 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Feb 2024 11:43:41 +0000 Subject: gentoo auto-resync : 04:02:2024 - 11:43:41 --- dev-java/bsf/Manifest | 3 - dev-java/bsf/bsf-2.4.0-r3.ebuild | 109 ---------------------- dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch | 35 ------- dev-java/bsf/files/bsf-2.4.0-build-properties.xml | 44 --------- 4 files changed, 191 deletions(-) delete mode 100644 dev-java/bsf/bsf-2.4.0-r3.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 (limited to 'dev-java/bsf') diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest index d8ae8aae3a33..0114fde3a0f1 100644 --- a/dev-java/bsf/Manifest +++ b/dev-java/bsf/Manifest @@ -1,7 +1,4 @@ -AUX bsf-2.4.0-PyJavaInstance.patch 1654 BLAKE2B c6a0efc5c429adb7dd0ba6a7fd68e7b49ac13b98b1bd3998e70294dd4bf15516c719807c940fbf0b2203f6804878edce223b12b29cccefd790812db186a71cf1 SHA512 ceb07c1613c4a68654132a1b95d4db2494183cb86fe20be050bf4f57079fc1967ac76dda17b28df586d3fe34b696eef4d5790e6fe82a73d13c5a4f64267048f0 -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 DIST bsf-src-2.4.0.tar.gz.asc 191 BLAKE2B c4d17ee6df06aa2da70b9e733cb9890cef2f0f22124d8699400494496c4045851feb006e53ee4f4d09e926d982afd4057c08caf791fd4ea8a8bef5f576d6d8a1 SHA512 b82d1f9e6cd6bc3b3228ceb8f5f0679e8dd95c2200328accafa0ee9fd4b4065367e071d0fa718ecdc34e11c6b14456a671d4e8e74d2b56dea4e8fc3db73c4392 -EBUILD bsf-2.4.0-r3.ebuild 2678 BLAKE2B c9c3c31634df671be5dcb7f4e93f135b1a873e48e109e592ee7beca161033ca3eafcaa7f07d2dad0ce4748d4eb0d9872a2dfd9ef8396710db04b1ed18e79a907 SHA512 254420c8664c8b6c50945c19c31aea2a61bcdca929f0cd6a3558773bce802bcac4c505586678bdc3fcb4506197b7e13cf463b4fa1f428cac832fb36059d98c1c EBUILD bsf-2.4.0-r5.ebuild 2225 BLAKE2B 47a5df02b0e71476625d844204d4ea0eaa7866820325d1e3e38041ed8d97d3b3047798626e6ac2d9b5434e8f813fbd8e0926c5c561f4872c727cfdcbaea44d5b SHA512 c218193486db09b94a57bd91692fcd58f6fd16d1c5130e331d44b9e48c0075aef73eeca84d5c319d47fb89dba98760ce517b77d0b46059e2d6c831230d008ca8 MISC metadata.xml 983 BLAKE2B 03534eb384215d3e15764d890376dabbfce25d06b1477d62ecdbe109c76f7b0fbd3eda6233211555e87d1d4583b73a5d9e4f7d5f61e8be4330aefda4c8ae93c9 SHA512 e95534d309f4c49781857b113852a8162eeacfea951b5f961b317bac3624cd6b7b129c192d361c16834884ea67f8eec210796e899da74ede487fbafdca3da5ad 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3