diff options
author | Mark Wright <gienah@gentoo.org> | 2012-12-29 11:27:56 +0000 |
---|---|---|
committer | Mark Wright <gienah@gentoo.org> | 2012-12-29 11:27:56 +0000 |
commit | bdfde2d072a83f7bbeb24fc739adc71f96f356d8 (patch) | |
tree | 608e1c18865b2e1b2512efcf32cea49dfb85fb29 /dev-haskell/cabal | |
parent | Add missing dependency on rspec itself that is present in the gemspec. (diff) | |
download | gentoo-2-bdfde2d072a83f7bbeb24fc739adc71f96f356d8.tar.gz gentoo-2-bdfde2d072a83f7bbeb24fc739adc71f96f356d8.tar.bz2 gentoo-2-bdfde2d072a83f7bbeb24fc739adc71f96f356d8.zip |
Add dev-lang/ghc upper bounds to cabal-1.8.0.6-r1 and cabal-1.10.2.0
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-haskell/cabal')
-rw-r--r-- | dev-haskell/cabal/ChangeLog | 6 | ||||
-rw-r--r-- | dev-haskell/cabal/cabal-1.10.2.0.ebuild | 4 | ||||
-rw-r--r-- | dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog index 0108fff2e7f1..0991b54e2da0 100644 --- a/dev-haskell/cabal/ChangeLog +++ b/dev-haskell/cabal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/cabal # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.81 2012/11/14 22:35:43 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.82 2012/12/29 11:27:56 gienah Exp $ + + 29 Dec 2012; Mark Wright <gienah@gentoo.org> cabal-1.10.2.0.ebuild, + cabal-1.8.0.6-r1.ebuild: + Add dev-lang/ghc upper bounds to cabal-1.8.0.6-r1 and cabal-1.10.2.0 *cabal-1.16.0.3 (14 Nov 2012) diff --git a/dev-haskell/cabal/cabal-1.10.2.0.ebuild b/dev-haskell/cabal/cabal-1.10.2.0.ebuild index 4c2315ef2571..3441d0e97fac 100644 --- a/dev-haskell/cabal/cabal-1.10.2.0.ebuild +++ b/dev-haskell/cabal/cabal-1.10.2.0.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/cabal/cabal-1.10.2.0.ebuild,v 1.8 2012/09/12 15:13:07 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.10.2.0.ebuild,v 1.9 2012/12/29 11:27:56 gienah Exp $ # ebuild generated by hackport 0.2.12 @@ -21,7 +21,7 @@ SLOT="0" KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="doc" -DEPEND=">=dev-lang/ghc-6.10.1" +DEPEND=">=dev-lang/ghc-6.10.1 <dev-lang/ghc-7.2" RDEPEND="${DEPEND} virtual/pkgconfig" # cabal uses dev-util/pkgconfig using runtime to resolve C dependencies, so diff --git a/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild b/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild index c2b597a67294..3a357ce0ab9f 100644 --- a/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild +++ b/dev-haskell/cabal/cabal-1.8.0.6-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/cabal/cabal-1.8.0.6-r1.ebuild,v 1.9 2012/09/12 15:13:07 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild,v 1.10 2012/12/29 11:27:56 gienah Exp $ CABAL_FEATURES="bootstrap lib profile" inherit haskell-cabal eutils @@ -20,7 +20,7 @@ IUSE="doc" # Cabal.cabal only depends on base>=1&&<5 and filepath>=1&&<1.2 # filepath has been a ghc core library since ghc 6.6.1, so let's use that as the # lowest possible ghc version -DEPEND=">=dev-lang/ghc-6.6.1" +DEPEND=">=dev-lang/ghc-6.6.1 <dev-lang/ghc-7" RDEPEND="${DEPEND} virtual/pkgconfig" # cabal uses dev-util/pkgconfig using runtime to resolve C dependencies, so |