fix doc target

diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index 8a8f73f0b6c5f4a573109557b2433b6452aeb603..0b7b92c7bbbabfd89542d5a1f2d5642db99b3366 100644 (file)
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jaxen
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.5 2004/12/21 18:59:32 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.6 2004/12/24 09:58:37 axxo Exp $
+
+  24 Dec 2004; Thomas Matthijs <axxo@gentoo.org> jaxen-1.1_beta2.ebuild:
+  fix doc target
 
 *jaxen-1.1_beta2 (19 Dec 2004)
 

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index a90f730c4037616591e4efb02aa8957c37bfed59..63918290e9cae20a101a9eaf085cbee6a3d17a0d 100644 (file)
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 364b983f2baf8b7dd39f4bc42bccffa5 jaxen-1.0.ebuild 1292
-MD5 b8f204ce6a9af59d768ed974a6f99efe jaxen-1.1_beta2.ebuild 1419
-MD5 1c72d54823d0e6478bd20def7e60d743 ChangeLog 920
+MD5 59f104e93a0d5f396f0ba310399f0d97 jaxen-1.1_beta2.ebuild 1576
+MD5 7d23c41280192a0db1642fbcbfc5e2a8 ChangeLog 1009
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 MD5 917b383454a8f38fb290d4a69ddb47ca files/jaxen-1.1_beta2-gentoo.diff 1254
 MD5 16edfe03c1dcf95c79b4b815c1b273da files/digest-jaxen-1.0 66
 MD5 316a481f610ecae9085418b487d1fe1b files/build.xml.patch 1018
 MD5 18b53511f075c771c0b69c5bc0b65dba files/MANIFEST.MF 307
 MD5 eafc9c5ca5edce2368074a57fb83ad61 files/digest-jaxen-1.1_beta2 144
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBy+hf/rLF9B432nYRArkcAJ94j3HNYmPDgtGMC5k8KKHjy5D9VACfTd0c
++14xGA9G6er/FN2YkeGatsQ=
+=xByU
+-----END PGP SIGNATURE-----

diff --git a/dev-java/jaxen/jaxen-1.1_beta2.ebuild b/dev-java/jaxen/jaxen-1.1_beta2.ebuild
index 38e2d99747f8b6472084b7ec1652b34297074765..3bba58c05e4e70f838a1fbb3dbde6fe5180bbd39 100644 (file)
--- a/dev-java/jaxen/jaxen-1.1_beta2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1_beta2.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/jaxen/jaxen-1.1_beta2.ebuild,v 1.2 2004/12/19 20:15:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta2.ebuild,v 1.3 2004/12/24 09:58:37 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -39,7 +39,13 @@ src_unpack() {
        java-pkg_jar-from dom4j-1
 
        cd ${S}
-       if ! use junit ; then
+       # circular deps :(
+       if has_version dev-java/ant-tasks ; then
+               if ! use junit ; then
+                       einfo "disabling junit"
+                       sed -i 's/depends="compile,test"/depends="compile"/' build.xml
+               fi
+       else
                sed -i 's/depends="compile,test"/depends="compile"/' build.xml
        fi
 }
@@ -47,7 +53,7 @@ src_unpack() {
 src_compile() {
        local antops="jar"
        use jikes && antops="${antops} -Dbuild.compiler=jikes"
-       use doc && antops="${antops} doc javadoc"
+       use doc && antops="${antops} javadoc"
        ant ${antops} || die "compile failed"
 }
 
@@ -55,5 +61,5 @@ src_install() {
 
        java-pkg_dojar target/jaxen*.jar
 
-       use doc && java-pkg_dohtml -r target/doc/*
+       use doc && java-pkg_dohtml -r dist/docs/*
 }