diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-12-24 15:15:05 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-12-24 15:15:05 +0000 |
| commit | 06625fe12807c1ce433be9f6177b849412e66c99 (patch) | |
| tree | 2c3621c5fde45b803d0cd2a56a6df9ba0d2983b3 /dev-haskell | |
| parent | Version bump. (diff) | |
| download | gentoo-2-06625fe12807c1ce433be9f6177b849412e66c99.tar.gz gentoo-2-06625fe12807c1ce433be9f6177b849412e66c99.tar.bz2 gentoo-2-06625fe12807c1ce433be9f6177b849412e66c99.zip | |
Fix build failure against ghc-7.6 (found by LMolr).
(Portage version: 2.2.0_alpha149_p1/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/zlib/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/zlib/zlib-0.5.3.3.ebuild | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/dev-haskell/zlib/ChangeLog b/dev-haskell/zlib/ChangeLog index 71675d9a5ffe..4c9ae61c4d49 100644 --- a/dev-haskell/zlib/ChangeLog +++ b/dev-haskell/zlib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/zlib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/zlib/ChangeLog,v 1.30 2012/12/22 22:02:02 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/zlib/ChangeLog,v 1.31 2012/12/24 15:15:05 slyfox Exp $ + + 24 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> zlib-0.5.3.3.ebuild: + Fix build failure against ghc-7.6 (found by LMolr). 22 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> -zlib-0.5.2.0.ebuild, -zlib-0.5.3.1.ebuild, -zlib-0.5.3.2.ebuild: diff --git a/dev-haskell/zlib/zlib-0.5.3.3.ebuild b/dev-haskell/zlib/zlib-0.5.3.3.ebuild index 388d9a7309e6..efee5ed5a848 100644 --- a/dev-haskell/zlib/zlib-0.5.3.3.ebuild +++ b/dev-haskell/zlib/zlib-0.5.3.3.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/zlib/zlib-0.5.3.3.ebuild,v 1.7 2012/09/12 15:04:09 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/zlib/zlib-0.5.3.3.ebuild,v 1.8 2012/12/24 15:15:05 slyfox Exp $ # ebuild generated by hackport 0.2.14 @@ -22,3 +22,8 @@ RDEPEND=">=dev-lang/ghc-6.8.2 sys-libs/zlib" DEPEND="${RDEPEND} >=dev-haskell/cabal-1.6" + +src_prepare() { + cabal_chdeps \ + 'bytestring == 0.9.*' 'bytestring >= 0.9 && < 0.11' +} |