From: Lennart Kolmodin <kolmodin@gentoo.org>
Date: Tue, 10 Apr 2007 17:36:29 +0000 (+0000)
Subject: Fix wrt 161424. Thanks to Bram Schoenmakers
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1cdd09a6594f199988cf7df60c01eaa76cddb516;p=gentoo.git

Fix wrt 161424. Thanks to Bram Schoenmakers
Package-Manager: portage-2.1.2.3
---

diff --git a/dev-lang/helium/ChangeLog b/dev-lang/helium/ChangeLog
index 0a2a860bb905..85d8b27c8128 100644
--- a/dev-lang/helium/ChangeLog
+++ b/dev-lang/helium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/helium
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.18 2007/04/06 01:10:06 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.19 2007/04/10 17:36:29 kolmodin Exp $
+
+  10 Apr 2007; Lennart Kolmodin <kolmodin@gentoo.org> helium-1.2-r1.ebuild:
+  Fix dependencies wrt bug 161424, i.e. dep+block overlap.
+  Thanks to Bram Schoenmakers <bramschoenmakers@xs4all.nl> for the patch.
 
 *helium-1.6 (06 Apr 2007)
 
diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest
index 32d4b3a8b57c..6a228aca9114 100644
--- a/dev-lang/helium/Manifest
+++ b/dev-lang/helium/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -27,18 +30,18 @@ EBUILD helium-1.1.ebuild 1845 RMD160 a205193639197a3d7850fab4104953254f4157fa SH
 MD5 ccf6a963e8490c462070f39bd7ccb4e9 helium-1.1.ebuild 1845
 RMD160 a205193639197a3d7850fab4104953254f4157fa helium-1.1.ebuild 1845
 SHA256 fa8b26bc7bdb99a88613d87fd43bda3e298b553138c1bb799297686a5fc733c6 helium-1.1.ebuild 1845
-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
+EBUILD helium-1.2-r1.ebuild 2253 RMD160 9c5bddb5b67a9e130d3e0165cb9778eb6e147347 SHA1 b80c9992fdc18cd809791060a1fa23f3118e7967 SHA256 21d769b95abd58e83926096ef85ef0e3979df81ef67302cd9d47a9f14c37f45b
+MD5 060e8ad3c44b013e786d58d1d69b1859 helium-1.2-r1.ebuild 2253
+RMD160 9c5bddb5b67a9e130d3e0165cb9778eb6e147347 helium-1.2-r1.ebuild 2253
+SHA256 21d769b95abd58e83926096ef85ef0e3979df81ef67302cd9d47a9f14c37f45b helium-1.2-r1.ebuild 2253
 EBUILD helium-1.6.ebuild 1771 RMD160 779687e8ae94f54bb4fd3049b1d4bd64ad5cd44a SHA1 5ac740f5aab2ca9ce532119cb74e62dbb1026126 SHA256 777cb639b1d567b7387a0d42540683bfbce5be0d4cf6325097ac00deba2bb689
 MD5 a67f8c471402e1a558e1e3adb9a0f990 helium-1.6.ebuild 1771
 RMD160 779687e8ae94f54bb4fd3049b1d4bd64ad5cd44a helium-1.6.ebuild 1771
 SHA256 777cb639b1d567b7387a0d42540683bfbce5be0d4cf6325097ac00deba2bb689 helium-1.6.ebuild 1771
-MISC ChangeLog 2687 RMD160 775b433eafda10818890101e52188e970903d5d8 SHA1 1f48ba0ac9349fc4fafd636ab701eaa6b61c0dbc SHA256 a5e0b729c135e3fce65cbfb20ed82d4b7ac3640a6794544e16d03a08655f6501
-MD5 fa2822d21a2d8f0517a40d88c999e08e ChangeLog 2687
-RMD160 775b433eafda10818890101e52188e970903d5d8 ChangeLog 2687
-SHA256 a5e0b729c135e3fce65cbfb20ed82d4b7ac3640a6794544e16d03a08655f6501 ChangeLog 2687
+MISC ChangeLog 2897 RMD160 3f31eb13945dd75c5d2d3e3727e7058e501125c0 SHA1 6a4df9b9776a254bb45128f944f046c71666afdc SHA256 68e60f435b83f9ec84fdafb4e7778e143cae0e7f06c41353208751bf8055c93c
+MD5 cf29ee01fc03c6d9361d5f8b70165473 ChangeLog 2897
+RMD160 3f31eb13945dd75c5d2d3e3727e7058e501125c0 ChangeLog 2897
+SHA256 68e60f435b83f9ec84fdafb4e7778e143cae0e7f06c41353208751bf8055c93c ChangeLog 2897
 MISC metadata.xml 224 RMD160 57bc74b2471cd3dba6dcdcce531df8eb82893cee SHA1 26ebe68897710a99cee04ae5e7c38217295e3dc2 SHA256 2b30834e4d9f141a1e1b63457d4af1f6a8cb6d4a47f8dd3b14e726277079769b
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 RMD160 57bc74b2471cd3dba6dcdcce531df8eb82893cee metadata.xml 224
@@ -52,3 +55,10 @@ SHA256 ef3be5170165948d4661b816056fbe5c09b9c88b2bdd42d8241de538cf9d92b1 files/di
 MD5 0fc89719d65568e4503a7198388299dd files/digest-helium-1.6 494
 RMD160 25052c702adc20628d53be34a542d8db0173a549 files/digest-helium-1.6 494
 SHA256 0ababcf8be23eae39ae6fc8277eb0664ee055615c515a8a06ad4e10bd1ac97a7 files/digest-helium-1.6 494
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGG8sp1n/CYbXjntIRAvupAJ9TMty3IjnBGX78yyoyAWA6DCQFNwCeN5W1
+QN5xdBQ9VUVCdgS9jPYF3LA=
+=QMcC
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/helium/helium-1.2-r1.ebuild b/dev-lang/helium/helium-1.2-r1.ebuild
index daae9f872150..30a120cf37f2 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.6 2006/09/19 23:41:57 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.2-r1.ebuild,v 1.7 2007/04/10 17:36:29 kolmodin Exp $
 
 inherit eutils java-pkg
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="x86 -sparc ~ppc"
 IUSE="readline"
 
-DEPEND=">=virtual/ghc-6.2
+DEPEND="<virtual/ghc-6.4
 	!>=virtual/ghc-6.4
 	readline? ( sys-libs/readline )"
 RDEPEND="virtual/jdk