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

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

diff --git a/dev-haskell/curl/ChangeLog b/dev-haskell/curl/ChangeLog
index 96b90d61cb5a33c8702923b70a3b887a36ec9739..0bc8d0aa9d3275f988d5f5de0a45e76a984ae161 100644 (file)
--- 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/Manifest b/dev-haskell/curl/Manifest
index c12cc44cb5efdebfe933be59a60b3879f54b8409..b9e88604d57869155b3068d579eb01c2a9e66678 100644 (file)
--- a/dev-haskell/curl/Manifest
+++ b/dev-haskell/curl/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX curl-1.3.5-ghc-7.patch 2179 RMD160 700c7ae969e0d09d745a09208ee5938531eaa762 SHA1 d4efa3c58dccee85eba088d15ed9a289d1451729 SHA256 d44521b82fdb262a70c53abf28f4a75429046e08bde1a0f7509a29a166f78c07
 DIST curl-1.3.5.tar.gz 47734 RMD160 81a047736fc82cbdb794980ee0f7b9f573266601 SHA1 a96dab93dc6ca3e01da49b7e909e11d8c7766b1e SHA256 351fce6db46b14949de615b181d654712158bdcf9603601e1a90c9d786a6d67c
 DIST curl-1.3.7.tar.gz 51278 RMD160 69762b6ee4e05d56668f769fd929ccfc9935f84d SHA1 6fc8a6bfab4e06325986025c0a823851b65005a7 SHA256 f1410ca81fffff241678d287588b201285c6c9637d6db5d90af6952bc639cd44
-EBUILD curl-1.3.5.ebuild 599 RMD160 43a61d701c7658b69d348c84fadffd6bfedf9aac SHA1 0d803d5255b6104206d3760ec64377ce792f49c2 SHA256 939b52219c9e85855b2ef3d4acd28f0f623a691e7031e8254906507ac957e50c
+EBUILD curl-1.3.5.ebuild 651 RMD160 2b85aa4cffae1fd2ec80075e4bc43dfd2940e0ea SHA1 6194f39ef820085b92bb6b39a3534c9bae5850e6 SHA256 48c76ac557117ac86379ac00f17568c4733c1a80df5f394877f2268ea96acf4a
 EBUILD curl-1.3.7.ebuild 654 RMD160 3e6c636819258e552dc44e3f96a4c26b91ef785f SHA1 82d620966095c0f280ee6f66751f9f3eb5378404 SHA256 3b6daa628c44be36eae5c222bda25bb8184a3db027408b0fb90ddd078d7eab83
-MISC ChangeLog 653 RMD160 331d0e236f8c2fa44d14e117f8a32424e8c4ab4d SHA1 27916ccce5c57cf8fe491a2161ff8c3ff3a69f19 SHA256 29b645516e94f75e53ed49864fbf78fd17795d40241cdf26fbaba7ff41bf8456
+MISC ChangeLog 846 RMD160 3cde2248c7816c531f5954a4890ba7673425126e SHA1 6fb085a2e6cea3c422492a634d29612e24934c5f SHA256 139fc4de570333bab3dfd3fd29258ef35286973cd23314dde93b509f96d137f8
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk43GkYACgkQcaHudmEf86pxggCeLuOtuA/O9uUBWc1o0FHBpTC5
-JGsAn24mvw4g/16UieJvq17lkryQ/fWB
-=EUnO
+iEYEARECAAYFAk8D/vsACgkQcaHudmEf86oVQACcCb/xPqEEh6H6bSKVPXYeMygN
+ROEAn04rY2JYCX+w2v7MmWMJZsV6IW1o
+=iIoT
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/curl/curl-1.3.5.ebuild b/dev-haskell/curl/curl-1.3.5.ebuild
index faf05800c36c56662b410909eefba9295e92617d..242ba48abc5e61e43a0a3574c25d331d80c6ba64 100644 (file)
--- 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 (file)
index 0000000..c1f5d08
--- /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
+