gentoo resync : 14.07.2018

4 files changed, 129 insertions, 0 deletions

diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch
new file mode 100644
index 000000000000..9f2958bc243a
--- /dev/null
+++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch
@@ -0,0 +1,14 @@
+--- src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java.orig	2015-11-11 15:58:46.578486000 +0000
++++ src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java	2015-11-11 15:59:05.351486000 +0000
+@@ -217,8 +217,9 @@
+         boolean debug = (cl.getOpt("debug") != null);
+ 
+         String allowmdef = cl.getOpt("allowmdef");
+-        Set mdefNamespaces = (allowmdef == null ? Collections.EMPTY_SET :
+-                new HashSet(Arrays.asList(XmlListImpl.split_list(allowmdef))));
++        Set mdefNamespaces = Collections.EMPTY_SET;
++        // Set mdefNamespaces = (allowmdef == null ? Collections.EMPTY_SET :
++        //         new HashSet(Arrays.asList(XmlListImpl.split_list(allowmdef))));
+ 
+         List extensions = new ArrayList();
+         if (cl.getOpt("extension") != null) {
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch
new file mode 100644
index 000000000000..8081f71775f6
--- /dev/null
+++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch
@@ -0,0 +1,64 @@
+diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
+--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java	2010-04-14 08:30:34.000000000 +0300
++++ src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java	2012-09-05 23:03:48.617016181 +0300
+@@ -27,10 +27,10 @@
+ import org.apache.xmlbeans.XmlError;
+ import org.apache.xmlbeans.InterfaceExtension;
+ import org.apache.xmlbeans.PrePostExtension;
+-import org.apache.xmlbeans.impl.jam.JamClassLoader;
+-import org.apache.xmlbeans.impl.jam.JamService;
+-import org.apache.xmlbeans.impl.jam.JamServiceFactory;
+-import org.apache.xmlbeans.impl.jam.JamServiceParams;
++import org.codehaus.jam.JamClassLoader;
++import org.codehaus.jam.JamService;
++import org.codehaus.jam.JamServiceFactory;
++import org.codehaus.jam.JamServiceParams;
+ import org.apache.xmlbeans.impl.schema.StscState;
+ 
+ import javax.xml.namespace.QName;
+diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
+--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java	2010-04-14 08:30:34.000000000 +0300
++++ src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java	2012-09-05 23:09:00.320097542 +0300
+@@ -18,10 +18,10 @@
+ import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig;
+ import org.apache.xmlbeans.InterfaceExtension;
+ import org.apache.xmlbeans.XmlObject;
+-import org.apache.xmlbeans.impl.jam.JMethod;
+-import org.apache.xmlbeans.impl.jam.JClass;
+-import org.apache.xmlbeans.impl.jam.JParameter;
+-import org.apache.xmlbeans.impl.jam.JamClassLoader;
++import org.codehaus.jam.JMethod;
++import org.codehaus.jam.JClass;
++import org.codehaus.jam.JParameter;
++import org.codehaus.jam.JamClassLoader;
+ 
+ public class InterfaceExtensionImpl implements InterfaceExtension
+ {
+diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java
+--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java	2010-04-14 08:30:34.000000000 +0300
++++ src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java	2012-09-05 23:06:48.081760004 +0300
+@@ -17,9 +17,9 @@
+ 
+ import org.apache.xmlbeans.XmlObject;
+ import org.apache.xmlbeans.PrePostExtension;
+-import org.apache.xmlbeans.impl.jam.JamClassLoader;
+-import org.apache.xmlbeans.impl.jam.JClass;
+-import org.apache.xmlbeans.impl.jam.JMethod;
++import org.codehaus.jam.JamClassLoader;
++import org.codehaus.jam.JClass;
++import org.codehaus.jam.JMethod;
+ import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig;
+ 
+ 
+diff -Nru /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java
+--- /tmp/xmlbeans-2.6.0.orig/src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java	2010-04-14 08:30:34.000000000 +0300
++++ src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java	2012-09-05 23:06:33.710940667 +0300
+@@ -3,7 +3,7 @@
+ import javax.xml.namespace.QName;
+ 
+ import org.apache.xmlbeans.UserType;
+-import org.apache.xmlbeans.impl.jam.JamClassLoader;
++import org.codehaus.jam.JamClassLoader;
+ import org.apache.xmlbeans.impl.xb.xmlconfig.Usertypeconfig;
+ 
+ public class UserTypeImpl implements UserType
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch
new file mode 100644
index 000000000000..866dc0f6ed53
--- /dev/null
+++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch
@@ -0,0 +1,14 @@
+diff -ur /tmp/xmlbeans-2.6.0.orig/src/store/org/apache/xmlbeans/impl/store/Locale.java src/store/org/apache/xmlbeans/impl/store/Locale.java
+--- /tmp/xmlbeans-2.6.0.orig/src/store/org/apache/xmlbeans/impl/store/Locale.java	2012-09-05 14:31:47.743396340 +0300
++++ src/store/org/apache/xmlbeans/impl/store/Locale.java	2012-09-05 14:35:31.527582989 +0300
+@@ -106,8 +106,8 @@
+ import org.apache.xmlbeans.impl.values.TypeStoreUser;
+ import org.apache.xmlbeans.impl.values.TypeStoreUserFactory;
+ 
+-import org.apache.xmlbeans.impl.piccolo.xml.Piccolo;
+-import org.apache.xmlbeans.impl.piccolo.io.FileFormatException;
++import com.bluecast.xml.Piccolo;
++import com.bluecast.io.FileFormatException;
+ 
+ public final class Locale
+     implements DOMImplementation, SaajCallback, XmlLocale
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch
new file mode 100644
index 000000000000..23467d2b24a6
--- /dev/null
+++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch
@@ -0,0 +1,37 @@
+--- a/build.xml
++++ b/build.xml
+@@ -433,7 +433,6 @@
+         <jar jarfile="build/private/xmlbeans-${version.base}${version.rc}-sources.jar" index="false">
+             <fileset dir="src/common" includes="**/*.java"/>
+             <fileset dir="src/configschema" includes="**/*.java"/>
+-            <fileset dir="src/jamsupport" includes="**/*.java"/>
+             <fileset dir="src/marshal" includes="**/*.java"/>
+             <fileset dir="src/repackage" includes="**/*.java"/>
+             <fileset dir="src/saaj_api" includes="**/*.java"/>
+@@ -488,7 +487,7 @@
+                  store.classes, saaj_api.classes,
+                  marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
+                  xmlinputstream.classes, resolver.jar, xbean_xpath.jar,
+-                 piccolo.classes, tools.classes, jamsupport.classes">
++                 piccolo.classes, tools.classes">
+         <jar jarfile="build/lib/xbean.jar" index="true">
+             <fileset dir="build/classes/xmlpublic"
+                 excludes="javax/**"/>
+@@ -711,17 +710,6 @@
+             </classpath>
+         </javac>
+     </target>
+-
+-
+-    <!-- support for running JAM under JDK1.5 ========================= -->
+-
+-    <target name="jamsupport.classes" depends="dirs,jam.classes">
+-        <javac srcdir="src/jamsupport" destdir="build/classes/jam" source="${javac.source}" target="${javac.target}" debug="on">
+-            <classpath id="jamsupport.compile.path">
+-                <pathelement location="build/classes/jam"/>
+-            </classpath>
+-        </javac>
+-    </target>
+ 
+     <!-- saaj_api target ============================================== -->
+