Version bump. bug #202988. Add local binary USE flag to workaround memory requirements without need of separate scala-bin package, bug #181390.

Package-Manager: portage-2.1.4

10 files changed, 184 insertions, 340 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index 92d8ff3a890d..b5eded35998a 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/scala
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.5 2007/12/17 17:48:13 caleb Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.6 2008/01/21 12:41:36 caster Exp $
+
+*scala-2.6.1 (21 Jan 2008)
+
+  21 Jan 2008; Vlastimil Babka <caster@gentoo.org>
+  -files/scala-2.4.0-build.xml.patch, -files/scala-2.5.1-build.xml.patch,
+  +files/scala-2.6.1-build.xml.patch, -scala-2.4.0.ebuild,
+  -scala-2.5.1.ebuild, +scala-2.6.1.ebuild:
+  Version bump. bug #202988. Add local binary USE flag to workaround memory
+  requirements without need of separate scala-bin package, bug #181390.
 
 *scala-2.6.0 (17 Dec 2007)
 
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index b61594f8a3dc..e3a09f263a02 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -1,44 +1,33 @@
-AUX scala-2.4.0-build.xml.patch 2980 RMD160 86d56cf747a0758e90b3aca886bfe6c2c7dfb198 SHA1 251954bd6648a9fb06b0a068fb565a68a1f91170 SHA256 32dfaf2d3dd769fa57760a24f754d002fa1d569f08bf786e3e8f38b744c38ee7
-MD5 ddac2a685d1d115f5da51eb506ed0efd files/scala-2.4.0-build.xml.patch 2980
-RMD160 86d56cf747a0758e90b3aca886bfe6c2c7dfb198 files/scala-2.4.0-build.xml.patch 2980
-SHA256 32dfaf2d3dd769fa57760a24f754d002fa1d569f08bf786e3e8f38b744c38ee7 files/scala-2.4.0-build.xml.patch 2980
-AUX scala-2.5.1-build.xml.patch 2953 RMD160 eacf7ce94872f0c9a3ba2f9e7814b978e889f5e0 SHA1 3bf40082e28c7d461fc7ba283dd9fa70ceda0489 SHA256 c4f7f7bb509837b73589b94f1426620900d74d9edae01206e343f1ae037d8369
-MD5 eeebad7fef290cb5b37e6fb38546ff6b files/scala-2.5.1-build.xml.patch 2953
-RMD160 eacf7ce94872f0c9a3ba2f9e7814b978e889f5e0 files/scala-2.5.1-build.xml.patch 2953
-SHA256 c4f7f7bb509837b73589b94f1426620900d74d9edae01206e343f1ae037d8369 files/scala-2.5.1-build.xml.patch 2953
 AUX scala-2.6.0-build.xml.patch 2964 RMD160 481e726ad79546bc42d929f4c647f8ee28b32a1a SHA1 7c4364306da9ffaee8dfadb455e60e30d53cf553 SHA256 70a4de1065377003c48ecf8a4ea78a61ddc54dad7f8d05f49f30361b7032ca70
 MD5 213ee9dfa5605ef82b93fa986bdb9fe2 files/scala-2.6.0-build.xml.patch 2964
 RMD160 481e726ad79546bc42d929f4c647f8ee28b32a1a files/scala-2.6.0-build.xml.patch 2964
 SHA256 70a4de1065377003c48ecf8a4ea78a61ddc54dad7f8d05f49f30361b7032ca70 files/scala-2.6.0-build.xml.patch 2964
