add doc useflag, and jikes support 70798, patch by Jan Brinkmann <lucky@the-luckyduck.de

diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index 879ae16966113c02311730e04d44042c9ac49de3..b4ebbcbdb7745158eb647ced1af52af9836a3196 100644 (file)
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/junit
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.16 2004/10/29 12:39:19 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.17 2004/11/14 14:13:55 axxo Exp $
+
+  14 Nov 2004; Thomas Matthijs <axxo@gentoo.org> junit-3.8.1-r1.ebuild:
+  add doc useflag, and jikes support 70798, patch by Jan Brinkmann
+  <lucky@the-luckyduck.de
 
   29 Oct 2004; Thomas Matthijs <axxo@gentoo.org> junit-3.8.1-r1.ebuild:
   remove nomirror

diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 4271f7650007ef9509a7185c314411c3cb20816e..c2939bfbe0674a5bac0ffd7e74c9fd55e4683702 100644 (file)
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7969b489ae53a6868f9af6a3b0ff731a junit-3.8.1-r1.ebuild 880
-MD5 a6e19d39c0a344d990da0254fbcfff89 ChangeLog 2679
+MD5 9cc04446a0935b1d6262accecb89d520 junit-3.8.1-r1.ebuild 1070
+MD5 bdacdc183e3e507393496035b644cb79 ChangeLog 2845
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 bab94fdc8a6c2abf20e0f2cee4849a4e files/digest-junit-3.8.1-r1 59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBgjoC/rLF9B432nYRAnK3AKDKzzgu+YHEfajdCgFuWjSohh8AAACgh81P
-Wx96T+UI6nqRQ272XCysT0A=
-=MK5C
+iD8DBQFBl2g5/rLF9B432nYRAsZ8AJ9Rc2wwjl/2u/yxQ6FsKJvBp1EtZgCgzLQu
+KN6/aeLIchxAHpiOvF948N8=
+=Bs0b
 -----END PGP SIGNATURE-----

diff --git a/dev-java/junit/junit-3.8.1-r1.ebuild b/dev-java/junit/junit-3.8.1-r1.ebuild
index 76f3c0e250283f1e7c87628c08afe8e2075a59a4..c7f1b7b51ce1c0b47ae44484886476a91900a5d4 100644 (file)
--- a/dev-java/junit/junit-3.8.1-r1.ebuild
+++ b/dev-java/junit/junit-3.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1-r1.ebuild,v 1.3 2004/10/29 12:39:19 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1-r1.ebuild,v 1.4 2004/11/14 14:13:55 axxo Exp $
 
 inherit java-pkg
 
@@ -12,8 +12,9 @@ HOMEPAGE="http://www.junit.org/"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
-IUSE=""
+IUSE="doc jikes"
 DEPEND=">=virtual/jdk-1.3
+       jikes? ( >=dev-java/jikes-1.21 )
        >=dev-java/ant-core-1.4
        >=app-arch/unzip-5.50-r1"
 RDEPEND=">=virtual/jdk-1.3"
@@ -25,8 +26,10 @@ src_unpack() {
 }
 
 src_compile() {
-       rm junit.jar
-       ant || die
+       rm -f junit.jar
+       local antflags="dist"
+       use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+       ant ${antflags} || die "failed to build"
 }
 
 src_install() {
@@ -34,5 +37,6 @@ src_install() {
        java-pkg_dojar junit.jar
        dodir /usr/share/ant-core/lib
        dosym /usr/share/junit/lib/junit.jar /usr/share/ant-core/lib/
-       java-pkg_dohtml -r README.html cpl-v10.html doc javadoc
+       java-pkg_dohtml -r README.html cpl-v10.html
+       use doc && java-pkg_dohtml -r doc javadoc
 }