Patch network-2.3.0.14 for ghc 7.6.1

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

3 files changed, 76 insertions, 5 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/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() {