Fix building with USE=doc, bug #310311. Thanks to Cosmin Giradu for finding the reason.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog
index a1f0b19174e443b80380de859c7d32ba8f1c63a9..0d984b92d8921c1b815a6132479ec70659ae8f7c 100644 (file)
--- a/dev-java/jaxme/ChangeLog
+++ b/dev-java/jaxme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jaxme
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.34 2010/01/20 02:59:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.35 2010/04/16 13:24:59 caster Exp $
+
+  16 Apr 2010; Vlastimil Babka <caster@gentoo.org> jaxme-0.5.2.ebuild:
+  Fix building with USE=doc, bug #310311. Thanks to Cosmin Giradu for
+  finding the reason.
 
   20 Jan 2010; Brent Baude <ranger@gentoo.org> jaxme-0.5.2.ebuild:
   Marking jaxme-0.5.2 ppc64 for bug 292286

diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
index 9d0cc738ecc99fba358936170194c66cab34fb32..7f9d1bb2627bed268af619b67867eceef708d99c 100644 (file)
--- a/dev-java/jaxme/Manifest
+++ b/dev-java/jaxme/Manifest
@@ -4,6 +4,6 @@ AUX jaxme-0.5.2-fix_marshallers.patch 1600 RMD160 cd4d579f4245a192226dea92e98be3
 DIST ws-jaxme-0.3.1-src.tar.gz 3058903 RMD160 cd994b5fd9a15473ed7390b8911601b794f76cd0 SHA1 4ba5fd76cbda407c0b32af2e3235dab66a8b0a00 SHA256 9f02b233849ec10cda455c51d5bda46929f5fcbed237c5a5a760a19eb59e852c
 DIST ws-jaxme-0.5.2-src.tar.gz 5478402 RMD160 75ed71ed02c84377a3c3a393a0a22637d01151e5 SHA1 e84103fca9dddb97f5eb2ad6549dcd77306ccd97 SHA256 0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc
 EBUILD jaxme-0.3.1-r4.ebuild 2370 RMD160 f216f440952e1723038ef06059674a2f93370e5a SHA1 c72383ed4d14a890459ffddaeabf4fe61c4bf2d5 SHA256 1e2912b7aaa1643fa274c89766dcd38508e3fe8fa8265f6486b1ac63b729cae5
-EBUILD jaxme-0.5.2.ebuild 2339 RMD160 c6719c431b1655bf662013f6712e2b0d0ed37bf9 SHA1 b030cac6532e47648a78466fcc930e96d2386599 SHA256 fb0dd76948950bf557af2edd59e43b0403b989442d0b8752660388ba417f0e2d
-MISC ChangeLog 4789 RMD160 e050d1b3149bc1f43fac10dc8cb0b3a8db2b7c37 SHA1 863c341c8a9155d45e0549e1ba28fbd3cb776746 SHA256 fc777698ef304ccce5ff625f05149f5718b462d08f3ee2234adbf61124fa83b2
+EBUILD jaxme-0.5.2.ebuild 2572 RMD160 595e2df650ff449cd5e82273be285f1806c6b404 SHA1 ed67e748aa41720e911e39876d98be724603b3db SHA256 50b3732db376d6c6bea3bdca0f90ae2caa882e736d6dfe18568cbe31f732c4fe
+MISC ChangeLog 4953 RMD160 54ffec1759dc833ea01949c53317cd616c7f18cc SHA1 4e6be97f4bdd9609ffa32a42db6df1fa95e45c40 SHA256 86ba4690a628e54b58d94546b7601083b1f186c50380b701ebe284356878a78d
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb

diff --git a/dev-java/jaxme/jaxme-0.5.2.ebuild b/dev-java/jaxme/jaxme-0.5.2.ebuild
index ff14f16fadd38f2f0c5c2a08fb13dfbbc29833a7..542ffd64c35de017af88b51b0cc5c1d01241199b 100644 (file)
--- a/dev-java/jaxme/jaxme-0.5.2.ebuild
+++ b/dev-java/jaxme/jaxme-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2.ebuild,v 1.7 2010/01/20 02:59:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2.ebuild,v 1.8 2010/04/16 13:24:59 caster Exp $
 
 EAPI="2"
 
@@ -46,7 +46,7 @@ java_prepare() {
        java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
        java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar
        java-pkg_jarfrom --build-only ant-core ant.jar ant.jar
-       # no linking to it, probably should be test only (FIXME)
+       # no linking to it, should be used for tests only but used to generate stuff during build anyway
        java-pkg_jarfrom --build-only hsqldb hsqldb.jar hsqldb-1.7.1.jar
 
        # Special case: jaxme uses ant/*.xml files, so rewriting them by hand
@@ -60,14 +60,19 @@ java_prepare() {
        epatch "${FILESDIR}/${P}-fix_marshallers.patch"
 }
 
-EANT_BUILD_TARGET="all"
-EANT_EXTRA_ARGS=""
 EANT_TEST_ANT_TASKS="hsqldb"
 
 src_compile() {
-       use doc && EANT_EXTRA_ARGS+="-Dbuild.apidocs=dist/doc/api"
+       local ant_target="all"
+       local ant_args=""
+       if use doc; then 
+               ant_args="-Dbuild.apidocs=dist/doc/api"
+               # The javadoc target depends on all so it is enough. Passing both results in two builds,
+               # where the second pass fails due to hsqldb lock - bug #310311.
+               ant_target="javadoc"
+       fi
 
-       java-pkg-2_src_compile
+       eant ${ant_args} ${ant_target}
 }
 
 src_install() {