Allow ghc-7.8 (bug #533066 by Michael Jones).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

diff --git a/dev-haskell/deepseq/ChangeLog b/dev-haskell/deepseq/ChangeLog
index ee38591ac7d5e30251d17e692b859752320ed5e7..abca111b65fa2f3b44b96cec2b72ff2d9fce4177 100644 (file)
--- a/dev-haskell/deepseq/ChangeLog
+++ b/dev-haskell/deepseq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/deepseq
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/ChangeLog,v 1.24 2014/07/25 08:58:55 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/ChangeLog,v 1.25 2014/12/20 09:39:01 slyfox Exp $
+
+  20 Dec 2014; Sergei Trofimovich <slyfox@gentoo.org> deepseq-1.3.0.1.ebuild:
+  Allow ghc-7.8 (bug #533066 by Michael Jones).
 
   25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> metadata.xml:
   Drop redundant '<maintainer>' field, leave only '<herd>'.

diff --git a/dev-haskell/deepseq/Manifest b/dev-haskell/deepseq/Manifest
index b6a17529e740ac4f4ec6dc2371a63eb0ccc82b36..a092f74c03edb6343161fffb5a93dcd05a400f73 100644 (file)
--- a/dev-haskell/deepseq/Manifest
+++ b/dev-haskell/deepseq/Manifest
@@ -5,14 +5,14 @@ DIST deepseq-1.3.0.0.tar.gz 3901 SHA256 fee10dbfceda33220fb9869652530c32ab288869
 DIST deepseq-1.3.0.1.tar.gz 3900 SHA256 9792d2aff7c65c1e3a9d720ba7fe109eb6aea50a51477ffafd2b5f9e8d9a1f19 SHA512 e04593845d9d1ec427a3448b9e5175e1c0842d55037cd05abd0cb7c3dbc5a5470a824f10c4e8f1fa8b6feae853ba9bdb0fe614e4c419c34298baf86c1f90b8d6 WHIRLPOOL 642336d1ba103a488746ca64871f49dda0602907b1c2b81d1c5dd8c15d01040160cc6fc7e9184a9cffe58065a199333a4d620b711594d981ce03c546e267e562
 DIST deepseq-1.3.0.2.tar.gz 4485 SHA256 779d65aae7d56765089aeb655d9fa26e6b59d626e42fe9e87644a312ca775626 SHA512 c85ba6616747883228813dec1f6d828b03174dbc45049592aa7596a6b4f15fb1aaa6613d2e73b5ff049ef35c66273e102b6dd5895f5e5abd8a1b25b70d9ff71b WHIRLPOOL d57ce527563744d78c2ba4f62de0efb548354abd6eeb7d82d8f496ad85bcb373ccf7e2d58ddac5e2812181164cf90b12be35e5dca017b58a8512a6c25266faeb
 EBUILD deepseq-1.3.0.0.ebuild 880 SHA256 e3f4c817fe925ee4a90f6a0974d8ff77d047dd08948f72624ff7a1dfb3eac139 SHA512 8a8cff2d36c7d3699f768431211c160335ba4a06c63914d1af68389cde9bdd881e974f91fe89fa8bc626fb5c8720144a82116aec4b2274c6eb9e3d1e3ebdf8c9 WHIRLPOOL cacab73471d5958a17385fca6b53a77410a912a1faba4d8a2869b44ea1d1baf49eb734738d90608c20e47d43289f34fcb9d53e1e7069147063b901e53e6a659b
-EBUILD deepseq-1.3.0.1.ebuild 835 SHA256 323ccb0f9bdca309c7935ce2ce81c879edfc28dd8a492964324a053fb70b3258 SHA512 69aaf99765824d0afc95cf77359afacce28c2d765099339084f42b2e42e58b8353e155f5542061e9323284dc129d13aa37ace693626bf6cfeb735d909dc66359 WHIRLPOOL a6b51a5d83652e17cbb5b795a05fd05c245e8b25079f72bf331cc933dad4ff2beb3cfc159a2c71a0142777e4ea7dec25d02c0681dafc4abdd2917a3f39b60093
+EBUILD deepseq-1.3.0.1.ebuild 919 SHA256 4a5836353e251fcd1880ee9f5dac0e5c49b419aa0fec2ed17f80ed8378eb57a8 SHA512 d263849539d89f397a013d7e206706db6174cbf240f9d92dd5d43d9b84ba6d08d27bc9e5ddcdc25ecca4bc9422f05f4d595a167f485c28b5d340f648b4fb6109 WHIRLPOOL 6976fa013e8b1aca9096463bf9b93a245b5a53f1473d92bcfc4d5783453b4bf5be6ca9bb07ea763516eaa6962d89cd9d5b7a8b58d4f6b57589fd967ff5bc5acd
 EBUILD deepseq-1.3.0.2.ebuild 838 SHA256 d4996f5a759c9cef60c7cd67d66acc8ef34aae101c42f47af4754e4ce2c0e3ad SHA512 c9ddb1ca981db50de91214d295e9ee8b7284c58f12d442cdea74b882fcf2df53872d6afa095bc31fd0d51de3a995cc6a0517610672823ca00d9de72d9fca46ff WHIRLPOOL 385e723682a22048db29f805c7b039c612a3dfb65b8683ae6510fa7ec421f479441308cd7e7d497052997401f751e310ed6909deeccb349bfbb8cfea7af5a042
-MISC ChangeLog 3407 SHA256 b9b64bb25388c72e9c74a546b9bfd409df6d72e86092f71d5ac3ffab2cc861a1 SHA512 71456737c8f18cb403a523cb3962052cafac104fa779536dd01a7a8ef189a155f6740232ecfbe41d1c596f3c4a17217e35ff1425431a7660d2220d684546d609 WHIRLPOOL 7a5e97c386ad647ddf510dae79ac2b5b71e111ab243250710fd213649aee8806aab1fd9b0b8062f205736fce5ad4ac48950e96fe5fc45deb75bd7935067604f9
+MISC ChangeLog 3534 SHA256 e213a532e35a7cd763dc2f01f33d2f4f00f723d716adf230d3456ba11aea5f9a SHA512 160372727cccdc0dc8e2805c26d0606bc654a2b0ac35e3c71440fab531ea8df7b208cd6810fa3126821e471773fcf7766a99c3ae599c383badb1e959acfb3d86 WHIRLPOOL f07968d85aa9b51d0465c238947a5212facbf9c3e7915b55cead878cb0b468f7583050a6eebe9d9332ecf2cbae8f45ee2f8f2893c9d4c9b8982d1685ea2eb4e6
 MISC metadata.xml 559 SHA256 60fdff392ee966766ffb73abee098befae1394ea9d0003fa2350af449a7e0891 SHA512 7372191eab9a39f0e3a6150c06865db13b975b1f89b2a3eb37dfd02a63b15ee4aac3341293cabbbec5f44798256b00c8e6b8d3bf7e20163a3dc70971508e7e2c WHIRLPOOL 484d3f765ec722940d40fddbb4400d4d492f76dc8ec2a39395999d23e80880b53d0428952b185c243d997eda9c1dc5afaf8daa4af26c9140cb59bbc7d83e3023
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlPSHIgACgkQcaHudmEf86qTZgCfVNgV2x/FldGgWb4061Zrmwxe
-tesAni4H9x8kyH2Z2VKGbxQonIFI8WhJ
-=V7nk
+iEYEAREIAAYFAlSVQ7YACgkQcaHudmEf86qWHwCeMG1FSmSGa2f3+Qek0HmJE3b+
+1uAAnj9kmP2XLUEZAStHO0lEYjLicDpQ
+=RHku
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild b/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
index 3803aca82e74f2ca111bb59dbc3983fe3068e647..4ebdb24dbd75f574ce765574e353b5d0900c0828 100644 (file)
--- a/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
+++ b/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild,v 1.10 2014/07/04 14:30:04 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild,v 1.11 2014/12/20 09:39:01 slyfox Exp $
 
 EAPI=5
 
@@ -25,3 +25,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 CABAL_CORE_LIB_GHC_PV="7.6.* 7.7.20121101 7.7.20121213"
+
+src_prepare() {
+       cabal_chdeps \
+               'array      >= 0.1 && < 0.5' 'array      >= 0.1'
+}