Update to close #17765 and #20712.

5 files changed, 88 insertions, 3 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index bec57d266321..00e2bcdff3f5 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.9 2003/04/06 08:19:27 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.10 2003/05/26 09:36:45 absinthe Exp $
+
+*xerces-2.3.0-r1 (26 May 2003)
+
+  26 May 2003; Dylan Carlson <absinthe@gentoo.org> xerces-2.3.0-r1.ebuild,
+  files/xerces-2.3.0-gentoo.diff:
+  Update to include fix for Blackdown compile bug, addressed by Voicu Liviu
+  <pacman@huji.ac.il> in #20712 (thank you). Also closes #17765.
 
 *xerces-2.3.0 (09 Mar 2003)
 
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index efec9dd20de4..ffe7ec69cefb 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,6 +1,6 @@
 MD5 1c5e230d8f40d149069d7d830511f94b xerces-2.3.0.ebuild 979
-MD5 49ee8682659b2dd2df191c37ab1685b6 xerces-2.3.0-r1.ebuild 1210
-MD5 2a0e8f15f6d187244fbb5a76feb2704b ChangeLog 2028
+MD5 0d507175afd89b7b3eaf24f378a0bf27 xerces-2.3.0-r1.ebuild 1213
+MD5 6959daa48ed6f5ffad5b8e4a520a2ce6 ChangeLog 2029
 MD5 0ed5652de5f404a3fefb774b2b1a8538 files/digest-xerces-2.3.0-r1 144
 MD5 0aecf5f2232e04fb4067f5f67b41d810 files/xerces-2.3.0-gentoo.diff 1418
 MD5 292bf76be10447bbda6f482a0b2101ea files/digest-xerces-2.3.0 206
diff --git a/dev-java/xerces/files/digest-xerces-2.3.0-r1 b/dev-java/xerces/files/digest-xerces-2.3.0-r1
new file mode 100644
index 000000000000..8bf3fa2e2584
--- /dev/null
+++ b/dev-java/xerces/files/digest-xerces-2.3.0-r1
@@ -0,0 +1,2 @@
+MD5 fd7e2b41e6f7a4571215a48d2abe9041 Xerces-J-src.2.3.0.tar.gz 1556920
+MD5 4bb1d3b58fe7ec986d110574e5affb6c Xerces-J-tools.2.3.0.tar.gz 3655640
diff --git a/dev-java/xerces/files/xerces-2.3.0-gentoo.diff b/dev-java/xerces/files/xerces-2.3.0-gentoo.diff
new file mode 100644
index 000000000000..d974c3578aa4
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.3.0-gentoo.diff
@@ -0,0 +1,33 @@
+--- xerces-2_3_0/src/org/apache/html/dom/HTMLFrameElementImpl.java	2003-05-09 14:15:04.000000000 +0300
++++ xerces-2_3_0/src/org/apache/html/dom/HTMLFrameElementImpl.java.new	2003-05-09 14:14:56.000000000 +0300
+@@ -67,7 +67,7 @@
+  * @see org.w3c.dom.html.HTMLFrameElement
+  * @see org.apache.xerces.dom.ElementImpl
+  */
+-public class HTMLFrameElementImpl
++public abstract class HTMLFrameElementImpl
+     extends HTMLElementImpl
+     implements HTMLFrameElement
+ {
+--- xerces-2_3_0/src/org/apache/html/dom/HTMLIFrameElementImpl.java	2003-05-09 14:14:45.000000000 +0300
++++ xerces-2_3_0/src/org/apache/html/dom/HTMLIFrameElementImpl.java.new	2003-05-09 14:14:36.000000000 +0300
+@@ -67,7 +67,7 @@
+  * @see org.w3c.dom.html.HTMLIFrameElement
+  * @see org.apache.xerces.dom.ElementImpl
+  */
+-public class HTMLIFrameElementImpl
++public abstract class HTMLIFrameElementImpl
+     extends HTMLElementImpl
+     implements HTMLIFrameElement
+ {
+--- xerces-2_3_0/src/org/apache/html/dom/HTMLObjectElementImpl.java	2003-05-09 14:14:25.000000000 +0300
++++ xerces-2_3_0/src/org/apache/html/dom/HTMLObjectElementImpl.java.new	2003-05-09 14:14:14.000000000 +0300
+@@ -67,7 +67,7 @@
+  * @see org.w3c.dom.html.HTMLObjectElement
+  * @see org.apache.xerces.dom.ElementImpl
+  */
+-public class HTMLObjectElementImpl
++public abstract class HTMLObjectElementImpl
+     extends HTMLElementImpl
+     implements HTMLObjectElement, HTMLFormControl
+ {
diff --git a/dev-java/xerces/xerces-2.3.0-r1.ebuild b/dev-java/xerces/xerces-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..952c3b0876d2
--- /dev/null
+++ b/dev-java/xerces/xerces-2.3.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.3.0-r1.ebuild,v 1.1 2003/05/26 09:36:45 absinthe Exp $
+
+inherit java-pkg
+
+S=${WORKDIR}/xerces-${PV//./_}
+DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
+SRC_URI="http://xml.apache.org/dist/xerces-j/Xerces-J-src.${PV}.tar.gz
+	http://xml.apache.org/dist/xerces-j/Xerces-J-tools.${PV}.tar.gz"
+HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
+DEPEND=">=dev-java/ant-1.5.2"
+RDEPEND=">=virtual/jdk-1.3"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~alpha"
+IUSE="doc"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	mv tools ${S}
+}
+
+src_compile() {
+	if [ -n "`use doc`" ] ; then
+		sh build.sh jar sampjar javadocs || die "Compile failed."
+	else
+		sh build.sh jar sampjar || die "Compile failed."
+	fi
+}
+
+src_install () {
+	java-pkg_dojar build/x*.jar
+	dodoc TODO STATUS README LICENSE ISSUES 
+	dohtml Readme.html
+
+	if [ -n "`use doc`" ] ; then
+		dodir /usr/share/doc/${P}
+		cp -a samples ${D}/usr/share/doc/${P}
+		dohtml -r build/docs/javadocs
+	fi
+}