diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2011-08-01 21:05:21 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2011-08-01 21:05:21 +0000 |
| commit | ba3047918974baa9f208cf3c8221f95e60917f66 (patch) | |
| tree | a00a32bd4fa26acb2e85cc2df2487e539ce3e3bd /dev-haskell/convertible | |
| parent | Mask nvidia-drivers-275.19 & 275.21 since they're causing lots of breakages (diff) | |
| download | gentoo-2-ba3047918974baa9f208cf3c8221f95e60917f66.tar.gz gentoo-2-ba3047918974baa9f208cf3c8221f95e60917f66.tar.bz2 gentoo-2-ba3047918974baa9f208cf3c8221f95e60917f66.zip | |
Future proof against upcoming ghc-7.
(Portage version: 2.1.10.7/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/convertible')
| -rw-r--r-- | dev-haskell/convertible/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/convertible/convertible-1.0.10.0.ebuild | 8 | ||||
| -rw-r--r-- | dev-haskell/convertible/files/convertible-1.0.10.0-time-1.2.patch | 13 |
3 files changed, 23 insertions, 4 deletions
diff --git a/dev-haskell/convertible/ChangeLog b/dev-haskell/convertible/ChangeLog index 07fa18517fc9..00aa2e58b06d 100644 --- a/dev-haskell/convertible/ChangeLog +++ b/dev-haskell/convertible/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/convertible # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/convertible/ChangeLog,v 1.1 2011/06/12 13:05:35 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/convertible/ChangeLog,v 1.2 2011/08/01 21:05:21 slyfox Exp $ + + 01 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> + convertible-1.0.10.0.ebuild, +files/convertible-1.0.10.0-time-1.2.patch: + Future proof against upcoming ghc-7. *convertible-1.0.10.0 (12 Jun 2011) diff --git a/dev-haskell/convertible/convertible-1.0.10.0.ebuild b/dev-haskell/convertible/convertible-1.0.10.0.ebuild index 3b7c56dc347e..6005de4ffaa9 100644 --- a/dev-haskell/convertible/convertible-1.0.10.0.ebuild +++ b/dev-haskell/convertible/convertible-1.0.10.0.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/convertible/convertible-1.0.10.0.ebuild,v 1.1 2011/06/12 13:05:35 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/convertible/convertible-1.0.10.0.ebuild,v 1.2 2011/08/01 21:05:21 slyfox Exp $ # ebuild generated by hackport 0.2.13 EAPI="3" CABAL_FEATURES="bin lib profile haddock hscolour" -inherit haskell-cabal +inherit base haskell-cabal DESCRIPTION="Typeclasses and instances for converting between types" HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible" @@ -20,7 +20,7 @@ IUSE="test" RDEPEND="dev-haskell/mtl >=dev-haskell/text-0.7 - <=dev-haskell/time-1.2.0.3 + <dev-haskell/time-1.3 >=dev-lang/ghc-6.8.2 " DEPEND="${RDEPEND} @@ -31,6 +31,8 @@ DEPEND="${RDEPEND} ) " +PATCHES=("${FILESDIR}/${PN}-1.0.10.0-time-1.2.patch") + src_configure() { cabal_src_configure $(cabal_flag test buildtests) } diff --git a/dev-haskell/convertible/files/convertible-1.0.10.0-time-1.2.patch b/dev-haskell/convertible/files/convertible-1.0.10.0-time-1.2.patch new file mode 100644 index 000000000000..e5a60351b1c3 --- /dev/null +++ b/dev-haskell/convertible/files/convertible-1.0.10.0-time-1.2.patch @@ -0,0 +1,13 @@ +diff --git a/convertible.cabal b/convertible.cabal +index 377562d..98b7cc7 100644 +--- a/convertible.cabal ++++ b/convertible.cabal +@@ -50,7 +50,7 @@ flag time_gte_113 + + library + if flag(splitBase) +- Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && <=1.2.0.3, ++ Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && < 1.3, + bytestring, containers, old-locale + if flag(time_gte_113) + Build-Depends: time>=1.1.3 |