summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2006-09-09 06:49:40 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2006-09-09 06:49:40 +0000
commite44dddfe464dd654e97a077ac9c14655e3501eb8 (patch)
tree93d5ca62643034683ecda468a213fffa95472000 /dev-java/jaxme
parentBump genutils to version 1.20, thanks to Joseph Monti (Bug #133531). (diff)
downloadgentoo-2-e44dddfe464dd654e97a077ac9c14655e3501eb8.tar.gz
gentoo-2-e44dddfe464dd654e97a077ac9c14655e3501eb8.tar.bz2
gentoo-2-e44dddfe464dd654e97a077ac9c14655e3501eb8.zip
Fixed to compile with JAVA_PKG_STRICT.
(Portage version: 2.1.1_rc1-r7)
Diffstat (limited to 'dev-java/jaxme')
-rw-r--r--dev-java/jaxme/ChangeLog5
-rw-r--r--dev-java/jaxme/jaxme-0.3.1-r2.ebuild11
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog
index 249698a4af76..591eb3d0326d 100644
--- a/dev-java/jaxme/ChangeLog
+++ b/dev-java/jaxme/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jaxme
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.11 2006/08/07 00:11:55 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.12 2006/09/09 06:49:40 betelgeuse Exp $
+
+ 09 Sep 2006; Petteri Räty <betelgeuse@gentoo.org> jaxme-0.3.1-r2.ebuild:
+ Fixed to compile with JAVA_PKG_STRICT.
07 Aug 2006; Joshua Nichols <nichoj@gentoo.org> jaxme-0.3.1-r2.ebuild:
Updated depenedencies, so that Java 1.6 won't be used at build time, because
diff --git a/dev-java/jaxme/jaxme-0.3.1-r2.ebuild b/dev-java/jaxme/jaxme-0.3.1-r2.ebuild
index 9c5aa5e49461..d8061132654f 100644
--- a/dev-java/jaxme/jaxme-0.3.1-r2.ebuild
+++ b/dev-java/jaxme/jaxme-0.3.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r2.ebuild,v 1.2 2006/08/07 00:11:55 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r2.ebuild,v 1.3 2006/09/09 06:49:40 betelgeuse Exp $
inherit java-pkg-2 java-ant-2 eutils
@@ -52,6 +52,10 @@ src_unpack() {
java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar
java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
+ # Bad build system, should be fixed to use properties
+ java-pkg_jarfrom ant-core ant.jar ant-1.5.4.jar
+ java-pkg_jarfrom ant-core ant.jar ant.jar
+
# Special case: jaxme uses build<foo>.xml files, so rewriting them by hand
# is better:
cd ${S}
@@ -61,10 +65,7 @@ src_unpack() {
}
src_compile() {
- local antflags="jar"
- use doc && antflags="${antflags} -Dbuild.apidocs=dist/doc/api javadoc"
-
- eant ${antflags} || die "Compilation failed"
+ eant $(use_doc -Dbuild.apidocs=dist/doc/api javadoc) jar
}
src_install() {