Block on ghc-6.4 rather than forcing a downgrade.

Package-Manager: portage-2.1-r2

4 files changed, 57 insertions, 24 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/Manifest b/dev-lang/helium/Manifest
index c57f0a4f8eb5..1252c025a1ca 100644
--- a/dev-lang/helium/Manifest
+++ b/dev-lang/helium/Manifest
@@ -1,20 +1,51 @@
 -----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
+AUX helium-1.1-readline.patch 1710 RMD160 4254f4a102623bfe0fd2883937706abb83b5e61a SHA1 890f05fd7f02cd939e668d0df6c767fc17157c0e SHA256 9295cf427e3f52e418ccb9d5491057fc90df13b1ce8621657ccaf70741e61763
+MD5 538379c81a9dfdc87a15ce0e6a504c8a files/helium-1.1-readline.patch 1710
+RMD160 4254f4a102623bfe0fd2883937706abb83b5e61a files/helium-1.1-readline.patch 1710
+SHA256 9295cf427e3f52e418ccb9d5491057fc90df13b1ce8621657ccaf70741e61763 files/helium-1.1-readline.patch 1710
+AUX helium-1.2-libraries.patch 1943 RMD160 d4e074d29d8919a0f2e8333c93313e44fcf15ade SHA1 c1109d2823b31e39627784b130aa380f5224ad7a SHA256 6206b35d537d93a91bcfc374bf11831850190897e60761f4a68b71e9014b7eb6
+MD5 24e12289b961bd308d3a79495d55952e files/helium-1.2-libraries.patch 1943
+RMD160 d4e074d29d8919a0f2e8333c93313e44fcf15ade files/helium-1.2-libraries.patch 1943
+SHA256 6206b35d537d93a91bcfc374bf11831850190897e60761f4a68b71e9014b7eb6 files/helium-1.2-libraries.patch 1943
+AUX helium-1.2-readline.patch 1661 RMD160 7fa5e4f9c8cd5daa7ac81720c2d7514efc4f3085 SHA1 4a35deefd9c5285acb88a7746f79b36041c6b7b9 SHA256 fcd69f6ed0a32769d156164597632e0d2dbfc8cf99b70da61d15e7b488525dfc
 MD5 fb82aad0fbf3d3cb5071c5fef803a7ec files/helium-1.2-readline.patch 1661
+RMD160 7fa5e4f9c8cd5daa7ac81720c2d7514efc4f3085 files/helium-1.2-readline.patch 1661
+SHA256 fcd69f6ed0a32769d156164597632e0d2dbfc8cf99b70da61d15e7b488525dfc files/helium-1.2-readline.patch 1661
+AUX helium-wrapper 715 RMD160 d149b2fecd4fb572207dac9ce367200c9ba69e9a SHA1 722c021ab96d588fe6f9eddb7bd9182b58b70afe SHA256 58516ac6fce8f7749f4e365a1317e427d23e68a2476c785090f955959a4ddb93
 MD5 b52e9cf5c002e2c5ce007e523f7ec7b8 files/helium-wrapper 715
-MD5 24e12289b961bd308d3a79495d55952e files/helium-1.2-libraries.patch 1943
-MD5 538379c81a9dfdc87a15ce0e6a504c8a files/helium-1.1-readline.patch 1710
+RMD160 d149b2fecd4fb572207dac9ce367200c9ba69e9a files/helium-wrapper 715
+SHA256 58516ac6fce8f7749f4e365a1317e427d23e68a2476c785090f955959a4ddb93 files/helium-wrapper 715
+DIST Hint.jar 120170
+DIST helium-1.1-src.tar.gz 901073
+DIST helium-1.2-src.tar.gz 1200565
+EBUILD helium-1.1.ebuild 1846 RMD160 ba1a21cfe33cff94c265a6897644129c516ba251 SHA1 0e8ab57fa907a3018f2c9192bd5c22d477a4d5f2 SHA256 feacd83ff71613257fe399820296a4339ea399d82bac9f0c82af3e3a1f371c48
+MD5 e4424d81497405cecf45992a9d2894af helium-1.1.ebuild 1846
+RMD160 ba1a21cfe33cff94c265a6897644129c516ba251 helium-1.1.ebuild 1846
+SHA256 feacd83ff71613257fe399820296a4339ea399d82bac9f0c82af3e3a1f371c48 helium-1.1.ebuild 1846
+EBUILD helium-1.2-r1.ebuild 2253 RMD160 8a2b2b4759b20fb81eecd85040c4600b3b7eed0a SHA1 9126de107facebb3db922b5a921e8ac4ceedbf6e SHA256 94b77bddf880f7ef627e12196214dc2d9d86c3e0bc66e3cc168fbc92d821739f
+MD5 fdcccfc25099b50d201103c258a24679 helium-1.2-r1.ebuild 2253
+RMD160 8a2b2b4759b20fb81eecd85040c4600b3b7eed0a helium-1.2-r1.ebuild 2253
+SHA256 94b77bddf880f7ef627e12196214dc2d9d86c3e0bc66e3cc168fbc92d821739f helium-1.2-r1.ebuild 2253
+MISC ChangeLog 2386 RMD160 47e88fbb3f7603aeaaef5a0b63cd0641446f667f SHA1 8856d5b07a94b5d5fa5003a37c46c2d6d2027fae SHA256 dc9825e5bfdb2399595d5c16ce092db7d129ba9a78e5a0164bde4312554dcabe
+MD5 4d58429a43a1e85e70b38f9aceb068c6 ChangeLog 2386
+RMD160 47e88fbb3f7603aeaaef5a0b63cd0641446f667f ChangeLog 2386
+SHA256 dc9825e5bfdb2399595d5c16ce092db7d129ba9a78e5a0164bde4312554dcabe ChangeLog 2386
+MISC metadata.xml 224 RMD160 57bc74b2471cd3dba6dcdcce531df8eb82893cee SHA1 26ebe68897710a99cee04ae5e7c38217295e3dc2 SHA256 2b30834e4d9f141a1e1b63457d4af1f6a8cb6d4a47f8dd3b14e726277079769b
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
+RMD160 57bc74b2471cd3dba6dcdcce531df8eb82893cee metadata.xml 224
+SHA256 2b30834e4d9f141a1e1b63457d4af1f6a8cb6d4a47f8dd3b14e726277079769b metadata.xml 224
 MD5 9383829eb1e80fc6be12c53d3162d58b files/digest-helium-1.1 119
+RMD160 99383c010958f71e5862e643b0608ad790708d7d files/digest-helium-1.1 119
+SHA256 7f6d8e71f94149896ba275a67f3db26fbc6dcab386ba9d1daf03e4e6b4d12ad7 files/digest-helium-1.1 119
 MD5 62f20b4dc3f4e34dd748b64d19dbb6c8 files/digest-helium-1.2-r1 120
+RMD160 e16671c31c3cdf850972472b0680c77c115071cb files/digest-helium-1.2-r1 120
+SHA256 339c09d5579d8d605cae29a7295bd2bdb2c93d7923331c02cd6740ba9e13ff2a files/digest-helium-1.2-r1 120
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFC5BmxkyZuKN4EQ6YRAhIVAJ4/stvITUIpzDWzzKGx4a3wzdcOTwCffq1y
-lRVc6VTMU5RBxgwYlVezuKE=
-=CAOp
+iD8DBQFFEH/0nUVyUObPUL4RAvvXAJ9BVDfybjXE5c/R1XJhBAAgw6DQHgCfdVQY
+CU6FR+7m40KEqw8u/CJ/2QE=
+=K7cu
 -----END PGP SIGNATURE-----
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 )"