summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Coutts <dcoutts@gentoo.org>2007-07-09 13:23:40 +0000
committerDuncan Coutts <dcoutts@gentoo.org>2007-07-09 13:23:40 +0000
commit74a77849983561966c739c21f6a0f0167d48c13a (patch)
tree155dc6c6356e289c184175a38de932bbc374849d /dev-haskell/arrows
parentApply fix from upstream to make pcap.findalldevs() work fine (bug #179342) (diff)
downloadhistorical-74a77849983561966c739c21f6a0f0167d48c13a.tar.gz
historical-74a77849983561966c739c21f6a0f0167d48c13a.tar.bz2
historical-74a77849983561966c739c21f6a0f0167d48c13a.zip
Fix building arrows-0.2.1 with current Cabal.
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'dev-haskell/arrows')
-rw-r--r--dev-haskell/arrows/ChangeLog5
-rw-r--r--dev-haskell/arrows/Manifest22
-rw-r--r--dev-haskell/arrows/arrows-0.2.1.ebuild10
3 files changed, 23 insertions, 14 deletions
diff --git a/dev-haskell/arrows/ChangeLog b/dev-haskell/arrows/ChangeLog
index 28a004bc8651..a0a7712588e6 100644
--- a/dev-haskell/arrows/ChangeLog
+++ b/dev-haskell/arrows/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/arrows
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/arrows/ChangeLog,v 1.5 2007/07/08 17:33:42 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/arrows/ChangeLog,v 1.6 2007/07/09 13:23:40 dcoutts Exp $
+
+ 09 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> arrows-0.2.1.ebuild:
+ Fix building arrows-0.2.1 with current Cabal.
*arrows-0.2.1 (08 Jul 2007)
diff --git a/dev-haskell/arrows/Manifest b/dev-haskell/arrows/Manifest
index ebc0c4511f38..8edaf69c8f43 100644
--- a/dev-haskell/arrows/Manifest
+++ b/dev-haskell/arrows/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
DIST ghc-6.6-src-extralibs.tar.bz2 2015443 RMD160 63d87d02f42efc032c20de7394f3b29431fd8eed SHA1 b94974e255165703d882bb522ec44c5bdc4b0aec SHA256 1c811695d074c7560ca9bd7773523f817ccb57390044392a1ad92cf0079bea29
DIST ghc-6.6.1-src-extralibs.tar.bz2 1928527 RMD160 1c18c85d978c4b3369132e247c823aaa90ea8530 SHA1 1398f6c35191d52410a2e066b382635dff0d8d6d SHA256 d162a82fc388fdd48c327b09bb6d778f2313d12d5282f3b120ac08a5d4e78902
-EBUILD arrows-0.2.1.ebuild 601 RMD160 5277a8545ed1d3f38d61ef144cf039482c935ca5 SHA1 77e25157611e490b872137a6c05b478544f5b91b SHA256 f070555c22fadd25b1baf7a3641acc0e04e67ab683c767437da6ff3b83c3b7d4
-MD5 a035eb9b5550898d596b2b08a286e83d arrows-0.2.1.ebuild 601
-RMD160 5277a8545ed1d3f38d61ef144cf039482c935ca5 arrows-0.2.1.ebuild 601
-SHA256 f070555c22fadd25b1baf7a3641acc0e04e67ab683c767437da6ff3b83c3b7d4 arrows-0.2.1.ebuild 601
+EBUILD arrows-0.2.1.ebuild 775 RMD160 e33e1f7f8aa9116be3a91841376bda14c549642d SHA1 566f37bae9e04e535be1b4ee465a7a88385b5727 SHA256 0dd23dd314f7b29726894e30c92a6dbe586ed643f304176162c0afd71d867e09
+MD5 362c8e0a7d62b1ed0625407e88f4f620 arrows-0.2.1.ebuild 775
+RMD160 e33e1f7f8aa9116be3a91841376bda14c549642d arrows-0.2.1.ebuild 775
+SHA256 0dd23dd314f7b29726894e30c92a6dbe586ed643f304176162c0afd71d867e09 arrows-0.2.1.ebuild 775
EBUILD arrows-0.2.ebuild 597 RMD160 c6881fe2f12cbf805672e43e019c92fab3b54503 SHA1 4d4fb993c327fc24fdd68424eb53beb691461b8d SHA256 5e4e4a3a9657bb4ccd866d42fc67516f373b8558256604707da4eac650a8c3ea
MD5 3be6cd4f70c0b360de7f2ef62446dc78 arrows-0.2.ebuild 597
RMD160 c6881fe2f12cbf805672e43e019c92fab3b54503 arrows-0.2.ebuild 597
SHA256 5e4e4a3a9657bb4ccd866d42fc67516f373b8558256604707da4eac650a8c3ea arrows-0.2.ebuild 597
-MISC ChangeLog 1036 RMD160 9ef09ad77fa5573f203ec2473630b4054ba39468 SHA1 8c9ce92a86a0702c0569d3ce471de27ad99df464 SHA256 1fab8833d6c0181906b573c0cc04609031447a8d420716316406bca05961332f
-MD5 4d8f5bb5b6c353b96df263a7e357b974 ChangeLog 1036
-RMD160 9ef09ad77fa5573f203ec2473630b4054ba39468 ChangeLog 1036
-SHA256 1fab8833d6c0181906b573c0cc04609031447a8d420716316406bca05961332f ChangeLog 1036
+MISC ChangeLog 1156 RMD160 530b43fc9a765d173eada5150965372bb8f41e80 SHA1 562d8b15a5f34861d66c6051abc115b26779305d SHA256 4cd944a333242a15835bc03dcb96a0b7b0f5cda46d0ce92a25231300c410deac
+MD5 f9961b717c373d7bd2789279103d70f0 ChangeLog 1156
+RMD160 530b43fc9a765d173eada5150965372bb8f41e80 ChangeLog 1156
+SHA256 4cd944a333242a15835bc03dcb96a0b7b0f5cda46d0ce92a25231300c410deac ChangeLog 1156
MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -28,7 +28,7 @@ SHA256 3d9bddb04ccd984fc7bda5d589e77b4e22ecb7459580338979543bd8ed551f0b files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
-iD8DBQFGkSAVnUVyUObPUL4RAkSoAJ9/OZKhaWmtWXuqA7RWkhoAGYQoYACfXEYe
-vsb7Hm2LRq437gaI2O55dJQ=
-=3n0l
+iD8DBQFGkjb8nUVyUObPUL4RAqwWAJ9BAj2bcrgo/1MAy2s1BS2n+iJhmwCfSanf
+FOfG15xTYwvxqNWjKCPpoGs=
+=AQTN
-----END PGP SIGNATURE-----
diff --git a/dev-haskell/arrows/arrows-0.2.1.ebuild b/dev-haskell/arrows/arrows-0.2.1.ebuild
index de2abb93d6b6..08775d978edf 100644
--- a/dev-haskell/arrows/arrows-0.2.1.ebuild
+++ b/dev-haskell/arrows/arrows-0.2.1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/arrows/arrows-0.2.1.ebuild,v 1.1 2007/07/08 17:33:42 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/arrows/arrows-0.2.1.ebuild,v 1.2 2007/07/09 13:23:40 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
-inherit base haskell-cabal
+inherit haskell-cabal
GHC_PV=6.6.1
@@ -19,3 +19,9 @@ IUSE=""
DEPEND=">=dev-lang/ghc-6.6"
S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}"
+
+# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x
+src_unpack() {
+ unpack "${A}"
+ sed -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" ${S}/Setup.hs
+}