Fix http-4000.1.2 build with ghc 7.4.1. Add http-4000.2.2 for ghc 7.4.1

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

4 files changed, 69 insertions, 21 deletions

diff --git a/dev-haskell/http/ChangeLog b/dev-haskell/http/ChangeLog
index a8269db3a138..e38222229115 100644
--- a/dev-haskell/http/ChangeLog
+++ b/dev-haskell/http/ChangeLog
@@ -1,8 +1,16 @@
 # ChangeLog for dev-haskell/http
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/ChangeLog,v 1.19 2011/12/04 17:26:32 slyfox Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/ChangeLog,v 1.20 2012/03/04 03:37:58 gienah Exp $
 
-*http-4000.1.2 (04 Dec 2011)
+*http-4000.2.2 (04 Mar 2012)
+
+  04 Mar 2012; Mark Wright <gienah@gentoo.org> +http-4000.2.2.ebuild:
+  Add http-4000.2.2 for ghc 7.4.1
+
+*http-4000.1.2 (04 Mar 2012)
+
+  04 Mar 2012; Mark Wright <gienah@gentoo.org> http-4000.1.2.ebuild,
+  Fix http-4000.1.2 build with ghc 7.4.1.
 
   04 Dec 2011; Sergei Trofimovich <slyfox@gentoo.org> +http-4000.1.2.ebuild:
   Version bump.
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index 0246ae9eb942..37c34c2bc2a2 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST HTTP-4000.1.1.tar.gz 59459 RMD160 c90418ef556cf833cffcb327df9b57e051ee8b25 SHA1 cdb8ae29b8524a912545059e4ec4a2b25ada88c5 SHA256 c3b7f8815f5528c88a41a4d62c4a0586edde644f83ae514f036a1cb35ce97026
 DIST HTTP-4000.1.2.tar.gz 59835 RMD160 b927af921ef198ddb824981b29b4d22b97d49fd4 SHA1 b5ee196ac334c1571980b2eba0b99999f03cc1c4 SHA256 c8725620a1566bcc6ded1304cced716b6d1f6e78da78aa580076671b3bf26ca7
+DIST HTTP-4000.2.2.tar.gz 65275 RMD160 d8983921bb48cb488be63278ce9b99f2a8717329 SHA1 b027a2049a9e18a304ea9e4f6a50f5cc3e7c507e SHA256 709f8d94fbbd538f198e844541dcbb53a3470207bcdeeb62774d17211b4f3963
 EBUILD http-4000.1.1.ebuild 825 RMD160 b3a968017cb0d086888b3786a470c5041ca16a2c SHA1 4eb59cb283b7a7f39606c3f49bf3251b2513141a SHA256 e83cadfec4c80f259b73ca4bb4209f35925ba6f3458099639725a34cf614809d
-EBUILD http-4000.1.2.ebuild 837 RMD160 f98feafaac43abfb2e47a7ba114738ee8c0b8181 SHA1 aa19089c445f769b3259f87a3a8c2a968ceaf071 SHA256 0d5b569507382c1c08c588508c2cb5520146fb0b8b08b831269c46a832bff37e
-MISC ChangeLog 2629 RMD160 381e94b20bd8cbbc29b1c7d75ac3ca8203b45b81 SHA1 eb4ec3d073a40c76ca36018ea948f65558ea5ed4 SHA256 cb658819fec2cdcf044cde5383499dca4f1bd722345b1e1a8f25137f76ca417a
+EBUILD http-4000.1.2.ebuild 1007 RMD160 a3c3b80c0298348b9ab41265c50c522875b69e58 SHA1 f6d04f82f6d0f9886d4561f710ba16384a296fb0 SHA256 4180b67d8263b299f5acb7e012d28d1ddb4b6c066d54a7a699386602cf836ec6
+EBUILD http-4000.2.2.ebuild 1199 RMD160 52161e4c9b6fb0ebb1c994b9c61439abe80251db SHA1 b89717689ab8bb2028f1ccc5023d0948afeebda8 SHA256 4ef1187f9fc82859ef375e7703a4c8a477898c1eec7a90aed6328f27ed547799
+MISC ChangeLog 2876 RMD160 10d3a0958d614ea4d5cd1a70d25eb4f17581a9d0 SHA1 aee89a40bc2186f035fed2c1d1c5b7aabe70aca5 SHA256 80ca961a29d7fd8b5ed03f2c64467db1a48fe54e1830c21a3efe7593f1ec996b
 MISC metadata.xml 598 RMD160 f0d35251efe34bf4077bfbd901d8331e3521bfe7 SHA1 944ca6bb505345e27b0005a7838b9b6d39b4fd38 SHA256 6d3d5c01b7801a992a1f7dbf919751107673e24df8dfac1a9a856e1efe687cef
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk7brkAACgkQcaHudmEf86q+4wCfVZ5huoqX73BP1nVl/cB0aOps
-FVgAn0kL2G+e4VvIWrRY02d0vPE+4+x/
-=mmb5
------END PGP SIGNATURE-----
diff --git a/dev-haskell/http/http-4000.1.2.ebuild b/dev-haskell/http/http-4000.1.2.ebuild
index 68073d6722ff..45458e60dba9 100644
--- a/dev-haskell/http/http-4000.1.2.ebuild
+++ b/dev-haskell/http/http-4000.1.2.ebuild
@@ -1,10 +1,10 @@
-# 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/http/http-4000.1.2.ebuild,v 1.1 2011/12/04 17:26:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild,v 1.2 2012/03/04 03:37:58 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
-EAPI="3"
+EAPI="4"
 
 CABAL_FEATURES="lib profile haddock hscolour hoogle"
 inherit haskell-cabal
@@ -21,11 +21,16 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE=""
 
-RDEPEND="dev-haskell/mtl
-		dev-haskell/network
-		dev-haskell/parsec
+RDEPEND="dev-haskell/mtl[profile?]
+		dev-haskell/network[profile?]
+		dev-haskell/parsec[profile?]
 		>=dev-lang/ghc-6.8.2"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2"
 
 S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -e 's@base >= 2 && < 4.5@base >= 2 \&\& < 4.6@' \
+		-i "${S}/${MY_PN}.cabal" || die "Could not loosen dependencies"
+}
diff --git a/dev-haskell/http/http-4000.2.2.ebuild b/dev-haskell/http/http-4000.2.2.ebuild
new file mode 100644
index 000000000000..cf3fd239aa10
--- /dev/null
+++ b/dev-haskell/http/http-4000.2.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/http-4000.2.2.ebuild,v 1.1 2012/03/04 03:37:58 gienah Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="4"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit base haskell-cabal
+
+MY_PN="HTTP"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library for client-side HTTP"
+HOMEPAGE="https://github.com/haskell/HTTP"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="=dev-haskell/mtl-2.0*[profile?]
+		dev-haskell/network[profile?]
+		dev-haskell/parsec[profile?]
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( >=dev-haskell/cabal-1.10
+			dev-haskell/hunit[profile?]
+			dev-haskell/httpd-shed[profile?]
+			=dev-haskell/split-0.1*[profile?]
+			dev-haskell/test-framework[profile?]
+			dev-haskell/test-framework-hunit[profile?]
+		)
+		"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	cabal_src_configure $(use test && use_enable test tests) #395351
+}