public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/xml-xmlbeans/files/, dev-java/xml-xmlbeans/
@ 2015-11-11 22:57 Patrice Clement
  0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2015-11-11 22:57 UTC (permalink / raw
  To: gentoo-commits

commit:     c6510d1c32926384f9c60451e5831b0301fed07a
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 19:39:18 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 22:54:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6510d1c

dev-java/xml-xmlbeans: Add a patch to get compilation to work with Java 8.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../xml-xmlbeans-2.6.0-SchemaCompiler.java.patch   | 14 +++++
 dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild    | 71 +++++++++++++---------
 2 files changed, 55 insertions(+), 30 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 0000000..9f2958b
--- /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/xml-xmlbeans-2.6.0.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
index 95abb65..e947374 100644
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
-
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 MY_P="xmlbeans-${PV}"
 
@@ -16,24 +15,36 @@ SRC_URI="http://archive.apache.org/dist/xmlbeans/source/${MY_P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-COMMON_DEP="dev-java/annogen:0
-	dev-java/ant-core:0
+CDEPEND="
+	dev-java/saxon:9
 	dev-java/jsr173:0
+	dev-java/annogen:0
 	dev-java/piccolo:0
-	dev-java/saxon:9
+	dev-java/ant-core:0
 	dev-java/xml-commons-resolver:0"
 
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEP}"
+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
 
@@ -41,33 +52,34 @@ java_prepare() {
 	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}
+	find . -iname '*.zip' -exec rm -v {} + || die
 
-		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}
+	# Symlink the dependencies.
+	java-pkg_jar-from jsr173{,.jar,_1.0_api_bundle.jar}
+	java-pkg_jar-from jsr173{,.jar,_1.0_api.jar}
 
-		# Put back the preserved old xbean jar.
-		mv "${T}"/oldxbean.jar . || die
-	popd > /dev/null || die
+	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}
 
-	# Remove broken jamsupport.
-	epatch "${FILESDIR}"/${P}-remove-jamsupport.patch
+	# Put back the preserved old xbean jar.
+	mv "${T}"/oldxbean.jar . || die
 
-	# Patch package imports.
-	epatch "${FILESDIR}"/${P}-piccolo.patch
-	epatch "${FILESDIR}"/${P}-jam.patch
+	popd > /dev/null || die
 
 	# Create empty directories to let the build pass.
-	mkdir -p build/classes/{jam,piccolo}
+	mkdir -p build/classes/{jam,piccolo} || die
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="annogen,ant-core,piccolo,saxon-9"
+
+EANT_GENTOO_CLASSPATH="
+	annogen
+	piccolo
+	ant-core
+	saxon-9
+"
 
 EANT_BUILD_TARGET="deploy"
 EANT_DOC_TARGET="docs"
