gentoo resync : 10.11.2017

8 files changed, 0 insertions, 765 deletions

diff --git a/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing-SI-7455.patch b/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing-SI-7455.patch
deleted file mode 100644
index 964b323d9b30..000000000000
--- a/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing-SI-7455.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-commit f3f1064c90371449949892f30de91cc1f2662c55
-Merge: 0b7dddb 050b4c9
-Author: Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com>
-Date:   Sat Jul 27 22:39:44 2013 -0700
-
-    Merge pull request #2750 from retronym/ticket/7455-2.10.x
-    
-    SI-7455 Drop dummy param for synthetic access constructor
-
-commit 050b4c951c838699c2fe30cbf01b63942c63a299
-Author: Jason Zaugg <jzaugg@gmail.com>
-Date:   Wed Jul 17 15:52:48 2013 +1000
-
-    SI-7455 Drop dummy param for synthetic access constructor
-    
-    Java synthesizes public constructors in private classes to
-    allow access from inner classes. The signature of
-    that synthetic constructor (known as a "access constructor")
-    has a dummy parameter appended to avoid overloading clashes.
-    javac chooses the type "Enclosing$1" for the dummy parameter
-    (called the "access constructor tag") which is either an
-    existing anonymous class or a synthesized class for this purpose.
-    
-    In OpenJDK, this transformation is performed in:
-    
-      langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
-    
-    (Incidentally, scalac would just emits a byte-code public
-    constructor in this situation, rather than a private constructor /
-    access constructor pair.)
-    
-    Scala parses the signature of the access contructor, and drops
-    the $outer parameter, but retains the dummy parameter. This causes
-    havoc when it tries to parse the bytecode for that anonymous class;
-    the class file parser doesn't have the enclosing type parameters
-    of Vector in scope and crash ensues.
-    
-    In any case, we shouldn't allow user code to see that constructor;
-    it should only be called from within its own compilation unit.
-    
-    This commit drops the dummy parameter from access constructor
-    signatures in class file parsing.
-
-diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
-index da11754..4e5204f 100644
---- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
-+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
-@@ -626,7 +626,7 @@ abstract class ClassfileParser {
-         sawPrivateConstructor = true
-       in.skip(2); skipAttributes()
-     } else {
--      if ((sflags & PRIVATE) != 0L && global.settings.optimise.value) {
-+      if ((sflags & PRIVATE) != 0L && global.settings.optimise.value) { // TODO this should be !optimize, no? See c4181f656d.
-         in.skip(4); skipAttributes()
-       } else {
-         val name = pool.getName(in.nextChar)
-@@ -636,7 +636,7 @@ abstract class ClassfileParser {
-           info match {
-             case MethodType(params, restpe) =>
-               // if this is a non-static inner class, remove the explicit outer parameter
--              val newParams = innerClasses getEntry currentClass match {
-+              val paramsNoOuter = innerClasses getEntry currentClass match {
-                 case Some(entry) if !isScalaRaw && !isStatic(entry.jflags) =>
-                   /* About `clazz.owner.isPackage` below: SI-5957
-                    * For every nested java class A$B, there are two symbols in the scala compiler.
-@@ -650,6 +650,15 @@ abstract class ClassfileParser {
-                 case _ =>
-                   params
-               }
-+              val newParams = paramsNoOuter match {
-+                case (init :+ tail) if (jflags & JAVA_ACC_SYNTHETIC) != 0L =>
-+                  // SI-7455 strip trailing dummy argument ("access constructor tag") from synthetic constructors which
-+                  // are added when an inner class needs to access a private constructor.
-+                  init
-+                case _ =>
-+                  paramsNoOuter
-+              }
-+
-               info = MethodType(newParams, clazz.tpe)
-           }
-         sym.setInfo(info)
-diff --git a/test/files/run/t7455.check b/test/files/run/t7455.check
-new file mode 100644
-index 0000000..0eb9342
---- /dev/null
-+++ b/test/files/run/t7455.check
-@@ -0,0 +1,4 @@
-+private[package <empty>] def <init>(x$1: String): Outer[E]
-+private[package <empty>] def <init>(): Outer$PrivateInner
-+private[package <empty>] def <init>(): Outer$PrivateStaticInner
-+private[package <empty>] def <init>(x$2: String): Outer$PublicInner
-diff --git a/test/files/run/t7455/Outer.java b/test/files/run/t7455/Outer.java
-new file mode 100644
-index 0000000..10c97a9
---- /dev/null
-+++ b/test/files/run/t7455/Outer.java
-@@ -0,0 +1,31 @@
-+public class Outer<E> {
-+    public void elements() {
-+        new C<E>() {
-+        };
-+    }
-+
-+    private Outer(String a) {}
-+
-+    static class SubSelf extends Outer<String> {
-+        public SubSelf() { super(""); }
-+    }
-+
-+    private class PrivateInner {
-+    }
-+    class SubPrivateInner extends PrivateInner {
-+    }
-+
-+    private class PublicInner {
-+        private PublicInner(String a) {}
-+    }
-+    class SubPublicInner extends PublicInner {
-+        public SubPublicInner() { super(""); }
-+    }
-+
-+    private static class PrivateStaticInner {
-+    }
-+    public static class SubPrivateStaticInner extends PrivateStaticInner {
-+    }
-+}
-+
-+class C<E> {}
-diff --git a/test/files/run/t7455/Test.scala b/test/files/run/t7455/Test.scala
-new file mode 100644
-index 0000000..b23a724
---- /dev/null
-+++ b/test/files/run/t7455/Test.scala
-@@ -0,0 +1,30 @@
-+import scala.tools.partest._
-+
-+// javac adds dummy parameters of type Outer$1 to synthetic access constructors
-+// This test shows that we strip them from the signatures. If we don't, we trigger
-+// parsing of Outer$1 which can fail if it references type parameters of the Outer.
-+//
-+// OLD OUTPUT:
-+//  private[package <empty>] def <init>(x$2: Outer$1): Outer$PrivateInner
-+//  error: error while loading Outer$1, class file 't7455-run.obj/Outer$1.class' is broken
-+//  (class java.util.NoSuchElementException/key not found: E)
-+//  ...
-+object Test extends DirectTest {
-+  override def code = ""
-+
-+  def show {
-+    val classpath = List(sys.props("partest.lib"), testOutput.path) mkString sys.props("path.separator")
-+    val compiler = newCompiler("-cp", classpath, "-d", testOutput.path)
-+    import compiler._, definitions._
-+    new compiler.Run
-+
-+    for {
-+      name <- Seq("Outer", "Outer$PrivateInner", "Outer$PrivateStaticInner", "Outer$PublicInner")
-+      clazz = compiler.rootMirror.staticClass(name)
-+      constr <- clazz.info.member(nme.CONSTRUCTOR).alternatives
-+    } {
-+      println(constr.defString)
-+      fullyInitializeSymbol(constr)
-+    }
-+  }
-+}
-
diff --git a/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing.patch b/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing.patch
deleted file mode 100644
index a9614f3db2b3..000000000000
--- a/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing.patch
+++ /dev/null
@@ -1,236 +0,0 @@
---- scala-2.10.2-orig/build.xml	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/build.xml	2013-08-20 20:41:23.335756000 +1000
-@@ -343,6 +343,8 @@
-       <echo level="warning"> You are using JDK7 for this build.
-         While this will be able to build most of Scala, it will not build the Swing project.
-         You will be unable to create a distribution.
-+        ^ The above is a message from the scala 2.10.2 release, the Gentoo
-+        ebuild applies patches for jdk 1.7 swing.
-       </echo>
-     </then></if>
- 
-@@ -1153,7 +1155,7 @@
-   <target name="quick.partest"    depends="quick.scalap, quick.comp, asm.done">
-     <staged-build with="locker"   stage="quick" project="partest" version="partest"/> </target>
- 
--  <target name="quick.swing"      depends="quick.actors, quick.lib" if="has.java6">
-+  <target name="quick.swing"      depends="quick.actors, quick.lib">
-     <staged-build with="locker"   stage="quick" project="swing"/> </target>
- 
-   <target name="quick.plugins"    depends="quick.comp">
-@@ -1204,7 +1206,7 @@
-     <staged-pack project="library"/></target>
- 
-   <target name="pack.actors"  depends="quick.lib">                <staged-pack project="actors"/> </target>
--  <target name="pack.swing" if="has.java6" depends="quick.swing"> <staged-pack project="swing"/> </target>
-+  <target name="pack.swing" depends="quick.swing"> <staged-pack project="swing"/> </target>
-   <target name="pack.reflect" depends="quick.reflect">            <staged-pack project="reflect"/> </target>
- 
-   <target name="pack.comp"    depends="quick.comp, asm.done">
-@@ -1351,9 +1353,7 @@
-       <make-plugin-bundle name="continuations" version="${osgi.version.number}" />
-       <touch file="${build-osgi.dir}/bundles.complete" verbose="no"/>
- 
--      <if><isset property="has.java6"/><then>
--        <make-bundle name="scala-swing" version="${osgi.version.number}"/></then>
--      </if>
-+      <make-bundle name="scala-swing" version="${osgi.version.number}"/>
-       <stopwatch name="osgi.bundle.timer" action="total"/></then>
-     </if>
-   </target>
---- scala-2.10.2-orig/src/swing/scala/swing/ComboBox.scala	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/src/swing/scala/swing/ComboBox.scala	2013-08-20 20:26:48.334061000 +1000
-@@ -9,7 +9,7 @@
- package scala.swing
- 
- import event._
--import javax.swing.{JList, JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer}
-+import javax.swing.{ JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer }
- import java.awt.event.ActionListener
- 
- object ComboBox {
-@@ -118,10 +118,10 @@
-   implicit def floatEditor(c: ComboBox[Float]): Editor[Float] = new BuiltInEditor(c)(s => s.toFloat, s => s.toString)
-   implicit def doubleEditor(c: ComboBox[Double]): Editor[Double] = new BuiltInEditor(c)(s => s.toDouble, s => s.toString)
- 
--  def newConstantModel[A](items: Seq[A]): ComboBoxModel = {
--    new AbstractListModel with ComboBoxModel {
-+  def newConstantModel[A](items: Seq[A]): ComboBoxModel[A] = {
-+    new AbstractListModel[A] with ComboBoxModel[A] {
-       private var selected: A = if (items.isEmpty) null.asInstanceOf[A] else items(0)
--      def getSelectedItem: AnyRef = selected.asInstanceOf[AnyRef]
-+      def getSelectedItem = selected.asInstanceOf[AnyRef]
-       def setSelectedItem(a: Any) {
-         if ((selected != null && selected != a) ||
-             selected == null && a != null) {
-@@ -129,7 +129,7 @@
-           fireContentsChanged(this, -1, -1)
-         }
-       }
--      def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+      def getElementAt(n: Int) = items(n).asInstanceOf[A]
-       def getSize = items.size
-     }
-   }
-@@ -157,7 +157,7 @@
-  * @see javax.swing.JComboBox
-  */
- class ComboBox[A](items: Seq[A]) extends Component with Publisher {
--  override lazy val peer: JComboBox = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin
-+  override lazy val peer: JComboBox[A] = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin
- 
-   object selection extends Publisher {
-     def index: Int = peer.getSelectedIndex
-@@ -182,7 +182,8 @@
-    * of the component to its own defaults _after_ the renderer has been
-    * configured. That's Swing's principle of most suprise.
-    */
--  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getRenderer)
-+  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getRenderer.asInstanceOf[ListCellRenderer[A]])
-+  // def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getRenderer)
-   def renderer_=(r: ListView.Renderer[A]) { peer.setRenderer(r.peer) }
- 
-   /* XXX: currently not safe to expose:
-@@ -201,8 +202,8 @@
-     peer.setEditor(editor(this).comboBoxPeer)
-   }
- 
--  def prototypeDisplayValue: Option[A] = toOption[A](peer.getPrototypeDisplayValue)
-+  def prototypeDisplayValue: Option[A] = Option(peer.getPrototypeDisplayValue)
-   def prototypeDisplayValue_=(v: Option[A]) {
--    peer.setPrototypeDisplayValue((v map toAnyRef).orNull)
-+    peer.setPrototypeDisplayValue((v map toAnyRef).orNull.asInstanceOf[A])
-   }
- }
---- scala-2.10.2-orig/src/swing/scala/swing/ListView.scala	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/src/swing/scala/swing/ListView.scala	2013-08-20 20:26:48.334716000 +1000
-@@ -24,21 +24,21 @@
-     val MultiInterval = Value(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
-   }
- 
--  def wrap[A](c: JList) = new ListView[A] {
-+  def wrap[A](c: JList[A]) = new ListView[A] {
-     override lazy val peer = c
-   }
- 
-   object Renderer {
--    def wrap[A](r: ListCellRenderer): Renderer[A] = new Wrapped[A](r)
-+    def wrap[A](r: ListCellRenderer[A]): Renderer[A] = new Wrapped[A](r)
- 
-     /**
-      * Wrapper for <code>javax.swing.ListCellRenderer<code>s
-      */
--  	class Wrapped[A](override val peer: ListCellRenderer) extends Renderer[A] {
--  	  def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
-+      class Wrapped[A](override val peer: ListCellRenderer[A]) extends Renderer[A] {
-+        def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
-         Component.wrap(peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent])
-+        }
-       }
--  	}
- 
-     /**
-      * Returns a renderer for items of type <code>A</code>. The given function
-@@ -55,8 +55,8 @@
-      * </code>
-      */
-     def apply[A,B](f: A => B)(implicit renderer: Renderer[B]): Renderer[A] = new Renderer[A] {
--      def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component =
--        renderer.componentFor(list, isSelected, focused, f(a), index)
-+      def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component =
-+        renderer.componentFor(list.asInstanceOf[ListView[_ <: B]], isSelected, focused, f(a), index)
-     }
-   }
- 
-@@ -69,11 +69,11 @@
-    * @see javax.swing.ListCellRenderer
-    */
-   abstract class Renderer[-A] {
--    def peer: ListCellRenderer = new ListCellRenderer {
--      def getListCellRendererComponent(list: JList, a: Any, index: Int, isSelected: Boolean, focused: Boolean) =
--        componentFor(ListView.wrap[A](list), isSelected, focused, a.asInstanceOf[A], index).peer
-+    def peer: ListCellRenderer[_ >: A] = new ListCellRenderer[A] {
-+      def getListCellRendererComponent(list: JList[_ <: A], a: A, index: Int, isSelected: Boolean, focused: Boolean) =
-+        componentFor(ListView.wrap[A](list.asInstanceOf[JList[A]]), isSelected, focused, a, index).peer
-     }
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component
-+    def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component
-   }
- 
-   /**
-@@ -110,7 +110,7 @@
-     /**
-      * Configures the component before returning it.
-      */
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = {
-+    def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = {
-       preConfigure(list, isSelected, focused, a, index)
-       configure(list, isSelected, focused, a, index)
-       component
-@@ -123,10 +123,10 @@
-    * that renders the string returned from an item's <code>toString</code>.
-    */
-   implicit object GenericRenderer extends Renderer[Any] {
--    override lazy val peer: ListCellRenderer = new DefaultListCellRenderer
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = {
--      val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent]
--      Component.wrap(c)
-+    override lazy val peer: ListCellRenderer[Any] = (new DefaultListCellRenderer).asInstanceOf[ListCellRenderer[Any]]
-+    def componentFor(list: ListView[_ <: Any], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = {
-+      val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused)
-+      Component.wrap(c.asInstanceOf[JComponent])
-     }
-   }
- }
-@@ -142,34 +142,34 @@
-  */
- class ListView[A] extends Component {
-   import ListView._
--  override lazy val peer: JList = new JList with SuperMixin
-+  override lazy val peer: JList[A] = new JList[A] with SuperMixin
- 
-   def this(items: Seq[A]) = {
-     this()
-     listData = items
-   }
- 
--  protected class ModelWrapper(val items: Seq[A]) extends AbstractListModel {
--    def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+  protected class ModelWrapper[A](val items: Seq[A]) extends AbstractListModel[A] {
-+    def getElementAt(n: Int) = items(n)
-     def getSize = items.size
-   }
- 
-   def listData: Seq[A] = peer.getModel match {
--    case model: ModelWrapper => model.items
--    case model @ _ => new Seq[A] { selfSeq =>
-+    case model: ModelWrapper[a] => model.items
-+    case model => new Seq[A] { selfSeq =>
-      def length = model.getSize
-      def iterator = new Iterator[A] {
-        var idx = 0
-        def next = { idx += 1; apply(idx-1) }
-        def hasNext = idx < selfSeq.length
-      }
--     def apply(n: Int) = model.getElementAt(n).asInstanceOf[A]
-+     def apply(n: Int): A = model.getElementAt(n)
-     }
-   }
- 
-   def listData_=(items: Seq[A]) {
--    peer.setModel(new AbstractListModel {
--      def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+    peer.setModel(new AbstractListModel[A] {
-+      def getElementAt(n: Int) = items(n)
-       def getSize = items.size
-     })
-   }
-@@ -216,7 +216,7 @@
-     def adjusting = peer.getSelectionModel.getValueIsAdjusting
-   }
- 
--  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getCellRenderer)
-+  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getCellRenderer.asInstanceOf[ListCellRenderer[A]])
-   def renderer_=(r: ListView.Renderer[A]) { peer.setCellRenderer(r.peer) }
- 
-   def fixedCellWidth = peer.getFixedCellWidth
diff --git a/dev-lang/scala/files/scala-2.10.2-maven-deps.patch b/dev-lang/scala/files/scala-2.10.2-maven-deps.patch
deleted file mode 100644
index 133a2a4f7576..000000000000
--- a/dev-lang/scala/files/scala-2.10.2-maven-deps.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- scala-2.10.2-orig/build.xml	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/build.xml	2013-08-30 22:48:11.727055000 +1000
-@@ -202,30 +202,19 @@
-          on repeated use of artifact:dependencies
-     -->
-     <if><not><isset property="maven-deps-done"></isset></not><then>
--      <mkdir dir="${user.home}/.m2/repository"/>
--      <!-- This task has an issue where if the user directory does not exist, so we create it above. UGH. -->
--      <artifact:dependencies pathId="extra.tasks.classpath" filesetId="extra.tasks.fileset">
--        <dependency groupId="biz.aQute" artifactId="bnd" version="1.50.0"/>
--      </artifact:dependencies>
-+      <path id="extra.tasks.classpath">
-+        <pathelement path="BNDLIB_CLASSPATH"></pathelement>
-+      </path>
- 
-       <!-- Pax runner -->
--      <property name="pax.exam.version" value="2.5.0"/>
--      <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset">
--        <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}"/>
--        <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/>
--        <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/>
--        <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.4.0"/>
--        <dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-framework" version="1.5.1"/>
--        <dependency groupId="ch.qos.logback" artifactId="logback-core" version="0.9.20"/>
--        <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="0.9.20"/>
--        <dependency groupId="junit" artifactId="junit" version="4.10"/>
--        <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="3.2.2"/>
--      </artifact:dependencies>
--
--      <artifact:dependencies pathId="partest.extras.classpath" filesetId="partest.extras.fileset" versionsId="partest.extras.versions">
--        <dependency groupId="com.googlecode.java-diff-utils" artifactId="diffutils" version="1.3.0"/>
--      </artifact:dependencies>
--
-+      <path id="pax.exam.classpath">
-+        <pathelement path="PAX_RUNNER_CLASSPATH"></pathelement>
-+      </path>
-+
-+      <path id="partest.extras.classpath">
-+        <pathelement path="DIFFUTILS_CLASSPATH"></pathelement>
-+      </path>
-+      <property name="partest.extras.versions" value="1.3.0"></property>
-       <!-- BND support -->
-       <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
- 
-@@ -1247,10 +1236,8 @@
-   <!-- depend on quick.done so quick.bin is run when pack.done is -->
-   <target name="pack.done" depends="quick.done, pack.bin">
-     <!-- copy dependencies to build/pack/lib, it only takes a second so don't bother with uptodate checks -->
--    <copy todir="${build-pack.dir}/lib">
--      <resources refid="partest.extras.fileset"/>
--      <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
--              from="${partest.extras.versions}" to="flatten"/>
-+    <copy todir="${build-pack.dir}/lib" flatten="true">
-+      <path><path refid="partest.extras.classpath"/></path>
-     </copy>
- 
-     <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.compiler.path"/>
-@@ -1769,10 +1756,8 @@
-       </fileset>
-     </copy>
- 
--    <copy todir="${dist.dir}/lib">
--      <resources refid="partest.extras.fileset"/>
--      <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
--              from="${partest.extras.versions}" to="flatten"/>
-+    <copy todir="${dist.dir}/lib" flatten="true">
-+      <path><path refid="partest.extras.classpath"/></path>
-     </copy>
- 
-     <mkdir dir="${dist.dir}/bin"/>
diff --git a/dev-lang/scala/files/scala-2.10.2-no-git.patch b/dev-lang/scala/files/scala-2.10.2-no-git.patch
deleted file mode 100644
index f1b83173036b..000000000000
--- a/dev-lang/scala/files/scala-2.10.2-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scala-2.10.2-orig/tools/get-scala-commit-date	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/tools/get-scala-commit-date	2013-08-20 20:26:34.859699000 +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="2013-05-31"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.10.2-orig/tools/get-scala-commit-sha	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/tools/get-scala-commit-sha	2013-08-20 20:26:34.860152000 +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="60d462ef6e0dba5f9a7c4cc81255fcb9fba7939a"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
diff --git a/dev-lang/scala/files/scala-2.10.3-no-git.patch b/dev-lang/scala/files/scala-2.10.3-no-git.patch
deleted file mode 100644
index 8309cef7e3d2..000000000000
--- a/dev-lang/scala/files/scala-2.10.3-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scala-2.10.3-orig/tools/get-scala-commit-date	2013-09-23 23:00:37.000000000 +1000
-+++ scala-2.10.3/tools/get-scala-commit-date	2014-02-09 14:14:29.132553839 +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="2013-09-23"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.10.3-orig/tools/get-scala-commit-sha	2013-09-23 23:00:37.000000000 +1000
-+++ scala-2.10.3/tools/get-scala-commit-sha	2014-02-09 14:08:46.878352444 +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="e2fec6b28dfd73482945ffab85d9b582d0cb9f17"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
diff --git a/dev-lang/scala/files/scala-2.10.4-no-git.patch b/dev-lang/scala/files/scala-2.10.4-no-git.patch
deleted file mode 100644
index 2efc8119015c..000000000000
--- a/dev-lang/scala/files/scala-2.10.4-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scala-2.10.4-orig/tools/get-scala-commit-date	2014-02-10 04:00:20.000000000 +1100
-+++ scala-2.10.4/tools/get-scala-commit-date	2014-07-05 18:19:38.054864707 +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="2014-02-10"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.10.4-orig/tools/get-scala-commit-sha	2014-02-10 04:00:20.000000000 +1100
-+++ scala-2.10.4/tools/get-scala-commit-sha	2014-07-05 18:20:27.799470430 +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="b66a39653b9bccab72036ba58fec5fd7d596d313"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
diff --git a/dev-lang/scala/files/scala-2.10.6-no-git.patch b/dev-lang/scala/files/scala-2.10.6-no-git.patch
deleted file mode 100644
index 259ef787cf7c..000000000000
--- a/dev-lang/scala/files/scala-2.10.6-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scala-2.10.6-orig/tools/get-scala-commit-date	2015-09-18 18:50:36.000000000 +1000
-+++ scala-2.10.6/tools/get-scala-commit-date	2016-01-29 18:53:09.874767271 +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="2015-09-18"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.10.6-orig/tools/get-scala-commit-sha	2015-09-18 18:50:36.000000000 +1000
-+++ scala-2.10.6/tools/get-scala-commit-sha	2016-01-29 18:53:44.097767230 +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="bda53196ebbeb1369c70f3d1ec066796c06a6409"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
diff --git a/dev-lang/scala/files/scala-2.9.2-java7.patch b/dev-lang/scala/files/scala-2.9.2-java7.patch
deleted file mode 100644
index 1cf8c8befe64..000000000000
--- a/dev-lang/scala/files/scala-2.9.2-java7.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-diff -Nru scala-2.9.2-sources/src/swing/scala/swing/ComboBox.scala scala-2.9.2-sources-gil/src/swing/scala/swing/ComboBox.scala
---- scala-2.9.2-sources/src/swing/scala/swing/ComboBox.scala	2012-03-18 17:09:24.000000000 +0100
-+++ scala-2.9.2-sources-gil/src/swing/scala/swing/ComboBox.scala	2012-11-23 17:09:08.353124190 +0100
-@@ -11,7 +11,7 @@
- package scala.swing
- 
- import event._
--import javax.swing.{JList, JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer}
-+import javax.swing.{ JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer }
- import java.awt.event.ActionListener
- 
- object ComboBox {
-@@ -120,10 +120,10 @@
-   implicit def floatEditor(c: ComboBox[Float]): Editor[Float] = new BuiltInEditor(c)(s => s.toFloat, s => s.toString)
-   implicit def doubleEditor(c: ComboBox[Double]): Editor[Double] = new BuiltInEditor(c)(s => s.toDouble, s => s.toString)
- 
--  def newConstantModel[A](items: Seq[A]): ComboBoxModel = {
--    new AbstractListModel with ComboBoxModel {
-+  def newConstantModel[A](items: Seq[A]): ComboBoxModel[A] = {
-+    new AbstractListModel[A] with ComboBoxModel[A] {
-       private var selected: A = if (items.isEmpty) null.asInstanceOf[A] else items(0)
--      def getSelectedItem: AnyRef = selected.asInstanceOf[AnyRef]
-+      def getSelectedItem = selected.asInstanceOf[AnyRef]
-       def setSelectedItem(a: Any) {
-         if ((selected != null && selected != a) ||
-             selected == null && a != null) {
-@@ -131,7 +131,7 @@
-           fireContentsChanged(this, -1, -1)
-         }
-       }
--      def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+      def getElementAt(n: Int) = items(n).asInstanceOf[A]
-       def getSize = items.size
-     }
-   }
-@@ -159,7 +159,7 @@
-  * @see javax.swing.JComboBox
-  */
- class ComboBox[A](items: Seq[A]) extends Component with Publisher {
--  override lazy val peer: JComboBox = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin
-+  override lazy val peer: JComboBox[A] = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin
- 
-   object selection extends Publisher {
-     def index: Int = peer.getSelectedIndex
-@@ -184,7 +184,8 @@
-    * of the component to its own defaults _after_ the renderer has been
-    * configured. That's Swing's principle of most suprise.
-    */
--  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getRenderer)
-+  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getRenderer.asInstanceOf[ListCellRenderer[A]])
-+  // def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getRenderer)
-   def renderer_=(r: ListView.Renderer[A]) { peer.setRenderer(r.peer) }
- 
-   /* XXX: currently not safe to expose:
-@@ -203,8 +204,8 @@
-     peer.setEditor(editor(this).comboBoxPeer)
-   }
- 
--  def prototypeDisplayValue: Option[A] = toOption[A](peer.getPrototypeDisplayValue)
-+  def prototypeDisplayValue: Option[A] = Option(peer.getPrototypeDisplayValue)
-   def prototypeDisplayValue_=(v: Option[A]) {
--    peer.setPrototypeDisplayValue(v map toAnyRef orNull)
-+    peer.setPrototypeDisplayValue((v map toAnyRef).orNull.asInstanceOf[A])
-   }
- }
-diff -Nru scala-2.9.2-sources/src/swing/scala/swing/ListView.scala scala-2.9.2-sources-gil/src/swing/scala/swing/ListView.scala
---- scala-2.9.2-sources/src/swing/scala/swing/ListView.scala	2012-03-18 17:09:26.000000000 +0100
-+++ scala-2.9.2-sources-gil/src/swing/scala/swing/ListView.scala	2012-11-23 17:20:45.704030454 +0100
-@@ -24,21 +24,21 @@
-     val MultiInterval = Value(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
-   }
- 
--  def wrap[A](c: JList) = new ListView[A] {
-+  def wrap[A](c: JList[A]) = new ListView[A] {
-     override lazy val peer = c
-   }
- 
-   object Renderer {
--    def wrap[A](r: ListCellRenderer): Renderer[A] = new Wrapped[A](r)
-+    def wrap[A](r: ListCellRenderer[A]): Renderer[A] = new Wrapped[A](r)
- 
-     /**
-      * Wrapper for <code>javax.swing.ListCellRenderer<code>s
-      */
--  	class Wrapped[A](override val peer: ListCellRenderer) extends Renderer[A] {
--  	  def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
-+      class Wrapped[A](override val peer: ListCellRenderer[A]) extends Renderer[A] {
-+        def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
-         Component.wrap(peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent])
-+        }
-       }
--  	}
- 
-     /**
-      * Returns a renderer for items of type <code>A</code>. The given function
-@@ -55,8 +55,8 @@
-      * </code>
-      */
-     def apply[A,B](f: A => B)(implicit renderer: Renderer[B]): Renderer[A] = new Renderer[A] {
--      def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component =
--        renderer.componentFor(list, isSelected, focused, f(a), index)
-+      def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component =
-+        renderer.componentFor(list.asInstanceOf[ListView[_ <: B]], isSelected, focused, f(a), index)
-     }
-   }
- 
-@@ -69,11 +69,11 @@
-    * @see javax.swing.ListCellRenderer
-    */
-   abstract class Renderer[-A] {
--    def peer: ListCellRenderer = new ListCellRenderer {
--      def getListCellRendererComponent(list: JList, a: Any, index: Int, isSelected: Boolean, focused: Boolean) =
--        componentFor(ListView.wrap[A](list), isSelected, focused, a.asInstanceOf[A], index).peer
-+    def peer: ListCellRenderer[_ >: A] = new ListCellRenderer[A] {
-+      def getListCellRendererComponent(list: JList[_ <: A], a: A, index: Int, isSelected: Boolean, focused: Boolean) =
-+        componentFor(ListView.wrap[A](list.asInstanceOf[JList[A]]), isSelected, focused, a, index).peer
-     }
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component
-+    def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component
-   }
- 
-   /**
-@@ -110,7 +110,7 @@
-     /**
-      * Configures the component before returning it.
-      */
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = {
-+    def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = {
-       preConfigure(list, isSelected, focused, a, index)
-       configure(list, isSelected, focused, a, index)
-       component
-@@ -123,10 +123,10 @@
-    * that renders the string returned from an item's <code>toString</code>.
-    */
-   implicit object GenericRenderer extends Renderer[Any] {
--    override lazy val peer: ListCellRenderer = new DefaultListCellRenderer
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = {
--      val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent]
--      Component.wrap(c)
-+    override lazy val peer: ListCellRenderer[Any] = (new DefaultListCellRenderer).asInstanceOf[ListCellRenderer[Any]]
-+    def componentFor(list: ListView[_ <: Any], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = {
-+      val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused)
-+      Component.wrap(c.asInstanceOf[JComponent])
-     }
-   }
- }
-@@ -142,34 +142,34 @@
-  */
- class ListView[A] extends Component {
-   import ListView._
--  override lazy val peer: JList = new JList with SuperMixin
-+  override lazy val peer: JList[A] = new JList[A] with SuperMixin
- 
-   def this(items: Seq[A]) = {
-     this()
-     listData = items
-   }
- 
--  protected class ModelWrapper(val items: Seq[A]) extends AbstractListModel {
--    def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+  protected class ModelWrapper[A](val items: Seq[A]) extends AbstractListModel[A] {
-+    def getElementAt(n: Int) = items(n)
-     def getSize = items.size
-   }
- 
-   def listData: Seq[A] = peer.getModel match {
--    case model: ModelWrapper => model.items
--    case model @ _ => new Seq[A] { selfSeq =>
-+    case model: ModelWrapper[a] => model.items
-+    case model => new Seq[A] { selfSeq =>
-      def length = model.getSize
-      def iterator = new Iterator[A] {
-        var idx = 0
-        def next = { idx += 1; apply(idx-1) }
-        def hasNext = idx < selfSeq.length
-      }
--     def apply(n: Int) = model.getElementAt(n).asInstanceOf[A]
-+     def apply(n: Int): A = model.getElementAt(n)
-     }
-   }
- 
-   def listData_=(items: Seq[A]) {
--    peer.setModel(new AbstractListModel {
--      def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+    peer.setModel(new AbstractListModel[A] {
-+      def getElementAt(n: Int) = items(n)
-       def getSize = items.size
-     })
-   }
-@@ -227,7 +227,7 @@
-     def adjusting = peer.getSelectionModel.getValueIsAdjusting
-   }
- 
--  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getCellRenderer)
-+  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getCellRenderer.asInstanceOf[ListCellRenderer[A]])
-   def renderer_=(r: ListView.Renderer[A]) { peer.setCellRenderer(r.peer) }
- 
-   def fixedCellWidth = peer.getFixedCellWidth