Patch hashed-storage-0.5.9 for ghc 7.6.1

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 80 insertions, 6 deletions

diff --git a/dev-haskell/hashed-storage/ChangeLog b/dev-haskell/hashed-storage/ChangeLog
index ae557e961f6d..cff83b48a40c 100644
--- a/dev-haskell/hashed-storage/ChangeLog
+++ b/dev-haskell/hashed-storage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/hashed-storage
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashed-storage/ChangeLog,v 1.27 2012/12/07 19:45:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashed-storage/ChangeLog,v 1.28 2012/12/29 13:37:41 gienah Exp $
+
+  29 Dec 2012; Mark Wright <gienah@gentoo.org>
+  +files/hashed-storage-0.5.9-ghc-7.6.patch, hashed-storage-0.5.9.ebuild:
+  Patch hashed-storage-0.5.9 for ghc 7.6.1
 
   07 Dec 2012; Agostino Sarubbo <ago@gentoo.org> hashed-storage-0.5.9.ebuild:
   Stable for ppc, wrt bug #418699
diff --git a/dev-haskell/hashed-storage/Manifest b/dev-haskell/hashed-storage/Manifest
index 1c9cd351de31..5a0738b6907e 100644
--- a/dev-haskell/hashed-storage/Manifest
+++ b/dev-haskell/hashed-storage/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX hashed-storage-0.5.7-ghc-7.2.patch 832 SHA256 1cca3f84ff482f688f3a6525040740fce4a3cb50a1998c51abfb70ab37703e37 SHA512 349ff64e37b8e04bebde8ad0db4a2234775f459ee935bdd9d396e2404acf108b07988ff8ab3c7185d7f81a6275aa24d2919922131ca40b224b64a3798beab954 WHIRLPOOL 02627f3c17f6d29ebc13859a6e00fd4dc0324c73fcbdf113bb3a0ffbfef7fb96495615740aaef8d3bc56ac2719a1043be4a51102e7535fe6c5094b665e1fcf7d
+AUX hashed-storage-0.5.9-ghc-7.6.patch 2918 SHA256 b4fa90dba832579e08b8c7a7dbc91cf5219a12ff971553c575d4bf1f57c6abda SHA512 00ba0a1749e8f2fc7bddeb887e6b1279bb8cd42428c8c8ca36a86d4b74edd31bb4dde0164ce6c3e54e7e47e40d22cb27ea3ac6a0b69e457b0a0e3da764d8d77a WHIRLPOOL d98de5d5c52e09b7611675e431eb8e687dc5bb39d92a883675c23230aa43f9ba51e2c5eee83ac63d6754e5fd6b8996405d4222fba8170c588d561b6de2dcecae
 DIST hashed-storage-0.4.13.tar.gz 54534 SHA256 c4e8dbd23469cde19696344f3e56088313ce5ee823e2d89ad2d0cb1fce602b63 SHA512 ed921fe2dcfd302510711ce7aca9c65e8f096d31d36308b6bdbe2eb3d8af0d236080dee24f187a4848a1adaa621ac1654b336f0c09930aff4e95e6ebce0eb58e WHIRLPOOL 82a07318a7ab599dfe71f33205bde76455f7240e88dc23c9ed1016066b63816dc1c924329a3b1b2e9403e329ddb033d430f8d9c01cfa3c2c78740d7e715205cc
 DIST hashed-storage-0.5.10.tar.gz 57658 SHA256 05824a4cedd2be03444fd0bc664f5c94f6edc50005f1a8f99657150fa6cdedcc SHA512 dfb9cecdfe44e311020ccb79c437d2bb326f18d4022a0386aacd5c23a7c93b6a4f70baa7c2724b796785257a1733407975682fd3b949eda80bee9824df9b7001 WHIRLPOOL f97a546b651e2a9f3e905203d9ff5db56c2edc472eec9edf2c133749e025f890118dd723a1c6eba61a18b5ab1116af888a256bac94f4557b8d18e726ec3b97b3
 DIST hashed-storage-0.5.7.tar.gz 56699 SHA256 03ecb905887a35ce9dde11ec689b4c272d68994830e0ad74550d6048f5478bfe SHA512 6fd68b173a6dae09baae3ad6bc7835c384c5c2b9fb1090e1191dbfa240e78601453c463b87d06e72fc6a0ee8bef1d8ee886ea1b1fe5eff92c4037cc1fc897c86 WHIRLPOOL 3652ddf6197fff3a0eb64db20ae613f9e93ebd493054666d00baab96496b14d0ddbb3bffa6e61954e5af6c32cd5c20f0842725b3683d16442ca4b3574366af4f
