Patch crypto 4.2.5 for ghc 7.6.1, EAPI=5

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

4 files changed, 122 insertions, 12 deletions

diff --git a/dev-haskell/crypto/ChangeLog b/dev-haskell/crypto/ChangeLog
index c18e21676f83..31ac2c0b62cb 100644
--- a/dev-haskell/crypto/ChangeLog
+++ b/dev-haskell/crypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/crypto
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/ChangeLog,v 1.5 2012/09/12 15:42:29 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/ChangeLog,v 1.6 2012/11/18 11:45:02 gienah Exp $
+
+  18 Nov 2012; Mark Wright <gienah@gentoo.org>
+  +files/crypto-4.2.5-ghc-7.6.patch, crypto-4.2.5.ebuild:
+  Patch crypto 4.2.5 for ghc 7.6.1, EAPI=5
 
   12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> crypto-4.2.4.ebuild,
   crypto-4.2.5.ebuild:
diff --git a/dev-haskell/crypto/Manifest b/dev-haskell/crypto/Manifest
index 6f9e044f5bda..96c6a1e6098b 100644
--- a/dev-haskell/crypto/Manifest
+++ b/dev-haskell/crypto/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX crypto-4.2.4-ghc-7.4.patch 1131 SHA256 a605b20502db870d68362256f0d6ee9f8ebdd200517f0d2f82755567c143cbca SHA512 1e5832abfb9ba054a4b46fdb33f2b516a0b92dac4b6bfa7cef1595e66ce3889b47447d62ee61572404889b8cffc089ebd1cbde4520d521d31045781becccbf09 WHIRLPOOL 8419557c98994adcac64d4096a5cf9a116dfecdb06468cd3ee7ff942a7b08f8d26a3db452d4ec8cca72f08fbc91dd423ae883e2032be17b3f3cd7b00e6c17555
+AUX crypto-4.2.5-ghc-7.6.patch 4081 SHA256 2461cd18c7c5baaa876ba4be6719983b7b73d7e532ea773e973d71a0140244b8 SHA512 5b951abad4a25e4d3c242e8b8501625276fe669d99fff0d895263c26a730d0ac028ac268f25086029cea71b780da4f03b45267172e0298ed58dcc9d996ce5d45 WHIRLPOOL ca86a65c776a344231ef2a42165019dce378d1e873e763ea319561ca9bd13e6d354fa5286dbed038234cfbbc8463efc7c201c0e58ae64a0361b94bd2a68543ea
 DIST Crypto-4.2.4.tar.gz 57027 SHA256 77986dd8100b678adc784e682180ba659617ff5708089847420166ead0768a17 SHA512 c840237c2df7c05882176d78e808e125b50b5ef5c26420822d1e5c4d6d0664d939f74591005bf781f61e19e875aa33b8a730e741b4c01b84821ba764f0e37f55 WHIRLPOOL 1f5146976a9240d998967d4cf81411e08acd4cfb621d8eab133d4dbafd58de7b3f50d20963e1e4cde8a4a567e02dfa175099289b97ec4c33e51737de9c523c79
 DIST Crypto-4.2.5.tar.gz 57486 SHA256 68754f0827f067707a1bf3d62f61e2b42f05ebf0c560a31a442a622974446473 SHA512 9e0f41953dd8b8460ea4b49232d539af655f2f05ebfd6e04964b1372845bc9530140232048757ec0fbe4ab37334d1331662e999687b40361022b33a7a8a3f247 WHIRLPOOL 13ffb5bb8ccdac5b78602c355fb4199ab73bc0287551295bd9790038607a7f03bc28dc4b3e4cbcc3649cc85a47eaf1b1967e617935c23202967c9f93b635508c
 EBUILD crypto-4.2.4.ebuild 1207 SHA256 d490bc89f3385f22d4e8096fa13506c5471af0888538029f2cb00b5c1164e50a SHA512 31fb01b94e72158e8aa333edd500b5ef555499cf05ad11d13edf65f0e7b83c5aade36a768b928a23bd2a4db1beb1e8a8eaf42426632df0339cf20a36d993f764 WHIRLPOOL deeaed91fc7ba8c3d60b22568766322b5767f1928fd306f59cc2ffcc20642314a5fc0c7a3734ee6cff8bd742381cc16fcfd54658d54b68ed6a4652c27abf6b03
