summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Coutts <dcoutts@gentoo.org>2006-09-19 23:41:57 +0000
committerDuncan Coutts <dcoutts@gentoo.org>2006-09-19 23:41:57 +0000
commit6f4cae89027befcabe7e0d3add8496f74a6be2c5 (patch)
treed19a5517c40dfae70a0028ac8bd0b507b25563c5 /dev-lang/helium
parentmissing dep added, see bug #147498 (diff)
downloadgentoo-2-6f4cae89027befcabe7e0d3add8496f74a6be2c5.tar.gz
gentoo-2-6f4cae89027befcabe7e0d3add8496f74a6be2c5.tar.bz2
gentoo-2-6f4cae89027befcabe7e0d3add8496f74a6be2c5.zip
Block on ghc-6.4 rather than forcing a downgrade.
(Portage version: 2.1-r2)
Diffstat (limited to 'dev-lang/helium')
-rw-r--r--dev-lang/helium/ChangeLog8
-rw-r--r--dev-lang/helium/helium-1.1.ebuild11
-rw-r--r--dev-lang/helium/helium-1.2-r1.ebuild11
3 files changed, 16 insertions, 14 deletions
diff --git a/dev-lang/helium/ChangeLog b/dev-lang/helium/ChangeLog
index f08e489d28f0..abba7a948276 100644
--- a/dev-lang/helium/ChangeLog
+++ b/dev-lang/helium/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/helium
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.15 2005/07/24 22:41:49 dcoutts Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.16 2006/09/19 23:41:57 dcoutts Exp $
+
+ 19 Sep 2006; Duncan Coutts <dcoutts@gentoo.org> helium-1.1.ebuild,
+ helium-1.2-r1.ebuild:
+ Block on ghc-6.4 rather than forcing a downgrade.
24 Jul 2005; <duncan@gentoo.org> helium-1.1.ebuild, helium-1.2-r1.ebuild:
Change the ghc dependency to a form that portage can cope with better.
diff --git a/dev-lang/helium/helium-1.1.ebuild b/dev-lang/helium/helium-1.1.ebuild
index 459b58c51a50..e2e8298f21a7 100644
--- a/dev-lang/helium/helium-1.1.ebuild
+++ b/dev-lang/helium/helium-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.1.ebuild,v 1.16 2005/07/24 22:41:49 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.1.ebuild,v 1.17 2006/09/19 23:41:57 dcoutts Exp $
inherit java-pkg
@@ -14,11 +14,10 @@ SLOT="0"
KEYWORDS="x86 -sparc"
IUSE="readline"
-DEPEND="virtual/libc
- <virtual/ghc-6.4
+DEPEND=">=virtual/ghc-6.2
+ !>=virtual/ghc-6.4
readline? ( sys-libs/readline )"
-RDEPEND="virtual/libc
- virtual/jdk
+RDEPEND="virtual/jdk
dev-libs/gmp
readline? ( sys-libs/readline )"
diff --git a/dev-lang/helium/helium-1.2-r1.ebuild b/dev-lang/helium/helium-1.2-r1.ebuild
index bfde9af3d9cf..daae9f872150 100644
--- a/dev-lang/helium/helium-1.2-r1.ebuild
+++ b/dev-lang/helium/helium-1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.2-r1.ebuild,v 1.5 2005/07/24 22:41:49 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.2-r1.ebuild,v 1.6 2006/09/19 23:41:57 dcoutts Exp $
inherit eutils java-pkg
@@ -14,11 +14,10 @@ SLOT="0"
KEYWORDS="x86 -sparc ~ppc"
IUSE="readline"
-DEPEND="virtual/libc
- <virtual/ghc-6.4
+DEPEND=">=virtual/ghc-6.2
+ !>=virtual/ghc-6.4
readline? ( sys-libs/readline )"
-RDEPEND="virtual/libc
- virtual/jdk
+RDEPEND="virtual/jdk
dev-libs/gmp
readline? ( sys-libs/readline )"