Added build fix for ghc-7.

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

5 files changed, 61 insertions, 16 deletions

diff --git a/dev-haskell/arrows/Manifest b/dev-haskell/arrows/Manifest
index b2c9459c2033..c2fbf8e94a44 100644
--- a/dev-haskell/arrows/Manifest
+++ b/dev-haskell/arrows/Manifest
@@ -3,18 +3,16 @@ Hash: SHA1
 
 DIST arrows-0.4.2.0.tar.gz 12211 RMD160 8329e7ff796a2741bf415efbc222f34638bf66ee SHA1 16970da8c9b91e91ca9e00ee218c01e2dbdaa96d SHA256 9c8508a08af50f7e449883390a2670c7b180ad13c5623a1e7ad4cf59cd58a69f
 DIST arrows-0.4.4.0.tar.gz 12393 RMD160 c862bfc8c6e880ef8b09867c77fe22389daf2ccd SHA1 010d8322a82f2691666ffcd52ab1f0833cd56cb3 SHA256 4999ba909061f5bede09e6116e2cac1cf89f04d3429a4a2be6ef79a677d89bb5
-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 644 RMD160 c7494b4ca95ccfc26dff353e4953910a8d54da2c SHA1 c9c3b218c9d612749b6087c36a9af37c74c3e0d7 SHA256 035a8088832bfc0b58971225fb496684750a4eeb23fe2d6d7539e58af9081bfd
-EBUILD arrows-0.2.ebuild 642 RMD160 b4482d177b7968f324fc8bbacd3059d71636b075 SHA1 a3819ceb289b7c4b4c366b23c4adf169ff084602 SHA256 519f05617611ce47e97e45569a38cb79f0719f7a49c1ecce6a99a71af8fe6c29
 EBUILD arrows-0.4.2.0.ebuild 603 RMD160 88bd7843c0921b264054e363fa9fcf231dc75c29 SHA1 ecbe9181592e4b25291cde81630a46cacce8e8b1 SHA256 8bf00daf6291a107b3990eade0148602449ba836998d470a3f319c253d7e90f9
 EBUILD arrows-0.4.4.0.ebuild 687 RMD160 d1484ad7eb9fcbd2bea7163be811bba526667204 SHA1 9a95ab13e16b9ea26030b592ea9869aa65ac0ee0 SHA256 79965f59f9ca3bc813d5a00c3d2b0cbbfba1026aeb68f1ce144adf63e703e872
