5 files changed, 11 insertions, 47 deletions
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 059133b207cc..1a41b439809a 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,9 +1,6 @@
-MD5 65bf68c101541a325daee7b808c64b55 xerces-2.3.0-r1.ebuild 1220
 MD5 034fd618c8d9eacea93f3ea81e758be3 xerces-2.5.0.ebuild 1183
-MD5 1785f1347a9dbc52d8c522f7ed85e106 ChangeLog 2266
+MD5 e33cabb0bb40a3958467a52cbf1b6c86 ChangeLog 2383
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 034fd618c8d9eacea93f3ea81e758be3 xerces-2.6.0.ebuild 1183
-MD5 0ed5652de5f404a3fefb774b2b1a8538 files/digest-xerces-2.3.0-r1 144
-MD5 0aecf5f2232e04fb4067f5f67b41d810 files/xerces-2.3.0-gentoo.diff 1418
+MD5 8258f9740c07bda9e688327cb23cee30 xerces-2.6.0.ebuild 1190
 MD5 4390c3834dfc898bef6d4d4cbc277fce files/digest-xerces-2.5.0 144
 MD5 1fcb1a39009fabe31915e46883eb55b9 files/digest-xerces-2.6.0 144
diff --git a/dev-java/xerces/files/digest-xerces-2.3.0-r1 b/dev-java/xerces/files/digest-xerces-2.3.0-r1
deleted file mode 100644
index 8bf3fa2e2584..000000000000
--- a/dev-java/xerces/files/digest-xerces-2.3.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-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/digest-xerces-2.6.0 b/dev-java/xerces/files/digest-xerces-2.6.0
new file mode 100644
index 000000000000..e4f6906e1d7c
--- /dev/null
+++ b/dev-java/xerces/files/digest-xerces-2.6.0
@@ -0,0 +1,2 @@
+MD5 cedd031587ce38db6fc23ef67923de4b Xerces-J-src.2.6.0.tar.gz 1544173
+MD5 32f6d726216609cc24edacb8afd586e9 Xerces-J-tools.2.6.0.tar.gz 3657400
diff --git a/dev-java/xerces/files/xerces-2.3.0-gentoo.diff b/dev-java/xerces/files/xerces-2.3.0-gentoo.diff
deleted file mode 100644
index d974c3578aa4..000000000000
--- a/dev-java/xerces/files/xerces-2.3.0-gentoo.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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.6.0.ebuild
index 6988bec0a6e4..8c044f297bc9 100644
--- a/dev-java/xerces/xerces-2.3.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.6.0.ebuild
@@ -1,34 +1,34 @@
 # 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.3 2003/09/06 22:26:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.0.ebuild,v 1.1 2003/12/02 04:18:31 strider Exp $
 
 inherit java-pkg eutils
 
 S=${WORKDIR}/xerces-${PV//./_}
 DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
 HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
-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"
+SRC_URI="mirror://apache/xml/xerces-j/Xerces-J-src.${PV}.tar.gz
+	mirror://apache/xml/xerces-j/Xerces-J-tools.${PV}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 IUSE="doc"
 
 DEPEND=">=dev-java/ant-1.5.2"
 RDEPEND=">=virtual/jdk-1.3"
+RESTRICT="nomirror"
 
 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."
+		sh build.sh jars sampjar javadocs || die "Compile failed."
 	else
-		sh build.sh jar sampjar || die "Compile failed."
+		sh build.sh jars sampjar || die "Compile failed."
 	fi
 }