[gentoo-commits] gentoo-x86 commit in dev-haskell/http: ChangeLog http-4000.1.2.ebuild http-4000.2.2.ebuild

["Mark Wright (gienah)" <gienah@gentoo.org>]

gienah      12/03/04 03:37:58

  Modified:             ChangeLog http-4000.1.2.ebuild
  Added:                http-4000.2.2.ebuild
  Log:
  Fix http-4000.1.2 build with ghc 7.4.1. Add http-4000.2.2 for ghc 7.4.1
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.20                 dev-haskell/http/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/ChangeLog?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/ChangeLog?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/ChangeLog?r1=1.19&r2=1.20

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/http/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog	4 Dec 2011 17:26:32 -0000	1.19
+++ ChangeLog	4 Mar 2012 03:37:58 -0000	1.20
@@ -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.



1.2                  dev-haskell/http/http-4000.1.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild?r1=1.1&r2=1.2

Index: http-4000.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- http-4000.1.2.ebuild	4 Dec 2011 17:26:32 -0000	1.1
+++ http-4000.1.2.ebuild	4 Mar 2012 03:37:58 -0000	1.2
@@ -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 @@
 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"
+}



1.1                  dev-haskell/http/http-4000.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/http-4000.2.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/http/http-4000.2.2.ebuild?rev=1.1&content-type=text/plain

Index: http-4000.2.2.ebuild
===================================================================
# 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
}