-MISC ChangeLog 2997 RMD160 deb3d128ccb4ae0c4b71c24c5fd4ede8df9d9168 SHA1 99b236a28792b71dc176533807495e43c6d80d89 SHA256 e9e9aa61aed3547c248d74b97c7a682af84275391789b1875d65056ec4c60bf5
+MISC ChangeLog 3087 RMD160 c580c845fff7ad414abc688a83e9f2d4dad8a871 SHA1 b6a51c759ca3536004b6537cc00389400b713cc3 SHA256 8ea90ee6b5995555c1d31d2194612af2895a070ab01b662e6fed203f46b3504e
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk43CiwACgkQcaHudmEf86oHgACeKKPIj+PQ4LSy1AMZlfPt9ylV
-wG0An3AWiGlhFzW0vilf5tS1pvJdEGRe
-=GQVH
+iEYEARECAAYFAk43DMAACgkQcaHudmEf86rc7ACfS9A9bbMhjr2AdNivoNadgi22
+s/4An21AQMZZyv/zxmlqhyOWzUfHJ4xG
+=UBgZ
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/binary/ChangeLog b/dev-haskell/binary/ChangeLog
index e8cc8b63201a..ecc56e20544d 100644
--- a/dev-haskell/binary/ChangeLog
+++ b/dev-haskell/binary/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/binary
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/binary/ChangeLog,v 1.13 2011/04/10 18:51:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/binary/ChangeLog,v 1.14 2011/08/01 20:24:32 slyfox Exp $
+
+  01 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> binary-0.5.0.2.ebuild,
+  +files/binary-0.5.0.2-ghc-7.patch:
+  Added build fix for ghc-7.
 
   10 Apr 2011; Fabian Groffen <grobian@gentoo.org> binary-0.5.0.2.ebuild:
   Marked ~x86-macos
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index 605bb886d247..8ee0f32331c0 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX binary-0.5.0.2-ghc-7.patch 1659 RMD160 32cce81268b7622c26f06f97a411596b642b8e71 SHA1 3b13cc55f3d5ae4d229987650e966043d9d4bf77 SHA256 7b4ac24d39cb2d367bbb7ff8c67ae5b773e0a4c3a37afd90fb46200e5be7f9f1
 DIST binary-0.4.1.tar.gz 37766 RMD160 969675ef1c4e43b55808c8433e825feae300444d SHA1 343087b5495f10f1d1ded8803720223f34fc488a SHA256 bb74824306843da25f6d97c271e2a06ee3a7e05fc529156fb81d7c576688e549
 DIST binary-0.4.2.tar.gz 39656 RMD160 a38fb67fbe11fd6ae80643a4c0f34b0a753e6e4e SHA1 a8c9bd44c32a7ecd7be8c2f889d1f5f1500ac954 SHA256 200d81da3348a1053c0f1ab5e5392dc51e9d48e26fcae609b518f9f67f22c4ef
 DIST binary-0.5.0.2.tar.gz 41494 RMD160 a4bb4be2071e33a2c43fea4c1fa6f103733c0753 SHA1 bb680c03dbae2765e14d91376440b762bb4b65a4 SHA256 e0c2dede617dc9b1611f62f2801f21d2fd48e044ee6886e77b55df10e0f2130b
 EBUILD binary-0.4.1.ebuild 590 RMD160 40167dad24e3346f79759f39c478f41732162a37 SHA1 c3847c0d24e5f91793ee5953d28b9246f93bab6d SHA256 f9f24693ec04e9c313acd75701f2d10bb2a8b4de3237b5b12ad8febe54ae2711
 EBUILD binary-0.4.2.ebuild 598 RMD160 b135b8baf911c6e04c41d829ef98f7487b23159a SHA1 bb442e96dffe34c970b4cb8997a10a670bf64638 SHA256 7b11a0aa3bf0dee0e5ce78d474e5fedee3531eef8787e2ce3450f732098691a7
-EBUILD binary-0.5.0.2.ebuild 673 RMD160 a8bd8bc8e56fb73e3a29523d39bbacb4979c1bbf SHA1 31ecce6fd8e756a475f40be5ce88723978201fd8 SHA256 612288d061185aa3e2e496edcc818fb018152679862250eb6869adb8e939c212
-MISC ChangeLog 1634 RMD160 fc69801d3edcedaa031ad4fae855730b88eef518 SHA1 d77c30d877080e884c475cda486e2b82dfca71ee SHA256 8d1c2583c87c5a544d040946b22d34a2e81867ee1111ed7f084d129dfd1536c8
+EBUILD binary-0.5.0.2.ebuild 822 RMD160 7b9f925c82ece753b429a6782b0f32319aed84aa SHA1 d3d9d2c461c84fb9c1a69207a7e931a26ef35a7b SHA256 d96a494e8bccbbb7c12c5f7286670ee03b2df007a83a5cac1db8db580e2fb209
+MISC ChangeLog 1777 RMD160 652e0852403b58019ca84950b340a37138da48b8 SHA1 7b6c335bdbcb92ce8f4fbdd52033a09b55bfd2f5 SHA256 7cd583615ed0c3786a87bb3ce0f7d0c4ba13f3195488263d0dd60ea19e694b6f
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (Darwin)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2h++MACgkQX3X2B8XHTom5YQCgn0tCVA/wGEdeMtuQe/495qyn
-OhEAoI2jeEu7SWmJdU0WPqKNdF3be3R7
-=pI4G
+iEYEARECAAYFAk43DE8ACgkQcaHudmEf86qa1gCeLxPKqXqXXvOTX7UwJnZXs6cl
+XVUAnjq7EqZR4cNsdPkFxxOVlyXg3Be+
+=hxyO
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/binary/binary-0.5.0.2.ebuild b/dev-haskell/binary/binary-0.5.0.2.ebuild
index fd11f89b8538..1a5596298d05 100644
--- a/dev-haskell/binary/binary-0.5.0.2.ebuild
+++ b/dev-haskell/binary/binary-0.5.0.2.ebuild
@@ -1,8 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/binary/binary-0.5.0.2.ebuild,v 1.11 2011/04/10 18:51:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/binary/binary-0.5.0.2.ebuild,v 1.12 2011/08/01 20:24:32 slyfox Exp $
 
