From 02f83c15d06488980ad136fe5fa61182f9a2b8bc Mon Sep 17 00:00:00 2001 From: Lennart Kolmodin Date: Tue, 10 Apr 2007 18:06:06 +0000 Subject: [PATCH] Fix deps. Just as bug 161424. Package-Manager: portage-2.1.2.3 --- dev-lang/helium/ChangeLog | 5 ++++- dev-lang/helium/Manifest | 22 +++++++++++----------- dev-lang/helium/helium-1.1.ebuild | 4 ++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dev-lang/helium/ChangeLog b/dev-lang/helium/ChangeLog index 85d8b27c8128..fbd2b51f11c3 100644 --- a/dev-lang/helium/ChangeLog +++ b/dev-lang/helium/ChangeLog @@ -1,6 +1,9 @@ # 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.19 2007/04/10 17:36:29 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.20 2007/04/10 18:06:06 kolmodin Exp $ + + 10 Apr 2007; helium-1.1.ebuild: + Fix deps, identical to bug 161424. 10 Apr 2007; Lennart Kolmodin helium-1.2-r1.ebuild: Fix dependencies wrt bug 161424, i.e. dep+block overlap. diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest index 6a228aca9114..4084184071da 100644 --- a/dev-lang/helium/Manifest +++ b/dev-lang/helium/Manifest @@ -26,10 +26,10 @@ DIST helium-1.1-src.tar.gz 901073 RMD160 ecfd1fda99daf8f97262c27bac6ace3cd33da7a DIST helium-1.2-src.tar.gz 1200565 RMD160 213f8c90243aa6db1ed1f188b131f7c7b8235f35 SHA1 de54d5b6275f2f3326f047180b507928e6ec182e SHA256 474aa26e2a92545d64158ea88440b5d5a7758318a0b34dbded4cc20814099bb0 DIST helium-1.6-ghc.patch.bz2 34579 RMD160 7754353e882d233533011f7e7be0bc92c01b83d0 SHA1 3be01c237bba001c0ed5bfe97cfbaac25aff05c0 SHA256 da463fe2a27689ec702eaf7c687446272f983845228cbb45d0fa91e1542cd7ab DIST helium-1.6-src.tar.gz 960254 RMD160 9700dde4b77adb73825965c00cdc02d3e1f6fab6 SHA1 9e1d43d25c92f86c57fe5864e26365923dcfe98c SHA256 a93632d031a16c0ea516f4fa7ce63acd0950543c74265e22abd0993856a0a053 -EBUILD helium-1.1.ebuild 1845 RMD160 a205193639197a3d7850fab4104953254f4157fa SHA1 45dff8273c2ecf7a4d43a4e483f3a8376eaff618 SHA256 fa8b26bc7bdb99a88613d87fd43bda3e298b553138c1bb799297686a5fc733c6 -MD5 ccf6a963e8490c462070f39bd7ccb4e9 helium-1.1.ebuild 1845 -RMD160 a205193639197a3d7850fab4104953254f4157fa helium-1.1.ebuild 1845 -SHA256 fa8b26bc7bdb99a88613d87fd43bda3e298b553138c1bb799297686a5fc733c6 helium-1.1.ebuild 1845 +EBUILD helium-1.1.ebuild 1844 RMD160 1d00803488c4ca664384e9683cc8c68833428c9c SHA1 77f40cfd47bdd9b5f6eafe5681bf9bb0b25627a1 SHA256 0659997b18746fd939872fcc6d596af41b9a27dfa7b6a73f0e287526e0f5f24c +MD5 5a03b263868ed08e6efb9f4068ee2d0e helium-1.1.ebuild 1844 +RMD160 1d00803488c4ca664384e9683cc8c68833428c9c helium-1.1.ebuild 1844 +SHA256 0659997b18746fd939872fcc6d596af41b9a27dfa7b6a73f0e287526e0f5f24c helium-1.1.ebuild 1844 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 @@ -38,10 +38,10 @@ EBUILD helium-1.6.ebuild 1771 RMD160 779687e8ae94f54bb4fd3049b1d4bd64ad5cd44a SH MD5 a67f8c471402e1a558e1e3adb9a0f990 helium-1.6.ebuild 1771 RMD160 779687e8ae94f54bb4fd3049b1d4bd64ad5cd44a helium-1.6.ebuild 1771 SHA256 777cb639b1d567b7387a0d42540683bfbce5be0d4cf6325097ac00deba2bb689 helium-1.6.ebuild 1771 -MISC ChangeLog 2897 RMD160 3f31eb13945dd75c5d2d3e3727e7058e501125c0 SHA1 6a4df9b9776a254bb45128f944f046c71666afdc SHA256 68e60f435b83f9ec84fdafb4e7778e143cae0e7f06c41353208751bf8055c93c -MD5 cf29ee01fc03c6d9361d5f8b70165473 ChangeLog 2897 -RMD160 3f31eb13945dd75c5d2d3e3727e7058e501125c0 ChangeLog 2897 -SHA256 68e60f435b83f9ec84fdafb4e7778e143cae0e7f06c41353208751bf8055c93c ChangeLog 2897 +MISC ChangeLog 2991 RMD160 534acb1634381570cfa9ab4a702ef966960a991c SHA1 b06c060145ac5e9ea168964d1758b5abd074f040 SHA256 009ea6c3d6ea096bd9e7ff31406fa27802ba84e6a1e69fafb65f6f5ef95ace8c +MD5 d90ac2800820b72b87efeef3fa3003c8 ChangeLog 2991 +RMD160 534acb1634381570cfa9ab4a702ef966960a991c ChangeLog 2991 +SHA256 009ea6c3d6ea096bd9e7ff31406fa27802ba84e6a1e69fafb65f6f5ef95ace8c ChangeLog 2991 MISC metadata.xml 224 RMD160 57bc74b2471cd3dba6dcdcce531df8eb82893cee SHA1 26ebe68897710a99cee04ae5e7c38217295e3dc2 SHA256 2b30834e4d9f141a1e1b63457d4af1f6a8cb6d4a47f8dd3b14e726277079769b MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224 RMD160 57bc74b2471cd3dba6dcdcce531df8eb82893cee metadata.xml 224 @@ -58,7 +58,7 @@ SHA256 0ababcf8be23eae39ae6fc8277eb0664ee055615c515a8a06ad4e10bd1ac97a7 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFGG8sp1n/CYbXjntIRAvupAJ9TMty3IjnBGX78yyoyAWA6DCQFNwCeN5W1 -QN5xdBQ9VUVCdgS9jPYF3LA= -=QMcC +iD8DBQFGG9Ic1n/CYbXjntIRAkttAJ4+bOmqWr/65nSi5trepOYo59s1hwCfUwT/ +cxmd5+NrA9JQfO/XZV3CPxI= +=OkE8 -----END PGP SIGNATURE----- diff --git a/dev-lang/helium/helium-1.1.ebuild b/dev-lang/helium/helium-1.1.ebuild index 75f60d7a798b..770f73f749bc 100644 --- a/dev-lang/helium/helium-1.1.ebuild +++ b/dev-lang/helium/helium-1.1.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-lang/helium/helium-1.1.ebuild,v 1.18 2007/01/06 18:21:43 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.1.ebuild,v 1.19 2007/04/10 18:06:06 kolmodin Exp $ inherit java-pkg @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="x86 -sparc" IUSE="readline" -DEPEND=">=virtual/ghc-6.2 +DEPEND="=virtual/ghc-6.4 readline? ( sys-libs/readline )" RDEPEND="virtual/jdk -- 2.26.2