Browse Source

haskell hacks not needed anymore

node1.ganeti 2 years ago
parent
commit
6f7f61ad91

+ 0 - 1
dev-haskell/semigroupoids/Manifest

@@ -1 +0,0 @@
1
-DIST semigroupoids-5.1.tar.gz 21664 SHA256 16ac8ce9b40b0407cdb1b1197a704ec58ec689d5a6de891165a577725361f835 SHA512 ffb02d3192f6a79dffad9cbd4f787484eeed6e49d9cfee412d1abdd4b552d151ca6d66711666f8448cc2c724383b5ff47e141088bdc69a2fb0d2122486fd4dc1 WHIRLPOOL f9838f79cb0ef6430f0a147ac438961eb3d27ddd5fc5ed468b2c8cebab1721b53a41d4e960e7c673fecb01e6de2018a2721e506acbea9a9ccf2dac9ad9565900

+ 0 - 169
dev-haskell/semigroupoids/files/remove-guards-ghc8.patch

@@ -1,169 +0,0 @@
1
-diff --git a/src/Data/Semigroupoid.hs b/src/Data/Semigroupoid.hs
2
-index 17b2db1..4d2c336 100644
3
---- a/src/Data/Semigroupoid.hs
4
-+++ b/src/Data/Semigroupoid.hs
5
-@@ -4,9 +4,9 @@
6
- {-# LANGUAGE PolyKinds #-}
7
- #endif
8
- 
9
--#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
10
--{-# LANGUAGE Trustworthy #-}
11
--#endif
12
-+-- #if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
13
-+-- {-# LANGUAGE Trustworthy #-}
14
-+-- #endif
15
- 
16
- -----------------------------------------------------------------------------
17
- -- |
18
-diff --git a/src/Data/Semigroupoid/Static.hs b/src/Data/Semigroupoid/Static.hs
19
-index b5123a4..9760d8b 100644
20
---- a/src/Data/Semigroupoid/Static.hs
21
-+++ b/src/Data/Semigroupoid/Static.hs
22
-@@ -1,8 +1,8 @@
23
- {-# LANGUAGE CPP #-}
24
- 
25
--#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
26
--{-# LANGUAGE Trustworthy #-}
27
--#endif
28
-+-- #if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
29
-+-- {-# LANGUAGE Trustworthy #-}
30
-+-- #endif
31
- 
32
- -----------------------------------------------------------------------------
33
- -- |
34
-diff --git a/src/Data/Functor/Apply.hs b/src/Data/Functor/Apply.hs
35
-index 09e8aee..9c64cc2 100644
36
---- a/src/Data/Functor/Apply.hs
37
-+++ b/src/Data/Functor/Apply.hs
38
-@@ -1,8 +1,8 @@
39
- {-# LANGUAGE CPP #-}
40
- 
41
--#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
42
--{-# LANGUAGE Trustworthy #-}
43
--#endif
44
-+-- #if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
45
-+-- {-# LANGUAGE Trustworthy #-}
46
-+-- #endif
47
- -----------------------------------------------------------------------------
48
- -- |
49
- -- Copyright   :  (C) 2011-2015 Edward Kmett
50
-diff --git a/src/Data/Functor/Bind.hs b/src/Data/Functor/Bind.hs
51
-index 0db7c06..9b6b02a 100644
52
---- a/src/Data/Functor/Bind.hs
53
-+++ b/src/Data/Functor/Bind.hs
54
-@@ -1,12 +1,12 @@
55
- {-# LANGUAGE CPP #-}
56
- 
57
--#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
58
--{-# LANGUAGE Trustworthy #-}
59
--#endif
60
-+-- #if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
61
-+-- -- {-# LANGUAGE Trustworthy #-}
62
-+-- #endif
63
- 
64
--#if __GLASGOW_HASKELL__ >= 708 && __GLASGOW_HASKELL__ < 710
65
--{-# OPTIONS_GHC -fno-warn-amp #-}
66
--#endif
67
-+-- #if __GLASGOW_HASKELL__ >= 708 && __GLASGOW_HASKELL__ < 710
68
-+-- {-# OPTIONS_GHC -fno-warn-amp #-}
69
-+-- #endif
70
- -----------------------------------------------------------------------------
71
- -- |
72
- -- Copyright   :  (C) 2011-2015 Edward Kmett
73
-diff --git a/src/Data/Functor/Bind/Class.hs b/src/Data/Functor/Bind/Class.hs
74
-index cdffb4c..2e7f282 100644
75
---- a/src/Data/Functor/Bind/Class.hs
76
-+++ b/src/Data/Functor/Bind/Class.hs
77
-@@ -4,15 +4,15 @@
78
- #define MIN_VERSION_semigroups(x,y,z) 1
79
- #endif
80
- 
81
--#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
82
--{-# LANGUAGE Trustworthy #-}
83
--#endif
84
-+-- #if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
85
-+-- {-# LANGUAGE Trustworthy #-}
86
-+-- #endif
87
- 
88
- {-# OPTIONS_HADDOCK not-home #-}
89
- 
90
--#if __GLASGOW_HASKELL__ >= 708 && __GLASGOW_HASKELL__ < 710
91
--{-# OPTIONS_GHC -fno-warn-amp #-}
92
--#endif
93
-+-- #if __GLASGOW_HASKELL__ >= 708 && __GLASGOW_HASKELL__ < 710
94
-+-- {-# OPTIONS_GHC -fno-warn-amp #-}
95
-+-- #endif
96
- 
97
- {-# OPTIONS_GHC -fno-warn-deprecations #-}
98
- 
99
-diff --git a/src/Data/Functor/Bind/Trans.hs b/src/Data/Functor/Bind/Trans.hs
100
-index a7455fb..a6520f6 100644
101
---- a/src/Data/Functor/Bind/Trans.hs
102
-+++ b/src/Data/Functor/Bind/Trans.hs
103
-@@ -16,9 +16,9 @@ module Data.Functor.Bind.Trans (
104
- 
105
- -- import _everything_
106
- import Control.Category
107
--#if __GLASGOW_HASKELL__ < 707
108
--import Control.Monad.Instances ()
109
--#endif
110
-+-- #if __GLASGOW_HASKELL__ < 707
111
-+-- import Control.Monad.Instances ()
112
-+-- #endif
113
- import Control.Monad.Trans.Class
114
- import Control.Monad.Trans.Cont
115
- -- import Control.Monad.Trans.Error
116
-diff --git a/src/Data/Functor/Extend.hs b/src/Data/Functor/Extend.hs
117
-index 4598cc4..b2db3ce 100644
118
---- a/src/Data/Functor/Extend.hs
119
-+++ b/src/Data/Functor/Extend.hs
120
-@@ -1,8 +1,8 @@
121
- {-# LANGUAGE CPP #-}
122
- 
123
--#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
124
--{-# LANGUAGE Trustworthy #-}
125
--#endif
126
-+-- #if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
127
-+-- {-# LANGUAGE Trustworthy #-}
128
-+-- #endif
129
- -----------------------------------------------------------------------------
130
- -- |
131
- -- Module      :  Data.Functor.Extend
132
-diff --git a/src/Data/Functor/Plus.hs b/src/Data/Functor/Plus.hs
133
-index 3e3c9fc..9d495d4 100644
134
---- a/src/Data/Functor/Plus.hs
135
-+++ b/src/Data/Functor/Plus.hs
136
-@@ -1,8 +1,8 @@
137
- {-# LANGUAGE CPP #-}
138
- 
139
--#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
140
--{-# LANGUAGE Trustworthy #-}
141
--#endif
142
-+-- #if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
143
-+-- {-# LANGUAGE Trustworthy #-}
144
-+-- #endif
145
- -----------------------------------------------------------------------------
146
- -- |
147
- -- Copyright   :  (C) 2011-2015 Edward Kmett
148
-diff --git a/src/Data/Functor/Alt.hs b/src/Data/Functor/Alt.hs
149
-index 7c326df..159e358 100644
150
---- a/src/Data/Functor/Alt.hs
151
-+++ b/src/Data/Functor/Alt.hs
152
-@@ -1,12 +1,12 @@
153
- {-# LANGUAGE CPP #-}
154
- 
155
--#if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
156
--{-# LANGUAGE Trustworthy #-}
157
--#endif
158
-+-- #if __GLASGOW_HASKELL__ >= 702 && __GLASGOW_HASKELL <= 706 && defined(MIN_VERSION_comonad) && !(MIN_VERSION_comonad(3,0,3))
159
-+-- {-# LANGUAGE Trustworthy #-}
160
-+-- #endif
161
- 
162
--#if __GLASGOW_HASKELL__ >= 711
163
-+-- #if __GLASGOW_HASKELL__ >= 711
164
- {-# LANGUAGE ConstrainedClassMethods #-}
165
--#endif
166
-+-- #endif
167
- -----------------------------------------------------------------------------
168
- -- |
169
- -- Module      :  Data.Functor.Alt

+ 0 - 50
dev-haskell/semigroupoids/semigroupoids-5.1.ebuild

@@ -1,50 +0,0 @@
1
-# Copyright 1999-2017 Gentoo Foundation
2
-# Distributed under the terms of the GNU General Public License v2
3
-
4
-EAPI=6
5
-
6
-# ebuild generated by hackport 0.5.9999
7
-#hackport: flags: +doctests
8
-
9
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
10
-inherit haskell-cabal
11
-
12
-DESCRIPTION="Semigroupoids: Category sans id"
13
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
14
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
15
-
16
-LICENSE="BSD"
17
-SLOT="0/${PV}"
18
-KEYWORDS="~amd64 ~x86"
19
-IUSE="+comonad +containers +contravariant +distributive +tagged"
20
-
21
-RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
22
-	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
23
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
24
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
25
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
26
-	>=dev-lang/ghc-7.4.1:=
27
-	comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] )
28
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
29
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
30
-	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
31
-"
32
-DEPEND="${RDEPEND}
33
-	>=dev-haskell/cabal-1.8
34
-	test? ( >=dev-haskell/doctest-0.9.1 <dev-haskell/doctest-0.12 )
35
-"
36
-
37
-src_prepare() {
38
-	default
39
-	epatch "${FILESDIR}"/remove-guards-ghc8.patch
40
-}
41
-
42
-src_configure() {
43
-	haskell-cabal_src_configure \
44
-		$(cabal_flag comonad comonad) \
45
-		$(cabal_flag containers containers) \
46
-		$(cabal_flag contravariant contravariant) \
47
-		$(cabal_flag distributive distributive) \
48
-		--flag=doctests \
49
-		$(cabal_flag tagged tagged)
50
-}

+ 0 - 1
dev-haskell/transformers/Manifest

@@ -1 +0,0 @@
1
-DIST transformers-0.4.3.0.tar.gz 28632 SHA256 b3d0a797e815ca50d411e20c02f781efe7751308007d880af7f0b5c4365c3a9d SHA512 c3ec0893ebba4fbd6087c3202e919552c4a9bff3350b5c0589e7ebb18751a515d98b8cac15b0a3252906ea72b5a0eb09b7fe88c8da88b09d6ce4fbf0f50b2780 WHIRLPOOL 89591781926b1d025056dedcfc5de61705056c1e3a8eba72f2e89789e78d2ed4d8909f84d6560dfc66bc0b360f98cb3dc3835f3a05c2325f747498373c88aa4b

+ 0 - 24
dev-haskell/transformers/files/monad-fix.patch

@@ -1,24 +0,0 @@
1
-diff --git a/Control/Monad/Trans/Error.hs b/Control/Monad/Trans/Error.hs
2
-index 4ef66a4..2551f83 100644
3
---- a/Control/Monad/Trans/Error.hs
4
-+++ b/Control/Monad/Trans/Error.hs
5
-@@ -66,13 +66,13 @@ import Data.Monoid (mempty)
6
- import Data.Traversable (Traversable(traverse))
7
- import System.IO.Error
8
- 
9
--instance MonadPlus IO where
10
--    mzero       = ioError (userError "mzero")
11
--    m `mplus` n = m `catchIOError` \ _ -> n
12
-+-- instance MonadPlus IO where
13
-+--    mzero       = ioError (userError "mzero")
14
-+--    m `mplus` n = m `catchIOError` \ _ -> n
15
- 
16
--instance Alternative IO where
17
--    empty = mzero
18
--    (<|>) = mplus
19
-+-- instance Alternative IO where
20
-+--    empty = mzero
21
-+--    (<|>) = mplus
22
- 
23
- #if !(MIN_VERSION_base(4,4,0))
24
- -- exported by System.IO.Error from base-4.4

+ 0 - 30
dev-haskell/transformers/transformers-0.4.3.0.ebuild

@@ -1,30 +0,0 @@
1
-# Copyright 1999-2015 Gentoo Foundation
2
-# Distributed under the terms of the GNU General Public License v2
3
-
4
-EAPI=5
5
-
6
-# ebuild generated by hackport 0.4.4.9999
7
-
8
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
9
-inherit haskell-cabal
10
-
11
-DESCRIPTION="Concrete functor and monad transformers"
12
-HOMEPAGE="http://hackage.haskell.org/package/transformers"
13
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
14
-
15
-LICENSE="BSD"
16
-SLOT="0/${PV}"
17
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
18
-IUSE=""
19
-
20
-RDEPEND=">=dev-lang/ghc-7.4.1:=
21
-"
22
-DEPEND="${RDEPEND}
23
-	>=dev-haskell/cabal-1.6
24
-"
25
-
26
-CABAL_CORE_LIB_GHC_PV="PM:7.8.4-r4 7.11.2015* PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3"
27
-
28
-src_prepare() {
29
-	epatch "${FILESDIR}/monad-fix.patch"	
30
-}

+ 13 - 0
metadata/md5-cache/dev-haskell/distributive-0.4.4

@@ -0,0 +1,13 @@
1
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
2
+DEPEND=>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.9.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
3
+DESCRIPTION=Distributive functors -- Dual to Traversable
4
+EAPI=5
5
+HOMEPAGE=https://github.com/ekmett/distributive/
6
+IUSE=doc hscolour profile test
7
+KEYWORDS=amd64 x86
8
+LICENSE=BSD
9
+RDEPEND=>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-6.10.4:=
10
+SLOT=0/0.4.4
11
+SRC_URI=mirror://hackage/packages/archive/distributive/0.4.4/distributive-0.4.4.tar.gz
12
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
13
+_md5_=a07b9b1c45f42d53fbd9ec5fec9f0030

File diff suppressed because it is too large
+ 13 - 0
metadata/md5-cache/dev-haskell/semigroupoids-5.1


+ 13 - 0
metadata/md5-cache/dev-haskell/transformers-0.4.3.0

@@ -0,0 +1,13 @@
1
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
2
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
3
+DESCRIPTION=Concrete functor and monad transformers
4
+EAPI=5
5
+HOMEPAGE=http://hackage.haskell.org/package/transformers
6
+IUSE=doc hscolour profile
7
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
8
+LICENSE=BSD
9
+RDEPEND=>=dev-lang/ghc-7.4.1:=
10
+SLOT=0/0.4.3.0
11
+SRC_URI=mirror://hackage/packages/archive/transformers/0.4.3.0/transformers-0.4.3.0.tar.gz
12
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
13
+_md5_=29fbf65690ad862ed4ebc681152c4ab6