fix deps, cleanups

(Portage version: 2.0.51.22-r1)

7 files changed, 41 insertions, 84 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index e02774afa648..9ad1ce1ae4b2 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.51 2005/05/30 19:24:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.52 2005/07/09 15:56:13 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> xerces-1.3.1-r1.ebuild,
+  xerces-2.3.0-r1.ebuild, xerces-2.6.2-r1.ebuild, xerces-2.6.2-r2.ebuild:
+  fix deps, cleanups
 
   30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   xerces-2.6.2-r2.ebuild:
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 37a53df7147a..25849d8aa469 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2aa998d900b5512aba9d202120a10951 ChangeLog 8019
+MD5 1c7e3577e84bb7ec7546d3c60271d998 xerces-1.3.1-r1.ebuild 1217
+MD5 e2351615af8953f1a401706dcd991ce9 xerces-2.6.2-r2.ebuild 1663
+MD5 e9d9583e8f9167c164f563f2f9c35b19 xerces-2.3.0-r1.ebuild 1502
+MD5 659649a4caf186d8e86ffaebde3d6fda xerces-2.6.2-r1.ebuild 1173
+MD5 9317c4982aeeb6e14af44b79a6330916 ChangeLog 8188
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 be18f82f884ae7e8e5aa1e8cf8faf872 xerces-2.6.2-r1.ebuild 1940
-MD5 dc74b18c1f0d426586d459fd2329cb59 xerces-1.3.1-r1.ebuild 1198
-MD5 7464b533d9dbfe665662ad63f0834bdd xerces-2.3.0-r1.ebuild 1685
-MD5 265f47dda561f78d0a39971cb281dea7 xerces-2.6.2-r2.ebuild 1879
-MD5 202c6353e68e489ff4ca668a0999534d files/digest-xerces-2.6.2-r1 144
-MD5 b0ae8698b0ae0ee1e309b38ba1f81141 files/digest-xerces-1.3.1-r1 70
+MD5 75b2cfa2eff39aa21e17c8b2ed40b6b6 files/xerces-2.6.2-r2-gentoo.patch 1342
 MD5 37e61d014a2f8f79909f6d0775c1959b files/digest-xerces-2.3.0-r1 71
+MD5 202c6353e68e489ff4ca668a0999534d files/digest-xerces-2.6.2-r1 144
 MD5 b0ce49e162a5ad60941af4594c938eda files/digest-xerces-2.6.2-r2 71
+MD5 70a862e66b1ea35b680b716d2c58a954 files/xerces-2.6.2-javadoc.patch 595
 MD5 a00b411ba35267075fda1f96c4867caf files/xerces-1.3.1-build.xml 1680
 MD5 4f14802b02f3ee092ebcf99c004af474 files/xerces-2.3.0-gentoo.patch 2684
-MD5 75b2cfa2eff39aa21e17c8b2ed40b6b6 files/xerces-2.6.2-r2-gentoo.patch 1342
-MD5 70a862e66b1ea35b680b716d2c58a954 files/xerces-2.6.2-javadoc.patch 595
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCm2iYKRy60XGEcJIRAsxzAKCmKleDcj71kPTyfLQbCRZnB8SEWQCeL1ta
-ro+rxSzavjiCl5JkjAx/KsA=
-=mK2h
------END PGP SIGNATURE-----
+MD5 b0ae8698b0ae0ee1e309b38ba1f81141 files/digest-xerces-1.3.1-r1 70
diff --git a/dev-java/xerces/files/xerces-2.6.2-r2-gentoo.patch b/dev-java/xerces/files/xerces-2.6.2-r2-gentoo.patch
index 87c29811597d..61445ea6fe88 100644
--- a/dev-java/xerces/files/xerces-2.6.2-r2-gentoo.patch
+++ b/dev-java/xerces/files/xerces-2.6.2-r2-gentoo.patch
@@ -1,16 +1,3 @@
-diff -urpN xerces-2_6_2.old/build.sh xerces-2_6_2/build.sh
---- xerces-2_6_2.old/build.sh	2004-02-20 19:58:14.000000000 +0100
-+++ xerces-2_6_2/build.sh	2005-01-15 14:41:31.437507680 +0100
-@@ -28,8 +28,8 @@ LIBDIR=./tools
- ANT_HOME="$LIBDIR"
- LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip"
- LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/ant.jar"
-+LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/ant-launcher.jar"
- LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/xml-apis.jar"
--LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/xercesImpl.jar"
- LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/bin/xjavac.jar"
- 
- 
 diff -urpN xerces-2_6_2.old/build.xml xerces-2_6_2/build.xml
 --- xerces-2_6_2.old/build.xml	2004-02-20 19:58:14.000000000 +0100
 +++ xerces-2_6_2/build.xml	2005-01-15 14:41:08.603978904 +0100
