[pkgsrc/trunk]: pkgsrc/lang/scala Upgrade to 2.11.6 from 2.11.1.

[yyamano <yyamano%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b9bd08915746
branches:  trunk
changeset: 649672:b9bd08915746
user:      yyamano <yyamano%pkgsrc.org@localhost>
date:      Tue Apr 07 14:21:43 2015 +0000

description:
Upgrade to 2.11.6 from 2.11.1.

http://www.scala-lang.org/news/2.11.6

Scala 2.11.6 is a bugfix release that is binary compatible with
previous releases in the Scala 2.11 series. We would like to highlight
the following changes:

* We fixed a cross-site scripting vulnerability in Scaladoc's
  JavaScript. Many thanks to @todesking for discovering this,
  suggesting a fix, and for delaying disclosure until this release!
  This bug could be used to access sensitive information on sites
  hosted on the same domain as Scaladoc-generated documentation. All
  previous versions of Scaladoc are affected (Scala 2.10.5 includes
  the fix as well). We do recommend, as a general precaution, to host
  Scaladoc documentation on its own domain.
* SI-9089 repl is now much less crash-and-burny when calling a
  function (which turns out to be a common thing people do in a
  REPL). Also, apologies to the author of SI-9022, who reported this
  before the bug was discovered and you had to wait in line for like
  three hours on a Tuesday afternoon. Or, maybe, that honor should go
  to the enigmatic dk14.
* SI-8759 no need to enter almost half the konami code to enter a
  right square bracket in the REPL (via jline 2.12.1). Thank you for
  implementing the jline fix, @michael72, and kudos to @jdillon and
  @trptcolin for cutting a new jline release just for us!

http://www.scala-lang.org/news/2.11.5

Scala 2.11.5 is a bugfix release that is binary compatible with
previous releases in the Scala 2.11 series. We would like to highlight
the following changes:

* heathermiller's SI-6502 Reenables loading jars into the running REPL
* mpociecha's The alternative, flat representation of classpath elements
* gbasler's Avoid the ¡CNF budget exceeded¢ exception via smarter
  translation into CNF
* adriaanm's SAMmy: eta-expansion, overloading, existentials
* A great number of documentation improvements - thank you (and, to
  those appearing for the first time in our release notes, welcome!):
  @kanielc, @lymia, @stevegury, @vigdorchik, @gourlaysama, @ichoran,
  @retronym, @xuwei-k, @dickwall, @phaller.

http://www.scala-lang.org/news/2.11.4

Scala 2.11.4 is a bugfix release that is binary compatible with
previous releases in the Scala 2.11 series. The changes include:

* Scala shell (REPL) is more friendly to Ctrl+D. It leaves your
  terminal in a clean state and suggests using :quit the next time
  (see #3902). Kudos to @gourlaysama!
* REPL uses different colors when printing references to vals and
  types. Pass -Dscala.color to enable that behavior (see
  #3993). Thanks to @puffnfresh!
* The Scala specification received a fair amount of love and became
  much more beautiful. It has got syntax highlighting (#3984),
  linkable headers, and a side bar with TOC (#3996). A few final
  touches has been merged that fix typos and mistakes stemming from
  automatic Latex to Markdown conversion we've done a while
  ago. Thanks for attention to details @gourlaysama, @som-snytt and
  roberthoedicke!
* Non-deterministic pattern matching warnings has been fixed
  (SI-7746). Many thanks to @gbasler for diving deep (#3954) into
  logical formulas constructed by our pattern matcher implementation!

https://groups.google.com/forum/#!msg/scala-internals/SSD9BNJaFbU/rACBkHrs2JEJ

> I've got an important information to share. I'd like to announce the
> Scala 2.11.3 artifacts as being dead on arrival. The 2.11.3
> artifacts that got released to Maven Central have a critical bug
> related to binary compatibility. Please stick to using Scala 2.11.2
> until 2.11.4 is released which is planned to happen as soon as we
> fix all critical bugs found in Scala 2.11.3. The rest of my email
> will discuss the events that led to a broken Scala release, next
> steps we're planning to take.

http://www.scala-lang.org/news/2.11.2

Scala 2.11.2 is a bugfix release that is binary compatible with
previous releases in the Scala 2.11 series. The changes include:

* Several issues in the collections library were resolved, most
  notably equality on ranges (SI-8738).
* The optimizer no longer eliminates division instructions that may
  throw an ArithmeticException (SI-7607).
* The -Xlint compiler flag is now parameterized by individual
  warnings. This is intended to replace the -Ywarn-... options, for
  instance, -Xlint:nullary-unit is equivalent to
  -Ywarn-nullary-unit. Run scalac -Xlint:help to see all available
  options. Kudos to @som-snytt!x
* TypeTags and Exprs are now serializable (SI-5919).

diffstat:

 lang/scala/Makefile                   |   4 ++--
 lang/scala/PLIST                      |  13 +++++++------
 lang/scala/distinfo                   |  18 +++++++++---------
 lang/scala/patches/patch-bin_fsc      |   8 ++++----
 lang/scala/patches/patch-bin_scala    |   8 ++++----
 lang/scala/patches/patch-bin_scalac   |   8 ++++----
 lang/scala/patches/patch-bin_scaladoc |   8 ++++----
 lang/scala/patches/patch-bin_scalap   |   8 ++++----
 8 files changed, 38 insertions(+), 37 deletions(-)

diffs (212 lines):

diff -r 3a5431d9e1f9 -r b9bd08915746 lang/scala/Makefile
--- a/lang/scala/Makefile       Tue Apr 07 13:21:24 2015 +0000
+++ b/lang/scala/Makefile       Tue Apr 07 14:21:43 2015 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2014/06/12 17:35:46 yyamano Exp $
+# $NetBSD: Makefile,v 1.11 2015/04/07 14:21:43 yyamano Exp $
 
-DISTNAME=      scala-2.11.1
+DISTNAME=      scala-2.11.6
 CATEGORIES=    lang
 MASTER_SITES=  http://www.scala-lang.org/files/archive/
 EXTRACT_SUFX=  .tgz
diff -r 3a5431d9e1f9 -r b9bd08915746 lang/scala/PLIST
--- a/lang/scala/PLIST  Tue Apr 07 13:21:24 2015 +0000
+++ b/lang/scala/PLIST  Tue Apr 07 14:21:43 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/06/12 17:35:46 yyamano Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/04/07 14:21:43 yyamano Exp $
 bin/fsc
 bin/scala
 bin/scalac
@@ -29,16 +29,17 @@
 share/${PKGNAME}/doc/tools/scalac.html
 share/${PKGNAME}/doc/tools/scaladoc.html
 share/${PKGNAME}/doc/tools/scalap.html
-share/${PKGNAME}/lib/akka-actor_2.11-2.3.3.jar
+share/${PKGNAME}/lib/akka-actor_2.11-2.3.4.jar
 share/${PKGNAME}/lib/config-1.2.1.jar
-share/${PKGNAME}/lib/jline-2.11.jar
+share/${PKGNAME}/lib/jline-2.12.1.jar
 share/${PKGNAME}/lib/scala-actors-2.11.0.jar
 share/${PKGNAME}/lib/scala-actors-migration_2.11-1.1.0.jar
 share/${PKGNAME}/lib/scala-compiler.jar
 share/${PKGNAME}/lib/scala-continuations-library_2.11-1.0.2.jar
-share/${PKGNAME}/lib/scala-continuations-plugin_${PKGVERSION}-1.0.2.jar
+share/${PKGNAME}/lib/scala-continuations-plugin_2.11.5-1.0.2.jar
 share/${PKGNAME}/lib/scala-library.jar
-share/${PKGNAME}/lib/scala-parser-combinators_2.11-1.0.1.jar
+share/${PKGNAME}/lib/scala-parser-combinators_2.11-1.0.3.jar
 share/${PKGNAME}/lib/scala-reflect.jar
 share/${PKGNAME}/lib/scala-swing_2.11-1.0.1.jar
-share/${PKGNAME}/lib/scala-xml_2.11-1.0.2.jar
+share/${PKGNAME}/lib/scala-xml_2.11-1.0.3.jar
+share/${PKGNAME}/lib/scalap-${PKGVERSION}.jar
diff -r 3a5431d9e1f9 -r b9bd08915746 lang/scala/distinfo
--- a/lang/scala/distinfo       Tue Apr 07 13:21:24 2015 +0000
+++ b/lang/scala/distinfo       Tue Apr 07 14:21:43 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2014/06/12 17:35:46 yyamano Exp $
+$NetBSD: distinfo,v 1.9 2015/04/07 14:21:43 yyamano Exp $
 
-SHA1 (scala-2.11.1.tgz) = 058281d9ed7738c99a9d5cd4988370448a12d0c1
-RMD160 (scala-2.11.1.tgz) = cbed803654c6be609627ffcac30768e49f010261
-Size (scala-2.11.1.tgz) = 25685521 bytes
-SHA1 (patch-bin_fsc) = 577aed4693be77a44068115038d3d6a823444d3b
-SHA1 (patch-bin_scala) = d341ccc17a3ee270f36d1b63f3ac46204df1b1fd
-SHA1 (patch-bin_scalac) = 05e1a8dbc0c2e072f9dd93fc0ecf32b6a18133dd
-SHA1 (patch-bin_scaladoc) = 180af81f7d2842b633e81697bccb276b44a869b2
-SHA1 (patch-bin_scalap) = 9388d658cd882e6627050b040cea13135ea7e0b0
+SHA1 (scala-2.11.6.tgz) = f30ff4104b0fed5c4beca2b599b8f67e66b7f4e6
+RMD160 (scala-2.11.6.tgz) = ef31a326a2d742a409d2df3150b2a15acace7b89
+Size (scala-2.11.6.tgz) = 27130723 bytes
+SHA1 (patch-bin_fsc) = d6f35942b9db8774cf5a61bb90f25a329b1cfba9
+SHA1 (patch-bin_scala) = d17dd91f5cc3b83656f6561f93a9b860352d3c5b
+SHA1 (patch-bin_scalac) = e2df09878a3bd8e1f3c985e24c7fefa2bd710462
+SHA1 (patch-bin_scaladoc) = 5592b7fffd1a2b3760a1ca3215495a344bb04240
+SHA1 (patch-bin_scalap) = 9183105dabc7ad7219b0ece19e52f1360af2555b
diff -r 3a5431d9e1f9 -r b9bd08915746 lang/scala/patches/patch-bin_fsc
--- a/lang/scala/patches/patch-bin_fsc  Tue Apr 07 13:21:24 2015 +0000
+++ b/lang/scala/patches/patch-bin_fsc  Tue Apr 07 14:21:43 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-bin_fsc,v 1.2 2013/07/05 14:40:33 ryoon Exp $
+$NetBSD: patch-bin_fsc,v 1.3 2015/04/07 14:21:44 yyamano Exp $
 
 Hardwire paths to installed files and Java binary.
 
---- bin/fsc.orig       2013-06-06 18:41:45.000000000 +0000
+--- bin/fsc.orig       2015-02-26 01:09:38.000000000 +0000
 +++ bin/fsc
 @@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
  fi
@@ -13,7 +13,7 @@
  SEP=":"
  
  # Possible additional command line options
-@@ -192,7 +192,7 @@ fi
+@@ -201,7 +201,7 @@ fi
  # be quoted: otherwise an empty string will appear as a command line
  # argument, and java will think that is the program to run.
  execCommand \
@@ -21,4 +21,4 @@
 +  "${JAVACMD:=@JAVA_HOME@/bin/java}" \
    $JAVA_OPTS \
    "${java_args[@]}" \
-   $(classpathArgs) \
+   "${classpath_args[@]}" \
diff -r 3a5431d9e1f9 -r b9bd08915746 lang/scala/patches/patch-bin_scala
--- a/lang/scala/patches/patch-bin_scala        Tue Apr 07 13:21:24 2015 +0000
+++ b/lang/scala/patches/patch-bin_scala        Tue Apr 07 14:21:43 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-bin_scala,v 1.2 2013/07/05 14:40:33 ryoon Exp $
+$NetBSD: patch-bin_scala,v 1.3 2015/04/07 14:21:44 yyamano Exp $
 
 Hardwire paths to installed files and Java binary.
 
---- bin/scala.orig     2013-06-06 18:41:45.000000000 +0000
+--- bin/scala.orig     2015-02-26 01:09:38.000000000 +0000
 +++ bin/scala
 @@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
  fi
@@ -13,7 +13,7 @@
  SEP=":"
  
  # Possible additional command line options
-@@ -192,7 +192,7 @@ fi
+@@ -201,7 +201,7 @@ fi
  # be quoted: otherwise an empty string will appear as a command line
  # argument, and java will think that is the program to run.
  execCommand \
@@ -21,4 +21,4 @@
 +  "${JAVACMD:=@JAVA_HOME@/bin/java}" \
    $JAVA_OPTS \
    "${java_args[@]}" \
-   $(classpathArgs) \
+   "${classpath_args[@]}" \
diff -r 3a5431d9e1f9 -r b9bd08915746 lang/scala/patches/patch-bin_scalac
--- a/lang/scala/patches/patch-bin_scalac       Tue Apr 07 13:21:24 2015 +0000
+++ b/lang/scala/patches/patch-bin_scalac       Tue Apr 07 14:21:43 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-bin_scalac,v 1.2 2013/07/05 14:40:33 ryoon Exp $
+$NetBSD: patch-bin_scalac,v 1.3 2015/04/07 14:21:44 yyamano Exp $
 
 Hardwire paths to installed files and Java binary.
 
---- bin/scalac.orig    2013-06-06 18:41:45.000000000 +0000
+--- bin/scalac.orig    2015-02-26 01:09:38.000000000 +0000
 +++ bin/scalac
 @@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
  fi
@@ -13,7 +13,7 @@
  SEP=":"
  
  # Possible additional command line options
-@@ -192,7 +192,7 @@ fi
+@@ -201,7 +201,7 @@ fi
  # be quoted: otherwise an empty string will appear as a command line
  # argument, and java will think that is the program to run.
  execCommand \
@@ -21,4 +21,4 @@
 +  "${JAVACMD:=@JAVA_HOME@/bin/java}" \
    $JAVA_OPTS \
    "${java_args[@]}" \
-   $(classpathArgs) \
+   "${classpath_args[@]}" \
diff -r 3a5431d9e1f9 -r b9bd08915746 lang/scala/patches/patch-bin_scaladoc
--- a/lang/scala/patches/patch-bin_scaladoc     Tue Apr 07 13:21:24 2015 +0000
+++ b/lang/scala/patches/patch-bin_scaladoc     Tue Apr 07 14:21:43 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-bin_scaladoc,v 1.2 2013/07/05 14:40:33 ryoon Exp $
+$NetBSD: patch-bin_scaladoc,v 1.3 2015/04/07 14:21:44 yyamano Exp $
 
 Hardwire paths to installed files and Java binary.
 
---- bin/scaladoc.orig  2013-06-06 18:41:45.000000000 +0000
+--- bin/scaladoc.orig  2015-02-26 01:09:38.000000000 +0000
 +++ bin/scaladoc
 @@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
  fi
@@ -13,7 +13,7 @@
  SEP=":"
  
  # Possible additional command line options
-@@ -192,7 +192,7 @@ fi
+@@ -201,7 +201,7 @@ fi
  # be quoted: otherwise an empty string will appear as a command line
  # argument, and java will think that is the program to run.
  execCommand \
@@ -21,4 +21,4 @@
 +  "${JAVACMD:=@JAVA_HOME@/bin/java}" \
    $JAVA_OPTS \
    "${java_args[@]}" \
-   $(classpathArgs) \
+   "${classpath_args[@]}" \
diff -r 3a5431d9e1f9 -r b9bd08915746 lang/scala/patches/patch-bin_scalap
--- a/lang/scala/patches/patch-bin_scalap       Tue Apr 07 13:21:24 2015 +0000
+++ b/lang/scala/patches/patch-bin_scalap       Tue Apr 07 14:21:43 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-bin_scalap,v 1.2 2013/07/05 14:40:33 ryoon Exp $
+$NetBSD: patch-bin_scalap,v 1.3 2015/04/07 14:21:44 yyamano Exp $
 
 Hardwire paths to installed files and Java binary.
 
---- bin/scalap.orig    2013-07-05 14:33:17.000000000 +0000
+--- bin/scalap.orig    2015-02-26 01:09:38.000000000 +0000
 +++ bin/scalap
 @@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
  fi
@@ -13,7 +13,7 @@
  SEP=":"
  
  # Possible additional command line options
-@@ -192,7 +192,7 @@ fi
+@@ -201,7 +201,7 @@ fi
  # be quoted: otherwise an empty string will appear as a command line
  # argument, and java will think that is the program to run.
  execCommand \
@@ -21,4 +21,4 @@
 +  "${JAVACMD:=@JAVA_HOME@/bin/java}" \
    $JAVA_OPTS \
    "${java_args[@]}" \
-   $(classpathArgs) \
+   "${classpath_args[@]}" \