version bump

(Portage version: 2.1.3.16)

2 files changed, 82 insertions, 0 deletions

diff --git a/dev-lang/scala/files/digest-scala-2.6.0 b/dev-lang/scala/files/digest-scala-2.6.0
new file mode 100644
index 000000000000..66e557f5aa2c
--- /dev/null
+++ b/dev-lang/scala/files/digest-scala-2.6.0
@@ -0,0 +1,3 @@
+MD5 47493b733bf87d51fdb86428f62a422f scala-2.6.0-final-sources.tgz 25405348
+RMD160 56cfa9cd224c5599ab4a5c7fd81019581dcbf2e2 scala-2.6.0-final-sources.tgz 25405348
+SHA256 afb33197c51cc9f6bd0283a3bdafb3f0721cc0cfb855df5d3b9abb5914c669a3 scala-2.6.0-final-sources.tgz 25405348
diff --git a/dev-lang/scala/files/scala-2.6.0-build.xml.patch b/dev-lang/scala/files/scala-2.6.0-build.xml.patch
new file mode 100644
index 000000000000..67a225329d62
--- /dev/null
+++ b/dev-lang/scala/files/scala-2.6.0-build.xml.patch
@@ -0,0 +1,79 @@
+--- build.xml.orig	2007-12-17 12:05:42.000000000 -0500
++++ build.xml	2007-12-17 12:07:34.000000000 -0500
+@@ -90,11 +90,13 @@
+   <!-- Setting-up Ant contrib tasks -->
+     <taskdef resource="net/sf/antcontrib/antlib.xml"
+              classpath="${ant-contrib.jar}"/>
++      <!--
+     <fail message="External library ${ant-contrib.jar} requires the optional Ant tasks to be installed">
+       <condition><not><and>
+         <available file="${ant.home}/lib/ant-nodeps.jar"/>
+       </and></not></condition>
+     </fail>
++      -->
+   </target>
+ 
+ <!-- ===========================================================================
+@@ -1052,7 +1054,7 @@
+ DOCUMENTATION
+ ============================================================================ -->
+ 
+-  <target name="docs" depends="setup.quick"
++  <target name="docs" depends="setup.quick" if="do.docs"
+     description="Generated the API for library sources">
+     <mkdir dir="${api-lib.dir}"/>
+     <quickdoc
+@@ -1070,7 +1072,7 @@
+     </quickdoc>
+   </target>
+ 
+-  <target name="docs.compiler" depends="setup.quick"
++  <target name="docs.compiler" depends="setup.quick" if="do.docs"
+     description="Generated the API for compiler sources">
+     <mkdir dir="${api-comp.dir}"/>
+     <quickdoc
+@@ -1155,7 +1157,7 @@
+ 
+   <target name="dist.patch" depends="init">
+     <propertyfile file="${number.file}">
+-      <entry key="version.patch" type="int" default="0" operation="+"/>
++      <entry key="version.patch" type="int" default="0"/>
+     </propertyfile>
+     <property file="${number.file}"/>
+     <property name="version.number"
+@@ -1165,7 +1167,7 @@
+ 
+   <target name="dist.minor" depends="init">
+     <propertyfile file="${number.file}">
+-      <entry key="version.minor" type="int" default="0" operation="+"/>
++      <entry key="version.minor" type="int" default="0"/>
+       <entry key="version.patch" type="int" value="0"/>
+     </propertyfile>
+     <property file="${number.file}"/>
+@@ -1339,7 +1341,7 @@
+     <copy todir="${dist.current.dir}/doc/scala">
+       <fileset dir="${docs.dir}" includes="README,LICENSE"/>
+     </copy>
+-    <copy todir="${dist.current.dir}/doc/scala/api">
++    <copy todir="${dist.current.dir}/doc/scala/api" failonerror="false">
+       <fileset dir="${api-lib.dir}"/>
+     </copy>
+     <copy todir="${dist.current.dir}/doc/scala/examples">
+@@ -1360,7 +1362,7 @@
+   </target>
+ 
+   <!-- Create the SBaz packages -->
+-  <target name="build.sbaz" depends="build.dist">
++  <target name="build.sbaz" depends="build.dist" if="do.archive">
+     <property name="sbaz.universe" value="http://www.scala-lang.org/downloads/packages"/>
+     <mkdir dir="${dist.dir}"/>
+   <!-- Create the Scala library package -->
+@@ -1426,7 +1428,7 @@
+     </quicksbaz>
+   </target>
+ 
+-  <target name="build.archive" depends="build.dist">
++  <target name="build.archive" depends="build.dist" if="do.archive">
+     <tar
+       destfile="${dist.dir}/scala-${version.number}.tgz"
+       compression="gzip">