1 |
commit: 683f81bdc3bdba809022aba9d837c4de7f4243ad |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 27 19:48:04 2018 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 27 19:48:50 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=683f81bd |
7 |
|
8 |
dev-perl/TheSchwartz: Fix for '.' in @INC issue #623128 |
9 |
|
10 |
- EAPI6 |
11 |
- Fix for '.' in @INC |
12 |
|
13 |
Bug: https://bugs.gentoo.org/623128 |
14 |
Package-Manager: Portage-2.3.18, Repoman-2.3.6 |
15 |
|
16 |
dev-perl/TheSchwartz/TheSchwartz-1.120.0-r1.ebuild | 22 ++ |
17 |
.../files/TheSchwartz-1.12-no-dot-inc.patch | 342 +++++++++++++++++++++ |
18 |
2 files changed, 364 insertions(+) |
19 |
|
20 |
diff --git a/dev-perl/TheSchwartz/TheSchwartz-1.120.0-r1.ebuild b/dev-perl/TheSchwartz/TheSchwartz-1.120.0-r1.ebuild |
21 |
new file mode 100644 |
22 |
index 00000000000..30391190d60 |
23 |
--- /dev/null |
24 |
+++ b/dev-perl/TheSchwartz/TheSchwartz-1.120.0-r1.ebuild |
25 |
@@ -0,0 +1,22 @@ |
26 |
+# Copyright 1999-2018 Gentoo Foundation |
27 |
+# Distributed under the terms of the GNU General Public License v2 |
28 |
+ |
29 |
+EAPI=6 |
30 |
+ |
31 |
+DIST_AUTHOR=JFEARN |
32 |
+DIST_VERSION=1.12 |
33 |
+inherit perl-module |
34 |
+ |
35 |
+DESCRIPTION="Reliable job queue" |
36 |
+ |
37 |
+SLOT="0" |
38 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
39 |
+IUSE="" |
40 |
+ |
41 |
+RDEPEND=">=dev-perl/Data-ObjectDriver-0.06" |
42 |
+DEPEND="${RDEPEND} |
43 |
+ dev-perl/Module-Build |
44 |
+" |
45 |
+PATCHES=( "${FILESDIR}/${PN}-1.12-no-dot-inc.patch" ) |
46 |
+# Parallel tests fail due to database ordering issues |
47 |
+DIST_TEST="do" |
48 |
|
49 |
diff --git a/dev-perl/TheSchwartz/files/TheSchwartz-1.12-no-dot-inc.patch b/dev-perl/TheSchwartz/files/TheSchwartz-1.12-no-dot-inc.patch |
50 |
new file mode 100644 |
51 |
index 00000000000..fefd0ffd1a5 |
52 |
--- /dev/null |
53 |
+++ b/dev-perl/TheSchwartz/files/TheSchwartz-1.12-no-dot-inc.patch |
54 |
@@ -0,0 +1,342 @@ |
55 |
+From 6c9a65ff8a2c896e7359d9b2da47fc8836c5dfe9 Mon Sep 17 00:00:00 2001 |
56 |
+From: Kent Fredric <kentnl@g.o> |
57 |
+Date: Wed, 28 Feb 2018 08:34:19 +1300 |
58 |
+Subject: Fix test failures on 5.26+ due to removal of '.' from @INC |
59 |
+ |
60 |
+'.' not being in @INC means `require "foo"` no longer implies |
61 |
+`require "./foo"` will occur as a result of @INC traversal. |
62 |
+ |
63 |
+This changes to use explicit paths ( ie: paths with a leading '/' |
64 |
+ or './' ) which disables @INC traversal and restores expected |
65 |
+semantics. |
66 |
+ |
67 |
+Bug: https://rt.cpan.org/Ticket/Display.html?id=124610 |
68 |
+Bug: https://bugs.gentoo.org/623128 |
69 |
+--- |
70 |
+ t/api.t | 2 +- |
71 |
+ t/cleanup.t | 2 +- |
72 |
+ t/client-time-unsync.t | 2 +- |
73 |
+ t/coalesce.t | 2 +- |
74 |
+ t/dead-dbs.t | 2 +- |
75 |
+ t/declined.t | 2 +- |
76 |
+ t/empty-db.t | 2 +- |
77 |
+ t/evenly-distribute.t | 2 +- |
78 |
+ t/fail-working-multiple.t | 2 +- |
79 |
+ t/funcid.t | 2 +- |
80 |
+ t/grab-race.t | 2 +- |
81 |
+ t/grab_and_work_on.t | 2 +- |
82 |
+ t/high-funcid-starvation.t | 2 +- |
83 |
+ t/insert-and-do.t | 2 +- |
84 |
+ t/parallel-workers.t | 2 +- |
85 |
+ t/priority.t | 2 +- |
86 |
+ t/replace-abort.t | 2 +- |
87 |
+ t/replace-with.t | 2 +- |
88 |
+ t/retry-delay.t | 2 +- |
89 |
+ t/scoreboard.t | 2 +- |
90 |
+ t/server-time.t | 2 +- |
91 |
+ t/unique.t | 2 +- |
92 |
+ t/work-before-funcids-exist.t | 2 +- |
93 |
+ 23 files changed, 23 insertions(+), 23 deletions(-) |
94 |
+ |
95 |
+diff --git a/t/api.t b/t/api.t |
96 |
+index 9d4d177..fb9c7b2 100644 |
97 |
+--- a/t/api.t |
98 |
++++ b/t/api.t |
99 |
+@@ -4,7 +4,7 @@ |
100 |
+ use strict; |
101 |
+ use warnings; |
102 |
+ |
103 |
+-require 't/lib/db-common.pl'; |
104 |
++require './t/lib/db-common.pl'; |
105 |
+ |
106 |
+ use TheSchwartz; |
107 |
+ use Test::More tests => 58 * 3; |
108 |
+diff --git a/t/cleanup.t b/t/cleanup.t |
109 |
+index 034dc59..f13f23f 100644 |
110 |
+--- a/t/cleanup.t |
111 |
++++ b/t/cleanup.t |
112 |
+@@ -3,7 +3,7 @@ |
113 |
+ use strict; |
114 |
+ use warnings; |
115 |
+ |
116 |
+-require 't/lib/db-common.pl'; |
117 |
++require './t/lib/db-common.pl'; |
118 |
+ |
119 |
+ use TheSchwartz; |
120 |
+ use Test::More tests => 30; |
121 |
+diff --git a/t/client-time-unsync.t b/t/client-time-unsync.t |
122 |
+index fa19a85..fd10047 100644 |
123 |
+--- a/t/client-time-unsync.t |
124 |
++++ b/t/client-time-unsync.t |
125 |
+@@ -17,7 +17,7 @@ BEGIN { |
126 |
+ } |
127 |
+ no warnings 'redefine'; |
128 |
+ |
129 |
+-require 't/lib/db-common.pl'; |
130 |
++require './t/lib/db-common.pl'; |
131 |
+ |
132 |
+ use TheSchwartz; |
133 |
+ use Test::More tests => 2; |
134 |
+diff --git a/t/coalesce.t b/t/coalesce.t |
135 |
+index b42f732..0c152f4 100644 |
136 |
+--- a/t/coalesce.t |
137 |
++++ b/t/coalesce.t |
138 |
+@@ -3,7 +3,7 @@ |
139 |
+ use strict; |
140 |
+ use warnings; |
141 |
+ |
142 |
+-require 't/lib/db-common.pl'; |
143 |
++require './t/lib/db-common.pl'; |
144 |
+ |
145 |
+ use TheSchwartz; |
146 |
+ use Test::More tests => 14 * 3; |
147 |
+diff --git a/t/dead-dbs.t b/t/dead-dbs.t |
148 |
+index eee73a6..673f5b4 100644 |
149 |
+--- a/t/dead-dbs.t |
150 |
++++ b/t/dead-dbs.t |
151 |
+@@ -4,7 +4,7 @@ |
152 |
+ use strict; |
153 |
+ use warnings; |
154 |
+ |
155 |
+-require 't/lib/db-common.pl'; |
156 |
++require './t/lib/db-common.pl'; |
157 |
+ |
158 |
+ use TheSchwartz; |
159 |
+ use Test::More tests => 6; |
160 |
+diff --git a/t/declined.t b/t/declined.t |
161 |
+index 8fca90d..78dca2f 100644 |
162 |
+--- a/t/declined.t |
163 |
++++ b/t/declined.t |
164 |
+@@ -1,7 +1,7 @@ |
165 |
+ use strict; |
166 |
+ use warnings; |
167 |
+ |
168 |
+-require 't/lib/db-common.pl'; |
169 |
++require './t/lib/db-common.pl'; |
170 |
+ |
171 |
+ use TheSchwartz; |
172 |
+ use Test::More tests => (5 + 21) * 3; |
173 |
+diff --git a/t/empty-db.t b/t/empty-db.t |
174 |
+index 17353cd..6fc9bc1 100644 |
175 |
+--- a/t/empty-db.t |
176 |
++++ b/t/empty-db.t |
177 |
+@@ -4,7 +4,7 @@ |
178 |
+ use strict; |
179 |
+ use warnings; |
180 |
+ |
181 |
+-require 't/lib/db-common.pl'; |
182 |
++require './t/lib/db-common.pl'; |
183 |
+ |
184 |
+ use TheSchwartz; |
185 |
+ use Test::More tests => 9; |
186 |
+diff --git a/t/evenly-distribute.t b/t/evenly-distribute.t |
187 |
+index 56533f0..3fc9082 100644 |
188 |
+--- a/t/evenly-distribute.t |
189 |
++++ b/t/evenly-distribute.t |
190 |
+@@ -4,7 +4,7 @@ |
191 |
+ use strict; |
192 |
+ use warnings; |
193 |
+ |
194 |
+-require 't/lib/db-common.pl'; |
195 |
++require './t/lib/db-common.pl'; |
196 |
+ |
197 |
+ use TheSchwartz; |
198 |
+ use Test::More tests => 12; |
199 |
+diff --git a/t/fail-working-multiple.t b/t/fail-working-multiple.t |
200 |
+index 3750fc7..94f07f7 100644 |
201 |
+--- a/t/fail-working-multiple.t |
202 |
++++ b/t/fail-working-multiple.t |
203 |
+@@ -3,7 +3,7 @@ |
204 |
+ use strict; |
205 |
+ use warnings; |
206 |
+ |
207 |
+-require 't/lib/db-common.pl'; |
208 |
++require './t/lib/db-common.pl'; |
209 |
+ |
210 |
+ use TheSchwartz; |
211 |
+ use Test::More tests => 12; |
212 |
+diff --git a/t/funcid.t b/t/funcid.t |
213 |
+index f363791..60510ba 100644 |
214 |
+--- a/t/funcid.t |
215 |
++++ b/t/funcid.t |
216 |
+@@ -4,7 +4,7 @@ |
217 |
+ use strict; |
218 |
+ use warnings; |
219 |
+ |
220 |
+-require 't/lib/db-common.pl'; |
221 |
++require './t/lib/db-common.pl'; |
222 |
+ |
223 |
+ use TheSchwartz; |
224 |
+ use Test::More tests => 24; |
225 |
+diff --git a/t/grab-race.t b/t/grab-race.t |
226 |
+index 1071362..efcdff8 100644 |
227 |
+--- a/t/grab-race.t |
228 |
++++ b/t/grab-race.t |
229 |
+@@ -4,7 +4,7 @@ |
230 |
+ use strict; |
231 |
+ use warnings; |
232 |
+ |
233 |
+-require 't/lib/db-common.pl'; |
234 |
++require './t/lib/db-common.pl'; |
235 |
+ |
236 |
+ use TheSchwartz; |
237 |
+ use Test::More tests => 2; |
238 |
+diff --git a/t/grab_and_work_on.t b/t/grab_and_work_on.t |
239 |
+index 7f7628e..be99827 100644 |
240 |
+--- a/t/grab_and_work_on.t |
241 |
++++ b/t/grab_and_work_on.t |
242 |
+@@ -3,7 +3,7 @@ |
243 |
+ use strict; |
244 |
+ use warnings; |
245 |
+ |
246 |
+-require 't/lib/db-common.pl'; |
247 |
++require './t/lib/db-common.pl'; |
248 |
+ |
249 |
+ use TheSchwartz; |
250 |
+ use Test::More tests => 27; |
251 |
+diff --git a/t/high-funcid-starvation.t b/t/high-funcid-starvation.t |
252 |
+index 8469e9d..c879049 100644 |
253 |
+--- a/t/high-funcid-starvation.t |
254 |
++++ b/t/high-funcid-starvation.t |
255 |
+@@ -4,7 +4,7 @@ |
256 |
+ use strict; |
257 |
+ use warnings; |
258 |
+ |
259 |
+-require 't/lib/db-common.pl'; |
260 |
++require './t/lib/db-common.pl'; |
261 |
+ |
262 |
+ use TheSchwartz; |
263 |
+ use Test::More tests => 12; |
264 |
+diff --git a/t/insert-and-do.t b/t/insert-and-do.t |
265 |
+index f6cc9f9..662abbd 100644 |
266 |
+--- a/t/insert-and-do.t |
267 |
++++ b/t/insert-and-do.t |
268 |
+@@ -3,7 +3,7 @@ |
269 |
+ use strict; |
270 |
+ use warnings; |
271 |
+ |
272 |
+-require 't/lib/db-common.pl'; |
273 |
++require './t/lib/db-common.pl'; |
274 |
+ |
275 |
+ use TheSchwartz; |
276 |
+ use Test::More tests => 26 * 3; |
277 |
+diff --git a/t/parallel-workers.t b/t/parallel-workers.t |
278 |
+index 1834041..5300385 100644 |
279 |
+--- a/t/parallel-workers.t |
280 |
++++ b/t/parallel-workers.t |
281 |
+@@ -4,7 +4,7 @@ |
282 |
+ use strict; |
283 |
+ use warnings; |
284 |
+ |
285 |
+-require 't/lib/db-common.pl'; |
286 |
++require './t/lib/db-common.pl'; |
287 |
+ |
288 |
+ use TheSchwartz; |
289 |
+ use Test::More tests => 2; |
290 |
+diff --git a/t/priority.t b/t/priority.t |
291 |
+index b6e1208..3ce6c6e 100644 |
292 |
+--- a/t/priority.t |
293 |
++++ b/t/priority.t |
294 |
+@@ -3,7 +3,7 @@ |
295 |
+ use strict; |
296 |
+ use warnings; |
297 |
+ |
298 |
+-require 't/lib/db-common.pl'; |
299 |
++require './t/lib/db-common.pl'; |
300 |
+ |
301 |
+ use TheSchwartz; |
302 |
+ use Test::More tests => ( ( 31 * 3 ) + ( 16 * 3 ) + ( 12 * 3 ) ); |
303 |
+diff --git a/t/replace-abort.t b/t/replace-abort.t |
304 |
+index 86d70f0..252bfb0 100644 |
305 |
+--- a/t/replace-abort.t |
306 |
++++ b/t/replace-abort.t |
307 |
+@@ -3,7 +3,7 @@ |
308 |
+ use strict; |
309 |
+ use warnings; |
310 |
+ |
311 |
+-require 't/lib/db-common.pl'; |
312 |
++require './t/lib/db-common.pl'; |
313 |
+ |
314 |
+ use TheSchwartz; |
315 |
+ use Test::More tests => 13; |
316 |
+diff --git a/t/replace-with.t b/t/replace-with.t |
317 |
+index f9e7978..6887988 100644 |
318 |
+--- a/t/replace-with.t |
319 |
++++ b/t/replace-with.t |
320 |
+@@ -3,7 +3,7 @@ |
321 |
+ use strict; |
322 |
+ use warnings; |
323 |
+ |
324 |
+-require 't/lib/db-common.pl'; |
325 |
++require './t/lib/db-common.pl'; |
326 |
+ |
327 |
+ use TheSchwartz; |
328 |
+ use Test::More tests => 30; |
329 |
+diff --git a/t/retry-delay.t b/t/retry-delay.t |
330 |
+index 27c5663..fdda944 100644 |
331 |
+--- a/t/retry-delay.t |
332 |
++++ b/t/retry-delay.t |
333 |
+@@ -4,7 +4,7 @@ |
334 |
+ use strict; |
335 |
+ use warnings; |
336 |
+ |
337 |
+-require 't/lib/db-common.pl'; |
338 |
++require './t/lib/db-common.pl'; |
339 |
+ |
340 |
+ use TheSchwartz; |
341 |
+ use Test::More tests => 24; |
342 |
+diff --git a/t/scoreboard.t b/t/scoreboard.t |
343 |
+index c19a9d8..bc197d0 100644 |
344 |
+--- a/t/scoreboard.t |
345 |
++++ b/t/scoreboard.t |
346 |
+@@ -3,7 +3,7 @@ |
347 |
+ use strict; |
348 |
+ use warnings; |
349 |
+ |
350 |
+-require 't/lib/db-common.pl'; |
351 |
++require './t/lib/db-common.pl'; |
352 |
+ |
353 |
+ use Test::More tests => 30; |
354 |
+ |
355 |
+diff --git a/t/server-time.t b/t/server-time.t |
356 |
+index 870ab8e..47ded3a 100644 |
357 |
+--- a/t/server-time.t |
358 |
++++ b/t/server-time.t |
359 |
+@@ -3,7 +3,7 @@ |
360 |
+ use strict; |
361 |
+ use warnings; |
362 |
+ |
363 |
+-require 't/lib/db-common.pl'; |
364 |
++require './t/lib/db-common.pl'; |
365 |
+ |
366 |
+ use TheSchwartz; |
367 |
+ use Test::More tests => 6; |
368 |
+diff --git a/t/unique.t b/t/unique.t |
369 |
+index f0bcea5..e013a32 100644 |
370 |
+--- a/t/unique.t |
371 |
++++ b/t/unique.t |
372 |
+@@ -4,7 +4,7 @@ |
373 |
+ use strict; |
374 |
+ use warnings; |
375 |
+ |
376 |
+-require 't/lib/db-common.pl'; |
377 |
++require './t/lib/db-common.pl'; |
378 |
+ |
379 |
+ use TheSchwartz; |
380 |
+ use Test::More tests => 18; |
381 |
+diff --git a/t/work-before-funcids-exist.t b/t/work-before-funcids-exist.t |
382 |
+index 9c06e43..17efbbc 100644 |
383 |
+--- a/t/work-before-funcids-exist.t |
384 |
++++ b/t/work-before-funcids-exist.t |
385 |
+@@ -4,7 +4,7 @@ |
386 |
+ use strict; |
387 |
+ use warnings; |
388 |
+ |
389 |
+-require 't/lib/db-common.pl'; |
390 |
++require './t/lib/db-common.pl'; |
391 |
+ |
392 |
+ use TheSchwartz; |
393 |
+ use Test::More tests => 6; |
394 |
+-- |
395 |
+2.15.1 |
396 |
+ |