Gentoo Archives: gentoo-commits

From: "Mark Wright (gienah)" <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/scala/files: scala-2.11.1-no-git.patch
Date: Tue, 08 Jul 2014 15:17:13
Message-Id: 20140708151710.7B8D82004F@flycatcher.gentoo.org
1 gienah 14/07/08 15:17:10
2
3 Added: scala-2.11.1-no-git.patch
4 Log:
5 Bump scala to 2.11.1, fixes Bug 508328 - dev-lang/scala-2.11.1 version bump, thanks to Joel for reporting.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
8
9 Revision Changes Path
10 1.1 dev-lang/scala/files/scala-2.11.1-no-git.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/files/scala-2.11.1-no-git.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/files/scala-2.11.1-no-git.patch?rev=1.1&content-type=text/plain
14
15 Index: scala-2.11.1-no-git.patch
16 ===================================================================
17 --- scala-2.11.1-orig/tools/get-scala-commit-date 2014-05-19 21:01:18.000000000 +1000
18 +++ scala-2.11.1/tools/get-scala-commit-date 2014-07-06 16:47:04.772397561 +1000
19 @@ -10,8 +10,8 @@
20
21 [[ $# -eq 0 ]] || cd "$1"
22
23 -lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
24 -lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
25 +lastcommitdate="2014-05-19"
26 +lastcommithours="00:00:00"
27
28 # 20120324
29 echo "${lastcommitdate//-/}-${lastcommithours//:/}"
30 --- scala-2.11.1-orig/tools/get-scala-commit-sha 2014-05-19 21:01:18.000000000 +1000
31 +++ scala-2.11.1/tools/get-scala-commit-sha 2014-07-06 16:47:25.704741601 +1000
32 @@ -12,7 +12,7 @@
33
34 # printf %016s is not portable for 0-padding, has to be a digit.
35 # so we're stuck disassembling it.
36 -hash=$(git log -1 --format="%H" HEAD)
37 +hash="1e1defd99c4b8874c517daf877b583a81e056c15"
38 hash=${hash#g}
39 hash=${hash:0:10}
40 echo "$hash"