-EBUILD crypto-4.2.5.ebuild 1205 SHA256 6cc2a15e1fb0a4cb506259ce78f28699136c1702dc7fa3553c2aed52306ba1bb SHA512 7f5b3c0306c1aec4869573f648f768474a360ad48554f78d1e9dbc123956930414c6288657d2e79c02ca0afd31d818bec1ce19866fa36e3513eb35489e7a0cb4 WHIRLPOOL 677f5a9d9b1c6577692b2cc6a6708001c1b1572a4be0683038919b1f04fc5c437ca5ac72d4c2b729a49ddfe2910ee20f2fb40f597fcb0f0770730fdeee98be47
-MISC ChangeLog 988 SHA256 1b6ccd8c4171bfc57b1561f76f52f8c8398919a41b9917a21acad66626d3aed7 SHA512 89d1fea235036b278d4c778ceb6828a40fa8c50e8664f59638b450ecc3e5f391862b1eb30d8a67199225cd0f6ab1c21425e4e04f900e09fb058778f8257c97ba WHIRLPOOL 1fd1cdebe6e02ecf18694e6f1c8b0b547249e09e4329d5daeb9a19da2febd827aade02c543553270b5a99ac618d2508abf8939e7b184444fe48f398bd0c7caf6
+EBUILD crypto-4.2.5.ebuild 1273 SHA256 807e4a172748578053bd671af97abcf32e3023c7f8558df7d3fc3a7726c0e468 SHA512 8adf379be01d6097c77ee4d2109d43c96de7795b7a93468ee3aaafd178987c05e9da14425118a8bf87b36f01c6a6ad73c4fb43c323d200c5297b92ac80ee7575 WHIRLPOOL a03033e719ba34bac926db00d0e4c4fdf95893d89e7afbb3b12c7642c99c2f81a8b5a4cba2cd66a66b5fec535c753b4e5d60dc2781ef4a277deafb8980a3f28e
+MISC ChangeLog 1137 SHA256 964f5cd6fa2de5b6c57192bc158d16e142a041f1bcdc13b21fe8d44291acab28 SHA512 ce73a5e03157f82e1837933a1fb84a607288899cc3db27c357cf21caa83d712d563e5af2765e02cb0106870fbed60a0b246745ba3c9b5e96970f1b6a59f9a712 WHIRLPOOL b7ec406a18e815ef6568fafe14530df3f4b971374d7ba70086e98b709659e6f03533214bbd436e00e3c7b5419a319a02dae2af16443a9929fc662679b7eec4f4
 MISC metadata.xml 524 SHA256 6e4fe6685f2ad27aefe3301b24596392951c117d2fab8aeaa738844eea605b8c SHA512 b24cedc57690060d1c5e7a32ca3d730354dae03ffc1c547adfbf108c123cad3e031ee4a3f45781e2a9bb4ba1c0681198986f52c2cffadfe6447e42eb3c6fd3bf WHIRLPOOL 78ddb6bd8b9552938454c1594fd9856174d5f946e73715313537e7e248f6eaeb947ea917a17d86cd6cd53e0ab2740ed874461858fc04d9ea3168fba1a5541594
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlCoykUACgkQoBEVQmGOlx9dAAEAtxI6D/TpybntY5odGVxdzXVB
+WY9LvjD11AjqzKdHfAkBAOKpeaqqhCilz/hf8/zMOT2MsArErTum7Afu/4932ert
+=A8hY
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/crypto/crypto-4.2.5.ebuild b/dev-haskell/crypto/crypto-4.2.5.ebuild
index f1d3efce9815..dede2783b9f0 100644
--- a/dev-haskell/crypto/crypto-4.2.5.ebuild
+++ b/dev-haskell/crypto/crypto-4.2.5.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/crypto/crypto-4.2.5.ebuild,v 1.2 2012/09/12 15:42:29 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/crypto-4.2.5.ebuild,v 1.3 2012/11/18 11:45:02 gienah Exp $
 
