From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/xml-xmlbeans/Manifest | 7 ++ .../xml-xmlbeans-2.6.0-SchemaCompiler.java.patch | 14 +++ .../files/xml-xmlbeans-2.6.0-jam.patch | 64 +++++++++++++ .../files/xml-xmlbeans-2.6.0-piccolo.patch | 14 +++ .../xml-xmlbeans-2.6.0-remove-jamsupport.patch | 37 ++++++++ dev-java/xml-xmlbeans/metadata.xml | 25 +++++ dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild | 105 +++++++++++++++++++++ 7 files changed, 266 insertions(+) create mode 100644 dev-java/xml-xmlbeans/Manifest create mode 100644 dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch create mode 100644 dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch create mode 100644 dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch create mode 100644 dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch create mode 100644 dev-java/xml-xmlbeans/metadata.xml create mode 100644 dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild (limited to 'dev-java/xml-xmlbeans') diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest new file mode 100644 index 000000000000..41567bbec037 --- /dev/null +++ b/dev-java/xml-xmlbeans/Manifest @@ -0,0 +1,7 @@ +AUX xml-xmlbeans-2.6.0-SchemaCompiler.java.patch 802 BLAKE2B 472a1d8cc749b0fe9689eb1eeabd12244397cad290daae41c8ae5b918502377d0ecb7c30d7952bc005ca9f5dae99f2dde1da3c04c47665904bb516717249ea33 SHA512 24ff76b5c046ac1e1837e75f7a3becbb64acf5966f584215e99d1b0f47a3ac5465ae53746d97ad8246f352452db7722e6135e95b660fda1d02010c4ec87a88ea +AUX xml-xmlbeans-2.6.0-jam.patch 3594 BLAKE2B 426b7a1d4051aa029abe56f377604216f0c64523867267d892ba2dde70fbb3b0600bf522e387a99e64d5582e3610dca65478c834a95bca9cbe80903cb71d3dc0 SHA512 e105cbd5efa08f80685d506dc22a6e9a1ef29df78cd6ca64f3de1a70a7ea93dad4e51f93ee38fcf73a823f01fe50981c4693d619fdad67cdd481279f64ad4a5c +AUX xml-xmlbeans-2.6.0-piccolo.patch 776 BLAKE2B e7a7795099c710a249136e3831c0f5198e4b41c03709445e0917508cbe82d5d84558a8b8e309937cd3926062ef60a260d400e61d7e8182537f3dcc6529f7ee2c SHA512 e32ac926cae60ff5d10e0647988c3dcfea986a9b0cab9667dd3c73bad6b49fb74585350022b43e24dbc30fef09d87823210e9dc38e830486145924904431e6be +AUX xml-xmlbeans-2.6.0-remove-jamsupport.patch 1656 BLAKE2B 35ef1a12f1e8c4dbf03ac3870b714fc246cc81d609aa7453ac5755476fe8a1fe7d46fb7e8e725cbdd06282cebbdb0c6ab85c394202004f7e91dcff54545bc827 SHA512 54b570f2960340eecf4368caeaf5d7c84ece7e691bda7460532d5d778e78a6b41a7e776de02b53fa5d5385f66639353758d76d710c1c3e2332ceb2854b9c84fe +DIST xmlbeans-2.6.0-src.zip 9005098 BLAKE2B e8fb7b22eab718245a24856893268dbc1a09b3228596f274e470ea55aca4c0d01c05ef8e3cbd2ddbdedfd16c66991ee5f8c4001cb68ff9876d5749f47d640006 SHA512 162dc3d283ebf9f7fae823a2ae8d835b708c2cbeed48349c85996e60b2b8dfe0e51b17bd37eb34327c6452b2c0fc7df8a4902816b145993e36ca614ceb43b2b7 +EBUILD xml-xmlbeans-2.6.0.ebuild 2339 BLAKE2B 9ce6a87c268fe18b0ff45f6053ccafaa716197d4421fbdfc8283a9d27ab9365f40edbe7bd922cc79c9c1010db759b751fbe0133efd801c6b26122800f9a7e23c SHA512 4a8a0c89c1c537cd9b6a30bb526761f2b06c95d80442397293c05be145e37f8989ce57ce397757c13f780610e3a989ba0f44e7673f6586a34ce36051e83324a2 +MISC metadata.xml 1185 BLAKE2B 0647d5d81e325691c54342510e249e98b26e07157d5f892d5b34ed54be045a7971ec925825afe9062d38bf5278bb316385c2e46901f6b65890cab3559b30897c SHA512 5f4554c860fb8b6b2bcf0b7cb8b0f8f147c187091cd64597aede3a3543570f586eb3c0fa4d69e2e2391bd5e839bb8ab089d05a05099554d206691c120c9321ff 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 @@ + + + +- + + + +@@ -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"> + + +@@ -711,17 +710,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- + + + diff --git a/dev-java/xml-xmlbeans/metadata.xml b/dev-java/xml-xmlbeans/metadata.xml new file mode 100644 index 000000000000..16bd04df50d9 --- /dev/null +++ b/dev-java/xml-xmlbeans/metadata.xml @@ -0,0 +1,25 @@ + + + + + java@gentoo.org + Java + + + + +XMLBeans is a tool that allows you to access the full power of XML in a Java +friendly way. It is an XML-Java binding tool. The idea is that you can take +advantage the richness and features of XML and XML Schema and have these +features mapped as naturally as possible to the equivalent Java language and +typing constructs. XMLBeans uses XML Schema to compile Java interfaces and +classes that you can then use to access and modify XML instance data. Using +XMLBeans is similar to using any other Java interface/class, you will see things +like getFoo or setFoo just as you would expect when working with Java. While a +major use of XMLBeans is to access your XML instance data with strongly typed +Java classes there are also API's that allow you access to the full XML infoset +(XMLBeans keeps full XML Infoset fidelity) as well as to allow you to reflect +into the XML schema itself through an XML Schema Object model. + + + diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild new file mode 100644 index 000000000000..caeeefcb60e9 --- /dev/null +++ b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +MY_P="xmlbeans-${PV}" + +DESCRIPTION="An XML-Java binding tool" +HOMEPAGE="http://xmlbeans.apache.org/" +SRC_URI="http://archive.apache.org/dist/xmlbeans/source/${MY_P}-src.zip" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64 ~ppc64 ~x86" + +CDEPEND=" + dev-java/saxon:9 + dev-java/jsr173:0 + dev-java/annogen:0 + dev-java/piccolo:0 + dev-java/ant-core:0 + dev-java/xml-commons-resolver:0" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.6" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${P}-remove-jamsupport.patch + "${FILESDIR}"/${P}-piccolo.patch + "${FILESDIR}"/${P}-jam.patch + "${FILESDIR}"/${P}-SchemaCompiler.java.patch +) + +java_prepare() { + epatch "${PATCHES[@]}" + + # Preserve the old xbean jar, which is required for bootstrapping schemas. + mv external/lib/oldxbean.jar "${T}"/ || die + + # Remove bundled binary files. + find . -name '*.jar' -exec rm -v {} + || die + + pushd external/lib > /dev/null || die + + find . -iname '*.zip' -exec rm -v {} + || die + + # Symlink the dependencies. + java-pkg_jar-from jsr173{,.jar,_1.0_api_bundle.jar} + java-pkg_jar-from jsr173{,.jar,_1.0_api.jar} + + mkdir xml-commons-resolver-1.1 || die + java-pkg_jar-from xml-commons-resolver{,.jar} xcresolver.zip + java-pkg_jar-from xml-commons-resolver{,.jar,-1.1/resolver.jar} + + # Put back the preserved old xbean jar. + mv "${T}"/oldxbean.jar . || die + + popd > /dev/null || die + + # Create empty directories to let the build pass. + mkdir -p build/classes/{jam,piccolo} || die +} + +JAVA_ANT_REWRITE_CLASSPATH="true" + +EANT_GENTOO_CLASSPATH=" + annogen + piccolo + ant-core + saxon-9 +" + +EANT_BUILD_TARGET="deploy" +EANT_DOC_TARGET="docs" + +EANT_EXTRA_ARGS="-Dpiccolo.classes.notRequired=true" +EANT_EXTRA_ARGS+=" -Djam.classes.notRequired=true" +EANT_EXTRA_ARGS+=" -Dsaxon9.jar.exists=true" + +src_install() { + java-pkg_dojar build/lib/xbean*.jar + + dodoc NOTICE.txt README.txt + if use doc; then + java-pkg_dojavadoc build/docs/reference + java-pkg_dohtml -r docs + fi + + use source && java-pkg_dosrc src/* +} + +pkg_postinst() { + ewarn "This package uses an old binary xbean to bootstrap its schemas." + ewarn "If you do not trust the binary part of this build, please unmerge." +} -- cgit v1.2.3