summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarty E. Plummer <hanetzer@startmail.com>2018-04-08 16:00:08 -0500
committerJames Le Cuirot <chewi@gentoo.org>2018-04-08 22:59:36 +0100
commit935303706906f96d41ac75da3f0ac2dd24b12faf (patch)
tree72455ea708cfebd5cff40cda0dc3880b7b5fe859 /dev-lang/scala/files/scala-2.11.11-no-git.patch
parentsys-libs/slang-2.3.2: arm64 stable (bug #651302) (diff)
downloadgentoo-935303706906f96d41ac75da3f0ac2dd24b12faf.tar.gz
gentoo-935303706906f96d41ac75da3f0ac2dd24b12faf.tar.bz2
gentoo-935303706906f96d41ac75da3f0ac2dd24b12faf.zip
dev-lang/scala: clean duplicate patches
Package-Manager: Portage-2.3.28, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/7900
Diffstat (limited to 'dev-lang/scala/files/scala-2.11.11-no-git.patch')
-rw-r--r--dev-lang/scala/files/scala-2.11.11-no-git.patch24
1 files changed, 0 insertions, 24 deletions
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
deleted file mode 100644
index b1012626c525..000000000000
--- a/dev-lang/scala/files/scala-2.11.11-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scala-2.11.8-orig/tools/get-scala-commit-date 2016-03-04 21:57:12.000000000 +1100
-+++ scala-2.11.8/tools/get-scala-commit-date 2016-09-16 10:29:09.215240534 +1000
-@@ -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="2016-03-04"
-+lastcommithours="00:00:00"
-
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.11.8-orig/tools/get-scala-commit-sha 2016-03-04 21:57:12.000000000 +1100
-+++ scala-2.11.8/tools/get-scala-commit-sha 2016-09-16 10:29:45.566119137 +1000
-@@ -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="1706a37eb84ec252aea77bccebad3e48448534ad"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"