@@ -6,6 +10,13 @@ DIST hashed-storage-0.5.9.tar.gz 56719 SHA256 62c2394d0a127222920211152022e8bc40
 EBUILD hashed-storage-0.4.13.ebuild 1140 SHA256 64fc76fec6681977a2141cc2008b327f2bc85a31e2dfb41bb6683a83dab77174 SHA512 973af52b22567cb6f370f527a538cabc6566d012b060c384b70a7cdb09cc21167ac52b52cca6f38d60fadbf171a94b143cb0c41de3f52245fd291258cccb1a16 WHIRLPOOL 20ceabd2dec47b73bf0af7104361d8a5147ea85db996ac10729b7edd7ad58f22cbcbb5b9344f2f76520219ad21a8ca840754c942c486887209dc444eea629c52
 EBUILD hashed-storage-0.5.10.ebuild 1344 SHA256 11e8995300ade4eb10ad04c59c8e01b9754200d1ebaa42786a9641be427e2faf SHA512 dd7b109b23e873f78c8d3e72b4227a08fe60122935ec842fb25dad528ad1651a080bfb7188f84cc03c699d239d87c447d7d99d6ca17ee8b57b6fc7781c609d83 WHIRLPOOL 4b24e812705d6e1694d2822f331437ea761a41e895c1c3cd18c0432a3de0c110491a463351fbea7dbda2fb70c68539097937330e60804f6f96bceae1f5e9646c
 EBUILD hashed-storage-0.5.7.ebuild 1206 SHA256 647ff8514c09c0ffa1723c82b426e976ede54c5acfb4fc516ca411e53c1be718 SHA512 3df9019909390d2e4463ca74e9ee727bdc2c50e3ad62da4bc2a0500f12a5e92ae4dc79ca2a28d0fd45babc105ee2237dba5a94e82b4b2b9556fdf551bef185de WHIRLPOOL 1346f3138205cc43661b7cf03ccf52e3c0fd5d0c7851e11b02eea9f8948ec72a4cf2e126a71723c0f773532a107df78bc96f8d83cdc22c520a661067265324ee
