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

[Andrew John Hughes]

commit:     d8923e042e8efb06b1870cc9209e473d5f0fbaaa
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Sun Sep 29 20:16:48 2013 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Sun Sep 29 20:16:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=d8923e04

jsr173 is already provided by the dependency on a 1.6 JDK.

Package-Manager: portage-2.2.6
Manifest-Sign-Key: 248BDC07

---
 dev-java/xml-xmlbeans/ChangeLog                    | 152 +++++++++++++++++++++
 dev-java/xml-xmlbeans/Manifest                     |  27 ++++
 .../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                 |  23 ++++
 dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild    |  93 +++++++++++++
 7 files changed, 410 insertions(+)

diff --git a/dev-java/xml-xmlbeans/ChangeLog b/dev-java/xml-xmlbeans/ChangeLog
new file mode 100644
index 0000000..a0c8a38
--- /dev/null
+++ b/dev-java/xml-xmlbeans/ChangeLog
@@ -0,0 +1,152 @@
+# ChangeLog for dev-java/xml-xmlbeans
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/ChangeLog,v 1.35 2013/09/17 17:15:56 tomwij Exp $
+
+*xml-xmlbeans-2.6.0 (17 Sep 2013)
+
+  17 Sep 2013; Tom Wijsman <TomWij@g.o>
+  +files/xml-xmlbeans-2.6.0-jam.patch, +files/xml-xmlbeans-2.6.0-piccolo.patch,
+  +files/xml-xmlbeans-2.6.0-remove-jamsupport.patch, +xml-xmlbeans-2.6.0.ebuild:
+  Version bump to 2.6.0, imported from dmol overlay; made additional adjustments
+  like adding missing dependencies and simplifying maintenance. Fixes bug
+  #173129. Thanks to Kim, Arfrever, Karsten, dmol and Java herd for helping.
+
+  28 Jul 2013; Fabian Groffen <grobian@g.o>
+  xml-xmlbeans-1.0.4_pre20041217-r1.ebuild:
+  Marked ~x64-macos, bug #435528
+
+  05 Feb 2013; Rick Farina <zerochaos@g.o>
+  xml-xmlbeans-1.0.4_pre20041217-r1.ebuild,
+  xml-xmlbeans-1.0.4_pre20041217.ebuild:
+  adding ~arm
+
+*xml-xmlbeans-1.0.4_pre20041217-r1 (13 Jan 2013)
+
+  13 Jan 2013; Ralph Sennhauser <sera@g.o>
+  +xml-xmlbeans-1.0.4_pre20041217-r1.ebuild:
+  Don't leak jre into DEPND, may confuse vm switching code. #432904
+  EAPI bump, use slot deps and java_prepare.
+
+  15 Apr 2012; Mike Frysinger <vapier@g.o>
+  xml-xmlbeans-1.0.4_pre20041217.ebuild:
+  Add back ia64 love #349020 by Dennis Schridde.
+
+  01 Jan 2012; Ralph Sennhauser <sera@g.o>
+  xml-xmlbeans-1.0.4_pre20041217.ebuild:
+  Drop ia64 support #345433
+
+  24 Apr 2010; Fabian Groffen <grobian@g.o>
+  xml-xmlbeans-1.0.4_pre20041217.ebuild:
+  Marked ~sparc-solaris ~x86-solaris, bug #314093
+
+  03 Jan 2010; Christian Faulhammer <fauli@g.o>
+  xml-xmlbeans-1.0.4_pre20041217.ebuild:
+  Transfer Prefix keywords
+
+  23 May 2007; Diego Pettenò <flameeyes@g.o> ChangeLog:
+  Add ~x86-fbsd keyword. Bug #176906.
+
+  09 May 2007; Raúl Porcel <armin76@g.o>
+  xml-xmlbeans-1.0.4_pre20041217.ebuild:
+  Add ~ia64 wrt #160813
+
+*xml-xmlbeans-1.0.4_pre20041217 (09 May 2007)
+
+  09 May 2007; Vlastimil Babka <caster@g.o>
+  +xml-xmlbeans-1.0.4_pre20041217.ebuild, -xml-xmlbeans-20041217-r1.ebuild:
+  Change version to one that will allow future bump. Will seems like a
+  downgrade, that's fine.
+
+  25 Apr 2007; Petteri Räty <betelgeuse@g.o>
+  xml-xmlbeans-20041217-r1.ebuild:
+  Add dev-java/ant-core to RDEPEND.
+
+  25 Apr 2007; Petteri Räty <betelgeuse@g.o>
+  -xml-xmlbeans-20041217.ebuild:
+  Remove generation 1 ebuild.
+
+  15 Apr 2007; Markus Rothe <corsair@g.o>
+  xml-xmlbeans-20041217-r1.ebuild:
+  Stable on ppc64
+
+  06 Apr 2007; Petteri Räty <betelgeuse@g.o>
+  xml-xmlbeans-20041217-r1.ebuild:
+  Mark stable on amd64 wrt bug #173559.
+
+  06 Apr 2007; nixnut <nixnut@g.o> xml-xmlbeans-20041217-r1.ebuild:
+  Stable on ppc wrt bug 173559
+
+  06 Apr 2007; Christian Faulhammer <opfer@g.o>
+  xml-xmlbeans-20041217-r1.ebuild:
+  filter jikes and stable x86, bug 173559
+
+  14 Feb 2007; Markus Rothe <corsair@g.o>
+  xml-xmlbeans-20041217-r1.ebuild:
+  Added ~ppc64
+
+  21 Jan 2007; Diego Pettenò <flameeyes@g.o>
+  xml-xmlbeans-20041217-r1.ebuild:
+  Add ~x86-fbsd keyword (see the various bugs for netbeans 5.5-r2).
+
+*xml-xmlbeans-20041217-r1 (26 Dec 2006)
+
+  26 Dec 2006; Petteri Räty <betelgeuse@g.o>
+  +xml-xmlbeans-20041217-r1.ebuild:
+  Migrated to generation 2.
+
+  05 Oct 2006; Gustavo Zacarias <gustavoz@g.o>
+  xml-xmlbeans-20041217.ebuild:
+  Dropping sparc keywords, see #96229
+
+  11 Mar 2006; Michael Hanselmann <hansmi@g.o>
+  xml-xmlbeans-20041217.ebuild:
+  Stable on ppc.
+
+  11 Sep 2005; Thomas Matthijs <axxo@g.o>
+  xml-xmlbeans-20041217.ebuild:
+  Disable junit #100895
+
+  22 Aug 2005; Gustavo Zacarias <gustavoz@g.o>
+  xml-xmlbeans-20041217.ebuild:
+  Stable on sparc
+
+  20 Jul 2005; Gustavo Zacarias <gustavoz@g.o>
+  xml-xmlbeans-20041217.ebuild:
+  Gimme ~sparc
+
+  09 Jul 2005; Thomas Matthijs <axxo@g.o>
+  xml-xmlbeans-20041217.ebuild:
+  fix deps
+
+  12 Jun 2005; Jan Brinkmann <luckyduck@g.o>
+  xml-xmlbeans-20041217.ebuild:
+  Updated dev-java/jaxen dependency.
+
+  16 May 2005; Jan Brinkmann <luckyduck@g.o>
+  xml-xmlbeans-20041217.ebuild:
+  stable on amd64 and x86, added ~ppc to KEYWORDS
+
+  16 Mar 2005; Jan Brinkmann <luckyduck@g.o>
+  xml-xmlbeans-20041217.ebuild:
+  xml-xmlbeans now makes use of java-pkg_dosrc
+
+  10 Jan 2005; Jan Brinkmann <luckyduck@g.o>
+  xml-xmlbeans-20041217.ebuild:
+  finally fixed the junit dependency nightmare. fixes #77097.
+
+  08 Jan 2005; Jan Brinkmann <luckyduck@g.o>
+  xml-xmlbeans-20041217.ebuild:
+  updated ant dependency because junit needs ant-tasks. fixes #77097.
+
+  03 Jan 2005; Jan Brinkmann <luckyduck@g.o> xml-xmlbeans-20041217.ebuild:
+  Updated junit dependency and added source useflag. Fixes #75906
+
+  24 Dec 2004; Thomas Matthijs <axxo@g.o>
+  files/xml-xmlbeans-gentoo.patch, xml-xmlbeans-20041217.ebuild:
+  fix #75528
+
+*xml-xmlbeans-20041217 (19 Dec 2004)
+
+  19 Dec 2004; Karl Trygve Kalleberg <karltk@g.o> xml-xmlbeans-20041217.ebuild:
+  Initial import. Ebuild submitted by the wunderbar Jan Brinkmann 
+  <lucky@×××××××××××××.de>. Fixes #74818.

diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest
new file mode 100644
index 0000000..c3d23dd
--- /dev/null
+++ b/dev-java/xml-xmlbeans/Manifest
@@ -0,0 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xml-xmlbeans-2.6.0-jam.patch 3594 SHA256 440288ae1446735835c8a86607854d8c0025ee369db8601360ca4107e4a8e2f8 SHA512 e105cbd5efa08f80685d506dc22a6e9a1ef29df78cd6ca64f3de1a70a7ea93dad4e51f93ee38fcf73a823f01fe50981c4693d619fdad67cdd481279f64ad4a5c WHIRLPOOL 19a7adfc0a4af24c483dd6ca40546ee7dc8ba1ea32dbd87682a90a811879ee8afc5eb88104e64a0eaf74d7d3b51feacd70866150f9cbc5971de489779515f20d
+AUX xml-xmlbeans-2.6.0-piccolo.patch 776 SHA256 059abe55f5503db3ce678915afcb160ad1a048ee22e93c3d2904151575388c64 SHA512 e32ac926cae60ff5d10e0647988c3dcfea986a9b0cab9667dd3c73bad6b49fb74585350022b43e24dbc30fef09d87823210e9dc38e830486145924904431e6be WHIRLPOOL 21b650ea7278414c07ffbc293c94129dd1ea570f0c7e3d774e940b4802ba596335f1a3f18e2774f73d408ebe51b82e5f4a80a2ab02b711421dcc65defc7838b0
+AUX xml-xmlbeans-2.6.0-remove-jamsupport.patch 1656 SHA256 35c4f2166821d92927609357e391c8fdd1b897a7ec2eb33988ea3d7f70f854f4 SHA512 54b570f2960340eecf4368caeaf5d7c84ece7e691bda7460532d5d778e78a6b41a7e776de02b53fa5d5385f66639353758d76d710c1c3e2332ceb2854b9c84fe WHIRLPOOL a67e0a8e0a3428e440ca71ba80632db14910e4580da3747c3063f22b2eda4dd29df7d473fd14f834efcb8ecfccd3d2a0cf6e57050879c9fd957c265e9b0e27ad
+DIST xmlbeans-2.6.0-src.zip 9005098 SHA256 3dff52b0854236adbbff9dc76722372415cd9a8f406f6133886a6c5228595390 SHA512 162dc3d283ebf9f7fae823a2ae8d835b708c2cbeed48349c85996e60b2b8dfe0e51b17bd37eb34327c6452b2c0fc7df8a4902816b145993e36ca614ceb43b2b7 WHIRLPOOL cd775fa268e56aa02d744be67012d807e1cebf978d453610b48a8ca865f8d1587f27ced161d622d5d6ae0badab80de80ee4b46b7bf3bb753f69242c20d1e03d5
+EBUILD xml-xmlbeans-2.6.0.ebuild 2444 SHA256 82e08f55c0404204cd71018bdda95dda9162e483b0e6ae333dbc2b2d7599323a SHA512 13b0a94b10e9d00c0c0229cc8970970c97d779567cac0be1a2562256a58b3746c166c051c7181755a79c1ae3a932a8fd6fbb1ff70c83afa618e43ae340b5268b WHIRLPOOL fe5e8f61173dee3e73619dc253c2c01e0c4da3a66b1aaa1766ba81c1de657d7f57086c105b3218c8d8e69a63919aafe42876b26d8c43b2076f3688b68333bac2
+MISC ChangeLog 5215 SHA256 b04d66cac7bc0af653cac1a8dacc69bc12504eec682ecd17d5b6672863814216 SHA512 beaae4c2d8f1853458722951f561be79d4f1762c6e2e0d0d829ca9cc6c0a5c6d38ad574af441e36df508584ff4084b8b81878306cea2fef9d096009599133fc3 WHIRLPOOL ac68e53cccd0a4d448964c8273011ba27a44f9914bd2a3e2f2ec0be0f446d51983ed53fc4560fb1375465906b37a55a9398c0c497dc4b86ecc3afa98674ebfcc
+MISC metadata.xml 1111 SHA256 767522bfb4c752e9c8a6bd07bcf61429d5340554933cfd39634536d300c4ec7e SHA512 9b9205f9a53fd6c6ea9340346344a9abe5772eb5e8906f1057d9901a667337a9391f9a216c60a43660255d780944fcad5dec6bc6bffe4b771473b357431019c8 WHIRLPOOL 740682bff0b742d1f8ceab3d695413f2de91a59f1e39159e5f0d1cfbe403de93c2f2dc8feca772a15af590ac286d5f185046624284e83ab1d46f202b82e8ab20
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSSIqwAAoJEDuWpXgki9wHjfIQAJLr7BjGNRbb0qbnilzi6lji
+qA1J6m9BiJXLT37W8zaDQUzFPC4X0MEntnSawsf11MTinRfSvwxRwAK0bmqFf8r3
+nwF5wD0aFzcTjdr45Cv+vug/ZOnf15Y9lEhhVIMwnTT72QAPIGsd5bVGaRAC87D2
+0gINQgSQ8KL1k4D2qyd0CySoGRAUXPDpfJ9ZtAqfc7pU7BlP1551Z8puc1yiSk3x
+tAT3fJThIGiwdSnyq7mkGNhQ/ooF7oxACbKmtGemGrhg5PgF8FnxveUEnyfpRaIj
+m4mPkbQW7sYlDGDyvMVGdemDYJwOWTaDAn7rqfZwhBaM40Zft0xZxup4137Oyytl
+rGfDLmKiU9n1cXbtwGQ4pd/oknarpAhrYZZTQHAWtU1wqAZ1Lz+ECm39ILzbhrR2
+GPF9vxLmuyAMe850K9taDeCzL5191A8wBHuJU4bXBelFMHhhST9Dw+xna9eUwrMn
+P9lBnDuyWqdvLTpHUJrhKk5uXMLHD+O/+W3rNvFYpmrxRkVpszIUdyKyWdNuRfkd
+pYBCYxmf3TOEU6bJ7fDEg4NHOi12Ih3HvvMk6fBRq1/0rH6L5ven/89l2BUGjQi+
+SzTnT5RKxP6SVY+MZw6Vof6JeXsPHVA3Wx+9M51EcjvrqnE9MqRIcvCPPwhhM0we
++fZE4DasYzSixRtKYBao
+=eJ11
+-----END PGP SIGNATURE-----

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 0000000..8081f71
--- /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 0000000..866dc0f
--- /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 0000000..23467d2
--- /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 ============================================== -->
+ 

diff --git a/dev-java/xml-xmlbeans/metadata.xml b/dev-java/xml-xmlbeans/metadata.xml
new file mode 100644
index 0000000..3f89838
--- /dev/null
+++ b/dev-java/xml-xmlbeans/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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
new file mode 100644
index 0000000..7f479f6
--- /dev/null
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild,v 1.1 2013/09/17 17:15:56 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils 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"
+
+COMMON_DEP="dev-java/annogen:0
+	dev-java/ant-core:0
+	dev-java/piccolo:0
+	dev-java/saxon:9
+	dev-java/xml-commons-resolver:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	# 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.
+		ln -s ${JAVA_HOME}/jre/lib/rt.jar jsr173_1.0_api_bundle.jar
+		ln -s ${JAVA_HOME}/jre/lib/rt.jar jsr173_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
+
+	# Remove broken jamsupport.
+	epatch "${FILESDIR}"/${P}-remove-jamsupport.patch
+
+	# Patch package imports.
+	epatch "${FILESDIR}"/${P}-piccolo.patch
+	epatch "${FILESDIR}"/${P}-jam.patch
+
+	# Create empty directories to let the build pass.
+	mkdir -p build/classes/{jam,piccolo}
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="annogen,ant-core,piccolo,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."
+}