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/missingh/, dev-haskell/missingh/files/
Date: Thu, 20 Aug 2020 07:35:38
Message-Id: 1597908932.a99d0a7c88cfbbf0daa95562cfb6fe820dfa908f.slyfox@gentoo
1 commit: a99d0a7c88cfbbf0daa95562cfb6fe820dfa908f
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 20 07:35:21 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 20 07:35:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a99d0a7c
7
8 dev-haskell/missingh: drop old
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 dev-haskell/missingh/Manifest | 3 --
14 .../missingh/files/missingh-1.2.0.2-ghc-7.7.patch | 47 --------------------
15 .../missingh/files/missingh-1.3.0.1-ghc-8.0.patch | 25 -----------
16 dev-haskell/missingh/missingh-1.2.0.2.ebuild | 51 ----------------------
17 dev-haskell/missingh/missingh-1.2.1.0.ebuild | 39 -----------------
18 dev-haskell/missingh/missingh-1.3.0.1.ebuild | 44 -------------------
19 6 files changed, 209 deletions(-)
20
21 diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest
22 index 14e242c982e..c6063886177 100644
23 --- a/dev-haskell/missingh/Manifest
24 +++ b/dev-haskell/missingh/Manifest
25 @@ -1,4 +1 @@
26 -DIST MissingH-1.2.0.2.tar.gz 115774 BLAKE2B ae1e4db5de9c9559f9687bfed16e52dba3fe782e6ce33e72bb60fe1cd5044cc70b0f839064144711c0f5863786c75ec34b17acd1449a8ca7387a5596185594e2 SHA512 148146468688d855af988874b28ec3e3ebafb99b8168d50734294ecc5400c832826e11c9714727f83381979f8f8a7c6e7bf6479e582e484ec0abcb741d22a0a9
27 -DIST MissingH-1.2.1.0.tar.gz 116445 BLAKE2B 66d319c3bdb883eb5a8349c6bf98cd119b143fb4180c3f3376f136d2fd398666ef92a47164516a33a7f7fe3a5da5ba41ffe1998b715168c27f0466dd042e09e6 SHA512 54ad72973ef20a2eb6a0e72ae8ff496ee48d359ba491bf094957737e02fce217fb00e950735f8c0b36a7fe48a7322a122e447b0c67e0205e8d1b6450ac4df3e3
28 -DIST MissingH-1.3.0.1.tar.gz 116812 BLAKE2B f2b17ed9df625558bf05719e490547f4fd605a494922d1b8daf0602fe913346a1e028940e63645de2c786339555b4480bce237f6ae613a2741d0d81acb75ec7c SHA512 e7c6f95d5437d86516f9aba79026b2abdd5131917a09da452623be68b2377067f8f093412c9919ebc904c4e61d43e755282d5bb333596de935c705958111dcf3
29 DIST MissingH-1.4.3.0.tar.gz 107358 BLAKE2B fa6cf7efd1a60defce6ec0e6bbee229b71f5afe4140cca31dd47c54fbeb8a2a7b0f3e41e4ccba3e010ab85c21fad4d9bb392bd4481a01a945a77de7366b6eae6 SHA512 eb42ad9fd09347d2ec661f8181c6d2c95fb4f9f05634373ac27b377508056afd909b4925f725b9e11441ee9877b66b46038005e469d0b754f8f6cb1cda66d1dc
30
31 diff --git a/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch b/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
32 deleted file mode 100644
33 index 0b249462fa5..00000000000
34 --- a/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
35 +++ /dev/null
36 @@ -1,47 +0,0 @@
37 ---- MissingH-1.2.0.2-orig/src/System/Cmd/Utils.hs 2013-08-22 00:35:27.000000000 +1000
38 -+++ MissingH-1.2.0.2/src/System/Cmd/Utils.hs 2013-09-28 01:17:29.697333968 +1000
39 -@@ -325,7 +325,11 @@
40 - Just (Exited (ExitSuccess)) -> return ()
41 - Just (Exited (ExitFailure fc)) ->
42 - cmdfailed funcname fp args fc
43 -+#if (__GLASGOW_HASKELL__ >= 707)
44 -+ Just (Terminated sig _) ->
45 -+#else
46 - Just (Terminated sig) ->
47 -+#endif
48 - warnfail fp args $ "Terminated by signal " ++ show sig
49 - Just (Stopped sig) ->
50 - warnfail fp args $ "Stopped by signal " ++ show sig
51 -@@ -351,7 +355,11 @@
52 - case ec of
53 - Exited ExitSuccess -> return ()
54 - Exited (ExitFailure fc) -> cmdfailed "safeSystem" command args fc
55 -+#if (__GLASGOW_HASKELL__ >= 707)
56 -+ Terminated s _ -> cmdsignalled "safeSystem" command args s
57 -+#else
58 - Terminated s -> cmdsignalled "safeSystem" command args s
59 -+#endif
60 - Stopped s -> cmdsignalled "safeSystem" command args s
61 - #endif
62 -
63 ---- MissingH-1.2.0.2-orig/testsrc/Eithertest.hs 2013-08-22 00:35:27.000000000 +1000
64 -+++ MissingH-1.2.0.2/testsrc/Eithertest.hs 2013-09-28 01:19:32.177332800 +1000
65 -@@ -6,6 +6,7 @@
66 - For license and copyright information, see the file LICENSE
67 -
68 - -}
69 -+{-# LANGUAGE CPP #-}
70 -
71 - module Eithertest(tests) where
72 - import Test.HUnit
73 -@@ -13,8 +14,10 @@
74 - import Test.HUnit.Tools
75 - import Control.Exception
76 -
77 -+#if (__GLASGOW_HASKELL__ < 707)
78 - instance Eq ErrorCall where
79 - (ErrorCall x) == (ErrorCall y) = x == y
80 -+#endif
81 -
82 - test_maybeToEither =
83 - let f msg inp exp = TestLabel msg $ TestCase $ assertEqual "" exp inp in
84
85 diff --git a/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch b/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch
86 deleted file mode 100644
87 index ac456396063..00000000000
88 --- a/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch
89 +++ /dev/null
90 @@ -1,25 +0,0 @@
91 ---- MissingH-1.3.0.1-orig/src/Data/BinPacking.hs 2014-10-28 23:46:24.000000000 +1100
92 -+++ MissingH-1.3.0.1/src/Data/BinPacking.hs 2016-04-20 10:23:16.403505044 +1000
93 -@@ -69,7 +69,7 @@
94 - > [(size, obj)] is the sizes and objects
95 - > result is Either error or results
96 - -}
97 --type BinPacker = (Num size, Ord size, Show size, Show obj) =>
98 -+type BinPacker = forall size obj . (Num size, Ord size, Show size, Show obj) =>
99 - [size] -- The sizes of bins
100 - -> [(size, obj)] -- The sizes and objects
101 - -> Either (BinPackerError size obj) [[(size, obj)]] -- Either error or results
102 ---- MissingH-1.3.0.1-orig/src/System/IO/HVFS.hs 2014-10-28 23:46:24.000000000 +1100
103 -+++ MissingH-1.3.0.1/src/System/IO/HVFS.hs 2016-04-24 18:50:36.893741944 +1000
104 -@@ -60,7 +60,10 @@
105 - import System.IO.PlafCompat
106 - import System.Posix.Types
107 - import System.Time
108 --import System.Directory
109 -+import System.Directory (createDirectory, doesDirectoryExist, doesFileExist,
110 -+ getCurrentDirectory, getDirectoryContents, getModificationTime,
111 -+ removeDirectory, removeFile, renameDirectory,
112 -+ renameFile, setCurrentDirectory)
113 -
114 - #if MIN_VERSION_directory(1,2,0)
115 - import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds )
116
117 diff --git a/dev-haskell/missingh/missingh-1.2.0.2.ebuild b/dev-haskell/missingh/missingh-1.2.0.2.ebuild
118 deleted file mode 100644
119 index 7fa593257ec..00000000000
120 --- a/dev-haskell/missingh/missingh-1.2.0.2.ebuild
121 +++ /dev/null
122 @@ -1,51 +0,0 @@
123 -# Copyright 1999-2020 Gentoo Authors
124 -# Distributed under the terms of the GNU General Public License v2
125 -
126 -EAPI=5
127 -
128 -# ebuild generated by hackport 0.3.3.9999
129 -
130 -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
131 -inherit base haskell-cabal
132 -
133 -MY_PN="MissingH"
134 -MY_P="${MY_PN}-${PV}"
135 -
136 -DESCRIPTION="Large utility library"
137 -HOMEPAGE="https://hackage.haskell.org/package/MissingH"
138 -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
139 -
140 -LICENSE="BSD"
141 -SLOT="0/${PV}"
142 -KEYWORDS="~amd64 ~x86 ~amd64-linux"
143 -IUSE=""
144 -
145 -RDEPEND="dev-haskell/hslogger:=[profile?]
146 - dev-haskell/hunit:=[profile?]
147 - dev-haskell/mtl:=[profile?]
148 - dev-haskell/network:=[profile?]
149 - dev-haskell/parsec:=[profile?]
150 - dev-haskell/random:=[profile?]
151 - dev-haskell/regex-compat:=[profile?]
152 - >=dev-lang/ghc-6.12.1:=
153 -"
154 -DEPEND="${RDEPEND}
155 - virtual/libiconv
156 - >=dev-haskell/cabal-1.8.0.2
157 - test? ( dev-haskell/quickcheck
158 - dev-haskell/testpack )
159 -"
160 -
161 -# libiconv is needed for the trick below to make it compile with ghc-6.12
162 -
163 -S="${WORKDIR}/${MY_P}"
164 -
165 -PATCHES=("${FILESDIR}/${PN}-1.2.0.2-ghc-7.7.patch")
166 -
167 -src_prepare() {
168 - base_src_prepare
169 - # (non-ASCII non-UTF-8 source breaks hscolour)
170 - cd src/System/Time
171 - mv ParseDate.hs ParseDate.hs.ISO-8859-1
172 - iconv -f ISO-8859-1 -t UTF-8 -c ParseDate.hs.ISO-8859-1 > ParseDate.hs || die "unable to recode ParseDate.hs to UTF-8"
173 -}
174
175 diff --git a/dev-haskell/missingh/missingh-1.2.1.0.ebuild b/dev-haskell/missingh/missingh-1.2.1.0.ebuild
176 deleted file mode 100644
177 index a081599283f..00000000000
178 --- a/dev-haskell/missingh/missingh-1.2.1.0.ebuild
179 +++ /dev/null
180 @@ -1,39 +0,0 @@
181 -# Copyright 1999-2020 Gentoo Authors
182 -# Distributed under the terms of the GNU General Public License v2
183 -
184 -EAPI=5
185 -
186 -# ebuild generated by hackport 0.3.6.9999
187 -
188 -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
189 -inherit haskell-cabal
190 -
191 -MY_PN="MissingH"
192 -MY_P="${MY_PN}-${PV}"
193 -
194 -DESCRIPTION="Large utility library"
195 -HOMEPAGE="https://hackage.haskell.org/package/MissingH"
196 -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
197 -
198 -LICENSE="BSD"
199 -SLOT="0/${PV}"
200 -KEYWORDS="~amd64 ~x86 ~amd64-linux"
201 -IUSE=""
202 -
203 -RDEPEND="dev-haskell/hslogger:=[profile?]
204 - dev-haskell/hunit:=[profile?]
205 - dev-haskell/mtl:=[profile?]
206 - dev-haskell/network:=[profile?]
207 - dev-haskell/parsec:=[profile?]
208 - dev-haskell/random:=[profile?]
209 - dev-haskell/regex-compat:=[profile?]
210 - >=dev-lang/ghc-6.12.1:=
211 -"
212 -DEPEND="${RDEPEND}
213 - >=dev-haskell/cabal-1.8.0.2
214 - test? ( dev-haskell/errorcall-eq-instance
215 - dev-haskell/quickcheck
216 - dev-haskell/testpack )
217 -"
218 -
219 -S="${WORKDIR}/${MY_P}"
220
221 diff --git a/dev-haskell/missingh/missingh-1.3.0.1.ebuild b/dev-haskell/missingh/missingh-1.3.0.1.ebuild
222 deleted file mode 100644
223 index 7c5973af14b..00000000000
224 --- a/dev-haskell/missingh/missingh-1.3.0.1.ebuild
225 +++ /dev/null
226 @@ -1,44 +0,0 @@
227 -# Copyright 1999-2019 Gentoo Authors
228 -# Distributed under the terms of the GNU General Public License v2
229 -
230 -EAPI=5
231 -
232 -# ebuild generated by hackport 0.4.4.9999
233 -
234 -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
235 -inherit haskell-cabal
236 -
237 -MY_PN="MissingH"
238 -MY_P="${MY_PN}-${PV}"
239 -
240 -DESCRIPTION="Large utility library"
241 -HOMEPAGE="https://github.com/jgoerzen/missingh/wiki"
242 -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
243 -
244 -LICENSE="BSD"
245 -SLOT="0/${PV}"
246 -KEYWORDS="~amd64 ~x86 ~amd64-linux"
247 -IUSE=""
248 -
249 -RDEPEND="dev-haskell/hslogger:=[profile?]
250 - dev-haskell/hunit:=[profile?]
251 - dev-haskell/mtl:=[profile?]
252 - dev-haskell/network:=[profile?]
253 - dev-haskell/old-time:=[profile?]
254 - dev-haskell/parsec:=[profile?]
255 - dev-haskell/random:=[profile?]
256 - dev-haskell/regex-compat:=[profile?]
257 - >=dev-lang/ghc-7.4.1:=
258 -"
259 -DEPEND="${RDEPEND}
260 - >=dev-haskell/cabal-1.8
261 - test? ( dev-haskell/errorcall-eq-instance
262 - dev-haskell/quickcheck
263 - dev-haskell/testpack )
264 -"
265 -
266 -S="${WORKDIR}/${MY_P}"
267 -
268 -src_prepare() {
269 - epatch "${FILESDIR}/${PN}-1.3.0.1-ghc-8.0.patch"
270 -}