gentoo resync : 03.11.2018

9 files changed, 0 insertions, 226 deletions

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
deleted file mode 100644
index efef8376a9d1..000000000000
--- a/dev-lang/scala/files/scala-2.11.1-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tools/get-scala-commit-date
-+++ b/tools/get-scala-commit-date
-@@ -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-05-19"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- a/tools/get-scala-commit-sha
-+++ b/tools/get-scala-commit-sha
-@@ -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="1e1defd99c4b8874c517daf877b583a81e056c15"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
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
deleted file mode 100644
index 56dd69a24b22..000000000000
--- a/dev-lang/scala/files/scala-2.11.2-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tools/get-scala-commit-date
-+++ b/tools/get-scala-commit-date
-@@ -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-07-21"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- a/tools/get-scala-commit-sha
-+++ b/tools/get-scala-commit-sha
-@@ -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="73fb460c1cd20ee97556ec0867d17efaa795d129"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
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
deleted file mode 100644
index f7a78d38c2cf..000000000000
--- a/dev-lang/scala/files/scala-2.11.4-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tools/get-scala-commit-date
-+++ b/tools/get-scala-commit-date
-@@ -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//:/}"
---- a/tools/get-scala-commit-sha
-+++ b/tools/get-scala-commit-sha
-@@ -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"
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
deleted file mode 100644
index 4bc7b7f9fae5..000000000000
--- a/dev-lang/scala/files/scala-2.11.6-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tools/get-scala-commit-date
-+++ b/tools/get-scala-commit-date
-@@ -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="2015-02-25"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- a/tools/get-scala-commit-sha
-+++ b/tools/get-scala-commit-sha
-@@ -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="092690e7bf71bb22e6e57afb7ea7f67fdfe31a0a"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
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
deleted file mode 100644
index f8ca464002e0..000000000000
--- a/dev-lang/scala/files/scala-2.11.7-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tools/get-scala-commit-date
-+++ b/tools/get-scala-commit-date
-@@ -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="2015-06-23"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- a/tools/get-scala-commit-sha
-+++ b/tools/get-scala-commit-sha
-@@ -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="1fbce4612c21a4d0c553ea489b4765494828c09f"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
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
deleted file mode 100644
index b577dcbc8df3..000000000000
--- a/dev-lang/scala/files/scala-2.11.8-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tools/get-scala-commit-date
-+++ b/tools/get-scala-commit-date
-@@ -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//:/}"
---- a/tools/get-scala-commit-sha
-+++ b/tools/get-scala-commit-sha
-@@ -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"
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
deleted file mode 100644
index 94cf149da7b6..000000000000
--- a/dev-lang/scala/files/scala-2.12.1-no-git.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/tools/get-scala-commit-date
-+++ b/tools/get-scala-commit-date
-@@ -10,13 +10,8 @@
- 
- [[ $# -eq 0 ]] || cd "$1"
- 
--if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
--	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)
--else
--	lastcommitdate=$(date +%Y-%m-%d)
--	lastcommithours=$(date +%H:%M:%S)
--fi
-+lastcommitdate="2016-12-05"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- a/tools/get-scala-commit-sha
-+++ b/tools/get-scala-commit-sha
-@@ -10,13 +10,7 @@
- 
- [[ $# -eq 0 ]] || cd "$1"
- 
--if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
--	# 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=${hash#g}
--	hash=${hash:0:10}
--else
--	hash="unknown"
--fi
-+hash="2787b47396013a44072fa7321482103b66fbccd3"
-+hash=${hash#g}
-+hash=${hash:0:10}
- echo "$hash"
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
deleted file mode 100644
index d622e651ef8f..000000000000
--- a/dev-lang/scala/files/scala-2.12.1-runner-script.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
-+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
-@@ -197,14 +197,11 @@
- # to java to suppress "." from materializing.
- if [[ "$usebootcp" == "true" ]]; then
-   classpath_args=("-Xbootclasspath/a:$TOOL_CLASSPATH" -classpath "\"\"")
--  # Note that the version numbers go 1.7, 1.8, 9, 10, ...
--  java_release="$(cat $JAVA_HOME/release | grep JAVA_VERSION)"
--  if [[ ! "$java_release" =~ JAVA_VERSION=\"1\. ]]; then
--    # Java 9 removed sun.boot.class.path, and the supposed replacement to at least see
--    # the appended boot classpath (jdk.boot.class.path.append) is not visible.
--    # So we have to pass a custom system property that PathResolver will find.
--    classpath_args+=("-Dscala.boot.class.path=$TOOL_CLASSPATH")
--  fi
-+  # Java 9 removed sun.boot.class.path, and the supposed replacement to at least see
-+  # the appended boot classpath (jdk.boot.class.path.append) is not visible.
-+  # So we have to pass a custom system property that PathResolver will find.
-+  # We do this for all JVM versions, rather than getting into the business of JVM version detection.
-+  classpath_args+=("-Dscala.boot.class.path=$TOOL_CLASSPATH")
- else
-   classpath_args=(-classpath "$TOOL_CLASSPATH")
- fi
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
deleted file mode 100644
index 5c921270bd50..000000000000
--- a/dev-lang/scala/files/scala-2.12.2-no-git.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/project/VersionUtil.scala
-+++ b/project/VersionUtil.scala
-@@ -80,18 +80,8 @@
- 
-     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 = "21d12e9f5ec1ffe023f509848911476c1552d06f"
-+        (new Date, commit.substring(0, 7))
-       } catch { case ex: Exception =>
-         log.error("Could not determine commit date + SHA: "+ex)
-         log.trace(ex)