diff options
| author |   Mark Wright <gienah@gentoo.org> | 2014-11-28 00:09:10 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2014-11-28 00:09:10 +0000 |
| commit | 2dcdabeae61be50d008f6b023dfa7b94a354adaa (patch) | |
| tree | fef18d1026ab6b7dfaec6e148260e30d8076360b /dev-lang/scala | |
| parent | Remove call to perl-module_pkg_postinst, does not do anything outside perl-core (diff) | |
| download | gentoo-2-2dcdabeae61be50d008f6b023dfa7b94a354adaa.tar.gz gentoo-2-2dcdabeae61be50d008f6b023dfa7b94a354adaa.tar.bz2 gentoo-2-2dcdabeae61be50d008f6b023dfa7b94a354adaa.zip | |
Thanks to Juergen Rose for reporting, fix Bug 530836 - dev-lang/scala-2.11.4 - Cannot find $EPATCH_SOURCE - scala-2.11.4-no-git.patch
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-lang/scala')
| -rw-r--r-- | dev-lang/scala/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/scala/files/scala-2.11.4-no-git.patch | 24 |
2 files changed, 29 insertions, 1 deletions
diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog index bb738de41937..d156582c439f 100644 --- a/dev-lang/scala/ChangeLog +++ b/dev-lang/scala/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/scala # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.42 2014/11/27 04:05:09 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.43 2014/11/28 00:09:10 gienah Exp $ + + 28 Nov 2014; Mark Wright <gienah@gentoo.org> +files/scala-2.11.4-no-git.patch: + Thanks to Juergen Rose for reporting, fix Bug 530836 - dev-lang/scala-2.11.4 - + Cannot find $EPATCH_SOURCE - scala-2.11.4-no-git.patch *scala-2.11.4 (27 Nov 2014) 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 new file mode 100644 index 000000000000..275c140a2a10 --- /dev/null +++ b/dev-lang/scala/files/scala-2.11.4-no-git.patch @@ -0,0 +1,24 @@ +--- scala-2.11.4-orig/tools/get-scala-commit-date 2014-10-23 20:06:36.000000000 +1100 ++++ scala-2.11.4/tools/get-scala-commit-date 2014-11-26 21:54:26.064081533 +1100 +@@ -10,8 +10,8 @@ + + [[ $# -eq 0 ]] || cd "$1" + +-lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1) +-lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2) ++lastcommitdate="2014-10-23" ++lastcommithours="00:00:00" + + # 20120324 + echo "${lastcommitdate//-/}-${lastcommithours//:/}" +--- scala-2.11.4-orig/tools/get-scala-commit-sha 2014-10-23 20:06:36.000000000 +1100 ++++ scala-2.11.4/tools/get-scala-commit-sha 2014-11-26 21:55:12.248629566 +1100 +@@ -12,7 +12,7 @@ + + # printf %016s is not portable for 0-padding, has to be a digit. + # so we're stuck disassembling it. +-hash=$(git log -1 --format="%H" HEAD) ++hash="d783face36a464498c4832acb059a61192dfb105" + hash=${hash#g} + hash=${hash:0:10} + echo "$hash" |