Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/constraints/, dev-haskell/constraints/files/
Date: Thu, 16 Feb 2017 10:26:47
Message-Id: 1487240799.6686dc7298afba5fc0a8daa6f6f97c400861e4b7.slyfox@gentoo
1 commit: 6686dc7298afba5fc0a8daa6f6f97c400861e4b7
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 16 10:25:51 2017 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 16 10:26:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6686dc72
7
8 dev-haskell/constraints: bump up to 0.8
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-haskell/constraints/Manifest | 1 +
13 dev-haskell/constraints/constraints-0.4.1.3.ebuild | 6 ++++-
14 dev-haskell/constraints/constraints-0.8.ebuild | 30 ++++++++++++++++++++++
15 .../files/constraints-0.4.1.3-ghc-8.patch | 17 ++++++++++++
16 4 files changed, 53 insertions(+), 1 deletion(-)
17
18 diff --git a/dev-haskell/constraints/Manifest b/dev-haskell/constraints/Manifest
19 index d9a5a0e903..dccb0c0621 100644
20 --- a/dev-haskell/constraints/Manifest
21 +++ b/dev-haskell/constraints/Manifest
22 @@ -1 +1,2 @@
23 DIST constraints-0.4.1.3.tar.gz 7311 SHA256 dd4353b66c85980363050566a13d17ad0216f072a06f207cb8d36530ded67af0 SHA512 0478c69be6a719b83d536aef7733d7383f5400a234829f49146597f89339d3aee46455f3f5001dfc213e07c116276699bf970a657051f3dddb8ab2d9f9593836 WHIRLPOOL b780fa13817bf75ec0e7ec8e9df484a7447332b7dd61c2566ed7119256249a81757de80b1836648de00aca3e77d2a04580c35d51cc40405ad0f1a2611e13bad1
24 +DIST constraints-0.8.tar.gz 12348 SHA256 4cd08765345a151f21a0a4c5ef0a85661f4e53ffe807a623d5502d9ed3ae1588 SHA512 8cd6f16e70657f95f6d9b0824f85e5991d7da85852a1664abf8b99f95ab85456ecda09f3e59577019284358c09b198d298d01ff152acb3086121521ee302e665 WHIRLPOOL 2d51af561daf6f38a36b356fa2b8dd6fbf594343b4e0cccdb114c4f3d7d253547728535788d6c59c3de39e3e7175eaa84ab2b8358cbdc955b1784980503d0411
25
26 diff --git a/dev-haskell/constraints/constraints-0.4.1.3.ebuild b/dev-haskell/constraints/constraints-0.4.1.3.ebuild
27 index f268679a49..c645e3be92 100644
28 --- a/dev-haskell/constraints/constraints-0.4.1.3.ebuild
29 +++ b/dev-haskell/constraints/constraints-0.4.1.3.ebuild
30 @@ -1,4 +1,4 @@
31 -# Copyright 1999-2015 Gentoo Foundation
32 +# Copyright 1999-2017 Gentoo Foundation
33 # Distributed under the terms of the GNU General Public License v2
34 # $Id$
35
36 @@ -24,3 +24,7 @@ RDEPEND=">=dev-haskell/newtype-0.2:=[profile?] <dev-haskell/newtype-0.3:=[profil
37 DEPEND="${RDEPEND}
38 >=dev-haskell/cabal-1.10
39 "
40 +
41 +src_prepare() {
42 + epatch "${FILESDIR}"/${P}-ghc-8.patch
43 +}
44
45 diff --git a/dev-haskell/constraints/constraints-0.8.ebuild b/dev-haskell/constraints/constraints-0.8.ebuild
46 new file mode 100644
47 index 0000000000..9794eb6938
48 --- /dev/null
49 +++ b/dev-haskell/constraints/constraints-0.8.ebuild
50 @@ -0,0 +1,30 @@
51 +# Copyright 1999-2017 Gentoo Foundation
52 +# Distributed under the terms of the GNU General Public License v2
53 +# $Id$
54 +
55 +EAPI=5
56 +
57 +# ebuild generated by hackport 0.4.7.9999
58 +
59 +CABAL_FEATURES="lib profile haddock hoogle hscolour"
60 +inherit haskell-cabal
61 +
62 +DESCRIPTION="Constraint manipulation"
63 +HOMEPAGE="https://github.com/ekmett/constraints/"
64 +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
65 +
66 +LICENSE="BSD"
67 +SLOT="0/${PV}"
68 +KEYWORDS="~amd64 ~x86"
69 +IUSE=""
70 +
71 +RDEPEND=">=dev-haskell/binary-0.7.3:=[profile?] <dev-haskell/binary-0.9:=[profile?]
72 + >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
73 + >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
74 + >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
75 + >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
76 + >=dev-lang/ghc-7.8.2:=
77 +"
78 +DEPEND="${RDEPEND}
79 + >=dev-haskell/cabal-1.18.1.3
80 +"
81
82 diff --git a/dev-haskell/constraints/files/constraints-0.4.1.3-ghc-8.patch b/dev-haskell/constraints/files/constraints-0.4.1.3-ghc-8.patch
83 new file mode 100644
84 index 0000000000..1b2f8169c4
85 --- /dev/null
86 +++ b/dev-haskell/constraints/files/constraints-0.4.1.3-ghc-8.patch
87 @@ -0,0 +1,17 @@
88 +diff --git a/Data/Constraint.hs b/Data/Constraint.hs
89 +index 84d67c0..a104f51 100644
90 +--- a/Data/Constraint.hs
91 ++++ b/Data/Constraint.hs
92 +@@ -79,3 +79,7 @@ import Data.Data
93 + #endif
94 ++#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 707
95 ++import GHC.Exts (Constraint)
96 ++#else
97 + import GHC.Prim (Constraint)
98 ++#endif
99 +
100 +@@ -375,3 +379,3 @@ instance Class () (b :=> a) where cls = Sub Dict
101 + instance Class b a => () :=> Class b a where ins = Sub Dict
102 +-instance (b :=> a) => () :=> b :=> a where ins = Sub Dict
103 ++instance (b :=> a) => () :=> (b :=> a) where ins = Sub Dict
104 +