Raise minimal required dev-haskell/mtl version to make it compile.

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

diff --git a/dev-vcs/git-annex/ChangeLog b/dev-vcs/git-annex/ChangeLog
index 1132d27af989798060b22901015f4c18221a427b..40ecebfc90776eb11f56f2c00000c0ed0e02847c 100644 (file)
--- a/dev-vcs/git-annex/ChangeLog
+++ b/dev-vcs/git-annex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/git-annex
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.1 2011/12/04 18:36:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/ChangeLog,v 1.2 2011/12/05 19:02:11 slyfox Exp $
+
+  05 Dec 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  git-annex-3.20111203.ebuild:
+  Raise minimal required dev-haskell/mtl version to make it compile.
 
 *git-annex-3.20111203 (04 Dec 2011)
 

diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 94af3b884b497c196a7dc5cc9655db2d70d74565..43f1d4f052724b1301d738da41cfdb2c654a6a9a 100644 (file)
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST git-annex-3.20111203.tar.gz 442974 RMD160 b5f06d6cbffc3cab1dca5f53f2b41ef748ae6d26 SHA1 3aea68b9e00fdfcc08d6f55f7879e21b6d4844df SHA256 3b7361c9d27302f23136266ff1223b2a82c280988b3c706d518539eb577af244
-EBUILD git-annex-3.20111203.ebuild 982 RMD160 0d2bfb9cb9f29ab76234a0da7a01671f105cdbb0 SHA1 af2a6d5a5700d163b3080863feb498f636c2c887 SHA256 e302c17324308e46a0e7b958aea35acd2829f7cc98204d964d094920ebbe6822
-MISC ChangeLog 481 RMD160 8665f0b7f114b2ecda783106955a37daf9e3b648 SHA1 adfe886fafa6690e8da0f0af0b159c4ce51ac9aa SHA256 b0d8545a73e6f03821a00822c0312fb69961dea92d5c74cac65d7f2aa71b0b4a
+EBUILD git-annex-3.20111203.ebuild 986 RMD160 96a04cbb14982b36eb8f859915b531622c4f2064 SHA1 e1d21993456c8d866ac281814caea209a25e0d19 SHA256 3fe88d21f2bd09150b69fed9624ca794f8b14e7effc979968719891021054cfe
+MISC ChangeLog 636 RMD160 ef40681eed5016f7bd859723b6c08d33f683253e SHA1 bb09603f425ff9c894c8a35b471ce7dfacb07006 SHA256 ec0fc89de88fbc18daed85d5eb56afacc8905b0406b6b5626c62abb6702bd4ef
 MISC metadata.xml 1020 RMD160 81b37c15cbdd25d6dcb65d45e5ba706c8674d6c7 SHA1 4d4ea625f0309ea23886699dc3c0a0b556d8f89f SHA256 adb6331810d079ace08d3df7e88a56839b86d9656b42a6212f641a462d34b4c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7bvqEACgkQcaHudmEf86o3rACfRE9kuy5q30TM/H+9jIsXOQ5n
-/d4Anj2htIAP4QF7Vey9Bzn/gg7iSl1Q
-=dH7P
+iEYEARECAAYFAk7dFioACgkQcaHudmEf86p7pwCeIyeSXPiTt2DGmLeSdpojsxQK
+hAgAnj7y6CKMBzAdGsPoFNVmjSNN2NoA
+=7Ww1
 -----END PGP SIGNATURE-----

diff --git a/dev-vcs/git-annex/git-annex-3.20111203.ebuild b/dev-vcs/git-annex/git-annex-3.20111203.ebuild
index 043cae25688d400b7e2c9c0ea5b9690c02bb293f..e5fe43eb33ede1c61ccc3ad136c4bd8ebb5f7c97 100644 (file)
--- a/dev-vcs/git-annex/git-annex-3.20111203.ebuild
+++ b/dev-vcs/git-annex/git-annex-3.20111203.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-3.20111203.ebuild,v 1.1 2011/12/04 18:36:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-3.20111203.ebuild,v 1.2 2011/12/05 19:02:11 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
                dev-haskell/json
                dev-haskell/missingh
                dev-haskell/monad-control
-               dev-haskell/mtl
+               >=dev-haskell/mtl-2
                dev-haskell/network
                dev-haskell/pcre-light
                dev-haskell/sha