-CABAL_FEATURES="lib profile haddock"
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
@@ -14,6 +18,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.6.1"
+RDEPEND=">=dev-lang/ghc-6.8.2"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2"
+
+PATCHES=("${FILESDIR}/binary-0.5.0.2-ghc-7.patch")
+
+CABAL_CORE_LIB_GHC_PV="7.2.0.20110728"
diff --git a/dev-haskell/binary/files/binary-0.5.0.2-ghc-7.patch b/dev-haskell/binary/files/binary-0.5.0.2-ghc-7.patch
new file mode 100644
index 000000000000..94d3f5d7e021
--- /dev/null
+++ b/dev-haskell/binary/files/binary-0.5.0.2-ghc-7.patch
@@ -0,0 +1,34 @@
+Patch was taken from binary fork of ghc-7 branch
+Fri Jul 30 15:29:36 EEST 2010  simonpj@microsoft.com
+  * Add type signature on local binding
+diff -rN -u old-binary/src/Data/Binary/Get.hs new-binary/src/Data/Binary/Get.hs
+--- old-binary/src/Data/Binary/Get.hs	2010-10-31 18:08:10.633817506 +0200
++++ new-binary/src/Data/Binary/Get.hs	2010-10-31 18:08:10.641817506 +0200
+@@ -370,16 +370,17 @@
+         return (xs, ys))
+ 
+   where
+-        first r 0 xs@(L.Chunk _ _) = writeSTRef r xs    >> return L.Empty
+-        first r _ L.Empty          = writeSTRef r L.Empty >> return L.Empty
+-
+-        first r n (L.Chunk x xs)
+-          | n < l     = do writeSTRef r (L.Chunk (B.drop (fromIntegral n) x) xs)
+-                           return $ L.Chunk (B.take (fromIntegral n) x) L.Empty
+-          | otherwise = do writeSTRef r (L.drop (n - l) xs)
+-                           liftM (L.Chunk x) $ unsafeInterleaveST (first r (n - l) xs)
+-
+-         where l = fromIntegral (B.length x)
++    first :: STRef s L.ByteString -> Int64 -> L.ByteString -> ST s L.ByteString
++    first r 0 xs@(L.Chunk _ _) = writeSTRef r xs    >> return L.Empty
++    first r _ L.Empty          = writeSTRef r L.Empty >> return L.Empty
++
++    first r n (L.Chunk x xs)
++      | n < l     = do writeSTRef r (L.Chunk (B.drop (fromIntegral n) x) xs)
++                       return $ L.Chunk (B.take (fromIntegral n) x) L.Empty
++      | otherwise = do writeSTRef r (L.drop (n - l) xs)
++                       liftM (L.Chunk x) $ unsafeInterleaveST (first r (n - l) xs)
++      where 
++        l = fromIntegral (B.length x)
+ #else
+ splitAtST i (B.LPS ps)  = runST (
+      do r  <- newSTRef undefined