fixed dependency errors and a wrong jar-from call.

diff --git a/dev-java/classworlds/ChangeLog b/dev-java/classworlds/ChangeLog
index 1ca7e1abeb656597acc8aff525d74ff9d2ba9998..7c4b77aa3e7a5eafbfa3b2bc0164c87ea5245a8f 100644 (file)
--- a/dev-java/classworlds/ChangeLog
+++ b/dev-java/classworlds/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/classworlds
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/classworlds/ChangeLog,v 1.11 2005/01/01 18:13:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/classworlds/ChangeLog,v 1.12 2005/01/05 09:14:38 luckyduck Exp $
+
+  05 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> classworlds-1.0-r2.ebuild:
+  Fixed dependency errors and a wrong jar-from call.
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
   classworlds-1.0-r2.ebuild:

diff --git a/dev-java/classworlds/Manifest b/dev-java/classworlds/Manifest
index 26ad08a8a59b598bc69d7d6eb8c09fac97c96eba..60fab7c2090aa8fdca6f6d1d5d3ad1c62bd88911 100644 (file)
--- a/dev-java/classworlds/Manifest
+++ b/dev-java/classworlds/Manifest
@@ -1,5 +1,5 @@
-MD5 a41c9c338ed59ee7240668014ce861d1 ChangeLog 1322
-MD5 8ff50b84e21c5afed914f81208ad2d36 classworlds-1.0-r2.ebuild 1136
+MD5 7697964741d4972079accbc5b507ca3c classworlds-1.0-r2.ebuild 1235
+MD5 3874634d62d5502cdb208b601211d6c9 ChangeLog 1454
 MD5 dc6ad4755e0695dd9a2a898624e16b7c metadata.xml 1546
-MD5 c8530f78dd3e23e4967723a10415c7b8 files/build-1.0.xml 5852
 MD5 65ee55fedb5b26dee5df9c665d297a12 files/digest-classworlds-1.0-r2 70
+MD5 c8530f78dd3e23e4967723a10415c7b8 files/build-1.0.xml 5852

diff --git a/dev-java/classworlds/classworlds-1.0-r2.ebuild b/dev-java/classworlds/classworlds-1.0-r2.ebuild
index c8bd43f9824ab562ed94fbdebc30b22068dff35d..2c35deed0990b17593d46b5a0fe06788e769b4ae 100644 (file)
--- a/dev-java/classworlds/classworlds-1.0-r2.ebuild
+++ b/dev-java/classworlds/classworlds-1.0-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/classworlds/classworlds-1.0-r2.ebuild,v 1.8 2005/01/01 18:13:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/classworlds/classworlds-1.0-r2.ebuild,v 1.9 2005/01/05 09:14:38 luckyduck Exp $
 
 inherit java-pkg
 
@@ -11,7 +11,11 @@ LICENSE="codehaus-classworlds"
 SLOT="1"
 KEYWORDS="x86 ~ppc ~amd64"
 IUSE="doc jikes"
-DEPEND="=dev-java/xerces-2.6*"
+DEPEND=">=virtual/jdk-1.4
+       jikes? ( >=dev-java/jikes-1.21 )
+       >=dev-java/ant-core-1.6"
+RDEPEND=">=virtual/jre-1.4
+       =dev-java/xerces-2.6*"
 
 src_unpack() {
        unpack ${A}
@@ -21,17 +25,18 @@ src_unpack() {
        cd ${S}/target/lib
 
        # karltk: remove the fake versioning here.
-       java-pkg_jar-from xerces || die "Missing xerces"
+       java-pkg_jar-from xerces-2 || die "Missing xerces"
 }
 
 src_compile() {
-       local myconf
-       use jikes && myconf="${myconf} -Dbuild.compiler=jikes"
-
-       ant ${myconf} jar || die "Failed to compile jars"
-       if (use doc) ; then
-               ant javadoc || die "Failed to generate docs"
+       local myconf="jar"
+       if use jikes; then
+               myconf="${myconf} -Dbuild.compiler=jikes"
+       fi
+       if use doc; then
+               myconf="${myconf} javadoc"
        fi
+       ant ${myconf} || die "Failed to compile jars"
 }
 
 src_install() {