1 |
commit: 935303706906f96d41ac75da3f0ac2dd24b12faf |
2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
3 |
AuthorDate: Sun Apr 8 21:00:08 2018 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 8 21:59:36 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93530370 |
7 |
|
8 |
dev-lang/scala: clean duplicate patches |
9 |
|
10 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/7900 |
12 |
|
13 |
dev-lang/scala/files/scala-2.11.1-no-git.patch | 8 ++++---- |
14 |
dev-lang/scala/files/scala-2.11.11-no-git.patch | 24 ---------------------- |
15 |
dev-lang/scala/files/scala-2.11.2-no-git.patch | 8 ++++---- |
16 |
dev-lang/scala/files/scala-2.11.4-no-git.patch | 8 ++++---- |
17 |
dev-lang/scala/files/scala-2.11.6-no-git.patch | 8 ++++---- |
18 |
dev-lang/scala/files/scala-2.11.7-no-git.patch | 8 ++++---- |
19 |
dev-lang/scala/files/scala-2.11.8-no-git.patch | 8 ++++---- |
20 |
dev-lang/scala/files/scala-2.12.1-no-git.patch | 8 ++++---- |
21 |
.../scala/files/scala-2.12.1-runner-script.patch | 4 ++-- |
22 |
dev-lang/scala/files/scala-2.12.2-no-git.patch | 4 ++-- |
23 |
dev-lang/scala/files/scala-2.12.4-no-git.patch | 4 ++-- |
24 |
dev-lang/scala/scala-2.11.1-r2.ebuild | 4 ++-- |
25 |
dev-lang/scala/scala-2.11.11.ebuild | 4 ++-- |
26 |
dev-lang/scala/scala-2.11.2-r2.ebuild | 4 ++-- |
27 |
dev-lang/scala/scala-2.11.4-r1.ebuild | 4 ++-- |
28 |
dev-lang/scala/scala-2.11.4-r2.ebuild | 4 ++-- |
29 |
dev-lang/scala/scala-2.11.6-r1.ebuild | 4 ++-- |
30 |
dev-lang/scala/scala-2.11.7-r1.ebuild | 4 ++-- |
31 |
dev-lang/scala/scala-2.11.8.ebuild | 4 ++-- |
32 |
dev-lang/scala/scala-2.12.1.ebuild | 4 ++-- |
33 |
dev-lang/scala/scala-2.12.2.ebuild | 4 ++-- |
34 |
dev-lang/scala/scala-2.12.4.ebuild | 2 +- |
35 |
22 files changed, 55 insertions(+), 79 deletions(-) |
36 |
|
37 |
diff --git a/dev-lang/scala/files/scala-2.11.1-no-git.patch b/dev-lang/scala/files/scala-2.11.1-no-git.patch |
38 |
index fbec47cd6c6..efef8376a9d 100644 |
39 |
--- a/dev-lang/scala/files/scala-2.11.1-no-git.patch |
40 |
+++ b/dev-lang/scala/files/scala-2.11.1-no-git.patch |
41 |
@@ -1,5 +1,5 @@ |
42 |
---- scala-2.11.1-orig/tools/get-scala-commit-date 2014-05-19 21:01:18.000000000 +1000 |
43 |
-+++ scala-2.11.1/tools/get-scala-commit-date 2014-07-06 16:47:04.772397561 +1000 |
44 |
+--- a/tools/get-scala-commit-date |
45 |
++++ b/tools/get-scala-commit-date |
46 |
@@ -10,8 +10,8 @@ |
47 |
|
48 |
[[ $# -eq 0 ]] || cd "$1" |
49 |
@@ -11,8 +11,8 @@ |
50 |
|
51 |
# 20120324 |
52 |
echo "${lastcommitdate//-/}-${lastcommithours//:/}" |
53 |
---- scala-2.11.1-orig/tools/get-scala-commit-sha 2014-05-19 21:01:18.000000000 +1000 |
54 |
-+++ scala-2.11.1/tools/get-scala-commit-sha 2014-07-06 16:47:25.704741601 +1000 |
55 |
+--- a/tools/get-scala-commit-sha |
56 |
++++ b/tools/get-scala-commit-sha |
57 |
@@ -12,7 +12,7 @@ |
58 |
|
59 |
# printf %016s is not portable for 0-padding, has to be a digit. |
60 |
|
61 |
diff --git a/dev-lang/scala/files/scala-2.11.11-no-git.patch b/dev-lang/scala/files/scala-2.11.11-no-git.patch |
62 |
deleted file mode 100644 |
63 |
index b1012626c52..00000000000 |
64 |
--- a/dev-lang/scala/files/scala-2.11.11-no-git.patch |
65 |
+++ /dev/null |
66 |
@@ -1,24 +0,0 @@ |
67 |
---- scala-2.11.8-orig/tools/get-scala-commit-date 2016-03-04 21:57:12.000000000 +1100 |
68 |
-+++ scala-2.11.8/tools/get-scala-commit-date 2016-09-16 10:29:09.215240534 +1000 |
69 |
-@@ -10,8 +10,8 @@ |
70 |
- |
71 |
- [[ $# -eq 0 ]] || cd "$1" |
72 |
- |
73 |
--lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1) |
74 |
--lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2) |
75 |
-+lastcommitdate="2016-03-04" |
76 |
-+lastcommithours="00:00:00" |
77 |
- |
78 |
- # 20120324 |
79 |
- echo "${lastcommitdate//-/}-${lastcommithours//:/}" |
80 |
---- scala-2.11.8-orig/tools/get-scala-commit-sha 2016-03-04 21:57:12.000000000 +1100 |
81 |
-+++ scala-2.11.8/tools/get-scala-commit-sha 2016-09-16 10:29:45.566119137 +1000 |
82 |
-@@ -12,7 +12,7 @@ |
83 |
- |
84 |
- # printf %016s is not portable for 0-padding, has to be a digit. |
85 |
- # so we're stuck disassembling it. |
86 |
--hash=$(git log -1 --format="%H" HEAD) |
87 |
-+hash="1706a37eb84ec252aea77bccebad3e48448534ad" |
88 |
- hash=${hash#g} |
89 |
- hash=${hash:0:10} |
90 |
- echo "$hash" |
91 |
|
92 |
diff --git a/dev-lang/scala/files/scala-2.11.2-no-git.patch b/dev-lang/scala/files/scala-2.11.2-no-git.patch |
93 |
index 87dbb8e4c8e..56dd69a24b2 100644 |
94 |
--- a/dev-lang/scala/files/scala-2.11.2-no-git.patch |
95 |
+++ b/dev-lang/scala/files/scala-2.11.2-no-git.patch |
96 |
@@ -1,5 +1,5 @@ |
97 |
---- scala-2.11.2-orig/tools/get-scala-commit-date 2014-07-21 17:50:18.000000000 +1000 |
98 |
-+++ scala-2.11.2/tools/get-scala-commit-date 2014-10-04 18:33:48.729779264 +1000 |
99 |
+--- a/tools/get-scala-commit-date |
100 |
++++ b/tools/get-scala-commit-date |
101 |
@@ -10,8 +10,8 @@ |
102 |
|
103 |
[[ $# -eq 0 ]] || cd "$1" |
104 |
@@ -11,8 +11,8 @@ |
105 |
|
106 |
# 20120324 |
107 |
echo "${lastcommitdate//-/}-${lastcommithours//:/}" |
108 |
---- scala-2.11.2-orig/tools/get-scala-commit-sha 2014-07-21 17:50:18.000000000 +1000 |
109 |
-+++ scala-2.11.2/tools/get-scala-commit-sha 2014-10-04 18:34:32.541990564 +1000 |
110 |
+--- a/tools/get-scala-commit-sha |
111 |
++++ b/tools/get-scala-commit-sha |
112 |
@@ -12,7 +12,7 @@ |
113 |
|
114 |
# printf %016s is not portable for 0-padding, has to be a digit. |
115 |
|
116 |
diff --git a/dev-lang/scala/files/scala-2.11.4-no-git.patch b/dev-lang/scala/files/scala-2.11.4-no-git.patch |
117 |
index 275c140a2a1..f7a78d38c2c 100644 |
118 |
--- a/dev-lang/scala/files/scala-2.11.4-no-git.patch |
119 |
+++ b/dev-lang/scala/files/scala-2.11.4-no-git.patch |
120 |
@@ -1,5 +1,5 @@ |
121 |
---- scala-2.11.4-orig/tools/get-scala-commit-date 2014-10-23 20:06:36.000000000 +1100 |
122 |
-+++ scala-2.11.4/tools/get-scala-commit-date 2014-11-26 21:54:26.064081533 +1100 |
123 |
+--- a/tools/get-scala-commit-date |
124 |
++++ b/tools/get-scala-commit-date |
125 |
@@ -10,8 +10,8 @@ |
126 |
|
127 |
[[ $# -eq 0 ]] || cd "$1" |
128 |
@@ -11,8 +11,8 @@ |
129 |
|
130 |
# 20120324 |
131 |
echo "${lastcommitdate//-/}-${lastcommithours//:/}" |
132 |
---- scala-2.11.4-orig/tools/get-scala-commit-sha 2014-10-23 20:06:36.000000000 +1100 |
133 |
-+++ scala-2.11.4/tools/get-scala-commit-sha 2014-11-26 21:55:12.248629566 +1100 |
134 |
+--- a/tools/get-scala-commit-sha |
135 |
++++ b/tools/get-scala-commit-sha |
136 |
@@ -12,7 +12,7 @@ |
137 |
|
138 |
# printf %016s is not portable for 0-padding, has to be a digit. |
139 |
|
140 |
diff --git a/dev-lang/scala/files/scala-2.11.6-no-git.patch b/dev-lang/scala/files/scala-2.11.6-no-git.patch |
141 |
index 231632a3b17..4bc7b7f9fae 100644 |
142 |
--- a/dev-lang/scala/files/scala-2.11.6-no-git.patch |
143 |
+++ b/dev-lang/scala/files/scala-2.11.6-no-git.patch |
144 |
@@ -1,5 +1,5 @@ |
145 |
---- scala-2.11.6-orig/tools/get-scala-commit-date 2015-02-25 12:22:22.000000000 +1100 |
146 |
-+++ scala-2.11.6/tools/get-scala-commit-date 2015-04-17 20:32:27.899791213 +1000 |
147 |
+--- a/tools/get-scala-commit-date |
148 |
++++ b/tools/get-scala-commit-date |
149 |
@@ -10,8 +10,8 @@ |
150 |
|
151 |
[[ $# -eq 0 ]] || cd "$1" |
152 |
@@ -11,8 +11,8 @@ |
153 |
|
154 |
# 20120324 |
155 |
echo "${lastcommitdate//-/}-${lastcommithours//:/}" |
156 |
---- scala-2.11.6-orig/tools/get-scala-commit-sha 2015-02-25 12:22:22.000000000 +1100 |
157 |
-+++ scala-2.11.6/tools/get-scala-commit-sha 2015-04-17 20:32:03.655808474 +1000 |
158 |
+--- a/tools/get-scala-commit-sha |
159 |
++++ b/tools/get-scala-commit-sha |
160 |
@@ -12,7 +12,7 @@ |
161 |
|
162 |
# printf %016s is not portable for 0-padding, has to be a digit. |
163 |
|
164 |
diff --git a/dev-lang/scala/files/scala-2.11.7-no-git.patch b/dev-lang/scala/files/scala-2.11.7-no-git.patch |
165 |
index ea337b23849..f8ca464002e 100644 |
166 |
--- a/dev-lang/scala/files/scala-2.11.7-no-git.patch |
167 |
+++ b/dev-lang/scala/files/scala-2.11.7-no-git.patch |
168 |
@@ -1,5 +1,5 @@ |
169 |
---- scala-2.11.7-orig/tools/get-scala-commit-date 2015-06-23 04:27:36.000000000 +1000 |
170 |
-+++ scala-2.11.7/tools/get-scala-commit-date 2015-07-04 11:53:24.696520666 +1000 |
171 |
+--- a/tools/get-scala-commit-date |
172 |
++++ b/tools/get-scala-commit-date |
173 |
@@ -10,8 +10,8 @@ |
174 |
|
175 |
[[ $# -eq 0 ]] || cd "$1" |
176 |
@@ -11,8 +11,8 @@ |
177 |
|
178 |
# 20120324 |
179 |
echo "${lastcommitdate//-/}-${lastcommithours//:/}" |
180 |
---- scala-2.11.7-orig/tools/get-scala-commit-sha 2015-06-23 04:27:36.000000000 +1000 |
181 |
-+++ scala-2.11.7/tools/get-scala-commit-sha 2015-07-04 11:51:15.598526730 +1000 |
182 |
+--- a/tools/get-scala-commit-sha |
183 |
++++ b/tools/get-scala-commit-sha |
184 |
@@ -12,7 +12,7 @@ |
185 |
|
186 |
# printf %016s is not portable for 0-padding, has to be a digit. |
187 |
|
188 |
diff --git a/dev-lang/scala/files/scala-2.11.8-no-git.patch b/dev-lang/scala/files/scala-2.11.8-no-git.patch |
189 |
index b1012626c52..b577dcbc8df 100644 |
190 |
--- a/dev-lang/scala/files/scala-2.11.8-no-git.patch |
191 |
+++ b/dev-lang/scala/files/scala-2.11.8-no-git.patch |
192 |
@@ -1,5 +1,5 @@ |
193 |
---- scala-2.11.8-orig/tools/get-scala-commit-date 2016-03-04 21:57:12.000000000 +1100 |
194 |
-+++ scala-2.11.8/tools/get-scala-commit-date 2016-09-16 10:29:09.215240534 +1000 |
195 |
+--- a/tools/get-scala-commit-date |
196 |
++++ b/tools/get-scala-commit-date |
197 |
@@ -10,8 +10,8 @@ |
198 |
|
199 |
[[ $# -eq 0 ]] || cd "$1" |
200 |
@@ -11,8 +11,8 @@ |
201 |
|
202 |
# 20120324 |
203 |
echo "${lastcommitdate//-/}-${lastcommithours//:/}" |
204 |
---- scala-2.11.8-orig/tools/get-scala-commit-sha 2016-03-04 21:57:12.000000000 +1100 |
205 |
-+++ scala-2.11.8/tools/get-scala-commit-sha 2016-09-16 10:29:45.566119137 +1000 |
206 |
+--- a/tools/get-scala-commit-sha |
207 |
++++ b/tools/get-scala-commit-sha |
208 |
@@ -12,7 +12,7 @@ |
209 |
|
210 |
# printf %016s is not portable for 0-padding, has to be a digit. |
211 |
|
212 |
diff --git a/dev-lang/scala/files/scala-2.12.1-no-git.patch b/dev-lang/scala/files/scala-2.12.1-no-git.patch |
213 |
index f5439e35aad..94cf149da7b 100644 |
214 |
--- a/dev-lang/scala/files/scala-2.12.1-no-git.patch |
215 |
+++ b/dev-lang/scala/files/scala-2.12.1-no-git.patch |
216 |
@@ -1,5 +1,5 @@ |
217 |
---- scala-2.12.1-orig/tools/get-scala-commit-date 2016-12-05 20:45:09.000000000 +1100 |
218 |
-+++ scala-2.12.1/tools/get-scala-commit-date 2016-12-27 16:41:41.695942033 +1100 |
219 |
+--- a/tools/get-scala-commit-date |
220 |
++++ b/tools/get-scala-commit-date |
221 |
@@ -10,13 +10,8 @@ |
222 |
|
223 |
[[ $# -eq 0 ]] || cd "$1" |
224 |
@@ -16,8 +16,8 @@ |
225 |
|
226 |
# 20120324 |
227 |
echo "${lastcommitdate//-/}-${lastcommithours//:/}" |
228 |
---- scala-2.12.1-orig/tools/get-scala-commit-sha 2016-12-05 20:45:09.000000000 +1100 |
229 |
-+++ scala-2.12.1/tools/get-scala-commit-sha 2016-12-27 16:44:07.393422207 +1100 |
230 |
+--- a/tools/get-scala-commit-sha |
231 |
++++ b/tools/get-scala-commit-sha |
232 |
@@ -10,13 +10,7 @@ |
233 |
|
234 |
[[ $# -eq 0 ]] || cd "$1" |
235 |
|
236 |
diff --git a/dev-lang/scala/files/scala-2.12.1-runner-script.patch b/dev-lang/scala/files/scala-2.12.1-runner-script.patch |
237 |
index 9115a9810f6..d622e651ef8 100644 |
238 |
--- a/dev-lang/scala/files/scala-2.12.1-runner-script.patch |
239 |
+++ b/dev-lang/scala/files/scala-2.12.1-runner-script.patch |
240 |
@@ -1,5 +1,5 @@ |
241 |
---- scala-2.12.1-orig/src/compiler/scala/tools/ant/templates/tool-unix.tmpl 2016-12-05 20:45:09.000000000 +1100 |
242 |
-+++ scala-2.12.1/src/compiler/scala/tools/ant/templates/tool-unix.tmpl 2016-12-28 11:46:29.120052198 +1100 |
243 |
+--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl |
244 |
++++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl |
245 |
@@ -197,14 +197,11 @@ |
246 |
# to java to suppress "." from materializing. |
247 |
if [[ "$usebootcp" == "true" ]]; then |
248 |
|
249 |
diff --git a/dev-lang/scala/files/scala-2.12.2-no-git.patch b/dev-lang/scala/files/scala-2.12.2-no-git.patch |
250 |
index 1c09bf6ba86..5c921270bd5 100644 |
251 |
--- a/dev-lang/scala/files/scala-2.12.2-no-git.patch |
252 |
+++ b/dev-lang/scala/files/scala-2.12.2-no-git.patch |
253 |
@@ -1,5 +1,5 @@ |
254 |
---- scala-2.12.2-orig/project/VersionUtil.scala 2017-04-13 02:16:08.000000000 +1000 |
255 |
-+++ scala-2.12.2/project/VersionUtil.scala 2017-05-04 23:45:50.715285243 +1000 |
256 |
+--- a/project/VersionUtil.scala |
257 |
++++ b/project/VersionUtil.scala |
258 |
@@ -80,18 +80,8 @@ |
259 |
|
260 |
val (dateObj, sha) = { |
261 |
|
262 |
diff --git a/dev-lang/scala/files/scala-2.12.4-no-git.patch b/dev-lang/scala/files/scala-2.12.4-no-git.patch |
263 |
index 04e620bcee2..0114e1d42b9 100644 |
264 |
--- a/dev-lang/scala/files/scala-2.12.4-no-git.patch |
265 |
+++ b/dev-lang/scala/files/scala-2.12.4-no-git.patch |
266 |
@@ -1,5 +1,5 @@ |
267 |
---- scala-2.12.4-orig/project/VersionUtil.scala 2017-10-11 09:05:11.000000000 +1100 |
268 |
-+++ scala-2.12.4/project/VersionUtil.scala 2018-01-29 15:58:57.205758665 +1100 |
269 |
+--- a/project/VersionUtil.scala |
270 |
++++ b/project/VersionUtil.scala |
271 |
@@ -2,7 +2,7 @@ |
272 |
|
273 |
import sbt.{stringToProcess => _, _} |
274 |
|
275 |
diff --git a/dev-lang/scala/scala-2.11.1-r2.ebuild b/dev-lang/scala/scala-2.11.1-r2.ebuild |
276 |
index 790709d5036..e2bdb4138ba 100644 |
277 |
--- a/dev-lang/scala/scala-2.11.1-r2.ebuild |
278 |
+++ b/dev-lang/scala/scala-2.11.1-r2.ebuild |
279 |
@@ -1,4 +1,4 @@ |
280 |
-# Copyright 1999-2016 Gentoo Foundation |
281 |
+# Copyright 1999-2018 Gentoo Foundation |
282 |
# Distributed under the terms of the GNU General Public License v2 |
283 |
|
284 |
EAPI="5" |
285 |
@@ -129,7 +129,7 @@ java_prepare() { |
286 |
cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die |
287 |
done |
288 |
# gentoo patch (by gienah) to stop it calling git log in the build |
289 |
- epatch "${FILESDIR}/${P}-no-git.patch" |
290 |
+ epatch "${FILESDIR}/${PN}-2.11.1-no-git.patch" |
291 |
# Note: to bump scala, some things to try are: |
292 |
# 1. update all the sha1s in JURI |
293 |
# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI |
294 |
|
295 |
diff --git a/dev-lang/scala/scala-2.11.11.ebuild b/dev-lang/scala/scala-2.11.11.ebuild |
296 |
index d0bce664a49..9809a7fcfcb 100644 |
297 |
--- a/dev-lang/scala/scala-2.11.11.ebuild |
298 |
+++ b/dev-lang/scala/scala-2.11.11.ebuild |
299 |
@@ -1,4 +1,4 @@ |
300 |
-# Copyright 1999-2017 Gentoo Foundation |
301 |
+# Copyright 1999-2018 Gentoo Foundation |
302 |
# Distributed under the terms of the GNU General Public License v2 |
303 |
|
304 |
EAPI="5" |
305 |
@@ -131,7 +131,7 @@ java_prepare() { |
306 |
cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die |
307 |
done |
308 |
# gentoo patch (by gienah) to stop it calling git log in the build |
309 |
- epatch "${FILESDIR}/${P}-no-git.patch" |
310 |
+ epatch "${FILESDIR}/${PN}-2.11.8-no-git.patch" |
311 |
# Note: to bump scala, some things to try are: |
312 |
# 1. update all the sha1s in JURI |
313 |
# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI |
314 |
|
315 |
diff --git a/dev-lang/scala/scala-2.11.2-r2.ebuild b/dev-lang/scala/scala-2.11.2-r2.ebuild |
316 |
index ffdaa3e3ca8..200cda5accd 100644 |
317 |
--- a/dev-lang/scala/scala-2.11.2-r2.ebuild |
318 |
+++ b/dev-lang/scala/scala-2.11.2-r2.ebuild |
319 |
@@ -1,4 +1,4 @@ |
320 |
-# Copyright 1999-2016 Gentoo Foundation |
321 |
+# Copyright 1999-2018 Gentoo Foundation |
322 |
# Distributed under the terms of the GNU General Public License v2 |
323 |
|
324 |
EAPI="5" |
325 |
@@ -129,7 +129,7 @@ java_prepare() { |
326 |
cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die |
327 |
done |
328 |
# gentoo patch (by gienah) to stop it calling git log in the build |
329 |
- epatch "${FILESDIR}/${P}-no-git.patch" |
330 |
+ epatch "${FILESDIR}/${PN}-2.11.2-no-git.patch" |
331 |
# Note: to bump scala, some things to try are: |
332 |
# 1. update all the sha1s in JURI |
333 |
# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI |
334 |
|
335 |
diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild |
336 |
index 067a60efc00..5ff29fa215e 100644 |
337 |
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild |
338 |
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild |
339 |
@@ -1,4 +1,4 @@ |
340 |
-# Copyright 1999-2016 Gentoo Foundation |
341 |
+# Copyright 1999-2018 Gentoo Foundation |
342 |
# Distributed under the terms of the GNU General Public License v2 |
343 |
|
344 |
EAPI="5" |
345 |
@@ -129,7 +129,7 @@ java_prepare() { |
346 |
cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die |
347 |
done |
348 |
# gentoo patch (by gienah) to stop it calling git log in the build |
349 |
- epatch "${FILESDIR}/${P}-no-git.patch" |
350 |
+ epatch "${FILESDIR}/${PN}-2.11.4-no-git.patch" |
351 |
# Note: to bump scala, some things to try are: |
352 |
# 1. update all the sha1s in JURI |
353 |
# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI |
354 |
|
355 |
diff --git a/dev-lang/scala/scala-2.11.4-r2.ebuild b/dev-lang/scala/scala-2.11.4-r2.ebuild |
356 |
index 2ce90ddd329..6015a9c1b7c 100644 |
357 |
--- a/dev-lang/scala/scala-2.11.4-r2.ebuild |
358 |
+++ b/dev-lang/scala/scala-2.11.4-r2.ebuild |
359 |
@@ -1,4 +1,4 @@ |
360 |
-# Copyright 1999-2016 Gentoo Foundation |
361 |
+# Copyright 1999-2018 Gentoo Foundation |
362 |
# Distributed under the terms of the GNU General Public License v2 |
363 |
|
364 |
EAPI="5" |
365 |
@@ -129,7 +129,7 @@ java_prepare() { |
366 |
cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die |
367 |
done |
368 |
# gentoo patch (by gienah) to stop it calling git log in the build |
369 |
- epatch "${FILESDIR}/${P}-no-git.patch" |
370 |
+ epatch "${FILESDIR}/${PN}-2.11.4-no-git.patch" |
371 |
# Note: to bump scala, some things to try are: |
372 |
# 1. update all the sha1s in JURI |
373 |
# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI |
374 |
|
375 |
diff --git a/dev-lang/scala/scala-2.11.6-r1.ebuild b/dev-lang/scala/scala-2.11.6-r1.ebuild |
376 |
index 16f6ccbb8cf..b31e50091cd 100644 |
377 |
--- a/dev-lang/scala/scala-2.11.6-r1.ebuild |
378 |
+++ b/dev-lang/scala/scala-2.11.6-r1.ebuild |
379 |
@@ -1,4 +1,4 @@ |
380 |
-# Copyright 1999-2016 Gentoo Foundation |
381 |
+# Copyright 1999-2018 Gentoo Foundation |
382 |
# Distributed under the terms of the GNU General Public License v2 |
383 |
|
384 |
EAPI="5" |
385 |
@@ -129,7 +129,7 @@ java_prepare() { |
386 |
cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die |
387 |
done |
388 |
# gentoo patch (by gienah) to stop it calling git log in the build |
389 |
- epatch "${FILESDIR}/${P}-no-git.patch" |
390 |
+ epatch "${FILESDIR}/${PN}-2.11.6-no-git.patch" |
391 |
# Note: to bump scala, some things to try are: |
392 |
# 1. update all the sha1s in JURI |
393 |
# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI |
394 |
|
395 |
diff --git a/dev-lang/scala/scala-2.11.7-r1.ebuild b/dev-lang/scala/scala-2.11.7-r1.ebuild |
396 |
index a0adcc1965c..25ec70aafff 100644 |
397 |
--- a/dev-lang/scala/scala-2.11.7-r1.ebuild |
398 |
+++ b/dev-lang/scala/scala-2.11.7-r1.ebuild |
399 |
@@ -1,4 +1,4 @@ |
400 |
-# Copyright 1999-2016 Gentoo Foundation |
401 |
+# Copyright 1999-2018 Gentoo Foundation |
402 |
# Distributed under the terms of the GNU General Public License v2 |
403 |
|
404 |
EAPI="5" |
405 |
@@ -129,7 +129,7 @@ java_prepare() { |
406 |
cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die |
407 |
done |
408 |
# gentoo patch (by gienah) to stop it calling git log in the build |
409 |
- epatch "${FILESDIR}/${P}-no-git.patch" |
410 |
+ epatch "${FILESDIR}/${PN}-2.11.7-no-git.patch" |
411 |
# Note: to bump scala, some things to try are: |
412 |
# 1. update all the sha1s in JURI |
413 |
# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI |
414 |
|
415 |
diff --git a/dev-lang/scala/scala-2.11.8.ebuild b/dev-lang/scala/scala-2.11.8.ebuild |
416 |
index 140be797d66..ae3518042cf 100644 |
417 |
--- a/dev-lang/scala/scala-2.11.8.ebuild |
418 |
+++ b/dev-lang/scala/scala-2.11.8.ebuild |
419 |
@@ -1,4 +1,4 @@ |
420 |
-# Copyright 1999-2016 Gentoo Foundation |
421 |
+# Copyright 1999-2018 Gentoo Foundation |
422 |
# Distributed under the terms of the GNU General Public License v2 |
423 |
|
424 |
EAPI="5" |
425 |
@@ -129,7 +129,7 @@ java_prepare() { |
426 |
cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die |
427 |
done |
428 |
# gentoo patch (by gienah) to stop it calling git log in the build |
429 |
- epatch "${FILESDIR}/${P}-no-git.patch" |
430 |
+ epatch "${FILESDIR}/${PN}-2.11.8-no-git.patch" |
431 |
# Note: to bump scala, some things to try are: |
432 |
# 1. update all the sha1s in JURI |
433 |
# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI |
434 |
|
435 |
diff --git a/dev-lang/scala/scala-2.12.1.ebuild b/dev-lang/scala/scala-2.12.1.ebuild |
436 |
index 38b815fd3f6..f38b2a17af2 100644 |
437 |
--- a/dev-lang/scala/scala-2.12.1.ebuild |
438 |
+++ b/dev-lang/scala/scala-2.12.1.ebuild |
439 |
@@ -1,4 +1,4 @@ |
440 |
-# Copyright 1999-2016 Gentoo Foundation |
441 |
+# Copyright 1999-2018 Gentoo Foundation |
442 |
# Distributed under the terms of the GNU General Public License v2 |
443 |
|
444 |
EAPI="6" |
445 |
@@ -134,7 +134,7 @@ src_prepare() { |
446 |
cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die |
447 |
done |
448 |
# gentoo patch (by gienah) to stop it calling git log in the build |
449 |
- eapply "${FILESDIR}/${P}-no-git.patch" |
450 |
+ eapply "${FILESDIR}/${PN}-2.12.1-no-git.patch" |
451 |
|
452 |
# https://issues.scala-lang.org/browse/SI-10098 |
453 |
eapply "${FILESDIR}/${PN}-2.12.1-runner-script.patch" |
454 |
|
455 |
diff --git a/dev-lang/scala/scala-2.12.2.ebuild b/dev-lang/scala/scala-2.12.2.ebuild |
456 |
index 4670aac7425..838d1769cc1 100644 |
457 |
--- a/dev-lang/scala/scala-2.12.2.ebuild |
458 |
+++ b/dev-lang/scala/scala-2.12.2.ebuild |
459 |
@@ -1,4 +1,4 @@ |
460 |
-# Copyright 1999-2017 Gentoo Foundation |
461 |
+# Copyright 1999-2018 Gentoo Foundation |
462 |
# Distributed under the terms of the GNU General Public License v2 |
463 |
|
464 |
EAPI="6" |
465 |
@@ -135,7 +135,7 @@ src_prepare() { |
466 |
done |
467 |
|
468 |
# gentoo patch (by gienah) to stop it calling git log in the build |
469 |
- eapply "${FILESDIR}/${P}-no-git.patch" |
470 |
+ eapply "${FILESDIR}/${PN}-2.12.2-no-git.patch" |
471 |
|
472 |
local SBT_PVR="$(java-config --query=PVR --package=sbt)" |
473 |
sed -e "s@×××.version=0.13.11@×××.version=${SBT_PVR}@" \ |
474 |
|
475 |
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild |
476 |
index 062f48a8746..767fdd49823 100644 |
477 |
--- a/dev-lang/scala/scala-2.12.4.ebuild |
478 |
+++ b/dev-lang/scala/scala-2.12.4.ebuild |
479 |
@@ -134,7 +134,7 @@ src_prepare() { |
480 |
done |
481 |
|
482 |
# gentoo patch (by gienah) to stop it calling git log in the build |
483 |
- eapply "${FILESDIR}/${P}-no-git.patch" |
484 |
+ eapply "${FILESDIR}/${PN}-2.12.4-no-git.patch" |
485 |
|
486 |
local SBT_PVR="$(java-config --query=PVR --package=sbt)" |
487 |
sed -e "s@×××.version=0.13.11@×××.version=${SBT_PVR}@" \ |