Allow darcs 2.5.2-r2 to build with mtl-2.1

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

4 files changed, 59 insertions, 11 deletions

diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog
index 9fb46394fbbc..6369c1883b5a 100644
--- a/dev-vcs/darcs/ChangeLog
+++ b/dev-vcs/darcs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/darcs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.28 2012/03/25 19:27:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.29 2012/04/13 10:33:55 gienah Exp $
+
+*darcs-2.5.2-r2 (13 Apr 2012)
+
+  13 Apr 2012; Mark Wright <gienah@gentoo.org> +darcs-2.5.2-r2.ebuild,
+  +files/darcs-2.5.2-mtl-2.1.patch, -darcs-2.5.2.ebuild:
+  Allow darcs 2.5.2-r2 to build with mtl-2.1
 
   25 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> darcs-2.5.2-r1.ebuild,
   darcs-2.5.2.ebuild:
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 990e91dff5c7..3668d3ab8f97 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX darcs-1.0.9-bashcomp.patch 510 RMD160 73888c758f4a2ac93b83229115d23599162c0b15 SHA1 1abf5c0477169eb0109a0dd7ecfb2c38dfee15ff SHA256 39a7e531f68ee4b71958d52557e6c6ace0c7717d546dcddccc4a5e7fb5daeff6
 AUX darcs-2.4.4-issue1770-curl_multi_perform-no-running-handles.patch 1617 RMD160 6cd0fdcae04518cb8d701f0db89ce7cad4a51c61 SHA1 10cd5b15ffcb9678e0fc8700b9059244a12bf06a SHA256 9716fad28813bae04e06c8a039c9e5cb094cbd0c4907855142e14c49334d387e
 AUX darcs-2.4.4-tests-emailformat.patch 1177 RMD160 fee2084eeb08f23e6b8ee771a369137e0cea8746 SHA1 8d74f367140e5300d663db7c77e0794419672a6b SHA256 6bd35d0c790d4fc583f650cccc433f5005036c06f4de3f139f685e5957b35835
 AUX darcs-2.5.2-ghc-7.2.patch 5084 RMD160 cf8f69a00c3924af192a15bcf3a845268b71d88e SHA1 6e5d64dfc748bbe47b831e75ca09686007702234 SHA256 7c5d189ba1377e881a500852cb823a10672ee3eac0b04fc6d6888f5f3fda3ba4
 AUX darcs-2.5.2-ghc-7.4.patch 5501 RMD160 7e25444c01596936e07f65b2dffefd4f720d1e35 SHA1 18e6cb3cc216e0f9ceee30e5b17aa97fe7fa5c60 SHA256 5927b96f6ff827e55c2afa43c92ba4dc1af91c470925c2e93b5962210e64584f
+AUX darcs-2.5.2-mtl-2.1.patch 1865 RMD160 59bae682f3cb6bdc5126a43377731d5bbf7e6a7f SHA1 e530da117f8446cefe081b49ceff1c465e2d3457 SHA256 887c64bbed82302e46d322efcd26a6c3a1d284a09cbf066eb94bf7ef53194845
 AUX darcs-2.5.2-relax-http-libs-deps.patch 1237 RMD160 bbc3070b39c66fd75fbf9a2bf8336b9315a3ea1e SHA1 926b9c6e9efe2fadb22c594ac5eddcadbd7982d0 SHA256 300450943c78c12929ea7a5005b9927d9d9fa33a70aea8634709442652880736
 AUX darcs-2.5.2-relax-regex-libs-deps.patch 2840 RMD160 48319d80de4e55709d238e69bf14b06388e640a2 SHA1 b32c417c352dc57d85a7d7be33ea2aa7793cd0a8 SHA256 fe32930704bbd411b0a65a6a378c7a9700257f165e8edad889b53ad227620b1a
 AUX darcs-2.5.2-tests-ghc-7.2.patch 708 RMD160 406b9caddc080596eee52276f0ae445cdc01a1e9 SHA1 edda5d6a60d10f4b669126a790f7817f6439a42f SHA256 f54f02114b5ca6477f750d0fb1712d79de61712e97480e54a94b35b6fa660104
@@ -13,13 +14,13 @@ DIST darcs-2.4.4.tar.gz 1193126 RMD160 cec11127740f350d25de7d4f9c7d7df115ebed6a
 DIST darcs-2.5.2.tar.gz 1231903 RMD160 53e357fb802a72f4b787bf1ca4a6e95e118b08af SHA1 da43ebf64ca4f41b456d5b1fd2038ae0ec5a36da SHA256 8953f9d64f8013876466b8ad5474a212ee4e164f419ba4012b5dcc9e590fb386
 EBUILD darcs-2.4.4-r1.ebuild 4883 RMD160 0df45342d54154887ed752c46aaf1c5e6fa67a9d SHA1 5f9afb371ee1afd22bc23dc191887b81741f9f16 SHA256 53d4fa631bde6fee6840febd3854bc53a4fd2527da8823cb0c0e656f2ea610db
 EBUILD darcs-2.5.2-r1.ebuild 4200 RMD160 aa4789ba1efc31655cc204f98c053cd36000b7af SHA1 aeaf7fae0e5b7073d98d79784ae95d62eb5aa084 SHA256 fcf62c1e15da10910a68d1bfa023c85c2adfa9af68a14878a53a0b2d4c447867
