diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2004-12-24 09:58:37 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2004-12-24 09:58:37 +0000 |
| commit | 45e3808da4d2a1fd7db6915705e0bc4387060d99 (patch) | |
| tree | 4e7466d445070c1b552d4d3306980041b2ae6b2e | |
| parent | Removed CXXFLAGS_${ABI} as it's not needed. Added a note to point someone cu... (diff) | |
| download | gentoo-2-45e3808da4d2a1fd7db6915705e0bc4387060d99.tar.gz gentoo-2-45e3808da4d2a1fd7db6915705e0bc4387060d99.tar.bz2 gentoo-2-45e3808da4d2a1fd7db6915705e0bc4387060d99.zip | |
fix doc target
| -rw-r--r-- | dev-java/jaxen/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/jaxen/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/jaxen/jaxen-1.1_beta2.ebuild | 14 |
3 files changed, 16 insertions, 7 deletions
diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog index 8a8f73f0b6c5..0b7b92c7bbba 100644 --- 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 a90f730c4037..e7ebaa3de0b1 100644 --- a/dev-java/jaxen/Manifest +++ b/dev-java/jaxen/Manifest @@ -1,5 +1,5 @@ -MD5 364b983f2baf8b7dd39f4bc42bccffa5 jaxen-1.0.ebuild 1292 -MD5 b8f204ce6a9af59d768ed974a6f99efe jaxen-1.1_beta2.ebuild 1419 +MD5 2b248131564dbf52f897d04208e664a6 jaxen-1.0.ebuild 1318 +MD5 efb61e6af56649ca378c8ea7e0ab31db jaxen-1.1_beta2.ebuild 1603 MD5 1c72d54823d0e6478bd20def7e60d743 ChangeLog 920 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 MD5 917b383454a8f38fb290d4a69ddb47ca files/jaxen-1.1_beta2-gentoo.diff 1254 diff --git a/dev-java/jaxen/jaxen-1.1_beta2.ebuild b/dev-java/jaxen/jaxen-1.1_beta2.ebuild index 38e2d99747f8..3bba58c05e4e 100644 --- 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/* } |