Patch network-2.3.0.14 for ghc 7.6.1

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

4 files changed, 89 insertions, 7 deletions

diff --git a/dev-haskell/network/ChangeLog b/dev-haskell/network/ChangeLog
index 02c6735f338c..be8fdacff8cc 100644
--- a/dev-haskell/network/ChangeLog
+++ b/dev-haskell/network/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/network
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.68 2012/12/17 17:08:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.69 2012/12/29 13:54:52 gienah Exp $
+
+  29 Dec 2012; Mark Wright <gienah@gentoo.org>
+  +files/network-2.3.0.14-ghc-7.5.patch, network-2.3.0.14.ebuild:
+  Patch network-2.3.0.14 for ghc 7.6.1
 
   17 Dec 2012; Agostino Sarubbo <ago@gentoo.org> network-2.3.0.14.ebuild:
   Stable for ia64, wrt bug #428936
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
index 97c7fdd1e379..08db439c76c7 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX network-2.2.0.0-eat-configure-opts.patch 747 SHA256 33f46b0bdcd63ea98fcd401409732f57c06c6421b92620ad7da49e75e2f62779 SHA512 835263a81de3348078a6d1a6832759afee04a2c557310202fca23506ca63090a06f194d36b7399e8d3a3a6ab18c0127ac53b7f4fecccf787a0bbf17d6e6a7cc4 WHIRLPOOL d914b7e43502b9236323f8d2ee4978c969b9a2ce4a2997bd7f6518bb965010498a01a6a6ba03362d83923faec7fb3bc75ae4b45c387445dc8e5828724b087d38
+AUX network-2.3.0.14-ghc-7.5.patch 2009 SHA256 4dcc6501ea32df0f4b47fe193d933e9f28af2684bc358aaab50685ca02c2eb97 SHA512 f8f12f42fd9bec6442ff4949ca238bb88820ce51fe5fe4bbf30e0df3ffab7e6cc995e1f6c727c209ff34155176393e6005334c3594d99e940807649e66eec65c WHIRLPOOL 581c1701ea12002670cfd6a7ed206dd79541084738a58ad0e4770bfc2265eeab102108cfe24ed3b8436e22ad36029ffdbd90d33357a35f4b1f2ae29cd8cfff5f
 DIST network-2.2.1.7.tar.gz 112028 SHA256 0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58 SHA512 32e8c5fda93b92000acd27a11578772d2ac15b9e229439ef02ebfb32838abc66dc9193a913eecc7f7e69034720c93d45fc51aeeabdc16c202e916b2285c48fdf WHIRLPOOL 4a048cb739fae58a5252bebcec91d3b88860f099eeba7deb722745a80b3b8daba82b0b25bcf1a7836df9c6ec9f219330841cd7f3b10093805b6a11e391e006ed
 DIST network-2.3.0.11.tar.gz 133563 SHA256 b3f50ae3f1554c4df5f4e4439a6b5d08fa9464aabfae66ed0da78f0a784615be SHA512 11f775d729a6619f3bdd685fbd73ccfe5ffe1d3ad325d3b4b43ab717a333c28cdf8c5732c149463f480e13b70a7530613ecc9ca71ea177f19abe54e30b44ebce WHIRLPOOL d1ef53196c8b3996d71d49ebcf0ea35dc6033edaf0e589cbb5b5117703086482866d51e29beefbd528faf9f0f3d60d1047d47abb7665f3b8b74bea51240a4734
 DIST network-2.3.0.13.tar.gz 133948 SHA256 0747e9091dd5ba220c31f77116c9edfe9ac6726090d58e55221371b63f1b8577 SHA512 ed722324b032916080642b5cd45afcb85d8f8c30e9bfbabe711cc89530ca2362c62f4ab0d6aab0044c51b03607f3dd2d1cdaed68fd5a357f80260e7ada8a176a WHIRLPOOL ff36d0cc0bcb78a37dc14bb221931a534d5f84e04e26739a28ed7852e5d6191907f649949fdb410c8923b6c1fbcf80b8a7b16e57b1480b6f0095b4aac43ea157
@@ -9,9 +13,16 @@ DIST network-2.4.0.1.tar.gz 135017 SHA256 3c0638d2aab64491d635d7be67d03bc3c3caba
 EBUILD network-2.2.1.7.ebuild 851 SHA256 f90c0dea559b4f822bd0ff9455737b77622345bf9954dc014e26ded0bd793c68 SHA512 58abdc5a25b4fa5e848776797214d9e4ea2b018dd40627675b9649c8985b422349b79b50602c0093136d1fd5144b5f137c93ee665f4cf6426173c003a33758ac WHIRLPOOL 2c7feb06cb0469758a0040ef635d0b1e186d4240c8e0a6593f7b6909cfb247d1095ce283488adf2f77286b1dc71c63f1f4e981ad95c76310a5295dee253dd2e4
 EBUILD network-2.3.0.11.ebuild 1186 SHA256 c32d3a82468defa6454f808aff5ee178cbef470110d4c29ffbf47685e8050020 SHA512 2c9732591f5fdcc31f1548e0539a22d9191e2bf59f5361f4e413d271cd0e17e00d332a180244437fd904ea6f1eea924071ea1c2e7b7cc8ab6f90ac68b431a7e0 WHIRLPOOL 7dfcfeaeba24d883a8a93a9ffe8b6ad28410e0bf3a8bc23e00b5d68d732c7a4cc6f9e1c7a35599c497a1558027dcfc184fd6eb29cadf3088a18f467fa3c2c9ed
 EBUILD network-2.3.0.13.ebuild 1233 SHA256 a69e8fff47e8102aabc8bb3a2579f9b4649b2f75c5ad6ccac5f8c2f3893d5ff2 SHA512 e3e2c9602cd71000004cd1cb3085af417884722abc764ac6654b5c6070c183814ed7aa1f33780ca38bcaecbad01846220d9fa8be73846195a70cf6155c8fc0e9 WHIRLPOOL 28b22c2f2041a76f41703d00305d25809cd0b5205d03b0510ebfa38999b9066a6679ea791c99476f3c91b7dbcda663d86262b2df64186fa3c55c0bc0a9814dbf
-EBUILD network-2.3.0.14.ebuild 1225 SHA256 4440b49f0862a7ce3c0a1f958796a6a346d1c2e8f25db5bce9a26888837711af SHA512 4004c4c592f96eb7332ae96763dbd7d1707eae82285a76f66ffcb34a94e96666000567fee46df456f16c305b168b05d97f9b862f58f72a03b0d62fea2b92c1a4 WHIRLPOOL 6185f2da7b14d77e7e1706cc9813fef05f75908cbbc1704902c7a9d2d934105be2bd5ce3c8f3e111ee79e4907dccbc0e0a70c82779adc283b9295cb1a864db9d
+EBUILD network-2.3.0.14.ebuild 1114 SHA256 64a973a69782e2b0bc6d38e66f5ac74518f00cfe4dd7490ff9234047db8dbe1f SHA512 f01be57db2407091e392708761d5bce2ffec3e477acd310008c2b9cf19752263deda0060e5d9669eda8a54d133b6bf98c543f82cbb62a9dfd91b67facc06fd37 WHIRLPOOL e69297e3e6a3773cbade2d4314c4927c8d6e5cbc67e312f7e0525f2017cb2be5bdb540c1fe9114c941778ea4ad297cf896a85fcf423a47ddcf474bdbe299ba6c
 EBUILD network-2.3.0.2.ebuild 814 SHA256 97a730c595e13705760daf6e69e7bef3e9000a8c6c79960bfb6bb77f5f35e76c SHA512 b2b87f8f554c82a558353f0ab8b704e801cdab6c58958601cf1b7950ca2673d99884e4470b4b6852ae400143b93fb98592da3c50f0f8e9244f865d1432c509ea WHIRLPOOL 3bba3f71491a463d880c322884ef3152275393b5bb5bcdb18aab871388350364fd944719191875fb3569170eeb1385dbefe99ac9f04c83e6e92571de39dd9010
 EBUILD network-2.3.0.7.ebuild 1025 SHA256 84ec4960c57adab600aa5f98567a1944759ac3db0f2c453a6f49155538cd8b47 SHA512 0bd9d5be7a7ab9f9958d7c151500d53eee978fa5ec6eec0ce3876d455971685bdc269709922b25c3ab0ec45f0fdaec7fe85ce0c0900fe1ed1aa8a76b0c74ca7f WHIRLPOOL 12ec703a5e13602a6c0ccda3c93ba76c23b90ce598ab40c6cd4b181cb56c380e6649bf7e2d80481da365385fb797dd4c79351fec0fff0d5863171015e6265ed8
 EBUILD network-2.4.0.1.ebuild 887 SHA256 5b3e2fd51fdb0db16559f2d3597f4c16a095a0d27b7b87d9bd37d1aa6d949698 SHA512 0f5cdfa647fdba393ced14a985cc0e2f8cc91614185468d3c4e7627f4f8e225ba23b71e3c1f881f5f993983d1362ea4186b4615801da79aba4bc375266a5705d WHIRLPOOL d18dd4f4789ac5fdbff0f806bb8e58f767f2e9589a2a3a3524e17b1d25850d2284f65236abf67a717765828f89c7d18f535f5ded216cdc86e709610d350f1fd1