@@ -88,8 +100,7 @@ src_install() {
 	use source && java-pkg_dosrc src/*
 }
 
-pkg_postinst()
-{
+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."
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xml-xmlbeans/files/, dev-java/xml-xmlbeans/
@ 2016-03-06 13:01 James Le Cuirot
  0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2016-03-06 13:01 UTC (permalink / raw
  To: gentoo-commits

commit:     af65cd3cb940d24c4f10020fb1d72061e7db12f1
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 12:54:10 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 13:01:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af65cd3c

dev-java/xml-xmlbeans: Remove old, closes bug #542064

Package-Manager: portage-2.2.27

 dev-java/xml-xmlbeans/Manifest                     |   1 -
 .../xml-xmlbeans/files/xml-xmlbeans-gentoo.patch   | 156 ---------------------
 .../xml-xmlbeans-1.0.4_pre20041217-r1.ebuild       |  61 --------
 3 files changed, 218 deletions(-)

diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest
index 38726e0..a3efb24 100644
--- a/dev-java/xml-xmlbeans/Manifest
+++ b/dev-java/xml-xmlbeans/Manifest
@@ -1,2 +1 @@
-DIST xml-xmlbeans-20041217.tar.bz2 2436239 SHA256 c2a53c653c9f49e172e2c364fc8e111ad3d258f906bbd6b8c65ca0b3f0c57a68 SHA512 93f662a10a12948bace265a34a23e851c1210da8d8af5e699d0f51eb6d1959220eaee8f9072d1a33330217aec08321eac7bf91d8aaa160f56b751b0ab4408619 WHIRLPOOL 0fd5c098d5b1c2ca49d00b639f0a49c87f62f6c74bce1bdf4bcdfe3b77a833dbc9bd7ad99fc40ab2bfb5561ebfb253d0c74a13a03803ad8cfba9f2063e0016bb
 DIST xmlbeans-2.6.0-src.zip 9005098 SHA256 3dff52b0854236adbbff9dc76722372415cd9a8f406f6133886a6c5228595390 SHA512 162dc3d283ebf9f7fae823a2ae8d835b708c2cbeed48349c85996e60b2b8dfe0e51b17bd37eb34327c6452b2c0fc7df8a4902816b145993e36ca614ceb43b2b7 WHIRLPOOL cd775fa268e56aa02d744be67012d807e1cebf978d453610b48a8ca865f8d1587f27ced161d622d5d6ae0badab80de80ee4b46b7bf3bb753f69242c20d1e03d5

diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch
deleted file mode 100644
index 9f3a765..0000000
--- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -uprN xml-xmlbeans-20041217.orig/v1/build.xml xml-xmlbeans-20041217/v1/build.xml
---- xml-xmlbeans-20041217.orig/v1/build.xml	2004-12-24 13:27:42.347587336 +0100
-+++ xml-xmlbeans-20041217/v1/build.xml	2004-12-24 13:35:28.859666720 +0100
-@@ -340,7 +340,7 @@
-        srcdir="test/src/drt"
-        destdir="build/private/classes/drt"
-        classpathref="test.compile.path"
--       source="1.4"
-+       source="1.4" target="1.4"
-        debug="on"/>
-   </target>
- 
-@@ -372,7 +372,7 @@
- 
-   <target name="soaptest.classes" depends="dirs, stsschema.jar">
-     <mkdir dir="build/private/classes/soaptest"/>
--    <javac srcdir="test/src/soaptest" destdir="build/private/classes/soaptest" source="1.4" debug="on">
-+    <javac srcdir="test/src/soaptest" destdir="build/private/classes/soaptest" source="1.4" target="1.4" debug="on">
-       <classpath>
-         <pathelement location="external/lib/jdom.jar"/>
-         <pathelement location="external/lib/junit.jar"/>
-@@ -395,7 +395,7 @@
-        srcdir="test/src/erictest"
-        destdir="build/private/classes/erictest"
-        classpathref="test.compile.path"
--       source="1.4"
-+       source="1.4" target="1.4"
-        debug="on"/>
-   </target>
- 
-@@ -411,7 +411,7 @@
-        srcdir="test/src/random"
-        destdir="build/private/classes/random"
-        classpathref="test.compile.path"
--       source="1.4"
-+       source="1.4" target="1.4"
-        debug="on"/>
-   </target>
- 
-@@ -423,7 +423,7 @@
- 
-   <target name="teststore.classes" depends="dirs">
-     <mkdir dir="build/private/classes/teststore"/>
--    <javac srcdir="test/src/teststore" destdir="build/private/classes/teststore" source="1.4" debug="on">
-+    <javac srcdir="test/src/teststore" destdir="build/private/classes/teststore" source="1.4" target="1.4" debug="on">
-       <classpath>
-         <pathelement location="build/private/classes/simpletypes"/>
-         <pathelement location="build/private/classes/xmlcomp"/>
-@@ -557,7 +557,7 @@
-     <property name="docs.dir" value="build/docs"/>
-     <delete dir="${docs.dir}"/>
-     <mkdir dir="${docs.dir}"/>
--    <javadoc packagenames="*" sourcepath="src/xmlpublic" classpath="${javadoc.path}" destdir="${docs.dir}/reference" windowtitle="XMLBeans Documentation" source="1.4" stylesheetfile="docs/stylesheet.css">
-+    <javadoc packagenames="*" sourcepath="src/xmlpublic" classpath="${javadoc.path}" source="1.4" destdir="${docs.dir}/reference" windowtitle="XMLBeans Documentation" stylesheetfile="docs/stylesheet.css">
-       <link href="http://xml.apache.org/xmlbeans/docs/reference/index.html"/>
-       <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-       <link href="http://java.sun.com/j2ee/1.4/docs/api/"/>
-@@ -583,7 +583,7 @@
-       srcdir="test/src/streamtest"
-       destdir="build/private/classes/streamtest"
-       classpathref="test.compile.path"
--      source="1.4"
-+      source="1.4" target="1.4"
-       debug="on"/>
-   </target>
- 
-@@ -736,7 +736,7 @@
- 
-   <target name="xmlpublic.classes" depends="dirs, xmlinputstream.classes">
-     <mkdir dir="build/classes/xmlpublic"/>
--    <javac srcdir="src/xmlpublic" destdir="build/classes/xmlpublic" source="1.4" debug="on">
-+    <javac srcdir="src/xmlpublic" destdir="build/classes/xmlpublic" source="1.4" target="1.4" debug="on">
-       <classpath>
-         <pathelement location="build/classes/xmlinputstream"/>
-       </classpath>
-@@ -756,7 +756,7 @@
- 
-   <target name="typestore.classes" depends="dirs, xmlpublic.classes, common.classes, xmlinputstream.classes">
-     <mkdir dir="build/classes/typestore"/>
--    <javac srcdir="src/typestore" destdir="build/classes/typestore" source="1.4" debug="on">
-+    <javac srcdir="src/typestore" destdir="build/classes/typestore" source="1.4" target="1.4" debug="on">
-       <classpath>
-         <pathelement location="build/classes/xmlinputstream"/>
-         <pathelement location="build/classes/xmlpublic"/>
-@@ -770,7 +770,7 @@
- 
-   <target name="common.classes" depends="dirs, xmlpublic.jar, xmlinputstream.classes">
-     <mkdir dir="build/classes/common"/>
--    <javac srcdir="src/common" destdir="build/classes/common" source="1.4" debug="on">
-+    <javac srcdir="src/common" destdir="build/classes/common" source="1.4" target="1.4" debug="on">
-       <classpath>
-         <pathelement location="build/classes/xmlinputstream"/>
-         <pathelement location="build/lib/xmlpublic.jar"/>
-@@ -783,7 +783,7 @@
- 
-   <target name="typeimpl.classes" depends="dirs, repackage.classes, xmlpublic.classes, typestore.classes, xsdschema.classes, configschema.classes, toolschema.classes">
-     <mkdir dir="build/classes/typeimpl"/>
--    <javac destdir="build/classes/typeimpl" source="1.4" debug="on">
-+    <javac destdir="build/classes/typeimpl" source="1.4" target="1.4" debug="on">
-       <classpath>
-         <pathelement location="build/classes/xmlinputstream"/>
-         <pathelement location="build/classes/common"/>
-@@ -816,7 +816,7 @@
- 
-   <target name="xmlcomp.classes" depends="dirs, repackage.classes, typeimpl.classes, xmlpublic.classes, typestore.classes">
-     <mkdir dir="build/classes/xmlcomp"/>
--    <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="1.4" debug="on">
-+    <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="1.4" target="1.4" debug="on">
-       <classpath>
-         <pathelement location="build/classes/xmlinputstream"/>
-         <pathelement location="build/classes/xmlpublic"/>
-@@ -837,7 +837,7 @@
-   <target name="xmlstore.classes"
-         depends="dirs, common.classes, typestore.classes, xmlpublic.classes">
-     <mkdir dir="build/classes/xmlstore"/>
--    <javac srcdir="src/xmlstore" destdir="build/classes/xmlstore" source="1.4" debug="on">
-+    <javac srcdir="src/xmlstore" destdir="build/classes/xmlstore" source="1.4" target="1.4" debug="on">
-       <classpath id="xmlstore.compile.path">
-         <pathelement location="build/classes/xmlinputstream"/>
-         <pathelement location="build/classes/typestore"/>
-@@ -916,7 +916,7 @@
- 
-   <target name="xmlconfig.classes" depends="dirs, xmlpublic.jar, configschema.classes">
-     <mkdir dir="build/classes/xmlconfig"/>
--    <javac srcdir="src/xmlconfig" destdir="build/classes/xmlconfig" source="1.4" debug="on">
-+    <javac srcdir="src/xmlconfig" destdir="build/classes/xmlconfig" source="1.4" target="1.4" debug="on">
-       <classpath>
-         <pathelement location="build/lib/xmlpublic.jar"/>
-         <pathelement location="build/classes/configschema"/>
-@@ -1044,7 +1044,7 @@
- 
-     <target name="repackage.classes">
-         <mkdir dir="build/classes/repackage"/>
--        <javac srcdir="src/repackage" destdir="build/classes/repackage" source="1.4" debug="on"/>
-+        <javac srcdir="src/repackage" destdir="build/classes/repackage" source="1.4" target="1.4" debug="on"/>
-     </target>
- 
-    <target name="check.jaxen.jar">
-@@ -1068,7 +1068,7 @@
-        srcdir="src/xpath"
-        destdir="build/private/classes/xpath"
-        classpathref="xpath.compile.path"
--       source="1.4"
-+       source="1.4" target="1.4"
-        debug="on">
-       <classpath id="xpath.compile.path">
-           <pathelement location="build/lib/xmlpublic.jar"/>
-@@ -1090,7 +1090,7 @@
-        srcdir="test/src/xpath"
-        destdir="build/private/classes/testxpath"
-        classpathref="testxpath.compile.path"
--       source="1.4"
-+       source="1.4" target="1.4"
-        debug="on">
-       <classpath id="testxpath.compile.path">
-           <pathelement location="build/lib/xmlpublic.jar"/>

diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
deleted file mode 100644
index 19c0e73..0000000
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_P="${PN}-20041217"
-
-DESCRIPTION="An XML-Java binding tool"
-HOMEPAGE="http://xmlbeans.apache.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-java/jaxen:1.1
-	dev-java/ant-core:0"
-RDEPEND="${COMMON_DEPEND}
-	>=virtual/jre-1.4"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/jdk-1.4"
-
-S="${WORKDIR}/${MY_P}/v1"
-
-java_prepare() {
-	epatch "${FILESDIR}/xml-xmlbeans-gentoo.patch"
-	java-ant_rewrite-classpath build.xml
-
-	cd "${S}"/external/lib
-	#TODO: includes and old copy named oldxbean.jar
-	#that probably should not be used
-	#rm -v *.jar
-
-	java-pkg_jar-from jaxen-1.1 jaxen.jar jaxen-1.1-beta-2.jar
-	java-pkg_filter-compiler jikes
-}
-
-src_compile() {
-	eant xbean.jar $(use_doc docs) \
-		-Dgentoo.classpath=$(java-pkg_getjars ant-core)
-}
-
-# Tests always seem to fail #100895
-
-src_install() {
-	java-pkg_dojar build/lib/xbean*.jar
-
-	dodoc CHANGES.txt 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/*
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/xml-xmlbeans/files/, dev-java/xml-xmlbeans/
@ 2021-08-09  5:31 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2021-08-09  5:31 UTC (permalink / raw
  To: gentoo-commits

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>java@gentoo.org</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."
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-08-09  5:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-06 13:01 [gentoo-commits] repo/gentoo:master commit in: dev-java/xml-xmlbeans/files/, dev-java/xml-xmlbeans/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2021-08-09  5:31 Miroslav Šulc
2015-11-11 22:57 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox