Fix build failure against ghc-6.12+binutils-22.1 (bug #397565 reported by Janusz)

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 76 insertions, 5 deletions

diff --git a/dev-haskell/curl/ChangeLog b/dev-haskell/curl/ChangeLog
index 96b90d61cb5a..0bc8d0aa9d32 100644
--- a/dev-haskell/curl/ChangeLog
+++ b/dev-haskell/curl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/curl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/curl/ChangeLog,v 1.4 2011/08/01 21:24:07 slyfox Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/curl/ChangeLog,v 1.5 2012/01/04 07:21:21 slyfox Exp $
+
+  04 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/curl-1.3.5-ghc-7.patch, curl-1.3.5.ebuild:
+  Fix build failure against ghc-6.12+binutils-22.1 (bug #397565 reported by
+  Janusz)
 
 *curl-1.3.7 (01 Aug 2011)
 
diff --git a/dev-haskell/curl/curl-1.3.5.ebuild b/dev-haskell/curl/curl-1.3.5.ebuild
index faf05800c36c..242ba48abc5e 100644
--- a/dev-haskell/curl/curl-1.3.5.ebuild
+++ b/dev-haskell/curl/curl-1.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/curl/curl-1.3.5.ebuild,v 1.3 2011/02/10 23:37:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/curl/curl-1.3.5.ebuild,v 1.4 2012/01/04 07:21:21 slyfox Exp $
 
 CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Haskell binding to libcurl"
 HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/curl"
@@ -17,3 +17,5 @@ IUSE=""
 DEPEND=">=dev-lang/ghc-6.6.1
 		>=dev-haskell/cabal-1.2
 		net-misc/curl"
+
+PATCHES=("${FILESDIR}"/${PN}-1.3.5-ghc-7.patch)
diff --git a/dev-haskell/curl/files/curl-1.3.5-ghc-7.patch b/dev-haskell/curl/files/curl-1.3.5-ghc-7.patch
new file mode 100644
index 000000000000..c1f5d08af277
--- /dev/null
+++ b/dev-haskell/curl/files/curl-1.3.5-ghc-7.patch
@@ -0,0 +1,64 @@
+https://bugs.gentoo.org/show_bug.cgi?id=397565
+-fvia-C is deprecated (and broken on ghc-6.12 + binutils-22.1)
+diff --git a/Network/Curl/Code.hs b/Network/Curl/Code.hs
+index ffb2531..0949438 100644
+--- a/Network/Curl/Code.hs
++++ b/Network/Curl/Code.hs
+@@ -1,5 +1,5 @@
+ {-# LANGUAGE ForeignFunctionInterface #-}
+-{-# OPTIONS -fvia-C -#include "curl/curl.h" #-}
++{-# OPTIONS -#include "curl/curl.h" #-}
+ --------------------------------------------------------------------
+ -- |
+ -- Module    : Network.Curl.Code
+diff --git a/Network/Curl/Easy.hs b/Network/Curl/Easy.hs
+index 46fe480..c2d2bc5 100644
+--- a/Network/Curl/Easy.hs
++++ b/Network/Curl/Easy.hs
+@@ -1,5 +1,5 @@
+ {-# LANGUAGE ForeignFunctionInterface #-}
+-{-# OPTIONS -fvia-C -#include "curl/curl.h" #-}
++{-# OPTIONS -#include "curl/curl.h" #-}
+ --------------------------------------------------------------------
+ -- |
+ -- Module    : Network.Curl.Easy
+diff --git a/Network/Curl/Info.hs b/Network/Curl/Info.hs
+index 2f31808..4a69938 100644
+--- a/Network/Curl/Info.hs
++++ b/Network/Curl/Info.hs
+@@ -1,5 +1,5 @@
+ {-# LANGUAGE ForeignFunctionInterface #-}
+-{-# OPTIONS -fvia-C -#include "curl/curl.h" #-}
++{-# OPTIONS -#include "curl/curl.h" #-}
+ --------------------------------------------------------------------
+ -- |
+ -- Module    : Network.Curl.Info
+diff --git a/Network/Curl/Post.hs b/Network/Curl/Post.hs
+index 0822fbb..c51c8aa 100644
+--- a/Network/Curl/Post.hs
++++ b/Network/Curl/Post.hs
+@@ -1,5 +1,5 @@
+ {-# LANGUAGE ForeignFunctionInterface #-}
+-{-# OPTIONS -fvia-C -#include "curl/curl.h" #-}
++{-# OPTIONS -#include "curl/curl.h" #-}
+ --------------------------------------------------------------------
+ -- |
+ -- Module    : Network.Curl.Post
+diff --git a/curl.cabal b/curl.cabal
+index 491161d..330ff18 100644
+--- a/curl.cabal
++++ b/curl.cabal
+@@ -37,11 +37,11 @@ library
+   c-sources: curlc.c
+   Extra-libraries: curl
+   Extensions:      CPP, ForeignFunctionInterface
+-  Ghc-options:     -Wall -fvia-C
++  Ghc-options:     -Wall
+ 
+   Build-Depends: base
+   if flag(new-base)
+-    Build-depends: base >= 3 && < 4, containers
++    Build-depends: base >= 3 && < 5, containers
+   else
+     Build-depends: base < 3
+