version bump

Package-Manager: portage-2.1.3.16

5 files changed, 210 insertions, 5 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index c1531d5b62bc..92d8ff3a890d 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2007/06/18 19:30:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.5 2007/12/17 17:48:13 caleb Exp $
+
+*scala-2.6.0 (17 Dec 2007)
+
+  17 Dec 2007; Caleb Tennis <caleb@gentoo.org>
+  +files/scala-2.6.0-build.xml.patch, +scala-2.6.0.ebuild:
+  version bump
 
   18 Jun 2007; Vlastimil Babka <caster@gentoo.org> scala-2.5.1.ebuild:
   Increase thread stack size for compilation on x86 - was getting stack
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index 7bad659167f9..b61594f8a3dc 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -6,8 +6,13 @@ AUX scala-2.5.1-build.xml.patch 2953 RMD160 eacf7ce94872f0c9a3ba2f9e7814b978e889
 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
+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
@@ -16,10 +21,14 @@ EBUILD scala-2.5.1.ebuild 2624 RMD160 92e811261e12b23457d2b16744b681ade6376933 S
 MD5 f45a644825e4ca5961bf675c89d52d44 scala-2.5.1.ebuild 2624
 RMD160 92e811261e12b23457d2b16744b681ade6376933 scala-2.5.1.ebuild 2624
 SHA256 7cea3bf9034efe323924287793981693e8229508afffb68c8d905df9397f0e50 scala-2.5.1.ebuild 2624
-MISC ChangeLog 1052 RMD160 816a2d778eff6c1be051cf5060215ea2c499b3fb SHA1 a53ddc5d16c5e1cc5d0e005d026e8e79a92638df SHA256 a2621e31aaefb8cbe6815e62a5c0a5ed5382a55a616a93204d14d7f9d87a948a
-MD5 c11d2f3db192760d59fc6f028fc31650 ChangeLog 1052
-RMD160 816a2d778eff6c1be051cf5060215ea2c499b3fb ChangeLog 1052
-SHA256 a2621e31aaefb8cbe6815e62a5c0a5ed5382a55a616a93204d14d7f9d87a948a ChangeLog 1052
+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
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -30,3 +39,6 @@ SHA256 bb174907aa63a184ae1044eb8427df085fabd111e18c9ceb55c2cdf72a50d7c4 files/di
 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
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">
diff --git a/dev-lang/scala/scala-2.6.0.ebuild b/dev-lang/scala/scala-2.6.0.ebuild
new file mode 100644
index 000000000000..8185a2c3e4e6
--- /dev/null
+++ b/dev-lang/scala/scala-2.6.0.ebuild
@@ -0,0 +1,105 @@
+# 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.6.0.ebuild,v 1.1 2007/12/17 17:48:13 caleb 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"
+}