Change the ghc dependency to a form that portage can cope with better.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 24 insertions, 13 deletions

diff --git a/dev-lang/helium/ChangeLog b/dev-lang/helium/ChangeLog
index 9247ee7d6de3..f08e489d28f0 100644
--- a/dev-lang/helium/ChangeLog
+++ b/dev-lang/helium/ChangeLog
@@ -1,6 +1,9 @@
 # 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.14 2005/05/04 17:56:47 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.15 2005/07/24 22:41:49 dcoutts Exp $
+
+  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.
 
   04 May 2005; David Holm <dholm@gentoo.org> helium-1.2-r1.ebuild:
   Added to ~ppc.
diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest
index c439e0b74c77..c57f0a4f8eb5 100644
--- a/dev-lang/helium/Manifest
+++ b/dev-lang/helium/Manifest
@@ -1,10 +1,20 @@
-MD5 b65c355724e70244660ff7abe83e4a0d ChangeLog 2088
-MD5 ab968ded77adb49ae2fce48082f756e9 helium-1.1.ebuild 1869
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 70697c96b2d7913ceb3f5761f7980497 helium-1.2-r1.ebuild 2260
+MD5 acb7319252ddecea9420624099713540 helium-1.1.ebuild 1853
+MD5 c128558990ac5e93b48bd93eb49505d9 ChangeLog 2240
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 bfc5642cb60b92093aa8d72647fde18f helium-1.2-r1.ebuild 2273
-MD5 9383829eb1e80fc6be12c53d3162d58b files/digest-helium-1.1 119
-MD5 538379c81a9dfdc87a15ce0e6a504c8a files/helium-1.1-readline.patch 1710
 MD5 fb82aad0fbf3d3cb5071c5fef803a7ec files/helium-1.2-readline.patch 1661
 MD5 b52e9cf5c002e2c5ce007e523f7ec7b8 files/helium-wrapper 715
-MD5 62f20b4dc3f4e34dd748b64d19dbb6c8 files/digest-helium-1.2-r1 120
 MD5 24e12289b961bd308d3a79495d55952e files/helium-1.2-libraries.patch 1943
+MD5 538379c81a9dfdc87a15ce0e6a504c8a files/helium-1.1-readline.patch 1710
+MD5 9383829eb1e80fc6be12c53d3162d58b files/digest-helium-1.1 119
+MD5 62f20b4dc3f4e34dd748b64d19dbb6c8 files/digest-helium-1.2-r1 120
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC5BmxkyZuKN4EQ6YRAhIVAJ4/stvITUIpzDWzzKGx4a3wzdcOTwCffq1y
+lRVc6VTMU5RBxgwYlVezuKE=
+=CAOp
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/helium/helium-1.1.ebuild b/dev-lang/helium/helium-1.1.ebuild
index c9d0be4a1b29..459b58c51a50 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
 # 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.15 2005/03/19 19:11:18 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.1.ebuild,v 1.16 2005/07/24 22:41:49 dcoutts Exp $
 
 inherit java-pkg
 
@@ -15,8 +15,7 @@ KEYWORDS="x86 -sparc"
 IUSE="readline"
 
 DEPEND="virtual/libc
-	virtual/ghc
-	!>=virtual/ghc-6.4
+	<virtual/ghc-6.4
 	readline? ( sys-libs/readline )"
 RDEPEND="virtual/libc
 	virtual/jdk
diff --git a/dev-lang/helium/helium-1.2-r1.ebuild b/dev-lang/helium/helium-1.2-r1.ebuild
index d341f4bf1e56..bfde9af3d9cf 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
 # 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.4 2005/05/04 17:56:47 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.2-r1.ebuild,v 1.5 2005/07/24 22:41:49 dcoutts Exp $
 
 inherit eutils java-pkg
 
@@ -15,8 +15,7 @@ KEYWORDS="x86 -sparc ~ppc"
 IUSE="readline"
 
 DEPEND="virtual/libc
-	!>=virtual/ghc-6.4
-	virtual/ghc
+	<virtual/ghc-6.4
 	readline? ( sys-libs/readline )"
 RDEPEND="virtual/libc
 	virtual/jdk