From 3bb13d5080ebca7a10eb59302fd846e8fd546d6b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 2 Jan 2015 18:26:48 +0000 Subject: [PATCH] =?utf8?q?Fix=20against=20ghc-7.8=20(bug=20#534332=20by=20?= =?utf8?q?=20Toralf=20F=C3=B6rster).?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x611FF3AA --- dev-haskell/uniqueid/ChangeLog | 8 +++- dev-haskell/uniqueid/Manifest | 13 +++--- .../files/uniqueid-0.1.1-ghc-7.8.patch | 46 +++++++++++++++++++ dev-haskell/uniqueid/uniqueid-0.1.1.ebuild | 14 ++++-- 4 files changed, 68 insertions(+), 13 deletions(-) create mode 100644 dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch diff --git a/dev-haskell/uniqueid/ChangeLog b/dev-haskell/uniqueid/ChangeLog index a145c9c0bf45..b32d38461e5f 100644 --- a/dev-haskell/uniqueid/ChangeLog +++ b/dev-haskell/uniqueid/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/uniqueid -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uniqueid/ChangeLog,v 1.2 2014/07/25 08:58:31 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uniqueid/ChangeLog,v 1.3 2015/01/02 18:26:47 slyfox Exp $ + + 02 Jan 2015; Sergei Trofimovich + +files/uniqueid-0.1.1-ghc-7.8.patch, uniqueid-0.1.1.ebuild: + Fix against ghc-7.8 (bug #534332 by Toralf Förster). 25 Jul 2014; Sergei Trofimovich metadata.xml: Drop redundant '' field, leave only ''. diff --git a/dev-haskell/uniqueid/Manifest b/dev-haskell/uniqueid/Manifest index 1035b30b8cd6..60cd5b8e6375 100644 --- a/dev-haskell/uniqueid/Manifest +++ b/dev-haskell/uniqueid/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX uniqueid-0.1.1-ghc-7.8.patch 1383 SHA256 7049d44365801119fa0e06c55a13d1bd09b3c126381c00600a8ef35623bc1d89 SHA512 2cb2bc04bc8ee52279ec953ed1435411d4715dec009012d191bd07df4ccd334ca4a60be123d00bf9a74a8f9e94e01b2fcea0c0692fdcf77c7d7a0c5d7b0948e5 WHIRLPOOL 2e742cf35dc4421032d8d93cad960e7b4d831065fe3a833470e08bf84472b892ab48dfbdfcd3888c7f62fac3e9c3a2389ee198ea1af741c12a074da1fa63c79b DIST uniqueid-0.1.1.tar.gz 2779 SHA256 e69df591c1ab9901af24bf0e63032765eb2b1ba4ca4fb720a234e9f292e03268 SHA512 4a1f753a320a5ddae8dd47c3e3729144cf28effaaa6f16a8cf13ad614e4aba3f720f82025f86d7c04ae5c28d03825b4d3442caa01cd534dfa05a70c6c9cadc68 WHIRLPOOL 4470eec443ae506ab61e5755bab93ac1b0da1d634cea06cc9e255c6575a80e0c4de569e3ec178bbe9602694ea111707fd482fd66d37721529b7417f221570172 -EBUILD uniqueid-0.1.1.ebuild 663 SHA256 9fe5c682c20cc0027ecff301cb6a25eead7b17764bac1d4e7ec19f4806452e51 SHA512 dfaa28aeef937d96cb8582fc7359a3c19b49b7750785b6d8e5622ace269f1e91e14157a25449fbd9eb9f65529e8d4b68f25b47ad82423e70a2a89f9acdf9f958 WHIRLPOOL 0d16d063146be82a8bab7c6435617fda8186f4ce0c8331fdc924f35a530fc261f62cd0024dfdc83d3b74848b7c59a9fc047dce48f3ba0827d1c6900b6672a976 -MISC ChangeLog 508 SHA256 a53fbd31443ab5c795ed05cee351f0c13991a8174464fdcc6831f5b9ede15ab9 SHA512 abb16050b28ffbdaa23d32f5d1765c32cbb49166073e294bb196519ec10e5d8d3b2023278f6324c8e275214b9cbba197b580a7a2b7c22c2a4933d315aa1f3945 WHIRLPOOL f21ec71d7b51661678f59a2439d52af292351687c544ceb64ab45acc3058a5f9427dd4e2d5b19c872c82ca4ea87ce10d31bbc8d054a4df86b6e153374f863fd9 +EBUILD uniqueid-0.1.1.ebuild 728 SHA256 4a3c012520487de5867b4284dc2c09093c373057d84a1b7ca7ea7be0b578a5a9 SHA512 46696b996719803e1b1cd137960c38c061d257dcbe3546fe73595503175d5de8cca5c9daee0fc376ebf647b21c19e31aaeb9bf36cadac8b987b4dc9d2293d7a7 WHIRLPOOL d4b228bbe41402dd027d4b61f00d3105709769fc6019aea9a15cc7ea7125411649ad1d9dc32c670e61b6adf833076e55c3c4406b4ad0672eb2a635826bb1cc7e +MISC ChangeLog 682 SHA256 36e7456a8a1706cdab30394788cee98450ea98e6b1be02661133a7f2806f49f6 SHA512 795105d3e3092d64e6cc375f3044a66992a509b04be83833fc7da18273f232f9a63070bce3930dfbdda1ce19e3691eecbfb9ecefe00c4ce497927126780bc2d6 WHIRLPOOL 4c4ea9388230283ba0b1ef4c35c90ba371f3586d485e8c6b2141dab598c7a367ccc22992b500be2553c28467e4f6152a1a8c494df94327b206d707a95a84af97 MISC metadata.xml 458 SHA256 7abb2e1c53005427ff1b1957e6629c08c8a429f5be0abbb0281bd355f3dc13cf SHA512 d9d812ecd276e656ec016222b11940eaeb0ffa3e80debe85033719580b7afd4e0258f3fd5b2fb55ecd89605c927efe816469c1c677e7f1925f2c0035d844ac7e WHIRLPOOL 679a71f3c85bf878379c37b5e0f3b540cfbc70db33a8c511d445f143069b52a8e9539f862dd4e28cb5c5f7f73a9b07632dea639e042d3a3a913d96fba2f42c0f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlPSHJUACgkQcaHudmEf86qYYACfR/uLSEAyJdqz0Ii9a+vS2iBG -gaAAniXFTWSrolK2EVqwCYyykGoHxoQ9 -=P/eP +iEYEAREIAAYFAlSm4ugACgkQcaHudmEf86rGRwCfapyIib2ebgIWJUJtV0fX51m2 +0ZcAn01aCWUJSW9z3AjOdjgoncNn0EXz +=x0Mi -----END PGP SIGNATURE----- diff --git a/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch b/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch new file mode 100644 index 000000000000..a48815ecda0e --- /dev/null +++ b/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch @@ -0,0 +1,46 @@ +diff --git a/Data/Unique/Id.hs b/Data/Unique/Id.hs +index f41127e..56853d9 100644 +--- a/Data/Unique/Id.hs ++++ b/Data/Unique/Id.hs +@@ -14,7 +14,7 @@ module Data.Unique.Id ( + ) where + + import GHC.Exts +-import GHC.IOBase ( unsafeDupableInterleaveIO ) ++import GHC.IO ( unsafeDupableInterleaveIO ) + + import Data.IORef + import System.IO.Unsafe ( unsafePerformIO ) +@@ -55,15 +55,15 @@ splitIdSupplyL ids = ids1 : splitIdSupplyL ids2 + idFromSupply :: IdSupply -> Id + idFromSupply (IdSupply n _ _) = Id (I# n) + +-instance Eq Id where Id (I# x) == Id (I# y) = x ==# y ++instance Eq Id where Id (I# x) == Id (I# y) = isTrue# (x ==# y) + + instance Ord Id + where +- Id (I# x) < Id (I# y) = x <# y +- Id (I# x) <= Id (I# y) = x <=# y ++ Id (I# x) < Id (I# y) = isTrue# (x <# y) ++ Id (I# x) <= Id (I# y) = isTrue# (x <=# y) + + compare (Id (I# x)) (Id (I# y)) = +- if x ==# y then EQ else if x <# y then LT else GT ++ if isTrue# (x ==# y) then EQ else if isTrue# (x <# y) then LT else GT + + instance Show Id + where +diff --git a/uniqueid.cabal b/uniqueid.cabal +index 8099520..83aaa39 100644 +--- a/uniqueid.cabal ++++ b/uniqueid.cabal +@@ -18,7 +18,7 @@ Build-Type: Simple + Stability: experimental + + Library +- Build-Depends: base >= 3 && < 5 ++ Build-Depends: base >= 3 && < 5, ghc-prim + Exposed-Modules: Data.Unique.Id + Extensions: MagicHash + Ghc-Options: -Wall diff --git a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild b/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild index 519369fd82a3..fd312981600b 100644 --- a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild +++ b/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild,v 1.1 2013/08/26 12:34:27 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild,v 1.2 2015/01/02 18:26:47 slyfox Exp $ EAPI=5 # ebuild generated by hackport 0.3.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal +inherit eutils haskell-cabal DESCRIPTION="Splittable Unique Identifier Supply" HOMEPAGE="http://github.com/sebfisch/uniqueid/wikis" @@ -18,6 +18,10 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=dev-lang/ghc-6.10.4:=" +RDEPEND=">=dev-lang/ghc-7.8.1:=" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6" + >=dev-haskell/cabal-1.6" + +src_prepare() { + epatch "${FILESDIR}"/${P}-ghc-7.8.patch +} -- 2.26.2