1 |
commit: a87068ce30830fd698b6bdf32412483b110977ac |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 26 00:01:15 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 26 00:06:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87068ce |
7 |
|
8 |
app-portage/hackport: bump up to 0.6.3 |
9 |
|
10 |
Reported-by: Toralf Förster |
11 |
Closes: https://bugs.gentoo.org/704778 |
12 |
Package-Manager: Portage-2.3.85, Repoman-2.3.20 |
13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
14 |
|
15 |
app-portage/hackport/Manifest | 1 + |
16 |
.../files/hackport-0.6.3-missing-ffi.patch | 33 +++++++++ |
17 |
.../files/hackport-0.6.3-missing-test-deps.patch | 79 ++++++++++++++++++++++ |
18 |
.../files/hackport-0.6.3-old-filepath.patch | 40 +++++++++++ |
19 |
app-portage/hackport/hackport-0.6.3.ebuild | 63 +++++++++++++++++ |
20 |
5 files changed, 216 insertions(+) |
21 |
|
22 |
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest |
23 |
index 718127ee5c8..0bf4db42fd2 100644 |
24 |
--- a/app-portage/hackport/Manifest |
25 |
+++ b/app-portage/hackport/Manifest |
26 |
@@ -1,2 +1,3 @@ |
27 |
DIST hackport-0.5.6.tar.gz 1639896 BLAKE2B 2c5892b3206b4cbb10f8dcbce1d043446b7b804ae0b5d1e59c49c733c80194e79c9091cfc933cbc7e7a592c0747ee034d56969d4261ad0a6a585259d5e8b4f76 SHA512 5dc20f11392757224a6cf79d525792e14aba64ffb44c9dd9b4f0df4acd9c00127d85f2b1f23cf2063f80895dbcc90ccc745e8f9aba3ef82f7ae8364db155fe4f |
28 |
DIST hackport-0.6.2.tar.gz 1625948 BLAKE2B 9dbb7695d3ca806cfef342697717fa232be2156bcb76c87413907460a9cea2f8cdd517dce453ae7846a00df53ab46058c8f42bd36bc33580cb32452b82c77816 SHA512 99207c4903ee5f3fdcc648edcc3a39ed06f0629a1d5bda577fc2c443c544bfd746154bc5e9de044810c148b1a38028ec0fdf908513b4252c05bb6c9c6eb9aa92 |
29 |
+DIST hackport-0.6.3.tar.gz 1986620 BLAKE2B 6878b3f378b1c5303047c4e6ea27edd587527bc0f303dae8947f0e2a066452b5c4cf3a13594499c3b367ff515114f43c2fa7dece935a704f0f6855fc23f14100 SHA512 ef2f2125c89352207f82e02668bfd84c9e38d5ed3f8643d19d4f270cf7440169c7e6d24513f90e7d616900a06a429e54cf01a42363ff463d536fa37700b7d1cc |
30 |
|
31 |
diff --git a/app-portage/hackport/files/hackport-0.6.3-missing-ffi.patch b/app-portage/hackport/files/hackport-0.6.3-missing-ffi.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..21c848ab53c |
34 |
--- /dev/null |
35 |
+++ b/app-portage/hackport/files/hackport-0.6.3-missing-ffi.patch |
36 |
@@ -0,0 +1,33 @@ |
37 |
+From 4264f8bc91dabce03ac858388358ff5f4c6db8df Mon Sep 17 00:00:00 2001 |
38 |
+From: Sergei Trofimovich <slyfox@g.o> |
39 |
+Date: Sat, 25 Jan 2020 23:52:58 +0000 |
40 |
+Subject: [PATCH 2/3] hackport.cabal: add missing ForeignFunctionInterface |
41 |
+ extension |
42 |
+MIME-Version: 1.0 |
43 |
+Content-Type: text/plain; charset=UTF-8 |
44 |
+Content-Transfer-Encoding: 8bit |
45 |
+ |
46 |
+gcc-8.0 does not enable `ForeignFunctionInterface` by default. |
47 |
+ |
48 |
+Reported-by: Toralf Förster |
49 |
+Bug: https://bugs.gentoo.org/704778 |
50 |
+Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
51 |
+--- |
52 |
+ hackport.cabal | 1 + |
53 |
+ 1 file changed, 1 insertion(+) |
54 |
+ |
55 |
+diff --git a/hackport.cabal b/hackport.cabal |
56 |
+index 049933e00..70928fe6b 100644 |
57 |
+--- a/hackport.cabal |
58 |
++++ b/hackport.cabal |
59 |
+@@ -70,6 +70,7 @@ Executable hackport |
60 |
+ DoAndIfThenElse, |
61 |
+ EmptyDataDecls, |
62 |
+ ExistentialQuantification, |
63 |
++ ForeignFunctionInterface, |
64 |
+ FlexibleContexts, |
65 |
+ FlexibleInstances, |
66 |
+ GADTs, |
67 |
+-- |
68 |
+2.25.0 |
69 |
+ |
70 |
|
71 |
diff --git a/app-portage/hackport/files/hackport-0.6.3-missing-test-deps.patch b/app-portage/hackport/files/hackport-0.6.3-missing-test-deps.patch |
72 |
new file mode 100644 |
73 |
index 00000000000..fa6c446cf38 |
74 |
--- /dev/null |
75 |
+++ b/app-portage/hackport/files/hackport-0.6.3-missing-test-deps.patch |
76 |
@@ -0,0 +1,79 @@ |
77 |
+From 4cd81196f7a477327ce87971b376e785f362b9b7 Mon Sep 17 00:00:00 2001 |
78 |
+From: Sergei Trofimovich <slyfox@g.o> |
79 |
+Date: Fri, 24 Jan 2020 08:09:34 +0000 |
80 |
+Subject: [PATCH 1/3] hackport.cabal: add missing test depends |
81 |
+ |
82 |
+Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
83 |
+--- |
84 |
+ hackport.cabal | 21 ++++++++++++++++++++- |
85 |
+ 1 file changed, 20 insertions(+), 1 deletion(-) |
86 |
+ |
87 |
+diff --git a/hackport.cabal b/hackport.cabal |
88 |
+index 94d345292..049933e00 100644 |
89 |
+--- a/hackport.cabal |
90 |
++++ b/hackport.cabal |
91 |
+@@ -76,6 +76,7 @@ Executable hackport |
92 |
+ GeneralizedNewtypeDeriving, |
93 |
+ KindSignatures, |
94 |
+ MultiParamTypeClasses, |
95 |
++ -- cabal |
96 |
+ PatternGuards, |
97 |
+ RankNTypes, |
98 |
+ RecordWildCards, |
99 |
+@@ -86,7 +87,6 @@ Executable hackport |
100 |
+ ViewPatterns |
101 |
+ other-extensions: |
102 |
+ DeriveDataTypeable, |
103 |
+- PatternGuards, |
104 |
+ -- extensions due to bundled cabal-install |
105 |
+ CPP, |
106 |
+ ForeignFunctionInterface, |
107 |
+@@ -151,9 +151,15 @@ Test-Suite test-resolve-category |
108 |
+ pretty, |
109 |
+ process, |
110 |
+ split, |
111 |
++ text, |
112 |
+ time, |
113 |
++ transformers, |
114 |
+ unix, |
115 |
+ xml |
116 |
++ default-extensions: |
117 |
++ -- cabal |
118 |
++ PatternGuards, |
119 |
++ DoAndIfThenElse |
120 |
+ |
121 |
+ Test-Suite test-print-deps |
122 |
+ ghc-options: -Wall |
123 |
+@@ -174,9 +180,15 @@ Test-Suite test-print-deps |
124 |
+ parsec, |
125 |
+ pretty, |
126 |
+ process, |
127 |
++ text, |
128 |
+ time, |
129 |
++ transformers, |
130 |
+ unix, |
131 |
+ xml |
132 |
++ default-extensions: |
133 |
++ -- cabal |
134 |
++ PatternGuards, |
135 |
++ DoAndIfThenElse |
136 |
+ |
137 |
+ Test-Suite test-normalize-deps |
138 |
+ ghc-options: -Wall |
139 |
+@@ -197,6 +209,13 @@ Test-Suite test-normalize-deps |
140 |
+ parsec, |
141 |
+ pretty, |
142 |
+ process, |
143 |
++ text, |
144 |
+ time, |
145 |
++ transformers, |
146 |
+ unix, |
147 |
+ xml |
148 |
++ |
149 |
++ default-extensions: |
150 |
++ -- cabal |
151 |
++ PatternGuards, |
152 |
++ DoAndIfThenElse |
153 |
+-- |
154 |
+2.25.0 |
155 |
+ |
156 |
|
157 |
diff --git a/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch b/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch |
158 |
new file mode 100644 |
159 |
index 00000000000..c660db766b2 |
160 |
--- /dev/null |
161 |
+++ b/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch |
162 |
@@ -0,0 +1,40 @@ |
163 |
+From b4fe6e48679084ca28c1192612c60599ae81808c Mon Sep 17 00:00:00 2001 |
164 |
+From: Sergei Trofimovich <slyfox@g.o> |
165 |
+Date: Sat, 25 Jan 2020 23:53:39 +0000 |
166 |
+Subject: [PATCH 3/3] Merge.hs: avoid using isExtensionOf |
167 |
+ |
168 |
+`isExtensionOf` is not available in gcc-8.0. |
169 |
+ |
170 |
+Reported-by: Jeremy Stent |
171 |
+Bug: https://bugs.gentoo.org/704778 |
172 |
+Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
173 |
+--- |
174 |
+ Merge.hs | 5 +++-- |
175 |
+ 1 file changed, 3 insertions(+), 2 deletions(-) |
176 |
+ |
177 |
+diff --git a/Merge.hs b/Merge.hs |
178 |
+index 645817345..522a3739d 100644 |
179 |
+--- a/Merge.hs |
180 |
++++ b/Merge.hs |
181 |
+@@ -39,7 +39,8 @@ import System.Directory ( getCurrentDirectory |
182 |
+ , listDirectory |
183 |
+ ) |
184 |
+ import System.Process (system) |
185 |
+-import System.FilePath ((</>), isExtensionOf) |
186 |
++import System.FilePath ((</>)) |
187 |
++import qualified System.FilePath as SF |
188 |
+ import System.Exit |
189 |
+ |
190 |
+ import qualified Cabal2Ebuild as C2E |
191 |
+@@ -183,7 +184,7 @@ getPreviousPackageId pkgDir newPkgId = do |
192 |
+ . L.sortOn (Portage.pkgVersion) |
193 |
+ . filter (<newPkgId) |
194 |
+ $ Portage.filePathToPackageId newPkgId |
195 |
+- <$> filter (\fp -> ".ebuild" `isExtensionOf` fp) pkgDir |
196 |
++ <$> filter (\fp -> SF.takeExtension fp == ".ebuild") pkgDir |
197 |
+ case pkgIds of |
198 |
+ x:_ -> Just x |
199 |
+ _ -> Nothing |
200 |
+-- |
201 |
+2.25.0 |
202 |
+ |
203 |
|
204 |
diff --git a/app-portage/hackport/hackport-0.6.3.ebuild b/app-portage/hackport/hackport-0.6.3.ebuild |
205 |
new file mode 100644 |
206 |
index 00000000000..5a74aa2efb6 |
207 |
--- /dev/null |
208 |
+++ b/app-portage/hackport/hackport-0.6.3.ebuild |
209 |
@@ -0,0 +1,63 @@ |
210 |
+# Copyright 1999-2020 Gentoo Authors |
211 |
+# Distributed under the terms of the GNU General Public License v2 |
212 |
+ |
213 |
+EAPI=7 |
214 |
+ |
215 |
+# ebuild generated by hackport 0.6.3.9999 |
216 |
+ |
217 |
+CABAL_FEATURES="test-suite" |
218 |
+inherit haskell-cabal |
219 |
+ |
220 |
+DESCRIPTION="Hackage and Portage integration tool" |
221 |
+HOMEPAGE="http://hackage.haskell.org/package/hackport" |
222 |
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" |
223 |
+ |
224 |
+LICENSE="GPL-2" |
225 |
+SLOT="0" |
226 |
+KEYWORDS="~amd64 ~x86" |
227 |
+IUSE="" |
228 |
+ |
229 |
+RESTRICT=test # tests are broken: need path to ebuild tree |
230 |
+ |
231 |
+RDEPEND=" |
232 |
+ app-portage/repoman |
233 |
+ dev-haskell/async:= |
234 |
+ dev-haskell/base16-bytestring:= |
235 |
+ dev-haskell/base64-bytestring:= |
236 |
+ dev-haskell/cryptohash:= |
237 |
+ dev-haskell/ed25519:= |
238 |
+ dev-haskell/extensible-exceptions:= |
239 |
+ dev-haskell/hashable:= |
240 |
+ >=dev-haskell/http-4000.0.3:= |
241 |
+ dev-haskell/missingh:= |
242 |
+ dev-haskell/mtl:= |
243 |
+ >=dev-haskell/network-2.6:= |
244 |
+ >=dev-haskell/network-uri-2.6:= |
245 |
+ dev-haskell/old-locale:= |
246 |
+ dev-haskell/old-time:= |
247 |
+ dev-haskell/parsec:= |
248 |
+ dev-haskell/random:= |
249 |
+ dev-haskell/regex-compat:= |
250 |
+ dev-haskell/split:= |
251 |
+ dev-haskell/stm:= |
252 |
+ >=dev-haskell/tar-0.5:= |
253 |
+ dev-haskell/text:= |
254 |
+ >=dev-haskell/xml-1.3.7:= |
255 |
+ dev-haskell/zlib:= |
256 |
+ >=dev-lang/ghc-7.8.2:= |
257 |
+" |
258 |
+DEPEND="${RDEPEND} |
259 |
+ >=dev-haskell/cabal-1.18.1.3 |
260 |
+ test? ( dev-haskell/hunit ) |
261 |
+" |
262 |
+ |
263 |
+PATCHES=( |
264 |
+ "${FILESDIR}"/${P}-missing-ffi.patch |
265 |
+ "${FILESDIR}"/${P}-missing-test-deps.patch |
266 |
+ "${FILESDIR}"/${P}-old-filepath.patch |
267 |
+) |
268 |
+ |
269 |
+src_install() { |
270 |
+ haskell-cabal_src_install |
271 |
+ doman man/hackport.1 |
272 |
+} |