-DIST scala-2.4.0-final-sources.tgz 7882898 RMD160 7430c39beb877b96cfb9e7e0c8509e0ce601e7c1 SHA1 edd41bb73e5ce646fe2d396d5c7f76af6b4d168a SHA256 a3fc202bdc4988697a830ab1cace8c30350fdf1b6f46d8860289efc49de5b486
-DIST scala-2.5.1-final-sources.tgz 24199025 RMD160 550a0b189e227551330f3642a93be8ab95ea71f0 SHA1 ff60ec7ccc62fee8ba94aae2248acd9f475c6a01 SHA256 cc2aec40da68666d29f2298de2c3909d72dc653c75d620a1a53fc4452a95f0a4
+AUX scala-2.6.1-build.xml.patch 2979 RMD160 2802d77c5ee835aa5f39e09f48ffc6a19f676686 SHA1 05b9ba1bd5b5311a10bc84f8825eeb207a864b94 SHA256 09182f2d72a225a098d560aa3853b05a8e58aef12dad414b1a133f134a0efab6
+MD5 bb477bbbb5e6b4cddf9d91d9ec353c5e files/scala-2.6.1-build.xml.patch 2979
+RMD160 2802d77c5ee835aa5f39e09f48ffc6a19f676686 files/scala-2.6.1-build.xml.patch 2979
+SHA256 09182f2d72a225a098d560aa3853b05a8e58aef12dad414b1a133f134a0efab6 files/scala-2.6.1-build.xml.patch 2979
 DIST scala-2.6.0-final-sources.tgz 25405348 RMD160 56cfa9cd224c5599ab4a5c7fd81019581dcbf2e2 SHA1 16b15d62c66fbe9790dd58e0fdf6130c4dadf727 SHA256 afb33197c51cc9f6bd0283a3bdafb3f0721cc0cfb855df5d3b9abb5914c669a3
-EBUILD scala-2.4.0.ebuild 2616 RMD160 6e9a2c99713fed715a6980a4283b20ca30b17a58 SHA1 f02b4699a4547296c92e5b5a239253dc4a0dbc7f SHA256 74acc69ebd1e78ef52c3aba2e87904664de2f2be9497afae3e7cc12d3d8418a0
-MD5 361f73f9665dd2ab149411fff91db2fb scala-2.4.0.ebuild 2616
-RMD160 6e9a2c99713fed715a6980a4283b20ca30b17a58 scala-2.4.0.ebuild 2616
-SHA256 74acc69ebd1e78ef52c3aba2e87904664de2f2be9497afae3e7cc12d3d8418a0 scala-2.4.0.ebuild 2616
-EBUILD scala-2.5.1.ebuild 2624 RMD160 92e811261e12b23457d2b16744b681ade6376933 SHA1 36e3805fa7e2dad15feff725c8afa7208be8a6f5 SHA256 7cea3bf9034efe323924287793981693e8229508afffb68c8d905df9397f0e50
-MD5 f45a644825e4ca5961bf675c89d52d44 scala-2.5.1.ebuild 2624
-RMD160 92e811261e12b23457d2b16744b681ade6376933 scala-2.5.1.ebuild 2624
-SHA256 7cea3bf9034efe323924287793981693e8229508afffb68c8d905df9397f0e50 scala-2.5.1.ebuild 2624
+DIST scala-2.6.1-final-sources.tgz 26459400 RMD160 e7f2e12d52e1a371c92f46165a3845af98a43c85 SHA1 122aa50760723649e5eadf4cd99f08c57be27879 SHA256 04cac1fff3550d362ea2f1ff4cdcaef9b45819aadc39ce599bfa0f465110dd4e
+DIST scala-2.6.1-gentoo-binary.tar.bz2 9440893 RMD160 f958b094ba1202644022de2275ad57faa5ba2c0f SHA1 c02d2afec9e42e0fca3af8dc2f69ce12bac00d81 SHA256 12443ed9cd42dcc740ee27d2b69f7c91f0104c1893152579b47426284c1a79c0
 EBUILD scala-2.6.0.ebuild 2623 RMD160 62a530badc945c153eaf86764fb06b0df166f24f SHA1 4ae3a01a7f6f5ded3b809cdb0cb2c29bd90041b6 SHA256 82132e0091ace8367d099cc65430d393061debc51304556cb7df49cc15aa3997
 MD5 c6b6af271ace4d3728b6ef97d6e6fdeb scala-2.6.0.ebuild 2623
 RMD160 62a530badc945c153eaf86764fb06b0df166f24f scala-2.6.0.ebuild 2623
 SHA256 82132e0091ace8367d099cc65430d393061debc51304556cb7df49cc15aa3997 scala-2.6.0.ebuild 2623
