commit: f3f254610fff7084fd31de7dc701f8c34566d5d0 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sun Aug 8 10:45:06 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Aug 9 05:31:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f25461
dev-java/xml-xmlbeans: remove last rited package Closes: https://bugs.gentoo.org/489486 Closes: https://bugs.gentoo.org/796587 Closes: https://bugs.gentoo.org/765451 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/xml-xmlbeans/Manifest | 1 - .../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 | 106 --------------------- 7 files changed, 261 deletions(-) diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest deleted file mode 100644 index 27b8c478340..00000000000 --- a/dev-java/xml-xmlbeans/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xmlbeans-2.6.0-src.zip 9005098 BLAKE2B e8fb7b22eab718245a24856893268dbc1a09b3228596f274e470ea55aca4c0d01c05ef8e3cbd2ddbdedfd16c66991ee5f8c4001cb68ff9876d5749f47d640006 SHA512 162dc3d283ebf9f7fae823a2ae8d835b708c2cbeed48349c85996e60b2b8dfe0e51b17bd37eb34327c6452b2c0fc7df8a4902816b145993e36ca614ceb43b2b7 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 deleted file mode 100644 index 9f2958bc243..00000000000 --- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-SchemaCompiler.java.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 deleted file mode 100644 index 8081f71775f..00000000000 --- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-jam.patch +++ /dev/null @@ -1,64 +0,0 @@ -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 deleted file mode 100644 index 866dc0f6ed5..00000000000 --- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-piccolo.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 23467d2b24a..00000000000 --- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-2.6.0-remove-jamsupport.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- 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 ============================================== --> - diff --git a/dev-java/xml-xmlbeans/metadata.xml b/dev-java/xml-xmlbeans/metadata.xml deleted file mode 100644 index 16bd04df50d..00000000000 --- a/dev-java/xml-xmlbeans/metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Java</name> -</maintainer> - -<longdescription> - -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. - -</longdescription> -</pkgmetadata> diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild deleted file mode 100644 index 9c2f973e212..00000000000 --- a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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="https://xmlbeans.apache.org/"; -SRC_URI="https://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} - app-arch/unzip - >=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." -}
