Dep fixes

Package-Manager: portage-2.0.51.22-r1

4 files changed, 30 insertions, 22 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index 81b661137079..e26d7ae31fc0 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.24 2005/06/28 01:44:42 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.25 2005/07/12 19:58:14 axxo Exp $
+
+  12 Jul 2005; Thomas Matthijs <axxo@gentoo.org> batik-1.5.ebuild,
+  batik-1.5.1-r4.ebuild:
+  Dep fixes
 
   28 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> batik-1.5.1-r4.ebuild:
   Stable on sparc
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index d1e894f6aaf0..71ba351709fd 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fdb35eb1d8cb549cc0e82823466e16aa batik-1.5.1-r4.ebuild 1734
+MD5 26a7826c94f987d3d68313a7c55b330a ChangeLog 3101
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 273afe0d007943a9fc3b2ba189d59085 batik-1.5.ebuild 1717
-MD5 8df34eca5039b1ece7707a2feba23884 ChangeLog 3000
-MD5 2773f6aa10bcb901bd07ea509571ccef files/digest-batik-1.5.1-r4 66
+MD5 1cf703be1761c052acca52fa24b3a5df batik-1.5.1-r4.ebuild 1741
+MD5 feea67feb4d07019ef9cc08ef1cf41df batik-1.5.ebuild 1742
 MD5 479ed0922a69b318b40b485614a6af16 files/digest-batik-1.5 63
+MD5 2773f6aa10bcb901bd07ea509571ccef files/digest-batik-1.5.1-r4 66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCwKuNKRy60XGEcJIRAgfYAJ9XMLAbAdzOr0r1wKaiugysCXi8cgCgpz4D
-I5hUQ+kPh5PIiuC0Ak5aMiU=
-=LMRJ
+iD8DBQFC1CFB/rLF9B432nYRAi7sAJ0dY7+tJ1Ik5RII06pl7LywG2sLogCgv3QQ
+7G6Yaxh6P/MEZD08wa5pC6U=
+=UrRw
 -----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 9e6a081f1e28..2f4aec227c2f 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.5 2005/06/28 01:44:42 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r4.ebuild,v 1.6 2005/07/12 19:58:14 axxo Exp $
 
 inherit java-pkg
 
@@ -13,13 +13,14 @@ SLOT="1.5.1"
 KEYWORDS="x86 sparc ppc amd64"
 IUSE="doc"
 
-DEPEND=">=virtual/jdk-1.3
-	app-arch/unzip
-	dev-java/ant-core"
 RDEPEND=">=virtual/jdk-1.3
 	=dev-java/rhino-1.5*
 	=dev-java/xerces-2.6*
 	dev-java/xml-commons"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core"
 
 S=${WORKDIR}/xml-batik
 
@@ -37,7 +38,7 @@ src_compile() {
 	ant ${antflags} || die "compile problem"
 }
 
-src_install () {
+src_install() {
 	java-pkg_dojar ${P}/batik*.jar
 
 	cd ${P}/lib
diff --git a/dev-java/batik/batik-1.5.ebuild b/dev-java/batik/batik-1.5.ebuild
index 4646be63ed6d..04acd8c36882 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.11 2005/06/12 20:06:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.ebuild,v 1.12 2005/07/12 19:58:14 axxo Exp $
 
 inherit java-pkg
 
@@ -8,16 +8,19 @@ DESCRIPTION="Batik is a Java(tm) technology based toolkit for applications or ap
 SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
 HOMEPAGE="http://xml.apache.org/batik/"
 IUSE="doc"
-DEPEND=">=virtual/jdk-1.3
-		=dev-java/rhino-1.5*
-		app-arch/unzip
-		>=dev-java/xerces-2.6.2-r1
-		dev-java/ant"
-RDEPEND=">=virtual/jdk-1.3"
 LICENSE="Apache-1.1"
 SLOT="1.5"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 
+RDEPEND=">=virtual/jdk-1.3
+	=dev-java/rhino-1.5*
+	=dev-java/xerces-2.6*
+	dev-java/xml-commons"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core"
+
 S=${WORKDIR}/xml-batik
 
 src_unpack() {
@@ -34,7 +37,7 @@ src_compile() {
 	ant ${antflags} || die "compile problem"
 }
 
-src_install () {
+src_install() {
 	java-pkg_dojar ${P}/batik*.jar
 
 	cd ${P}/lib