-EBUILD hashed-storage-0.5.9.ebuild 1252 SHA256 d7bc12c077d25d28c184d4e2e1e86b765bb01a3f6e453752c0248ce094f9694a SHA512 0d1618c06c7b84976b8a8e0b3fbb25e30956c72c4f895bdf2ae221083a6454f9cdb981e972bbe8fdbaba49b9b66eab887da4e9da350da43f01b19cc23d568de2 WHIRLPOOL ec3ceb45696c5d8f651ff5a5c3c94c7a6b0d7fde9d0915924845f61e78f9ff51538dcadc440c5ed06cae4a064347858f1ae6a112400b0e3e6577b52cc5ed8f1e
-MISC ChangeLog 3961 SHA256 a30d02642f31bf6554f487f78b0e3e10c609dca5b4a3118d193f893a16cee293 SHA512 5754f7b6f68514eda1b32de7bb747a079d5e87c25c7ff2a95dbed547374faf86cc8f023f01fdcc9a4c9a7d069b26ce02d67dbbc93083f9541c06ab397c2d6f69 WHIRLPOOL cfb29811640dc545de0605baaf83da153031a04fd4260cf3503e2eed33b28b49a14add7d184395661be4eae335302c7037a3c351cd6def79ccb9884de07e6583
+EBUILD hashed-storage-0.5.9.ebuild 1342 SHA256 40efb03d8a171ef4674185a917c159c1c30a8c01e51c0f33a1bebb748db0013a SHA512 2e838c3416f73b84880621116716e56ad9f1a8ebec1227169ef4ff57c00bd6cb733b6110dec47c610a7b5e1cabe70d3a6548a68550759e9c5c2d92a270e1db4b WHIRLPOOL c489421b9c9a890806934d02cb6757cd079381ba5d28698680e2c31cab44d54875b4bf18f4a67e58d5c8b4d8fd49a0085412196b3051b8b1ecb294e371e3ad8a
+MISC ChangeLog 4129 SHA256 e615c85534a805dad3d06dbba27309dc2c593753cb8ecb6028f52a3c267de602 SHA512 644cc5d1ef1a65ade2d3073e37b19e3cf4b9f865fc46491d696e9172c1481eba22c6f0773cf97513ef8b46a08f4701f2e572a7c85259b982a62a1f772686d920 WHIRLPOOL 2c04e58200aaa6d06fbb3386da5009d44d972716088d21a0212e68d0da6dc991c79fff2fc086b11f22458a948855930d0549206f394ceaf4f32ba40057388063
 MISC metadata.xml 654 SHA256 9d07f64131c9cd6b041f3025d72578e6ff2a92adc2f950d2dc81c7dce70d0c22 SHA512 28c0f0e808fb9fecd6284cb979f0aff139cb0a458753be40fb137191a8926f18c4725d7dfc903885b56b8cafae4211ec20c8d168b8d985f0e91e44ffe4870b1c WHIRLPOOL fc93b1d80121414cec1a6449d54c282f20e66b1af139423e875a901861399bf28b9b7a27334910c67e82fac98aad5a161e6d34b30522e58d7c84a5a86ef657cb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDe8iwACgkQoBEVQmGOlx8NugEArhmLjljhANcE5RzdBhJos2hg
