summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2020-01-14 23:13:15 +1100
committerMark Wright <gienah@gentoo.org>2020-01-14 23:13:15 +1100
commit626af0525b7cae58bc7051c5dd627a89ce1b1ad5 (patch)
tree5b4c28fce09913fd0f98e41124c089ab2f18cbe0 /dev-lang/scala/files
parentdev-java/sbt: Bump to 0.13.18, fix bugs #671072 #671284 (diff)
downloadgentoo-626af0525b7cae58bc7051c5dd627a89ce1b1ad5.tar.gz
gentoo-626af0525b7cae58bc7051c5dd627a89ce1b1ad5.tar.bz2
gentoo-626af0525b7cae58bc7051c5dd627a89ce1b1ad5.zip
dev-lang/scala: Bump to 2.12.10
Thanks to toralf for reporting bug #623824, fixed with EAPI=7. Thanks to Till Schafer for reporting bug #662184, fixed with: use doc && einstalldocs Thanks to Gentookh for reporting, fixed by only calling check-reqs functions if ! use binary Closes: https://bugs.gentoo.org/show_bug.cgi?id=623824 Closes: https://bugs.gentoo.org/show_bug.cgi?id=662184 Closes: https://bugs.gentoo.org/show_bug.cgi?id=617586 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mark Wright <gienah@gentoo.org>
Diffstat (limited to 'dev-lang/scala/files')
-rw-r--r--dev-lang/scala/files/scala-2.12.10-no-git.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/dev-lang/scala/files/scala-2.12.10-no-git.patch b/dev-lang/scala/files/scala-2.12.10-no-git.patch
new file mode 100644
index 000000000000..017cb983b59b
--- /dev/null
+++ b/dev-lang/scala/files/scala-2.12.10-no-git.patch
@@ -0,0 +1,37 @@
+--- scala-2.12.10-orig/project/VersionUtil.scala 2019-09-05 01:01:59.000000000 +1000
++++ scala-2.12.10/project/VersionUtil.scala 2019-09-12 11:00:05.525154568 +1000
+@@ -2,7 +2,7 @@
+
+ import sbt.{stringToProcess => _, _}
+ import Keys._
+-import java.util.{Date, Locale, Properties, TimeZone}
++import java.util.{Calendar, Date, Locale, Properties, TimeZone}
+ import java.io.{File, FileInputStream}
+ import java.text.SimpleDateFormat
+
+@@ -65,18 +65,13 @@
+ val log = sLog.value
+ val (dateObj, sha) = {
+ try {
+- // Use JGit to get the commit date and SHA
+- import org.eclipse.jgit.storage.file.FileRepositoryBuilder
+- import org.eclipse.jgit.revwalk.RevWalk
+- val db = new FileRepositoryBuilder().findGitDir.build
+- val head = db.resolve("HEAD")
+- if (head eq null) {
+- log.info("No git HEAD commit found -- Using current date and 'unknown' SHA")
+- (new Date, "unknown")
+- } else {
+- val commit = new RevWalk(db).parseCommit(head)
+- (new Date(commit.getCommitTime.toLong * 1000L), commit.getName.substring(0, 7))
+- }
++ val commit = "61701c22900f14676fa181500722b64330eb2605"
++ val cal = Calendar.getInstance();
++ cal.set(Calendar.YEAR, 2019);
++ cal.set(Calendar.MONTH, Calendar.SEPTEMBER);
++ cal.set(Calendar.DAY_OF_MONTH, 5);
++ val date = cal.getTime();
++ (date, commit.substring(0, 7))
+ } catch {
+ case ex: Exception =>
+ log.error("Could not determine commit date + SHA: " + ex)