-MISC ChangeLog 8901 SHA256 dfbadf8be96d7ac55b713647bdbaffa1b2055bedaeb9c9be4be1348e8e4f7b88 SHA512 109f5f09a752dbc6d8582828a336e54e443e5dd44baacd1fecb4d0ee052fa3df165bf3a5265f3c42e2608975aa6a39018219ca4bff7c9c8e3b3ec165382d772d WHIRLPOOL b2ecf83a9a09738df3227796d86314808e692aff1ab5bc83e2338f86160edba1330d184c28cd012215287f6acf325f53e6ccb12afade6bbf0b41b2969158a029
+MISC ChangeLog 9057 SHA256 dd45b4c2bed065442fc2a29cbcb471e248090f816572efc044a2273cf8bc18e0 SHA512 e4c56fb2458a024051b02c5c8e51f00b145d7c81996c7221fa1063e72eb4db394b17e26673758e79e57929739bc321d80b86a43bb86937a6b7f4f5e57a038bfc WHIRLPOOL b393c3c56bc610a21204e1ad1b5446dbf6563e20255da3f89cd316cedc107e07b9851596b52cfda8eec5bd411e3f1ae0abadcbf15fc31d0ae659bc4fcbf2900f
 MISC metadata.xml 226 SHA256 e5dc2b6b77ac9bf27c18c122bdce1f2e766bbe26979d753337459c3fe807b851 SHA512 ab01f2a59cef0c84d5ec40bf54b03cfe070c9fb14f4d86fd7577aae2f893f2a51a3524f3afb55b31ba9dff9e2d168a516bc65b5e729df196298969268770a632 WHIRLPOOL 93426518ef4d789da504d28e1346f50b3961b3d7950ec2fd9958d443585d8dfbb65662a12b134163b6aa6ba1ada80bc0056542b2a6907ad2dcc7624dad051567
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDe9jMACgkQoBEVQmGOlx89XgD/Ygqi/Wyq45j7dH6dnHtM5ZcH
+X4as3GxaO7XbfCVKWm8A/jjtsvBHIWyXQbeZFKCjwBSXfms5hRdgDkJIlEqb8dmX
+=NsG4
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/network/files/network-2.3.0.14-ghc-7.5.patch b/dev-haskell/network/files/network-2.3.0.14-ghc-7.5.patch
new file mode 100644
index 000000000000..e6a01539728a
--- /dev/null
+++ b/dev-haskell/network/files/network-2.3.0.14-ghc-7.5.patch
@@ -0,0 +1,69 @@
+--- network-2.3.0.14-orig/network.cabal	2012-06-04 10:25:39.000000000 +1000
++++ network-2.3.0.14/network.cabal	2012-06-27 20:21:38.271566190 +1000
+@@ -39,7 +39,7 @@
+       Network.Socket.ByteString.MsgHdr
+ 
+   build-depends:
+-    base >= 3 && < 4.6,
++    base >= 3 && < 4.7,
+     bytestring < 1.0,
+     parsec >= 2.0 && < 3.2
+ 
+@@ -62,11 +62,11 @@
+   type: exitcode-stdio-1.0
+ 
+   build-depends:
+-    base < 4.6,
+-    bytestring < 0.10,
++    base < 4.7,
++    bytestring < 1.0,
+     HUnit < 1.3,
+     network,
+-    test-framework < 0.6,
++    test-framework < 0.7,
+     test-framework-hunit < 0.3
+ 
+ test-suite uri
+@@ -75,10 +75,10 @@
+   type: exitcode-stdio-1.0
+ 
+   build-depends:
+-    base < 4.6,
++    base < 4.7,
+     HUnit < 1.3,
+     network,
+-    test-framework < 0.6,
++    test-framework < 0.7,
+     test-framework-hunit < 0.3
+ 
+ source-repository head
+--- network-2.3.0.14-orig/Network/BSD.hsc	2012-06-04 10:25:39.000000000 +1000
++++ network-2.3.0.14/Network/BSD.hsc	2012-06-28 18:07:39.287001755 +1000
+@@ -112,7 +112,9 @@
+ import Foreign.Marshal.Array (allocaArray0, peekArray0)
+ import Foreign.Marshal.Utils (with, fromBool)
+ import Data.Typeable
++#if !MIN_VERSION_base(4,6,0)
+ import Prelude hiding (catch)
++#endif
+ import System.IO.Error (ioeSetErrorString, mkIOError)
+ import System.IO.Unsafe (unsafePerformIO)
+ 
+--- network-2.3.0.14-orig/tests/Simple.hs	2012-06-04 10:25:39.000000000 +1000
++++ network-2.3.0.14/tests/Simple.hs	2012-06-28 18:18:31.176027682 +1000
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE ScopedTypeVariables #-}
++{-# LANGUAGE CPP, ScopedTypeVariables #-}
+ {-# OPTIONS_GHC -fno-warn-unused-do-bind #-}
+ 
+ module Main where
+@@ -10,7 +10,9 @@
+ import qualified Data.ByteString.Char8 as C
+ import Network.Socket hiding (recv, recvFrom, send, sendTo)
+ import Network.Socket.ByteString
++#if !MIN_VERSION_base(4,6,0)
+ import Prelude hiding (catch)
++#endif
+ import Test.Framework (Test, defaultMain, testGroup)
+ import Test.Framework.Providers.HUnit (testCase)
+ import Test.HUnit (Assertion, (@=?))
diff --git a/dev-haskell/network/network-2.3.0.14.ebuild b/dev-haskell/network/network-2.3.0.14.ebuild
index 380c8825cc5f..746c198a9e45 100644
--- a/dev-haskell/network/network-2.3.0.14.ebuild
+++ b/dev-haskell/network/network-2.3.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.3.0.14.ebuild,v 1.7 2012/12/17 17:08:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.3.0.14.ebuild,v 1.8 2012/12/29 13:54:52 gienah Exp $
 
 EAPI="4"
 
@@ -27,10 +27,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/network-2.2.0.0-eat-configure-opts.patch"
+	epatch "${FILESDIR}/network-2.3.0.14-ghc-7.5.patch"
 	eautoreconf
-	sed -e 's@test-framework < 0.6@test-framework < 0.7@' \
-		-e 's@bytestring < 0.10@bytestring < 1.0@' \
-		-i "${S}/${PN}.cabal" || die "Could not loosen dependencies"
 }
 
 src_configure() {