-MISC ChangeLog 1201 RMD160 54d8fba732137247c061cc4bb9fb0c706e7db7d3 SHA1 1992c7e69bfff3da713bea4a978e938f88b2220f SHA256 ea3b6066b7c4819ea332bd4f2afd7dd5ea87d17bcc00c49a32efe3df16947c0f
-MD5 c6d670cc55f60fb13bb47d7dad63bde6 ChangeLog 1201
-RMD160 54d8fba732137247c061cc4bb9fb0c706e7db7d3 ChangeLog 1201
-SHA256 ea3b6066b7c4819ea332bd4f2afd7dd5ea87d17bcc00c49a32efe3df16947c0f ChangeLog 1201
+EBUILD scala-2.6.1.ebuild 3553 RMD160 20d71aa1d0811cca85808fd6b8c8ab1d564928d6 SHA1 a63affea5bb28e39963dd926d97128eea7998baa SHA256 176bfcf885824139129bb10fe7e9be7d5253dab5bbc382d7a443af60038448e6
+MD5 62d715c003c4e4214142dfbb7998e629 scala-2.6.1.ebuild 3553
+RMD160 20d71aa1d0811cca85808fd6b8c8ab1d564928d6 scala-2.6.1.ebuild 3553
+SHA256 176bfcf885824139129bb10fe7e9be7d5253dab5bbc382d7a443af60038448e6 scala-2.6.1.ebuild 3553
+MISC ChangeLog 1607 RMD160 68d1d4def3060dfa9c9f803b9482ea318967c0d7 SHA1 8672f2e2b7018b2c6f344542351c498519b65b73 SHA256 4b83376c0ea400633a0aed39423b2aed1cee0565230f3cf2e49e14814b3648e2
+MD5 0a5e066cace8e00456aa5517a5b6a968 ChangeLog 1607
+RMD160 68d1d4def3060dfa9c9f803b9482ea318967c0d7 ChangeLog 1607
+SHA256 4b83376c0ea400633a0aed39423b2aed1cee0565230f3cf2e49e14814b3648e2 ChangeLog 1607
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 230b37fd79b7c98b34d5449d7be5c7b6 files/digest-scala-2.4.0 271
-RMD160 0a150772f14e587542bf23428a5ab5f7a8c3d28e files/digest-scala-2.4.0 271
-SHA256 bb174907aa63a184ae1044eb8427df085fabd111e18c9ceb55c2cdf72a50d7c4 files/digest-scala-2.4.0 271
-MD5 9b62de2affb622c0b4fca7e11126a2aa files/digest-scala-2.5.1 274
-RMD160 41875042ad2e0ac35206ba47f73a71547148c004 files/digest-scala-2.5.1 274
-SHA256 e54f3c83630bfd21105275f5ae2394299ec708bfe264c1c29d3670b76a70c940 files/digest-scala-2.5.1 274
 MD5 8811d06985ac79e15c79ec921ac4e9c0 files/digest-scala-2.6.0 274
 RMD160 03d29471dd634cde9a2a4ad46e3ecf9f47a5c8df files/digest-scala-2.6.0 274
 SHA256 cb711ace94166c7a4bf65698a512e0588cd3242b2df0aa7b19062a81f569e221 files/digest-scala-2.6.0 274
