Fixed build breakage against ghc-7.4 (bug #412289 by Robin Johnson).

Package-Manager: portage-2.2.0_alpha100_p7/cvs/Linux x86_64

4 files changed, 42 insertions, 8 deletions

diff --git a/dev-haskell/crypto/ChangeLog b/dev-haskell/crypto/ChangeLog
index 69da5d2c987a..0f63d1d10a80 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.2 2012/03/16 21:48:59 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/ChangeLog,v 1.3 2012/04/17 19:42:55 slyfox Exp $
+
+  17 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/crypto-4.2.4-ghc-7.4.patch, crypto-4.2.4.ebuild:
+  Fixed build breakage against ghc-7.4 (bug #412289 by Robin Johnson).
 
   16 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> crypto-4.2.4.ebuild:
   Fixed case in HOMEPAGE.
diff --git a/dev-haskell/crypto/Manifest b/dev-haskell/crypto/Manifest
index 9d38bf758b49..6c8be2910b90 100644
--- a/dev-haskell/crypto/Manifest
+++ b/dev-haskell/crypto/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX crypto-4.2.4-ghc-7.4.patch 1131 RMD160 b6245d410f9e55f058ffa2e9c4e40bbdee733f61 SHA1 d6cae742db2b7e71f5f3025e63b06cfb98f9d78b SHA256 a605b20502db870d68362256f0d6ee9f8ebdd200517f0d2f82755567c143cbca
 DIST Crypto-4.2.4.tar.gz 57027 RMD160 05b00b9407f7d9e5f531ea7dc0b9ead6b58debfc SHA1 e057284972efba38353f80dbd9b8508f37d4e860 SHA256 77986dd8100b678adc784e682180ba659617ff5708089847420166ead0768a17
-EBUILD crypto-4.2.4.ebuild 1161 RMD160 7daf088dfb4b1f8dcac0860390a7a8eeaa94d455 SHA1 ec2d7ff5c9b843e78ae34e1a09218061a484e170 SHA256 01313fddf4ccb4c04121056bd4d50181c13ce2d33a8f5645f474d9a8282b9e6d
-MISC ChangeLog 510 RMD160 93fbf16f1ad14c06f3ea18baefa70f563a8c195c SHA1 097972c34939d7c13bd8e1a0c128956bcc5cc689 SHA256 88ce0731510612a6e2bb01f25c3a2288848c8dd8278be8d8b25366ca3afa18ba
+EBUILD crypto-4.2.4.ebuild 1217 RMD160 1372439804bad8ce7c1dd7d5f6ce2a4d69971183 SHA1 73c7df71f2e351a50b9663a05e5b7f2e71c981bf SHA256 fb315d588d87133703c2e046feb2691915b854f996975114eb9c12f331bbb03c
+MISC ChangeLog 694 RMD160 93e239c1927bbcf85c7ad2ab48f75d7641fe5153 SHA1 018167f8c0b0e6c5ea687d33856100e94ae178b3 SHA256 0d0a1f8ac8100740a65bed1653c0f709a8b2df99d9a5fff494b44b97d43c6cbd
 MISC metadata.xml 524 RMD160 0b480a78962dae52f0b831cba206c2f396c97fb2 SHA1 40b6e65e8e78f6d00580706d12bd20e9e967c313 SHA256 6e4fe6685f2ad27aefe3301b24596392951c117d2fab8aeaa738844eea605b8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9jtmoACgkQcaHudmEf86ox9gCeMuspOXktYMYtwKjj20MpqhAJ
-/FEAn0l6hbYp6gYZTrP9dmS7dChmIdsO
-=QNb4
+iEYEARECAAYFAk+NyOoACgkQcaHudmEf86q1WACdHCTU7oaV6UgJ63vACqFEjmqS
+HpMAoIJmzsIvI7yKgnTIBWQF1O0CNRvL
+=VZ1E
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/crypto/crypto-4.2.4.ebuild b/dev-haskell/crypto/crypto-4.2.4.ebuild
index 84a473c6a957..0dc0a73b1f18 100644
--- a/dev-haskell/crypto/crypto-4.2.4.ebuild
+++ b/dev-haskell/crypto/crypto-4.2.4.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.4.ebuild,v 1.2 2012/03/16 21:48:59 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/crypto-4.2.4.ebuild,v 1.3 2012/04/17 19:42:55 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
 EAPI="3"
 
 CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 MY_PN="Crypto"
 MY_P="${MY_PN}-${PV}"
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=("${FILESDIR}/${PN}-4.2.4-ghc-7.4.patch")
+
 src_test() {
 	TESTS="SymmetricTest SHA1Test RSATest QuickTest HMACTest WordListTest"
 
diff --git a/dev-haskell/crypto/files/crypto-4.2.4-ghc-7.4.patch b/dev-haskell/crypto/files/crypto-4.2.4-ghc-7.4.patch
new file mode 100644
index 000000000000..a4ca6a702b68
--- /dev/null
+++ b/dev-haskell/crypto/files/crypto-4.2.4-ghc-7.4.patch
@@ -0,0 +1,27 @@
+--- Crypto-4.2.4-orig/Data/Digest/SHA2.hs	2011-09-08 10:30:07.000000000 +1000
++++ Crypto-4.2.4/Data/Digest/SHA2.hs	2011-12-20 13:28:26.401971284 +1100
+@@ -106,7 +106,7 @@
+ data Hash384 = Hash384 !Word64 !Word64 !Word64 !Word64 !Word64 !Word64 deriving (Eq, Ord)
+ data Hash224 = Hash224 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 deriving (Eq, Ord)
+ 
+-instance (Integral a) => Show (Hash8 a) where
++instance (Integral a, Show a) => Show (Hash8 a) where
+  showsPrec _ (Hash8 a b c d e f g h) =
+   (showHex a) . (' ':) .
+   (showHex b) . (' ':) .
+@@ -146,7 +146,7 @@
+      where
+       bs = bitSize (head r)
+ 
+-instance (Integral h, Bits h) => Hash (Hash8 h) where
++instance (Integral h, Bits h, Show h) => Hash (Hash8 h) where
+   toOctets (Hash8 x0 x1 x2 x3 x4 x5 x6 x7) = bitsToOctets =<< [x0, x1, x2, x3, x4, x5, x6, x7]
+ 
+ instance Hash Hash384 where
+@@ -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