diff --git a/dev-java/xerces/xerces-1.3.1-r1.ebuild b/dev-java/xerces/xerces-1.3.1-r1.ebuild
index 50c9fe25d2ac..7fe3a4350ec6 100644
--- a/dev-java/xerces/xerces-1.3.1-r1.ebuild
+++ b/dev-java/xerces/xerces-1.3.1-r1.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-1.3.1-r1.ebuild,v 1.5 2005/05/06 13:36:18 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-1.3.1-r1.ebuild,v 1.6 2005/07/09 15:56:13 axxo Exp $
 
 inherit java-pkg
 
@@ -15,7 +15,8 @@ KEYWORDS="x86 ppc sparc amd64"
 
 DEPEND=">=virtual/jdk-1.3
 	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
+	source? ( app-arch/zip )
+	dev-java/ant-core"
 RDEPEND=">=virtual/jre-1.3
 	>=dev-java/xalan-2.5.2"
 IUSE="doc jikes source"
diff --git a/dev-java/xerces/xerces-2.3.0-r1.ebuild b/dev-java/xerces/xerces-2.3.0-r1.ebuild
index be022b696617..fabb9239066c 100644
--- a/dev-java/xerces/xerces-2.3.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.3.0-r1.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.3.0-r1.ebuild,v 1.11 2005/05/06 13:36:18 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.3.0-r1.ebuild,v 1.12 2005/07/09 15:56:13 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,14 +13,15 @@ SLOT="2.3"
 KEYWORDS="x86 amd64 sparc ~ppc"
 IUSE="doc examples jikes source"
 
-DEPEND=">=virtual/jdk-1.3
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3
-	>=dev-java/ant-core-1.5.2
-	>=dev-java/xalan-2.5.2
-	dev-java/xjavac
 	>=dev-java/xml-commons-1.0_beta2"
+DEPEND=">=virtual/jdk-1.3
+	>=dev-java/ant-core-1.5.2
+	>=dev-java/xjavac-20041208-r1
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
 S=${WORKDIR}/xerces-${PV//./_}
 
 src_unpack() {
@@ -30,9 +31,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoo.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 xalan
 	java-pkg_jar-from xml-commons xml-apis.jar
 
 	mkdir ${S}/tools/bin && cd ${S}/tools/bin
@@ -43,7 +41,7 @@ src_compile() {
 	local antflags="jars"
 	use doc && antflags="${antflags} javadocs"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	sh build.sh ${antflags} || die "ant build failed"
+	ant ${antflags} || die "ant build failed"
 }
 
 src_install () {
diff --git a/dev-java/xerces/xerces-2.6.2-r1.ebuild b/dev-java/xerces/xerces-2.6.2-r1.ebuild
index bf428f94caaf..41d665800de1 100644
--- a/dev-java/xerces/xerces-2.6.2-r1.ebuild
+++ b/dev-java/xerces/xerces-2.6.2-r1.ebuild
@@ -1,10 +1,9 @@
 # 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-r1.ebuild,v 1.15 2005/01/26 21:20:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r1.ebuild,v 1.16 2005/07/09 15:56:13 axxo Exp $
 
 inherit java-pkg eutils
 
-IUSE="doc"
 
 S=${WORKDIR}/xerces-${PV//./_}
 DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
@@ -16,8 +15,10 @@ LICENSE="Apache-1.1"
 SLOT="2"
 KEYWORDS="x86 ppc sparc amd64 ppc64"
 
-DEPEND=">=dev-java/ant-core-1.5.2"
-RDEPEND=">=virtual/jdk-1.3"
+DEPEND=">=virtual/jdk-1.3
+	>=dev-java/ant-core-1.5.2"
+RDEPEND=">=virtual/jre-1.3"
+IUSE="doc"
 
 src_unpack() {
 	unpack ${A}
@@ -25,7 +26,6 @@ src_unpack() {
 }
 
 src_compile() {
-	addpredict /dev/random
 	if use doc ; then
 		sh build.sh jars sampjar javadocs || die "Compile failed."
 	else
@@ -44,22 +44,3 @@ src_install() {
 		java-pkg_dohtml -r build/docs/javadocs
 	fi
 }
-
-pkg_postinst() {
-	if use doc ; then
-		einfo "                                                          "
-		einfo " API Documentation is in /usr/share/doc/${PN}-${PV}.      "
-		einfo "                                                          "
-		einfo " Online Documentation:                                    "
-		einfo "     http://xml.apache.org/xerces2-j/api.html             "
-		einfo "                                                          "
-		epause 5
-	else
-		einfo "                                                          "
-		einfo " Online Documentation:                                    "
-		einfo "     http://xml.apache.org/xerces2-j/api.html             "
-		einfo "                                                          "
-		epause 5
-	fi
-}
-
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() {