[gentoo-commits] repo/gentoo:master commit in: dev-java/xml-xmlbeans/files/, dev-java/xml-xmlbeans/

[James Le Cuirot]

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/*
-}