diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-12-24 15:15:12 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-12-24 15:15:12 +0000 |
| commit | 7c07d5e56b5cd3a506c4e9b85fc8cf1984acb817 (patch) | |
| tree | c3273d2a52a6c90fa7ca4ce85dfd831ac259ea3b /dev-haskell | |
| parent | Version bump. (diff) | |
| download | historical-7c07d5e56b5cd3a506c4e9b85fc8cf1984acb817.tar.gz historical-7c07d5e56b5cd3a506c4e9b85fc8cf1984acb817.tar.bz2 historical-7c07d5e56b5cd3a506c4e9b85fc8cf1984acb817.zip | |
Fix build failure against ghc-7.6 (found by LMolr).
Package-Manager: portage-2.2.0_alpha149_p1/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/zlib/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/zlib/Manifest | 10 | ||||
| -rw-r--r-- | dev-haskell/zlib/zlib-0.5.3.3.ebuild | 7 |
3 files changed, 15 insertions, 7 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/Manifest b/dev-haskell/zlib/Manifest index 5323e23ddd11..4f35ad77142f 100644 --- a/dev-haskell/zlib/Manifest +++ b/dev-haskell/zlib/Manifest @@ -3,14 +3,14 @@ Hash: SHA256 DIST zlib-0.5.3.3.tar.gz 125636 SHA256 e2adb6c55f5bc69eb1e931edcb2ef392ac96139cf6b6bca1b2a7229f381938c3 SHA512 769381f39fcbd0c995bf8b2955c87464e4fe28200dabbb1f11ebca9937339ce6d119eef96be73a8f7c03d5a4e935ea9f9a0df348f345e00c2cc940fb2f9e6186 WHIRLPOOL 424ac6e0dfa864f2a4a835735a78dce1d12c3b7107197f9e59e3fd551238a0e036c5da02ebdd280ac98ea083272d5192063e916a6e7fbb8543fef35b9920b0e7 DIST zlib-0.5.4.0.tar.gz 127571 SHA256 61771a451a23a26954d8f9f0d5c5b63f633fd3f272c9ab70a2ebe78532270ca2 SHA512 d086e6e193a7b09eb908e850cb57179c67f2f13435c657a4a6629e1642785bf6b2e7cb35c49f70a0f5331450ac085461f832ae1405c43af76f9c4850b0c4d039 WHIRLPOOL facca3eba09eeaed6274b694b61551195bb0df56432de87ff20bd08e41a2de17359586f260f74967d8a4724813febb1c1e5d9e4002cb9081e9d44fa511379f9a -EBUILD zlib-0.5.3.3.ebuild 742 SHA256 348c9c5074024809b3df4d63c630a6b78d8cc89c63ee594cfc897ac5e44f0055 SHA512 09bf2c910a29a14d64df0422c335e1cddda0048d2ad263890bd22fc7137e3d6433858e4a255dc65bd8ccb85f079469018894d335f86cd02373da4a4a8fcc65ce WHIRLPOOL 4b69af7067b4f836a191af3f9833e651949fc127d6687fb4e0c62318f9955fd12380ff28d5fc91d8ae200d648385b7a4851dddf3d8ac603ea385e23fe42d31b9 +EBUILD zlib-0.5.3.3.ebuild 831 SHA256 0cc148b57e2addcddb1865ee5f878e0f06f43db1249986a4423e12c57fe196ba SHA512 dc794544a2fa33c8c1605e5e0171b3f4d612fc34fe3a0e72cbd565702baf975e5b12f349c6b04ce3c0727f36521452b0e21844895fc34259d4016889c3407dc6 WHIRLPOOL ced59459022344917c80dc17d57e1246ddbacb9142b16e814c5aa7af1cb9b3ac942f64532ab7eeb17b43722242127cab321eb7c0ee3025fc314bf810faed5d09 EBUILD zlib-0.5.4.0.ebuild 758 SHA256 0afcea8d21f128a5c01701e1619d397d61b5566e818ae0b440db9a0e83566010 SHA512 c9f5d06622796f8647aa948b240619c0bf8c9cb05a9674d8293896784a65bdf2c91ee5c06efcc3f80ecd0ea62bf5000054d7583f315cedb3aff806257b7ac7cb WHIRLPOOL 7a16f44df579b73c7b2ab18821771511f0a3b28460c1ab4786597dd5674629004a33641ea1d3679779428a9e02758affc05cc2a7fd0ad74172e787cd56303090 -MISC ChangeLog 3645 SHA256 5947ee34b70ec373abc504b4d4a209eba3036508496c76bcc72219eade43da57 SHA512 66e4e7abb7c3f8fdf17324b96d00392598f9d0a5cd188ea4a84ec2388591ca393b1b0c52a7fa7618507fefcb04b76671dee00e234029e33c84f2168eec4dd2ec WHIRLPOOL af4b59059f59dfe49552d49940d1dbd3a72fe2a2f46aeef9f80bbe77c6841f6862cd2157c892aa8c324d11b478b92adcab1f54a3a93086404131591619cd6ac7 +MISC ChangeLog 3775 SHA256 15a907438927ffd305784ee79868619123dc55ceeb297557138de52b60c36ba3 SHA512 0f6a2337585b348ab741da895907f6703654f6e862bb7ef3e5044596cf741aae3a9bacea62bedd8e3c1e51b89944ad4570f00cc33e7ade8f2cf37069d185af14 WHIRLPOOL cdea50b9e558dbcd647d7c54a186a2412b84bff379e875b06b2439bb73f8dc1aaf2c04cbf9354fe70fab224bae540fa506f53410d96eb3f1a055afaf402d3da6 MISC metadata.xml 733 SHA256 1be2a7d91b8743f27ca0544ef36d861e67fc0a741ccd3d091fee7a577ae70220 SHA512 07fa9dbc1a416c3060bf01293fbcbb906d6bc8bf4c98de17f1a5063abddfb7a8c0889919fba576c9f837e553dff87956d848b4c6dc494e49106445204d598463 WHIRLPOOL e266c5406cefaa0bcd6f7a9ba3081ea728b4c1dbb5bd90c4f16d9a32b3e718d549a8741a80e1f59a37243a032cebfad97fe97050d912241fe348b13d4bee5090 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlDWLcUACgkQcaHudmEf86oghgCfbxCJWN8l7TQOxGpOcJZ5Dz7+ -79MAnjr3LVbUGZw7ItnrAMF7O6TmOIXl -=Pzyw +iEYEAREIAAYFAlDYcWYACgkQcaHudmEf86oUHACdGi/5szXMyyIOYITM9H8JO2g2 +WxwAn3VUE+xIl3/Ey/8PZ1xVxSOEOO/F +=xlRH -----END PGP SIGNATURE----- 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' +} |