Bump lifted-base to 0.1.1. Loosen transformers dep in lifted-base-0.1.0.3-r1.

(Portage version: 2.1.10.63/cvs/Linux x86_64)

4 files changed, 67 insertions, 2 deletions

diff --git a/dev-haskell/lifted-base/ChangeLog b/dev-haskell/lifted-base/ChangeLog
index 0a40854df3eb..e4f50ceb206b 100644
--- a/dev-haskell/lifted-base/ChangeLog
+++ b/dev-haskell/lifted-base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/lifted-base
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lifted-base/ChangeLog,v 1.2 2012/03/29 20:09:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lifted-base/ChangeLog,v 1.3 2012/06/02 03:14:13 gienah Exp $
+
+*lifted-base-0.1.1 (02 Jun 2012)
+
+  02 Jun 2012; Mark Wright <gienah@gentoo.org>
+  +files/lifted-base-0.1.1-test-ghc-6.12.patch, +lifted-base-0.1.1.ebuild,
+  lifted-base-0.1.0.3-r1.ebuild:
+  Bump lifted-base to 0.1.1. Loosen transformers dep in lifted-base-0.1.0.3-r1.
 
   29 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
   +files/lifted-base-0.1.0.1-test-ghc-6.12.patch:
diff --git a/dev-haskell/lifted-base/files/lifted-base-0.1.1-test-ghc-6.12.patch b/dev-haskell/lifted-base/files/lifted-base-0.1.1-test-ghc-6.12.patch
new file mode 100644
index 000000000000..fe92161bbf03
--- /dev/null
+++ b/dev-haskell/lifted-base/files/lifted-base-0.1.1-test-ghc-6.12.patch
@@ -0,0 +1,19 @@
+--- lifted-base-0.1.1-orig/test/test.hs	2012-04-28 23:47:19.000000000 +1000
++++ lifted-base-0.1.1/test/test.hs	2012-05-04 11:21:19.840997008 +1000
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE DeriveDataTypeable, FlexibleContexts #-}
++{-# LANGUAGE DeriveDataTypeable, FlexibleContexts, CPP #-}
+ 
+ -- from base:
+ import Prelude hiding (catch)
+@@ -38,7 +38,9 @@
+ main :: IO ()
+ main = defaultMain
+     [ testSuite "IdentityT" runIdentityT
+-    , testSuite "ListT" $ fmap head . runListT
++#if MIN_VERSION_base(4,3,0)
++    , testSuite "ListT" $ fmap head . runListT -- this test fails with ghc 6.12.3
++#endif
+     , testSuite "MaybeT" $ fmap fromJust . runMaybeT
+     , testSuite "ReaderT" $ flip runReaderT "reader state"
+     , testSuite "WriterT" runWriterT'
diff --git a/dev-haskell/lifted-base/lifted-base-0.1.0.3-r1.ebuild b/dev-haskell/lifted-base/lifted-base-0.1.0.3-r1.ebuild
index 0fb44cdd6fa9..8fe6c34a856d 100644
--- a/dev-haskell/lifted-base/lifted-base-0.1.0.3-r1.ebuild
+++ b/dev-haskell/lifted-base/lifted-base-0.1.0.3-r1.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/lifted-base/lifted-base-0.1.0.3-r1.ebuild,v 1.1 2012/03/24 14:24:01 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lifted-base/lifted-base-0.1.0.3-r1.ebuild,v 1.2 2012/06/02 03:14:13 gienah Exp $
 
 # ebuild generated by hackport 0.2.17.9999
 
@@ -34,6 +34,7 @@ PATCHES=("${FILESDIR}/${PN}-0.1.0.1-test-ghc-6.12.patch")
 src_prepare() {
 	base_src_prepare
 	sed -e 's@test-framework       >= 0.2.4 && < 0.5@test-framework       >= 0.2.4 \&\& < 0.7@' \
+		-e 's@transformers         >= 0.2   && < 0.3@transformers         >= 0.2   \&\& < 0.4@' \
 		-i "${S}/${PN}.cabal" || die "Could not loosen dependencies"
 }
 
diff --git a/dev-haskell/lifted-base/lifted-base-0.1.1.ebuild b/dev-haskell/lifted-base/lifted-base-0.1.1.ebuild
new file mode 100644
index 000000000000..221f40d702e6
--- /dev/null
+++ b/dev-haskell/lifted-base/lifted-base-0.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lifted-base/lifted-base-0.1.1.ebuild,v 1.1 2012/06/02 03:14:13 gienah Exp $
+
+EAPI=4
+
+# ebuild generated by hackport 0.2.18.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit base haskell-cabal
+
+DESCRIPTION="lifted IO operations from the base library"
+HOMEPAGE="https://github.com/basvandijk/lifted-base"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-haskell/base-unicode-symbols-0.1.1[profile?]
+		<dev-haskell/base-unicode-symbols-0.3[profile?]
+		=dev-haskell/monad-control-0.3*[profile?]
+		=dev-haskell/transformers-base-0.4*[profile?]
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		test? ( >=dev-haskell/hunit-1.2.2
+			<dev-haskell/hunit-1.3
+			>=dev-haskell/test-framework-0.2.4
+			<dev-haskell/test-framework-0.7
+			>=dev-haskell/test-framework-hunit-0.2.4
+			<dev-haskell/test-framework-hunit-0.3
+			>=dev-haskell/transformers-0.2
+			<dev-haskell/transformers-0.4
+		)
+		>=dev-haskell/cabal-1.9.2"
+
+PATCHES=("${FILESDIR}/${PN}-0.1.1-test-ghc-6.12.patch")