dep fixes

Package-Manager: portage-2.0.51.22-r1

4 files changed, 23 insertions, 22 deletions

diff --git a/dev-java/openjgraph/ChangeLog b/dev-java/openjgraph/ChangeLog
index dfa4c6128009..69438c0e9231 100644
--- a/dev-java/openjgraph/ChangeLog
+++ b/dev-java/openjgraph/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-java/openjgraph
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/openjgraph/ChangeLog,v 1.6 2004/11/03 11:36:06 axxo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjgraph/ChangeLog,v 1.7 2005/07/15 20:15:04 axxo Exp $
 
   03 Nov 2004; Thomas Matthijs <axxo@gentoo.org> openjgraph-0.9.2-r1.ebuild,
   openjgraph-0.9.2.ebuild:
diff --git a/dev-java/openjgraph/Manifest b/dev-java/openjgraph/Manifest
index f9d883a9f132..08c6d9c6571d 100644
--- a/dev-java/openjgraph/Manifest
+++ b/dev-java/openjgraph/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a8b0c039a2563b8d4a3616268b22d992 openjgraph-0.9.2.ebuild 729
-MD5 d1fb3cee03d46523589d929ce1d280fb openjgraph-0.9.2-r1.ebuild 1032
-MD5 36f867466d33a1718c261fc6f64b0440 ChangeLog 900
+MD5 ee63ef5eb6b9074b85dbddf401b1fa8e openjgraph-0.9.2.ebuild 728
+MD5 f54df472187498d7be82c161ca301f0a openjgraph-0.9.2-r1.ebuild 963
+MD5 d067b255410fb79033b9ad6ba2b0be61 ChangeLog 900
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 277134782da94e7034dfe3f3870963ec files/digest-openjgraph-0.9.2-r1 66
 MD5 277134782da94e7034dfe3f3870963ec files/digest-openjgraph-0.9.2 66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFBiMKs/rLF9B432nYRAqYHAJ9EUAzuz0SJrcsYIuHPFQ4ghVRZnACfVesX
-2xoBm32d6LmvtIQBeGbQHJg=
-=/y3D
+iD8DBQFC2Bln/rLF9B432nYRAqhUAKDI6ybjQ3dbLwVUOSfKxY+jcktgSgCeKCR/
+y8B1qPj90/dib+VPQPXsyDg=
+=FTvA
 -----END PGP SIGNATURE-----
diff --git a/dev-java/openjgraph/openjgraph-0.9.2-r1.ebuild b/dev-java/openjgraph/openjgraph-0.9.2-r1.ebuild
index 066cf3c843ba..12dfca53074d 100644
--- a/dev-java/openjgraph/openjgraph-0.9.2-r1.ebuild
+++ b/dev-java/openjgraph/openjgraph-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/openjgraph/openjgraph-0.9.2-r1.ebuild,v 1.2 2004/11/03 11:36:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjgraph/openjgraph-0.9.2-r1.ebuild,v 1.3 2005/07/15 20:15:04 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -8,24 +8,25 @@ DESCRIPTION="Open-source graph library for Java"
 SRC_URI="mirror://sourceforge/openjgraph/${P}.zip"
 HOMEPAGE="http://openjgraph.sf.net"
 IUSE=""
+RDEPEND=">=virtual/jre-1.4
+	dev-java/log4j
+	=dev-java/xerces-1.3*"
 DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
 	app-arch/unzip
-	dev-java/log4j
 	dev-java/junit
-	=dev-java/xerces-1.3*
 	>=dev-java/ant-1.6"
 
-RDEPEND=">=virtual/jdk-1.4"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~ppc ~sparc x86"
 
 S=${WORKDIR}/${P//./_}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}/lib/
-	rm -f ant.jar jakarta-ant-1.4.1-optional.jar junit.jar log4j-core.jar jaxp.jar crimson.jar
+	rm -f *.jar
 	java-pkg_jar-from log4j
 	java-pkg_jar-from xerces-1.3
 	java-pkg_jar-from junit
@@ -35,7 +36,7 @@ src_compile() {
 	./compileall.sh || die "compile failed"
 }
 
-src_install () {
+src_install() {
 	java-pkg_dojar dist/${PN}.jar
 
 	insinto /usr/share/${PN}/examples
diff --git a/dev-java/openjgraph/openjgraph-0.9.2.ebuild b/dev-java/openjgraph/openjgraph-0.9.2.ebuild
index 25a519ad5c92..68d45747ab7c 100644
--- a/dev-java/openjgraph/openjgraph-0.9.2.ebuild
+++ b/dev-java/openjgraph/openjgraph-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/openjgraph/openjgraph-0.9.2.ebuild,v 1.6 2004/11/03 11:36:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjgraph/openjgraph-0.9.2.ebuild,v 1.7 2005/07/15 20:15:04 axxo Exp $
 
 inherit java-pkg
 
@@ -10,10 +10,10 @@ HOMEPAGE="http://openjgraph.sf.net"
 IUSE=""
 DEPEND=">=virtual/jdk-1.3
 		app-arch/unzip"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
+KEYWORDS="~ppc ~sparc x86"
 
 S=${WORKDIR}/${P//./_}
 
@@ -21,7 +21,7 @@ src_compile() {
 	./compileall.sh || die "compile failed"
 }
 
-src_install () {
+src_install() {
 	java-pkg_dojar dist/${PN}.jar
 
 	insinto /usr/share/${PN}/examples