+MD5 eef6f8d6f39dac1f010f43a451b2a62a files/digest-scala-2.6.1 557
+RMD160 64dc77d48461b101f87812f2f1ff40fb93e7cf44 files/digest-scala-2.6.1 557
+SHA256 3ee5fd8016cc6aef6aaf0bd4d92d49fcd5c5600ece4065e68a65b7ebe45b6f91 files/digest-scala-2.6.1 557
diff --git a/dev-lang/scala/files/digest-scala-2.4.0 b/dev-lang/scala/files/digest-scala-2.4.0
deleted file mode 100644
index 910d0137dd3f..000000000000
--- a/dev-lang/scala/files/digest-scala-2.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 14cf470ffc730161f7c8810f1545d9c2 scala-2.4.0-final-sources.tgz 7882898
-RMD160 7430c39beb877b96cfb9e7e0c8509e0ce601e7c1 scala-2.4.0-final-sources.tgz 7882898
-SHA256 a3fc202bdc4988697a830ab1cace8c30350fdf1b6f46d8860289efc49de5b486 scala-2.4.0-final-sources.tgz 7882898
diff --git a/dev-lang/scala/files/digest-scala-2.5.1 b/dev-lang/scala/files/digest-scala-2.5.1
deleted file mode 100644
index 1eb8c6faa2d8..000000000000
--- a/dev-lang/scala/files/digest-scala-2.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6e0c63a6e8d7d1612d1b9c53649388b0 scala-2.5.1-final-sources.tgz 24199025
-RMD160 550a0b189e227551330f3642a93be8ab95ea71f0 scala-2.5.1-final-sources.tgz 24199025
-SHA256 cc2aec40da68666d29f2298de2c3909d72dc653c75d620a1a53fc4452a95f0a4 scala-2.5.1-final-sources.tgz 24199025
diff --git a/dev-lang/scala/files/digest-scala-2.6.1 b/dev-lang/scala/files/digest-scala-2.6.1
new file mode 100644
index 000000000000..85780632981d
--- /dev/null
+++ b/dev-lang/scala/files/digest-scala-2.6.1
@@ -0,0 +1,6 @@
+MD5 34851e6b001955b169529397d499f17f scala-2.6.1-final-sources.tgz 26459400
+RMD160 e7f2e12d52e1a371c92f46165a3845af98a43c85 scala-2.6.1-final-sources.tgz 26459400
+SHA256 04cac1fff3550d362ea2f1ff4cdcaef9b45819aadc39ce599bfa0f465110dd4e scala-2.6.1-final-sources.tgz 26459400
+MD5 3ea29a63a16a1e8265bb64cfd886f15c scala-2.6.1-gentoo-binary.tar.bz2 9440893
+RMD160 f958b094ba1202644022de2275ad57faa5ba2c0f scala-2.6.1-gentoo-binary.tar.bz2 9440893
+SHA256 12443ed9cd42dcc740ee27d2b69f7c91f0104c1893152579b47426284c1a79c0 scala-2.6.1-gentoo-binary.tar.bz2 9440893
diff --git a/dev-lang/scala/files/scala-2.4.0-build.xml.patch b/dev-lang/scala/files/scala-2.4.0-build.xml.patch
deleted file mode 100644
index f542a80c2d07..000000000000
--- a/dev-lang/scala/files/scala-2.4.0-build.xml.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- build.xml.orig	2007-03-21 17:53:06.000000000 +0100
-+++ build.xml	2007-05-04 13:53:33.000000000 +0200
-@@ -86,11 +86,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>
-+	-->
-   <!-- Making sure enough memory is available -->
-     <propertyregex
-       property="memory.set" input="${env.ANT_OPTS}" select="\1"
-@@ -784,7 +786,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
-@@ -802,7 +804,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
-@@ -886,7 +888,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"
-@@ -896,7 +898,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}"/>
-@@ -1045,7 +1047,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">
-@@ -1066,7 +1068,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://scala.epfl.ch/downloads/packages"/>
-     <mkdir dir="${dist.dir}"/>
-   <!-- Create the Scala library package -->
-@@ -1120,7 +1122,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">
diff --git a/dev-lang/scala/files/scala-2.5.1-build.xml.patch b/dev-lang/scala/files/scala-2.6.1-build.xml.patch
index fe5aa6533f33..9c5fd40a1501 100644
--- a/dev-lang/scala/files/scala-2.5.1-build.xml.patch
+++ b/dev-lang/scala/files/scala-2.6.1-build.xml.patch
@@ -1,20 +1,20 @@
---- build.xml.orig	2007-06-18 09:19:50.000000000 -0400
-+++ build.xml	2007-06-18 09:20:19.000000000 -0400
-@@ -85,11 +85,13 @@
+--- build.xml	2007-12-19 14:34:43.000000000 +0100
++++ build.xml	2008-01-20 18:00:33.000000000 +0100
+@@ -108,11 +108,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>
  
  <!-- ===========================================================================
-@@ -784,7 +786,7 @@
+@@ -1410,7 +1412,7 @@
  DOCUMENTATION
  ============================================================================ -->
  
@@ -23,7 +23,7 @@
      description="Generated the API for library sources">
      <mkdir dir="${api-lib.dir}"/>
      <quickdoc
-@@ -802,7 +804,7 @@
+@@ -1428,7 +1430,7 @@
      </quickdoc>
    </target>
  
@@ -32,7 +32,7 @@
      description="Generated the API for compiler sources">
      <mkdir dir="${api-comp.dir}"/>
      <quickdoc
-@@ -886,7 +888,7 @@
+@@ -1513,7 +1515,7 @@
  
    <target name="dist.patch" depends="init">
      <propertyfile file="${number.file}">
