1 |
commit: 8e584fd3a5ef8591c6f9df20e3d641f09822bb88 |
2 |
Author: Jack Todaro <solpeth <AT> posteo <DOT> org> |
3 |
AuthorDate: Sun Jul 31 03:34:09 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 31 04:45:09 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e584fd3 |
7 |
|
8 |
dev-haskell/wreq: remove broken USE flags |
9 |
|
10 |
The bug mentioned below shows that certain |
11 |
USE flags are in fact broken against the latest |
12 |
aeson-2.0 dependency, while the package itself |
13 |
is compatible with aeson-2.0. |
14 |
|
15 |
This disables those USE flags as they are in |
16 |
fact testing flags only. |
17 |
|
18 |
Closes: https://bugs.gentoo.org/862411 |
19 |
Signed-off-by: Jack Todaro <solpeth <AT> posteo.org> |
20 |
Closes: https://github.com/gentoo/gentoo/pull/26678 |
21 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
22 |
|
23 |
dev-haskell/wreq/metadata.xml | 31 -------------- |
24 |
dev-haskell/wreq/wreq-0.5.3.3-r1.ebuild | 66 ++++++++++++++++++++++++++++ |
25 |
dev-haskell/wreq/wreq-0.5.3.3.ebuild | 76 --------------------------------- |
26 |
3 files changed, 66 insertions(+), 107 deletions(-) |
27 |
|
28 |
diff --git a/dev-haskell/wreq/metadata.xml b/dev-haskell/wreq/metadata.xml |
29 |
index 4bbbdcaa2edb..937381521944 100644 |
30 |
--- a/dev-haskell/wreq/metadata.xml |
31 |
+++ b/dev-haskell/wreq/metadata.xml |
32 |
@@ -5,35 +5,4 @@ |
33 |
<email>haskell@g.o</email> |
34 |
<name>Gentoo Haskell</name> |
35 |
</maintainer> |
36 |
- <longdescription> |
37 |
- |
38 |
- A web client library that is designed for ease of use. |
39 |
- |
40 |
- Tutorial: <http://www.serpentine.com/wreq/tutorial.html> |
41 |
- |
42 |
- Features include: |
43 |
- |
44 |
- * Simple but powerful `lens`-based API |
45 |
- |
46 |
- * A solid test suite, and built on reliable libraries like |
47 |
- http-client and lens |
48 |
- |
49 |
- * Session handling includes connection keep-alive and pooling, and |
50 |
- cookie persistence |
51 |
- |
52 |
- * Automatic response body decompression |
53 |
- |
54 |
- * Powerful multipart form and file upload handling |
55 |
- |
56 |
- * Support for JSON requests and responses, including navigation of |
57 |
- schema-less responses |
58 |
- |
59 |
- * Basic and OAuth2 bearer authentication |
60 |
- |
61 |
- * Early TLS support via the tls package |
62 |
- </longdescription> |
63 |
- <use> |
64 |
- <flag name="aws">Enable AWS tests</flag> |
65 |
- <flag name="httpbin">Install client</flag> |
66 |
- </use> |
67 |
</pkgmetadata> |
68 |
|
69 |
diff --git a/dev-haskell/wreq/wreq-0.5.3.3-r1.ebuild b/dev-haskell/wreq/wreq-0.5.3.3-r1.ebuild |
70 |
new file mode 100644 |
71 |
index 000000000000..4ddf3edcde72 |
72 |
--- /dev/null |
73 |
+++ b/dev-haskell/wreq/wreq-0.5.3.3-r1.ebuild |
74 |
@@ -0,0 +1,66 @@ |
75 |
+# Copyright 1999-2022 Gentoo Authors |
76 |
+# Distributed under the terms of the GNU General Public License v2 |
77 |
+ |
78 |
+EAPI=8 |
79 |
+ |
80 |
+# ebuild generated by hackport 0.7.2.1.9999 |
81 |
+#hackport: flags: -developer,-doctest,-aws,-httpbin |
82 |
+ |
83 |
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite" |
84 |
+inherit haskell-cabal |
85 |
+ |
86 |
+DESCRIPTION="An easy-to-use HTTP client library" |
87 |
+HOMEPAGE="https://www.serpentine.com/wreq" |
88 |
+ |
89 |
+LICENSE="BSD" |
90 |
+SLOT="0/${PV}" |
91 |
+KEYWORDS="~amd64 ~x86" |
92 |
+ |
93 |
+RESTRICT=test # requires network |
94 |
+ |
95 |
+RDEPEND=">=dev-haskell/aeson-0.7.0.3:=[profile?] |
96 |
+ >=dev-haskell/attoparsec-0.11.1.0:=[profile?] |
97 |
+ >=dev-haskell/authenticate-oauth-1.5:=[profile?] |
98 |
+ dev-haskell/base16-bytestring:=[profile?] |
99 |
+ dev-haskell/case-insensitive:=[profile?] |
100 |
+ dev-haskell/cryptonite:=[profile?] |
101 |
+ dev-haskell/hashable:=[profile?] |
102 |
+ >=dev-haskell/http-client-0.6:=[profile?] |
103 |
+ >=dev-haskell/http-client-tls-0.3.3:=[profile?] |
104 |
+ >=dev-haskell/http-types-0.8:=[profile?] |
105 |
+ >=dev-haskell/lens-4.5:=[profile?] |
106 |
+ dev-haskell/lens-aeson:=[profile?] |
107 |
+ dev-haskell/memory:=[profile?] |
108 |
+ dev-haskell/mime-types:=[profile?] |
109 |
+ >=dev-haskell/psqueues-0.2:=[profile?] |
110 |
+ dev-haskell/time-locale-compat:=[profile?] |
111 |
+ dev-haskell/unordered-containers:=[profile?] |
112 |
+ >=dev-lang/ghc-8.10.1:= |
113 |
+" |
114 |
+DEPEND="${RDEPEND} |
115 |
+ >=dev-haskell/cabal-3.2.0.0 |
116 |
+ >=dev-haskell/cabal-doctest-1.0.2 <dev-haskell/cabal-doctest-1.1" |
117 |
+# test? ( >=dev-haskell/aeson-pretty-0.8.0 |
118 |
+# dev-haskell/base64-bytestring |
119 |
+# dev-haskell/hunit |
120 |
+# dev-haskell/network-info |
121 |
+# >=dev-haskell/quickcheck-2.7 |
122 |
+# >=dev-haskell/snap-core-1.0.0.0 |
123 |
+# >=dev-haskell/snap-server-0.9.4.4 |
124 |
+# dev-haskell/temporary |
125 |
+# dev-haskell/test-framework |
126 |
+# dev-haskell/test-framework-hunit |
127 |
+# dev-haskell/test-framework-quickcheck2 |
128 |
+# dev-haskell/unix-compat |
129 |
+# dev-haskell/uuid |
130 |
+# dev-haskell/vector |
131 |
+# dev-haskell/doctest ) |
132 |
+# " |
133 |
+ |
134 |
+src_configure() { |
135 |
+ haskell-cabal_src_configure \ |
136 |
+ --flag=-aws \ |
137 |
+ --flag=-developer \ |
138 |
+ --flag=-doctest \ |
139 |
+ --flag=-httpbin |
140 |
+} |
141 |
|
142 |
diff --git a/dev-haskell/wreq/wreq-0.5.3.3.ebuild b/dev-haskell/wreq/wreq-0.5.3.3.ebuild |
143 |
deleted file mode 100644 |
144 |
index 0c9018f69297..000000000000 |
145 |
--- a/dev-haskell/wreq/wreq-0.5.3.3.ebuild |
146 |
+++ /dev/null |
147 |
@@ -1,76 +0,0 @@ |
148 |
-# Copyright 1999-2022 Gentoo Authors |
149 |
-# Distributed under the terms of the GNU General Public License v2 |
150 |
- |
151 |
-EAPI=7 |
152 |
- |
153 |
-# ebuild generated by hackport 0.6.7.9999 |
154 |
-#hackport: flags: -developer,+doctest |
155 |
- |
156 |
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" |
157 |
-inherit haskell-cabal |
158 |
- |
159 |
-DESCRIPTION="An easy-to-use HTTP client library" |
160 |
-HOMEPAGE="http://www.serpentine.com/wreq/" |
161 |
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" |
162 |
- |
163 |
-LICENSE="BSD" |
164 |
-SLOT="0/${PV}" |
165 |
-KEYWORDS="~amd64 ~x86" |
166 |
-IUSE="aws httpbin" |
167 |
- |
168 |
-RESTRICT=test # needs network |
169 |
- |
170 |
-RDEPEND=">=dev-haskell/aeson-0.7.0.3:=[profile?] |
171 |
- >=dev-haskell/attoparsec-0.11.1.0:=[profile?] |
172 |
- >=dev-haskell/authenticate-oauth-1.5:=[profile?] |
173 |
- dev-haskell/base16-bytestring:=[profile?] |
174 |
- dev-haskell/case-insensitive:=[profile?] |
175 |
- dev-haskell/cryptonite:=[profile?] |
176 |
- >=dev-haskell/exceptions-0.5:=[profile?] |
177 |
- dev-haskell/hashable:=[profile?] |
178 |
- >=dev-haskell/http-client-0.6:=[profile?] |
179 |
- >=dev-haskell/http-client-tls-0.3.3:=[profile?] |
180 |
- >=dev-haskell/http-types-0.8:=[profile?] |
181 |
- >=dev-haskell/lens-4.5:=[profile?] |
182 |
- dev-haskell/lens-aeson:=[profile?] |
183 |
- dev-haskell/memory:=[profile?] |
184 |
- dev-haskell/mime-types:=[profile?] |
185 |
- >=dev-haskell/psqueues-0.2:=[profile?] |
186 |
- dev-haskell/text:=[profile?] |
187 |
- dev-haskell/time-locale-compat:=[profile?] |
188 |
- dev-haskell/unordered-containers:=[profile?] |
189 |
- >=dev-lang/ghc-8.4.3:= |
190 |
- httpbin? ( >=dev-haskell/aeson-pretty-0.8.0:=[profile?] |
191 |
- dev-haskell/base64-bytestring:=[profile?] |
192 |
- >=dev-haskell/snap-core-1.0.0.0:=[profile?] |
193 |
- >=dev-haskell/snap-server-0.9.4.4:=[profile?] |
194 |
- dev-haskell/unix-compat:=[profile?] |
195 |
- dev-haskell/uuid:=[profile?] ) |
196 |
-" |
197 |
-DEPEND="${RDEPEND} |
198 |
- >=dev-haskell/cabal-2.2.0.1 |
199 |
- >=dev-haskell/cabal-doctest-1.0.2 <dev-haskell/cabal-doctest-1.1 |
200 |
- test? ( dev-haskell/doctest |
201 |
- dev-haskell/hunit |
202 |
- dev-haskell/network-info |
203 |
- >=dev-haskell/quickcheck-2.7 |
204 |
- dev-haskell/temporary |
205 |
- dev-haskell/test-framework |
206 |
- dev-haskell/test-framework-hunit |
207 |
- dev-haskell/test-framework-quickcheck2 |
208 |
- dev-haskell/vector |
209 |
- !httpbin? ( >=dev-haskell/aeson-pretty-0.8.0 |
210 |
- dev-haskell/base64-bytestring |
211 |
- >=dev-haskell/snap-core-1.0.0.0 |
212 |
- >=dev-haskell/snap-server-0.9.4.4 |
213 |
- dev-haskell/unix-compat |
214 |
- dev-haskell/uuid ) ) |
215 |
-" |
216 |
- |
217 |
-src_configure() { |
218 |
- haskell-cabal_src_configure \ |
219 |
- $(cabal_flag aws aws) \ |
220 |
- --flag=-developer \ |
221 |
- --flag=doctest \ |
222 |
- $(cabal_flag httpbin httpbin) |
223 |
-} |