+qfEz7+AWm3U5tR/t4jEA+wYjQBPeEssvxVm/rW+Ted/1vn7G7U8t4NxMt/Bguqa2
+=MDEP
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/hashed-storage/files/hashed-storage-0.5.9-ghc-7.6.patch b/dev-haskell/hashed-storage/files/hashed-storage-0.5.9-ghc-7.6.patch
new file mode 100644
index 000000000000..21baf9605d9c
--- /dev/null
+++ b/dev-haskell/hashed-storage/files/hashed-storage-0.5.9-ghc-7.6.patch
@@ -0,0 +1,57 @@
+--- hashed-storage-0.5.9-orig/Storage/Hashed/Tree.hs	2011-10-09 07:47:55.000000000 +1100
++++ hashed-storage-0.5.9/Storage/Hashed/Tree.hs	2012-09-15 00:38:24.233669282 +1000
+@@ -41,6 +41,7 @@
+ import Data.List( union, sort )
+ import Control.Monad( filterM, liftM )
+ import Control.Applicative( (<$>) )
++import qualified Control.Exception ( catch, IOException )
+ 
+ --------------------------------
+ -- Tree, Blob and friends
+@@ -195,7 +196,7 @@
+         let
+             subtree (name, sub) =
+                 do let here = path `appendPath` name
+-                   sub' <- (Just <$> unstub sub) `catch` \_ -> return Nothing
++                   sub' <- (Just <$> unstub sub) `Control.Exception.catch` \(_ :: Control.Exception.IOException) -> return Nothing
+                    case sub' of
+                      Nothing -> return $ Left [(here, treeHash t_, Nothing)]
+                      Just sub -> do
+@@ -204,10 +205,10 @@
+                               Left problems -> Left problems
+                               Right tree -> Right (name, SubTree tree)
+             badBlob (_, f@(File (Blob s h))) =
+-              fmap (/= h) (hashFunc f `catch` (\_ -> return NoHash))
++              fmap (/= h) (hashFunc f `Control.Exception.catch` (\(_ :: Control.Exception.IOException) -> return NoHash))
+             badBlob _ = return False
+             render (name, f@(File (Blob _ h))) = do
+-              h' <- (Just <$> hashFunc f) `catch` \_ -> return Nothing
++              h' <- (Just <$> hashFunc f) `Control.Exception.catch` \(_ :: Control.Exception.IOException) -> return Nothing
+               return (path `appendPath` name, h, h')
+         subs <- mapM subtree [ x | x@(_, item) <- listImmediate t_, isSub item ]
+         badBlobs <- filterM badBlob (listImmediate t) >>= mapM render
+--- hashed-storage-0.5.9-orig/Storage/Hashed/Darcs.hs	2011-10-09 07:47:55.000000000 +1100
++++ hashed-storage-0.5.9/Storage/Hashed/Darcs.hs	2012-09-15 00:40:02.693038029 +1000
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE BangPatterns #-}
++{-# LANGUAGE BangPatterns, ScopedTypeVariables #-}
+ 
+ -- | A few darcs-specific utility functions. These are used for reading and
+ -- writing darcs and darcs-compatible hashed trees.
+@@ -10,6 +10,7 @@
+ import System.Directory( doesFileExist )
+ import Codec.Compression.GZip( decompress, compress )
+ import Control.Applicative( (<$>) )
++import qualified Control.Exception ( catch, IOException )
+ 
+ import qualified Data.ByteString.Char8 as BS8
+ import qualified Data.ByteString.Lazy.Char8 as BL8
+@@ -290,7 +291,7 @@
+ 
+ darcsPristineRefs :: FileSegment -> IO [Hash]
+ darcsPristineRefs fs = do
+-  con <- (darcsParseDir <$> readSegment fs) `catch` \_ -> return []
++  con <- (darcsParseDir <$> readSegment fs) `Control.Exception.catch` \(_ :: Control.Exception.IOException) -> return []
+   return $! [ hash | (_, _, _, hash) <- con, valid hash ]
+     where valid NoHash = False
+           valid _ = True
diff --git a/dev-haskell/hashed-storage/hashed-storage-0.5.9.ebuild b/dev-haskell/hashed-storage/hashed-storage-0.5.9.ebuild
index 542fa5e59c26..374ba5de35f9 100644
--- a/dev-haskell/hashed-storage/hashed-storage-0.5.9.ebuild
+++ b/dev-haskell/hashed-storage/hashed-storage-0.5.9.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashed-storage/hashed-storage-0.5.9.ebuild,v 1.10 2012/12/07 19:45:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashed-storage/hashed-storage-0.5.9.ebuild,v 1.11 2012/12/29 13:37:41 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
 EAPI=4
 
 CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Hashed file storage support code."
 HOMEPAGE="http://hackage.haskell.org/package/hashed-storage"
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE="test"
+RESTRICT="test"
 
 RDEPEND="dev-haskell/binary[profile?]
 		dev-haskell/dataenc[profile?]
@@ -26,6 +27,7 @@ RDEPEND="dev-haskell/binary[profile?]
 		>=dev-lang/ghc-6.12"
 DEPEND=">=dev-haskell/cabal-1.6
 		test? (
+			>=dev-haskell/quickcheck-2.3
 			dev-haskell/test-framework[profile?]
 			dev-haskell/test-framework-hunit[profile?]
 			dev-haskell/test-framework-quickcheck2[profile?]
@@ -33,7 +35,7 @@ DEPEND=">=dev-haskell/cabal-1.6
 		)
 		${RDEPEND}"
 
-RESTRICT="test"
+PATCHES=("${FILESDIR}/${PN}-0.5.9-ghc-7.6.patch")
 
 src_configure() {
 	cabal_src_configure $(cabal_flag test)