diff options
| author |   Mark Wright <gienah@gentoo.org> | 2012-04-13 10:33:55 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2012-04-13 10:33:55 +0000 |
| commit | 715b3d179a8ac92bcda857dc58d1cefb8139fd12 (patch) | |
| tree | 7518ee4cde9b83e9f8e0719fb299efe627643e80 /dev-vcs | |
| parent | Bump http to 4000.2.3 (diff) | |
| download | gentoo-2-715b3d179a8ac92bcda857dc58d1cefb8139fd12.tar.gz gentoo-2-715b3d179a8ac92bcda857dc58d1cefb8139fd12.tar.bz2 gentoo-2-715b3d179a8ac92bcda857dc58d1cefb8139fd12.zip | |
Allow darcs 2.5.2-r2 to build with mtl-2.1
(Portage version: 2.1.10.56/cvs/Linux x86_64)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/darcs/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-vcs/darcs/darcs-2.5.2-r2.ebuild (renamed from dev-vcs/darcs/darcs-2.5.2.ebuild) | 11 | ||||
| -rw-r--r-- | dev-vcs/darcs/files/darcs-2.5.2-mtl-2.1.patch | 38 |
3 files changed, 52 insertions, 5 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/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, |