From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 14 Jul 2018 20:57:42 +0100
Subject: gentoo resync : 14.07.2018

---
 dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch | 35 ------------------
 dev-java/bsf/files/bsf-2.4.0-build-properties.xml | 44 -----------------------
 2 files changed, 79 deletions(-)
 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/files')

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 @@
-<?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>
-- 
cgit v1.2.3