diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-01-05 09:14:38 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-01-05 09:14:38 +0000 |
| commit | b2a61e557ae03c4cb3721787d16b50230aec7e68 (patch) | |
| tree | 69e0fa743c15b4ae632ca630651487b2edd6ccd5 /dev-java | |
| parent | qalculate (diff) | |
| download | gentoo-2-b2a61e557ae03c4cb3721787d16b50230aec7e68.tar.gz gentoo-2-b2a61e557ae03c4cb3721787d16b50230aec7e68.tar.bz2 gentoo-2-b2a61e557ae03c4cb3721787d16b50230aec7e68.zip | |
fixed dependency errors and a wrong jar-from call.
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/classworlds/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/classworlds/classworlds-1.0-r2.ebuild | 23 |
2 files changed, 18 insertions, 10 deletions
diff --git a/dev-java/classworlds/ChangeLog b/dev-java/classworlds/ChangeLog index 1ca7e1abeb65..7c4b77aa3e7a 100644 --- 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/classworlds-1.0-r2.ebuild b/dev-java/classworlds/classworlds-1.0-r2.ebuild index c8bd43f9824a..2c35deed0990 100644 --- 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() { |