summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-04-26 21:40:37 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-04-26 21:40:37 +0000
commit6b236991c32195b3b7d2dd9fd9c1eb7aa449eec0 (patch)
treefb69bf1a18e349110b03589a444e8bd6fd1a39ee
parent2.1.2.5 maintenance release. (diff)
downloadgentoo-2-6b236991c32195b3b7d2dd9fd9c1eb7aa449eec0.tar.gz
gentoo-2-6b236991c32195b3b7d2dd9fd9c1eb7aa449eec0.tar.bz2
gentoo-2-6b236991c32195b3b7d2dd9fd9c1eb7aa449eec0.zip
Fix RDEPEND and switch to java-pkg_dojavadoc.
(Portage version: 2.1.2.4)
-rw-r--r--dev-java/werken-xpath/ChangeLog8
-rw-r--r--dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild20
2 files changed, 17 insertions, 11 deletions
diff --git a/dev-java/werken-xpath/ChangeLog b/dev-java/werken-xpath/ChangeLog
index ecbdfe49b1d2..f827fd01bdc6 100644
--- a/dev-java/werken-xpath/ChangeLog
+++ b/dev-java/werken-xpath/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/werken-xpath
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/ChangeLog,v 1.6 2006/07/22 20:45:07 nelchael Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/ChangeLog,v 1.7 2007/04/26 21:40:37 betelgeuse Exp $
+
+ 26 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+ werken-xpath-0.9.4_beta-r1.ebuild:
+ Fix RDEPEND and switch to java-pkg_dojavadoc.
22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
werken-xpath-0.9.4_beta-r1.ebuild:
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild
index 58803025a09c..6861983fe64d 100644
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild,v 1.2 2006/07/22 20:45:07 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild,v 1.3 2007/04/26 21:40:37 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2 eutils versionator
@@ -16,14 +18,14 @@ SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz"
LICENSE="werken.xpath"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
+COMMON_DEP="
+ ~dev-java/jdom-1.0_beta9
+ dev-java/antlr"
DEPEND=">=virtual/jdk-1.4
- dev-java/ant-core
- dev-java/antlr
- source? ( app-arch/zip )"
+ ${COMMON_DEP}"
RDEPEND=">=virtual/jre-1.4
- ~dev-java/jdom-1.0_beta9"
+ ${COMMON_DEP}"
S="${WORKDIR}/${MY_PN}"
@@ -64,7 +66,7 @@ src_compile() {
src_install() {
java-pkg_dojar build/${MY_PN}.jar
- dodoc README TODO LIMITATIONS
- use doc && java-pkg_dohtml -r build/api
+ dodoc README TODO LIMITATIONS || die
+ use doc && java-pkg_dojavadoc build/api
use source && java-pkg_dosrc src/*
}