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 | 615d88555215c98df2dca2a7b0afe925168b04fd (patch) | |
| tree | 803f7040d98cb249b563bf80c5ba05e9e534a088 /dev-haskell | |
| parent | Mask nvidia-drivers-275.19 & 275.21 since they're causing lots of breakages (diff) | |
| download | historical-615d88555215c98df2dca2a7b0afe925168b04fd.tar.gz historical-615d88555215c98df2dca2a7b0afe925168b04fd.tar.bz2 historical-615d88555215c98df2dca2a7b0afe925168b04fd.zip | |
Future proof against upcoming ghc-7.
Package-Manager: portage-2.1.10.7/cvs/Linux x86_64
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/convertible/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/convertible/Manifest | 11 | ||||
| -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 |
4 files changed, 29 insertions, 9 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/Manifest b/dev-haskell/convertible/Manifest index 119a74fe6257..5f5587107895 100644 --- a/dev-haskell/convertible/Manifest +++ b/dev-haskell/convertible/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX convertible-1.0.10.0-time-1.2.patch 442 RMD160 3088a828131f3f1758ce02b5ee0f2800e80e215d SHA1 66806dcb73b916016b3d6fbe0e6dcbd5278c6ec7 SHA256 8060b37c31727c24c9bc2459d9df7304b95a707a6dd371fc7190a2bc4334efe4 DIST convertible-1.0.10.0.tar.gz 23231 RMD160 2ea88cc80584ba6b0f0347808e53f9f54597cd2a SHA1 afaf63327838fdf890245bc093d0b9a94858cdea SHA256 219cba91e1b95334602de0f35554100fcbcc852b2efaa0aab8bfbb0a48eb12de -EBUILD convertible-1.0.10.0.ebuild 1269 RMD160 4097afc90d46e67ad90b921f64150496c116a5a2 SHA1 febb377fda88da292152cce4a7f5935cb62226a8 SHA256 473d84de0780008749e3110d839a648d956baa06455d38436f1202d92ad53835 -MISC ChangeLog 456 RMD160 49724a99544a874e8bc97c983c85fae2d3c79579 SHA1 35dd6da61024f96a9bd84b6bde4902d256ef1318 SHA256 a319a025b9663c0405543cc5bf07072888e6095fefcb32a9935e21a055612696 +EBUILD convertible-1.0.10.0.ebuild 1324 RMD160 31b3c84a8c33028706152a567028a319d5fbd439 SHA1 623e4455782a8d60ba9f963a8910238724005da1 SHA256 912c45be1d0fc0d000f23f7c04112f70ac215cd6af36b848f048381c3aa9bfe2 +MISC ChangeLog 625 RMD160 b86fc812033e1f204f091e286fa9c4fc62c5fc6d SHA1 1637ef897a41c7e859012f67ac530c203ac40a3c SHA256 56eb6b30b8d99cc12fa11cf8bc66a785a91e688085c320045d75a318ef251e51 MISC metadata.xml 610 RMD160 1e2b551523c5e2fd565cda7a06c5bb4e5e349379 SHA1 8e8e6485394620de1ca5ef232ca186a24748fd7f SHA256 d41613f5e06ace1c1d7be1aeeb56167872d10aa28575e440725648bfd88d7ecb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk30uloACgkQcaHudmEf86pSiACfUOoNbXeTewX4JMZ+OUpjDQmz -SGsAnjqtREjU+7erzzEFjxyuGFlROylM -=sJQO +iEYEARECAAYFAk43FeAACgkQcaHudmEf86pbKACcDtUYyf94eiX1iresE6Sy0RBO +UGoAnjRU/bA/Pc3y2VAgMW1ETW0UdEFN +=C97i -----END PGP SIGNATURE----- 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 |