-EBUILD darcs-2.5.2.ebuild 4088 RMD160 98d343380b049c3665275c74f0174581465de3a1 SHA1 d1a44bd7681257414678fdaf2bf1bd962928192a SHA256 2c6d38bade24a9e58b3665967d32bda92d7742da3c67881737558914a22b84d8
-MISC ChangeLog 22406 RMD160 911664c676882848459e208c60d747be73f36ad2 SHA1 db67d91382d6b9533eb841a0dfbbead1a4ef0cb0 SHA256 bb03454b10f22591a0f7c5cdec1156079a592809a3d7562be5c293b104f7053f
+EBUILD darcs-2.5.2-r2.ebuild 4248 RMD160 50618993288b27bd98f0c9ab7c3991602ddf1bc2 SHA1 9dcb383e2c928bd61a6514c31a2c3ee049292b15 SHA256 2e06ade8a41beabe9d95e516632521e3a68f825b252eafbcbe0f83c066d94221
+MISC ChangeLog 22611 RMD160 e60bd7aca7d67150816170010d2dda43bc52736d SHA1 e9b0f726be13cc85ee80ac17059f17f7b419c83d SHA256 f054d4ac6baee2c3c1754c4bfa461dd16ef8ce30100bca7241798fecd37aa5e5
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9vcs0ACgkQcaHudmEf86pODQCfe8MtJcRdXoHE7fVdmMGJgNDx
-SHcAn14bcKtIPg1WqOUYjENExjMZZHm0
-=pDRK
+iF4EAREIAAYFAk+IASMACgkQoBEVQmGOlx/vHQD/aWDE5yQ48qTkA9cm4lldgmco
+EWGgJDcEtYbsTi/Byf0A/2PGlNUeqXmqoG711y1do6QgVVI21Q8W63aEdbvcAMIc
+=LCkV
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/darcs/darcs-2.5.2.ebuild b/dev-vcs/darcs/darcs-2.5.2-r2.ebuild
index 04c4190a76a7..b265efef593d 100644
--- a/dev-vcs/darcs/darcs-2.5.2.ebuild
+++ b/dev-vcs/darcs/darcs-2.5.2-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild,v 1.6 2012/03/25 19:27:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2-r2.ebuild,v 1.1 2012/04/13 10:33:55 gienah Exp $
 
-EAPI="3"
+EAPI="4"
 CABAL_FEATURES="bin lib profile haddock hscolour"
 inherit haskell-cabal bash-completion-r1
 
@@ -18,9 +18,9 @@ IUSE="doc test"
 RDEPEND="=dev-haskell/hashed-storage-0.5*[profile?]
 		=dev-haskell/haskeline-0.6*[profile?]
 		=dev-haskell/html-1.0*[profile?]
-		<dev-haskell/http-4000.2[profile?]
+		<dev-haskell/http-4000.3[profile?]
 		=dev-haskell/mmap-0.5*[profile?]
-		<dev-haskell/mtl-2.1[profile?]
+		<dev-haskell/mtl-2.2[profile?]
 		>=dev-haskell/network-2.2[profile?]
 		<dev-haskell/parsec-3.2[profile?]
 		=dev-haskell/random-1.0*[profile?]
@@ -55,6 +55,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.5.2-relax-regex-libs-deps.patch"
 	epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.2.patch"
 	epatch "${FILESDIR}/${PN}-2.5.2-tests-ghc-7.2.patch"
+	epatch "${FILESDIR}/${PN}-2.5.2-relax-http-libs-deps.patch"
+	epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.4.patch"
+	epatch "${FILESDIR}/${PN}-2.5.2-mtl-2.1.patch"
 
 	# hlint tests tend to break on every newly released hlint
 	rm "${S}/tests/haskell_policy.sh"
diff --git a/dev-vcs/darcs/files/darcs-2.5.2-mtl-2.1.patch b/dev-vcs/darcs/files/darcs-2.5.2-mtl-2.1.patch
new file mode 100644
index 000000000000..2718e9ec0368
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.5.2-mtl-2.1.patch
@@ -0,0 +1,38 @@
+--- darcs-2.5.2-orig/darcs.cabal	2012-04-12 00:35:07.075608173 +1000
++++ darcs-2.5.2/darcs.cabal	2012-04-12 00:40:06.173429235 +1000
+@@ -171,7 +171,7 @@
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+                      regex-compat >= 0.71 && < 0.96,
+-                     mtl          >= 1.0 && < 2.1,
++                     mtl          >= 1.0 && < 2.2,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+                      filepath     >= 1.1.0.0 && < 1.5.0.0,
+@@ -376,7 +376,7 @@
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+                      regex-compat >= 0.71 && < 0.96,
+-                     mtl          >= 1.0 && < 2.1,
++                     mtl          >= 1.0 && < 2.2,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+                      filepath     >= 1.1.0.0 && < 1.5.0.0,
+@@ -524,7 +524,7 @@
+   build-depends:   base          < 5,
+                    extensible-exceptions >= 0.1 && < 0.2,
+                    regex-compat >= 0.71 && < 0.96,
+-                   mtl          >= 1.0 && < 2.1,
++                   mtl          >= 1.0 && < 2.2,
+                    parsec       >= 2.0 && < 3.2,
+                    html         == 1.0.*,
+                    filepath     >= 1.1.0.0 && < 1.5.0.0,
+@@ -620,7 +620,7 @@
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+                      regex-compat >= 0.71 && < 0.96,
+-                     mtl          >= 1.0 && < 2.1,
++                     mtl          >= 1.0 && < 2.2,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+                      filepath     >= 1.1.0.0 && < 1.5.0.0,