@@ -41,7 +41,7 @@
      </propertyfile>
      <property file="${number.file}"/>
      <property name="version.number"
-@@ -896,7 +898,7 @@
+@@ -1523,7 +1525,7 @@
  
    <target name="dist.minor" depends="init">
      <propertyfile file="${number.file}">
@@ -50,7 +50,7 @@
        <entry key="version.patch" type="int" value="0"/>
      </propertyfile>
      <property file="${number.file}"/>
-@@ -1045,7 +1047,7 @@
+@@ -1729,7 +1731,7 @@
      <copy todir="${dist.current.dir}/doc/scala">
        <fileset dir="${docs.dir}" includes="README,LICENSE"/>
      </copy>
@@ -59,17 +59,17 @@
        <fileset dir="${api-lib.dir}"/>
      </copy>
      <copy todir="${dist.current.dir}/doc/scala/examples">
-@@ -1066,7 +1068,7 @@
+@@ -1750,7 +1752,7 @@
    </target>
  
    <!-- Create the SBaz packages -->
--  <target name="build.sbaz" depends="build.dist">
+-  <target name="build.sbaz" depends="build.dist,msil,cldc,android">
 +  <target name="build.sbaz" depends="build.dist" if="do.archive">
-     <property name="sbaz.universe" value="http://scala.epfl.ch/downloads/packages"/>
+     <property name="sbaz.universe" value="http://www.scala-lang.org/downloads/packages"/>
      <mkdir dir="${dist.dir}"/>
    <!-- Create the Scala library package -->
-@@ -1120,7 +1122,7 @@
-     </quicksbaz>
+@@ -1846,7 +1848,7 @@
+     </then></if>
    </target>
  
 -  <target name="build.archive" depends="build.dist">
