summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2007-12-17 13:58:18 +0000
committerCaleb Tennis <caleb@gentoo.org>2007-12-17 13:58:18 +0000
commit7faa7bf2af7dafe2abe179a2bf8b21373e45e5b4 (patch)
treecaca3905d67c3e9bb8ac45283d322ad7609834e7 /dev-java/jruby/jruby-1.0.0.ebuild
parentSparc stable, Bug #202552. (diff)
downloadgentoo-2-7faa7bf2af7dafe2abe179a2bf8b21373e45e5b4.tar.gz
gentoo-2-7faa7bf2af7dafe2abe179a2bf8b21373e45e5b4.tar.bz2
gentoo-2-7faa7bf2af7dafe2abe179a2bf8b21373e45e5b4.zip
version bump, with a few dep changes. See bug #190124
(Portage version: 2.1.3.16)
Diffstat (limited to 'dev-java/jruby/jruby-1.0.0.ebuild')
-rw-r--r--dev-java/jruby/jruby-1.0.0.ebuild9
1 files changed, 4 insertions, 5 deletions
diff --git a/dev-java/jruby/jruby-1.0.0.ebuild b/dev-java/jruby/jruby-1.0.0.ebuild
index 75fc287a6980..faf7d4ec7e57 100644
--- a/dev-java/jruby/jruby-1.0.0.ebuild
+++ b/dev-java/jruby/jruby-1.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.0.0.ebuild,v 1.3 2007/10/24 05:29:46 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.0.0.ebuild,v 1.4 2007/12/17 13:58:17 caleb Exp $
JAVA_PKG_IUSE="doc source test"
inherit eutils java-pkg-2 java-ant-2
@@ -23,12 +23,11 @@ IUSE="bsf"
COMMON_DEPEND=">=dev-java/jline-0.9.91
=dev-java/asm-2.2*
- dev-java/backport-util-concurrent
- !<dev-java/jruby-1.0.0_rc2-r1"
+ dev-java/backport-util-concurrent"
RDEPEND=">=virtual/jre-1.4
${COMMON_DEPEND}"
-# FIXME doesn't quite compile correctly with 1.6
-DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
+
+DEPEND=">=virtual/jdk-1.4
bsf? ( >=dev-java/bsf-2.3 )
test? (
=dev-java/junit-3*