summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2007-05-13 18:23:19 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2007-05-13 18:23:19 +0000
commit5311c235da927992eaacd81872c5f6eaef8f0cdd (patch)
treeee73eaa652c51123533ad7319e909002171f82b3 /dev-java/qdox
parentadd <herd>no-herd</herd> (diff)
downloadgentoo-2-5311c235da927992eaacd81872c5f6eaef8f0cdd.tar.gz
gentoo-2-5311c235da927992eaacd81872c5f6eaef8f0cdd.tar.bz2
gentoo-2-5311c235da927992eaacd81872c5f6eaef8f0cdd.zip
Fix building qdox.
(Portage version: 2.1.2.7)
Diffstat (limited to 'dev-java/qdox')
-rw-r--r--dev-java/qdox/ChangeLog6
-rw-r--r--dev-java/qdox/qdox-20050104-r1.ebuild31
2 files changed, 28 insertions, 9 deletions
diff --git a/dev-java/qdox/ChangeLog b/dev-java/qdox/ChangeLog
index dd32824273e0..c008e0e22db9 100644
--- a/dev-java/qdox/ChangeLog
+++ b/dev-java/qdox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/qdox
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/ChangeLog,v 1.8 2007/04/20 14:44:47 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/ChangeLog,v 1.9 2007/05/13 18:23:19 nelchael Exp $
+
+ 13 May 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+ qdox-20050104-r1.ebuild:
+ Fix building qdox.
20 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
qdox-20050104-r1.ebuild:
diff --git a/dev-java/qdox/qdox-20050104-r1.ebuild b/dev-java/qdox/qdox-20050104-r1.ebuild
index 55e3ae14124e..25c8ae567352 100644
--- a/dev-java/qdox/qdox-20050104-r1.ebuild
+++ b/dev-java/qdox/qdox-20050104-r1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/qdox-20050104-r1.ebuild,v 1.4 2007/04/20 14:44:47 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/qdox-20050104-r1.ebuild,v 1.5 2007/05/13 18:23:19 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
@@ -11,25 +13,38 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="Apache-1.1"
SLOT="1.6" # it's the 1.6 codebase
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
+IUSE=""
+
+COMMON_DEP="dev-java/junit
+ dev-java/ant-core"
-COMMON_DEP="
- dev-java/junit
- >=dev-java/ant-core-1.4"
DEPEND=">=virtual/jdk-1.4
${COMMON_DEP}"
RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"
-src_compile() {
+src_unpack() {
+
+ unpack ${A}
java-ant_rewrite-classpath "${S}/build.xml"
- eant -Dgentoo.classpath=$(java-pkg_getjars junit,ant-core) jar $(use_doc docs)
+
+}
+
+EANT_DOC_TARGET="docs"
+
+src_compile() {
+
+ EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars junit,ant-core)"
+ java-pkg-2_src_compile
+
}
src_install() {
+
java-pkg_dojar dist/${PN}.jar
dodoc README.txt
- use doc && java-pkg_dohtml -r doc/*
+ use doc && java-pkg_dojavadoc docs
use source && java-pkg_dosrc src/java/*
+
}