summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-09-27 12:28:26 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-09-27 12:28:26 +0000
commit99b63d8b3ed45b5fde8df021232a42934a6ee88c (patch)
treed8bb9208daea9eec9abffe0d3eed93b3bd5248be /dev-java/gjdoc
parentStable on x86 (bug #238611) (diff)
downloadgentoo-2-99b63d8b3ed45b5fde8df021232a42934a6ee88c.tar.gz
gentoo-2-99b63d8b3ed45b5fde8df021232a42934a6ee88c.tar.bz2
gentoo-2-99b63d8b3ed45b5fde8df021232a42934a6ee88c.zip
Use EAPI 2 use dependencies to require antlr with the java use flag. Fixes bug #233765.
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)
Diffstat (limited to 'dev-java/gjdoc')
-rw-r--r--dev-java/gjdoc/ChangeLog6
-rw-r--r--dev-java/gjdoc/gjdoc-0.7.9.ebuild13
2 files changed, 12 insertions, 7 deletions
diff --git a/dev-java/gjdoc/ChangeLog b/dev-java/gjdoc/ChangeLog
index 02f6c0ca222c..ae88c0035494 100644
--- a/dev-java/gjdoc/ChangeLog
+++ b/dev-java/gjdoc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/gjdoc
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.32 2008/04/22 13:57:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.33 2008/09/27 12:28:26 betelgeuse Exp $
+
+ 27 Sep 2008; Petteri Räty <betelgeuse@gentoo.org> gjdoc-0.7.9.ebuild:
+ Use EAPI 2 use dependencies to require antlr with the java use flag. Fixes
+ bug #233765.
*gjdoc-0.7.9 (22 Apr 2008)
diff --git a/dev-java/gjdoc/gjdoc-0.7.9.ebuild b/dev-java/gjdoc/gjdoc-0.7.9.ebuild
index 09466f0b990d..3ece8917c74b 100644
--- a/dev-java/gjdoc/gjdoc-0.7.9.ebuild
+++ b/dev-java/gjdoc/gjdoc-0.7.9.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.9.ebuild,v 1.1 2008/04/22 13:57:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.9.ebuild,v 1.2 2008/09/27 12:28:26 betelgeuse Exp $
+EAPI=2
JAVA_PKG_IUSE="source"
inherit eutils autotools java-pkg-2
@@ -23,13 +24,13 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
#
IUSE="xmldoclet"
+RDEPEND=">=virtual/jre-1.4
+ >=dev-java/antlr-2.7.1[java]"
+
# Refused to emerge with sun-jdk-1.3* complaining about wanting a bigger stack size
-DEPEND=">=dev-java/antlr-2.7.1
+DEPEND="${RDEPEND}
>=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4
- >=dev-java/antlr-2.7.1"
-
src_unpack() {
unpack ${A}
cd "${S}"
@@ -62,7 +63,7 @@ src_install() {
done
dobin "${FILESDIR}"/gjdoc
- dodoc AUTHORS ChangeLog NEWS README
+ dodoc AUTHORS ChangeLog NEWS README || die
cd "${S}"/docs
emake DESTDIR="${D}" install || die "Failed to install documentation"