-EAPI=4
+EAPI=5
 
-# ebuild generated by hackport 0.2.18.9999
+# ebuild generated by hackport 0.3.9999
 
 CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 MY_PN="Crypto"
 MY_P="${MY_PN}-${PV}"
@@ -17,19 +17,21 @@ HOMEPAGE="http://hackage.haskell.org/package/Crypto"
 SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-haskell/hunit[profile?]
-		>=dev-haskell/quickcheck-2.4.0.1[profile?]
-		dev-haskell/random[profile?]
-		>=dev-lang/ghc-6.8.2"
+RDEPEND="dev-haskell/hunit:=[profile?]
+		>=dev-haskell/quickcheck-2.4.0.1:=[profile?]
+		dev-haskell/random:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=("${FILESDIR}/${PN}-4.2.5-ghc-7.6.patch")
+
 src_test() {
 	TESTS="SymmetricTest SHA1Test RSATest QuickTest HMACTest WordListTest"
 
diff --git a/dev-haskell/crypto/files/crypto-4.2.5-ghc-7.6.patch b/dev-haskell/crypto/files/crypto-4.2.5-ghc-7.6.patch
new file mode 100644
index 000000000000..23bc1ec43f26
--- /dev/null
+++ b/dev-haskell/crypto/files/crypto-4.2.5-ghc-7.6.patch
@@ -0,0 +1,93 @@
+--- Crypto-4.2.5-orig/Data/Digest/SHA1.hs	2012-05-14 21:58:24.000000000 +1000
++++ Crypto-4.2.5/Data/Digest/SHA1.hs	2012-11-18 22:00:46.168927637 +1100
+@@ -93,7 +93,7 @@
+       g [] = Nothing
+       g xs = Just (splitAt 64 xs)
+ 
+-fromBytes :: (Bits a) => [a] -> a
++fromBytes :: (Num a, Bits a) => [a] -> a
+ fromBytes input =
+     let dofb accum [] = accum
+         dofb accum (x:xs) = dofb ((shiftL accum 8) .|. x) xs
+--- Crypto-4.2.5-orig/Data/Digest/SHA2.hs	2012-05-14 21:58:24.000000000 +1000
++++ Crypto-4.2.5/Data/Digest/SHA2.hs	2012-11-18 22:00:46.169927666 +1100
+@@ -80,7 +80,7 @@
+ -- | 'padding' currently requires that the bitSize of @a@ divide the bitSize 
+ -- of @w@
+ -----------------------------------------------------------------------------
+-padding :: (ShaData w, Bits a, Integral a) => [a] -> [[w]]
++padding :: (ShaData w, Bits a, Num w, Integral a) => [a] -> [[w]]
+ padding x = unfoldr block $ paddingHelper x 0 (0::Int) (0::Integer)
+  where
+   block [] = Nothing
+@@ -155,7 +155,7 @@
+ instance Hash Hash224 where
+   toOctets (Hash224 x0 x1 x2 x3 x4 x5 x6) = bitsToOctets =<< [x0, x1, x2, x3, x4, x5, x6]
+ 
+-shaStep :: (ShaData w) => Hash8 w -> [w] -> Hash8 w
++shaStep :: (ShaData w, Num w) => Hash8 w -> [w] -> Hash8 w
+ shaStep h m = (foldl' (flip id) h (zipWith mkStep3 ks ws)) `plus` h
+  where
+   ws = m++zipWith4 smallSigma (drop (blockSize-2) ws) (drop (blockSize-7) ws)
+@@ -173,7 +173,7 @@
+ -- | Due to the limitations of 'padding', 'sha' currently requires that the
+ -- bitSize of @a@ divide the bitSize of @w@
+ -----------------------------------------------------------------------------
+-sha :: (ShaData w, Bits a, Integral a) => Hash8 w -> [a] -> Hash8 w
++sha :: (ShaData w, Num w, Bits a, Integral a) => Hash8 w -> [a] -> Hash8 w
+ sha h0 x = foldl' shaStep h0 $ padding x
+ 
+ stringToOctets :: String -> [Word8]
+@@ -282,4 +282,4 @@
+ 
+ -- Test with:
+ -- ghc -no-recomp -O --make Data/Digest/SHA2.hs -main-is Data.Digest.SHA2.moduleTest -o moduleTest && ./moduleTest && rm moduleTest
+-moduleTest = runTestTT test_sha2
+\ No newline at end of file
++moduleTest = runTestTT test_sha2
+--- Crypto-4.2.5-orig/Data/LargeWord.hs	2012-05-14 21:58:24.000000000 +1000
++++ Crypto-4.2.5/Data/LargeWord.hs	2012-11-18 22:00:46.169927666 +1100
+@@ -62,7 +62,7 @@
+ data LargeKey a b = LargeKey a b
+    deriving (Eq, Ord)
+ 
+-instance (Ord a, Bits a, LargeWord a, Bits b, LargeWord b) =>
++instance (Num a, Ord a, Bits a, LargeWord a, Num b, Bits b, LargeWord b) =>
+    LargeWord (LargeKey a b) where
+       largeWordToInteger (LargeKey lo hi) =
+          largeWordToInteger lo + (2^(bitSize lo)) * largeWordToInteger hi
+@@ -96,17 +96,17 @@
+          where conv = integerToLargeWord . largeWordToInteger
+       largeBitSize ~(LargeKey lo hi) = largeBitSize lo + largeBitSize hi
+ 
+-instance (Ord a, Bits a, LargeWord a, Bits b, LargeWord b) => Show (LargeKey a b) where
++instance (Num a, Ord a, Bits a, LargeWord a, Num b, Bits b, LargeWord b) => Show (LargeKey a b) where
+    showsPrec p = showInt . largeWordToInteger
+ 
+-instance (Ord a, Bits a, LargeWord a, Bits b, LargeWord b) => 
++instance (Num a, Ord a, Bits a, LargeWord a, Num b, Bits b, LargeWord b) => 
+    Num (LargeKey a b) where
+       (+) = largeWordPlus
+       fromInteger = integerToLargeWord 
+ 
+ -- Larger keys are instances of Bits provided their constituents are keys.
+ 
+-instance (Ord a, Bits a, LargeWord a, Bits b, LargeWord b) => 
++instance (Num a, Ord a, Bits a, LargeWord a, Num b, Bits b, LargeWord b) => 
+    Bits (LargeKey a b) where
+       (.&.) = largeWordAnd
+       (.|.) = largeWordOr
+@@ -130,11 +130,11 @@
+ boflk :: (LargeKey a b) -> b
+ boflk = undefined
+ 
+-instance (Ord a, Bits a, LargeWord a, Ord b, Bits b, LargeWord b) =>
++instance (Num a, Ord a, Bits a, LargeWord a, Num b, Ord b, Bits b, LargeWord b) =>
+    Integral (LargeKey a b) where
+       toInteger = largeWordToInteger
+ 
+-instance (Ord a, Bits a, LargeWord a, Ord b, Bits b, LargeWord b) =>
++instance (Num a, Ord a, Bits a, LargeWord a, Num b, Ord b, Bits b, LargeWord b) =>
+    Real (LargeKey a b)
+ 
+ instance Enum (LargeKey a b)