diff --git a/dev-lang/scala/scala-2.4.0.ebuild b/dev-lang/scala/scala-2.4.0.ebuild
deleted file mode 100644
index 0dddbc380cd6..000000000000
--- a/dev-lang/scala/scala-2.4.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.4.0.ebuild,v 1.2 2007/05/06 00:38:40 ali_bush Exp $
-
-JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-nodeps"
-inherit check-reqs java-pkg-2 java-ant-2 versionator
-
-MY_P="${P}-final"
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="http://www.scala-lang.org/downloads/distrib/files/${MY_P}-sources.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-contrib"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	debug-print "Checking for sufficient physical RAM"
-
-	if use amd64; then
-		CHECKREQS_MEMORY="1024"
-	else
-		CHECKREQS_MEMORY="512"
-	fi
-	check_reqs
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# remove check for ant-nodeps.jar in ant-core/lib; make docs opt-in;
-	# don't increase version; don't create dist archives
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	cd lib || die
-	# other jars are needed for bootstrap
-	rm -v ant-contrib.jar || die
-	java-pkg_jar-from --build-only ant-contrib
-}
-
-src_compile() {
-	if use amd64; then
-		export ANT_OPTS="-Xmx1024M -Xms1024M"
-	else
-		export ANT_OPTS="-Xmx512M -Xms512M"
-	fi
-	local target
-	if [[ "$(get_version_component_range 3)"  == "0" ]];
-	then
-		target="minor"
-	else
-		target="patch"
-	fi
-	eant dist.${target} $(use_doc -Ddo.docs=true)
-}
-
-src_test() {
-	bash ${S}/test/scalatest || die "Some tests aren't passed"
-}
-
-scala_launcher() {
-	local SCALADIR="/usr/share/${PN}"
-	local bcp="${SCALADIR}/lib/scala-library.jar"
-	java-pkg_dolauncher "${1}" --main "${2}" ${3} \
-		--java_args "-Xmx256M -Xms16M -Xbootclasspath/a:\\\"${bcp}\\\" -Dscala.home=\\\"${SCALADIR}\\\" -Denv.classpath=\\\"\${CLASSPATH}\\\""
-}
-
-src_install() {
-	cd dists/${MY_P} || die
-	local SCALADIR="/usr/share/${PN}/"
-
-	# sources are .scala so no use for java-pkg_dosrc
-	if use source; then
-		dodir "${SCALADIR}/src"
-		insinto "${SCALADIR}/src"
-		doins lib/*-src.jar
-	fi
-
-	rm lib/*-src.jar
-	java-pkg_dojar lib/*.jar
-
-	doman man/man1/*.1 || die
-	local docdir="doc/${PN}"
-	dodoc "${docdir}"/{LICENSE,README} ../../docs/TODO || die
-	if use doc; then
-		java-pkg_dojavadoc "${docdir}/api"
-		dohtml -r "${docdir}/tools" || die
-	fi
-	use examples && java-pkg_doexamples "${docdir}/examples"
-
-	scala_launcher fsc scala.tools.nsc.CompileClient
-	scala_launcher scala scala.tools.nsc.MainGenericRunner
-	scala_launcher scalac scala.tools.nsc.Main
-	scala_launcher scaladoc scala.tools.nsc.Main "--pkg_args -doc"
-}
diff --git a/dev-lang/scala/scala-2.5.1.ebuild b/dev-lang/scala/scala-2.5.1.ebuild
deleted file mode 100644
index 82c49fa980b4..000000000000
--- a/dev-lang/scala/scala-2.5.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.5.1.ebuild,v 1.2 2007/06/18 19:30:26 caster Exp $
-
-JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-nodeps"
-inherit check-reqs java-pkg-2 java-ant-2 versionator
-
-MY_P="${P}-final"
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="http://www.scala-lang.org/downloads/distrib/files/${MY_P}-sources.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-contrib"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	debug-print "Checking for sufficient physical RAM"
-
-	if use amd64; then
-		CHECKREQS_MEMORY="1024"
-	else
-		CHECKREQS_MEMORY="512"
-	fi
-	check_reqs
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# remove check for ant-nodeps.jar in ant-core/lib; make docs opt-in;
-	# don't increase version; don't create dist archives
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	cd lib || die
-	# other jars are needed for bootstrap
-	rm -v ant-contrib.jar || die
-	java-pkg_jar-from --build-only ant-contrib
-}
-
-src_compile() {
-	if use amd64; then
-		export ANT_OPTS="-Xmx1024M -Xms1024M"
-	else
-		export ANT_OPTS="-Xmx512M -Xms512M -Xss1024k"
-	fi
-	local target
-	if [[ "$(get_version_component_range 3)"  == "0" ]];
-	then
-		target="minor"
-	else
-		target="patch"
-	fi
-	eant dist.${target} $(use_doc -Ddo.docs=true)
-}
-
-src_test() {
-	bash ${S}/test/scalatest || die "Some tests aren't passed"
-}
-
-scala_launcher() {
-	local SCALADIR="/usr/share/${PN}"
-	local bcp="${SCALADIR}/lib/scala-library.jar"
-	java-pkg_dolauncher "${1}" --main "${2}" ${3} \
-		--java_args "-Xmx256M -Xms16M -Xbootclasspath/a:\\\"${bcp}\\\" -Dscala.home=\\\"${SCALADIR}\\\" -Denv.classpath=\\\"\${CLASSPATH}\\\""
-}
-
-src_install() {
-	cd dists/${MY_P} || die
-	local SCALADIR="/usr/share/${PN}/"
-
-	# sources are .scala so no use for java-pkg_dosrc
-	if use source; then
-		dodir "${SCALADIR}/src"
-		insinto "${SCALADIR}/src"
-		doins lib/*-src.jar
-	fi
-
-	rm lib/*-src.jar
-	java-pkg_dojar lib/*.jar
-
-	doman man/man1/*.1 || die
-	local docdir="doc/${PN}"
-	dodoc "${docdir}"/{LICENSE,README} ../../docs/TODO || die
-	if use doc; then
-		java-pkg_dojavadoc "${docdir}/api"
-		dohtml -r "${docdir}/tools" || die
-	fi
-	use examples && java-pkg_doexamples "${docdir}/examples"
-
-	scala_launcher fsc scala.tools.nsc.CompileClient
-	scala_launcher scala scala.tools.nsc.MainGenericRunner
-	scala_launcher scalac scala.tools.nsc.Main
-	scala_launcher scaladoc scala.tools.nsc.Main "--pkg_args -doc"
-}
diff --git a/dev-lang/scala/scala-2.6.1.ebuild b/dev-lang/scala/scala-2.6.1.ebuild
new file mode 100644
index 000000000000..1a915b27bc1e
--- /dev/null
+++ b/dev-lang/scala/scala-2.6.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.6.1.ebuild,v 1.1 2008/01/21 12:41:36 caster Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
+
+MY_P="${P}-final"
+
+# creating the binary:
+# JAVA_PKG_FORCE_VM="$available-1.4" USE="doc examples source" ebuild scala-*.ebuild compile
+# cd $WORDKIR
+# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 dists docs/TODO
+
+DESCRIPTION="The Scala Programming Language"
+HOMEPAGE="http://www.scala-lang.org/"
+SRC_URI="!binary? ( http://www.scala-lang.org/downloads/distrib/files/${MY_P}-sources.tgz )
+	binary? ( mirror://gentoo/${P}-gentoo-binary.tar.bz2 )"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+# one fails with 1.7, two with 1.4 (blackdown)
+RESTRICT="test"
+
+DEPEND=">=virtual/jdk-1.4
+	!binary? (
+		dev-java/ant-contrib
+		dev-java/jline
+	)"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/jline"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	if ! use binary; then
+		debug-print "Checking for sufficient physical RAM"
+
+		ewarn "This package can fail to build with memory allocation errors in some cases."
+		ewarn "If you are unable to build from sources, please try USE=binary"
+		ewarn "for this package. See bug #181390 for more information."
+		ebeep 3
+		epause 5
+
+		if use amd64; then
+			CHECKREQS_MEMORY="1024"
+		else
+			CHECKREQS_MEMORY="512"
+		fi
+		check_reqs
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if ! use binary; then
+		# remove check for ant-nodeps.jar in ant-core/lib; make docs opt-in;
+		# don't increase version; don't create dist archives
+		epatch "${FILESDIR}/${P}-build.xml.patch"
+
+		cd lib || die
+		# other jars are needed for bootstrap
+		rm -v ant-contrib.jar jline.jar #cldcapi10.jar midpapi10.jar msil.jar *.dll || die
+		java-pkg_jar-from --build-only ant-contrib
+		java-pkg_jar-from jline
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		if use amd64; then
+			export ANT_OPTS="-Xmx1024M -Xms1024M"
+		else
+			export ANT_OPTS="-Xmx512M -Xms512M -Xss1024k"
+		fi
+		local target
+		if [[ "$(get_version_component_range 3)"  == "0" ]];
+		then
+			target="minor"
+		else
+			target="patch"
+		fi
+		eant dist.${target} $(use_doc -Ddo.docs=true)
+	else
+		einfo "Skipping compilation, USE=binary is set."
+	fi
+}
+
+src_test() {
+	bash test/scalatest || die "Some tests aren't passed"
+}
+
+scala_launcher() {
+	local SCALADIR="/usr/share/${PN}"
+	local bcp="${SCALADIR}/lib/scala-library.jar"
+	java-pkg_dolauncher "${1}" --main "${2}" ${3} \
+		--java_args "-Xmx256M -Xms16M -Xbootclasspath/a:\\\"${bcp}\\\" -Dscala.home=\\\"${SCALADIR}\\\" -Denv.classpath=\\\"\${CLASSPATH}\\\""
+}
+
+src_install() {
+	cd dists/${MY_P} || die
+	local SCALADIR="/usr/share/${PN}/"
+
+	# sources are .scala so no use for java-pkg_dosrc
+	if use source; then
+		dodir "${SCALADIR}/src"
+		insinto "${SCALADIR}/src"
+		doins lib/*-src.jar
+	fi
+
+	rm lib/*-src.jar || die
+	java-pkg_dojar lib/*.jar
+	use binary && java-pkg_register-dependency jline
+
+	doman man/man1/*.1 || die
+	local docdir="doc/${PN}"
+	dodoc "${docdir}/README" ../../docs/TODO || die
+	if use doc; then
+		java-pkg_dojavadoc "${docdir}/api"
+		dohtml -r "${docdir}/tools" || die
+	fi
+
+	use examples && java-pkg_doexamples "${docdir}/examples"
+
+	scala_launcher fsc scala.tools.nsc.CompileClient
+	scala_launcher scala scala.tools.nsc.MainGenericRunner
+	scala_launcher scalac scala.tools.nsc.Main
+	scala_launcher scaladoc scala.tools.nsc.Main "--pkg_args -doc"
+}