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

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

5 files changed, 76 insertions, 8 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/Manifest b/dev-haskell/lifted-base/Manifest
index 75fc64c2af77..dc9bc13a4ea2 100644
--- a/dev-haskell/lifted-base/Manifest
+++ b/dev-haskell/lifted-base/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX lifted-base-0.1.0.1-test-ghc-6.12.patch 485 RMD160 96003ef080b881c8a6c7769f9f09d59b154845ca SHA1 c71c494f8ad201277395c20fefe74b61454a9093 SHA256 a4e9592632cf2f00859e0adaca087e4b7d8394782b7a66c37db0102a3f1ff2d2
+AUX lifted-base-0.1.1-test-ghc-6.12.patch 742 RMD160 55e4b4a9d29136765bae7fdd87f8ace811482b78 SHA1 32757300b403b7ebd92dc8b85f69b6bebd968c0e SHA256 3944f33ef3846ac2579f1c8211ba0a7fd2ca8d2cbdd29f6207a403cda0c73dd9
 DIST lifted-base-0.1.0.3.tar.gz 8557 RMD160 dad8235489616d9fdbb81fea54aa898dcdbe2fd8 SHA1 ea02337047337c5b3d554e826a500998eecc510d SHA256 66f4f6ceca1612bc738a33ba786b717c4412a025079ece7eed6449ded19662ba
-EBUILD lifted-base-0.1.0.3-r1.ebuild 1318 RMD160 09be20040a6bbed5cc8f603ab0ad5d3a26e557fa SHA1 044afd0103f56c138bd4262b9bd119a6acc7f491 SHA256 c9203631fcba1c5d4a119169a336de3e539e0e31c020518357ee3a2c1142b90e
-MISC ChangeLog 639 RMD160 5c88fbaaf00c66fff85fb3d0ba39ef83e4409666 SHA1 cf926ac73a0f89dd598c4c059bdd05a1c3b4d098 SHA256 8d54b118bad4c120515946b715b2f753b84056ec06247a3aee24768046cb05c5
+DIST lifted-base-0.1.1.tar.gz 10640 RMD160 49ac1268368d40b9eeae2a7e80daa08447d75da5 SHA1 7808e9830f0d58e132010de4ce11ec79c7f0e497 SHA256 759300ba3eaf4e78455066c438c3f64ccffd6af5d80550bf4d0075c57f180691
+EBUILD lifted-base-0.1.0.3-r1.ebuild 1410 RMD160 e43dda3b5ef6080cb8c7299b59fae68c03c8165b SHA1 8c2ff57684472c13bc0b2599393456be46cec5b0 SHA256 ca288abfb06dc4e89217b56bf1c188591f0774da7b1ca6767cdffa7b34793102
+EBUILD lifted-base-0.1.1.ebuild 1245 RMD160 c5e3660c9be4d75ff597ef795c0e7eb2362a8533 SHA1 8f889e3530edcd2d2e5048b554a35c76fe537ad5 SHA256 daaff0bb0888a58857d1bf6da20de04ff553e7fd4613b81fcb5e806dd1509caf
+MISC ChangeLog 909 RMD160 33198022b56db095f8c8189495a3b354ddfcca09 SHA1 8b84eb501038720b3480f878329b65a712b6b5bd SHA256 53eb6e4fd763d22d4ee4342e4d1751695d16c627a97f9e0b6aa673b286f098dd
 MISC metadata.xml 706 RMD160 cc2e827e697f332d312d91af3bbc75a0fa98d5bf SHA1 870410b07115d994a6cc65e890ad5d8cfb0982e6 SHA256 2a81952f49490b518311c153a65b43dc34ebe5d0d040392f40b27a5ec13e7e1d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk90wqIACgkQcaHudmEf86qLTwCfdpFJLpETv+LtcRry30QR5IIg
-DkwAnizME4RpJ5SM5mfl2O224RJni6tB
-=j/v3
+iF4EAREIAAYFAk/JhRAACgkQoBEVQmGOlx+gNAD+IqubobKqBZ1D+HIXzzYaPsYG
++BT0e44Zt/Pc3/C/lbsBALGIGuGAtSBO1hWTghkPwWIPGWJAmSbG3kpVgABnhsdu
+=MO4y
 -----END PGP SIGNATURE-----
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")