Loosened xerces dependency (bug #115158).

Package-Manager: portage-2.0.53_rc7

5 files changed, 24 insertions, 18 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index 72144498f5a3..7274f81f67f5 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/batik
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.27 2005/09/10 16:07:19 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.28 2005/12/11 19:02:14 nichoj Exp $
+
+  11 Dec 2005; Joshua Nichols <nichoj@gentoo.org> batik-1.5.ebuild,
+  batik-1.5.1-r4.ebuild, batik-1.6.ebuild:
+  Loosened xerces dependency (bug #115158).
 
 *batik-1.6 (10 Sep 2005)
 
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 7b6e6dde854f..7a9f94bf19cb 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f6f2950d236b9496d6773ee5b1ce3dc2 batik-1.6.ebuild 1831
-MD5 b6eed76ca2877152a6e3af99578a4ae2 ChangeLog 3393
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 cd9726dba2d7ec03d52ef50129eaab99 batik-1.5.1-r4.ebuild 1747
-MD5 feea67feb4d07019ef9cc08ef1cf41df batik-1.5.ebuild 1742
-MD5 479ed0922a69b318b40b485614a6af16 files/digest-batik-1.5 63
-MD5 a929b00b059832c13cf91cc68c2cecf1 files/digest-batik-1.6 64
+MD5 772a0595af291429f2e6ac9fda47d746 ChangeLog 3551
+MD5 60e6a3dffdf319bc47b435890cdc48cc batik-1.5.1-r4.ebuild 1744
+MD5 eae4855f2c1119b07ccd5df2a3b735d6 batik-1.5.ebuild 1744
+MD5 b13c2c935221dac369f4cd02e85898a1 batik-1.6.ebuild 1907
 MD5 88405976cca078c6468469f91d2ff161 files/batik-1.6-jikes.patch 1738
+MD5 479ed0922a69b318b40b485614a6af16 files/digest-batik-1.5 63
 MD5 2773f6aa10bcb901bd07ea509571ccef files/digest-batik-1.5.1-r4 66
+MD5 a929b00b059832c13cf91cc68c2cecf1 files/digest-batik-1.6 64
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDIwi//rLF9B432nYRAjBCAJkBMNwPeZ8dVTCOKhRZrZpWm1bD7ACgrNo7
-3IJKyzPDpD+uMhOEPqj65mM=
-=mBa3
+iD8DBQFDnHg7ndWRXhKOboURAip+AKCfrNgzMWZLP6Ve69gJ62HpnVgc6gCfRvYI
+zrt5h0YGm5baSu3FuuPtQb8=
+=lRZe
 -----END PGP SIGNATURE-----
diff --git a/dev-java/batik/batik-1.5.1-r4.ebuild b/dev-java/batik/batik-1.5.1-r4.ebuild
index 7e28b68a60bb..60c4322afa10 100644
--- a/dev-java/batik/batik-1.5.1-r4.ebuild
+++ b/dev-java/batik/batik-1.5.1-r4.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/batik/batik-1.5.1-r4.ebuild,v 1.8 2005/08/26 13:15:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r4.ebuild,v 1.9 2005/12/11 19:02:14 nichoj Exp $
 
 inherit java-pkg
 
@@ -15,7 +15,7 @@ IUSE="doc"
 
 RDEPEND=">=virtual/jre-1.3
 	=dev-java/rhino-1.5*
-	=dev-java/xerces-2.6*
+	>=dev-java/xerces-2.6
 	dev-java/xml-commons"
 DEPEND=">=virtual/jdk-1.3
 	${RDEPEND}
diff --git a/dev-java/batik/batik-1.5.ebuild b/dev-java/batik/batik-1.5.ebuild
index 4b1fc2307972..202d0c6b5042 100644
--- a/dev-java/batik/batik-1.5.ebuild
+++ b/dev-java/batik/batik-1.5.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/batik/batik-1.5.ebuild,v 1.13 2005/07/12 19:59:33 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.ebuild,v 1.14 2005/12/11 19:02:14 nichoj Exp $
 
 inherit java-pkg
 
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 
 RDEPEND=">=virtual/jre-1.3
 	=dev-java/rhino-1.5*
-	=dev-java/xerces-2.6*
+	>=dev-java/xerces-2.6
 	dev-java/xml-commons"
 DEPEND=">=virtual/jdk-1.3
 	${RDEPEND}
diff --git a/dev-java/batik/batik-1.6.ebuild b/dev-java/batik/batik-1.6.ebuild
index 0f7be0eba4ec..e62637ad1fc1 100644
--- a/dev-java/batik/batik-1.6.ebuild
+++ b/dev-java/batik/batik-1.6.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/batik/batik-1.6.ebuild,v 1.2 2005/09/10 16:24:02 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6.ebuild,v 1.3 2005/12/11 19:02:14 nichoj Exp $
 
 inherit java-pkg eutils
 
@@ -15,7 +15,7 @@ IUSE="doc jikes"
 
 RDEPEND=">=virtual/jre-1.3
 	=dev-java/rhino-1.5*
-	=dev-java/xerces-2.6*
+	>=dev-java/xerces-2.6
 	dev-java/xml-commons"
 DEPEND=">=virtual/jdk-1.3
 	${RDEPEND}
@@ -40,7 +40,9 @@ src_compile() {
 	use doc && antflags="${antflags} javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
-	ant ${antflags} || die "compile problem"
+	# Fails to build on amd64 without this
+	ANT_OPTS="${ANT_OPTS} -Xmx1g" \
+		ant ${antflags} || die "compile problem"
 }
 
 src_install() {