1 files changed, 10 insertions, 14 deletions
diff --git a/dev-java/xerces/xerces-2.6.2-r2.ebuild b/dev-java/xerces/xerces-2.6.2-r2.ebuild
index 7799e4609068..8d2ad868e08b 100644
--- a/dev-java/xerces/xerces-2.6.2-r2.ebuild
+++ b/dev-java/xerces/xerces-2.6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r2.ebuild,v 1.7 2005/05/30 19:24:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r2.ebuild,v 1.8 2005/07/09 15:56:13 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,15 +13,16 @@ SLOT="2"
 KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="doc jikes examples source"
 
-DEPEND=">=virtual/jdk-1.3
-	jikes? ( >=dev-java/jikes-1.21 )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3
+RDEPEND=">=virtual/jre-1.4
 	>=dev-java/ant-core-1.5.2
-	>=dev-java/xalan-2.5.2
 	>=dev-java/xml-commons-1.0_beta2
 	>=dev-java/xml-commons-resolver-1.1
 	>=dev-java/xjavac-20041208"
+DEPEND=">=virtual/jdk-1.4
+	jikes? ( >=dev-java/jikes-1.21 )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
 S=${WORKDIR}/xerces-${PV//./_}
 
 src_unpack() {
@@ -31,16 +32,11 @@ src_unpack() {
 	epatch ${FILESDIR}/${PF}-gentoo.patch
 	epatch ${FILESDIR}/${P}-javadoc.patch
 
-	mkdir ${S}/tools
-	cd ${S}/tools
-	java-pkg_jar-from ant-core ant.jar
-	java-pkg_jar-from ant-core ant-launcher.jar
-	java-pkg_jar-from junit
-	java-pkg_jar-from xalan
+	mkdir tools && cd tools
+	rm -f *.jar
 	java-pkg_jar-from xml-commons xml-apis.jar
 	java-pkg_jar-from xml-commons-resolver xml-commons-resolver.jar resolver.jar
 
-
 	mkdir ${S}/tools/bin
 	cd ${S}/tools/bin
 	java-pkg_jar-from xjavac-1
@@ -50,7 +46,7 @@ src_compile() {
 	local antflags="jars sampjar"
 	use doc && antflags="${antflags} javadocs"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	sh build.sh ${antflags} || die "Compile failed."
+	ant ${antflags} || die "Compile failed."
 }
 
 src_install() {