Version bump, with minor change to build.xml.patch

Package-Manager: portage-2.1.2.7

5 files changed, 210 insertions, 5 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index 3d836c2045be..338ab88f6d57 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.2 2007/05/06 00:38:40 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.3 2007/06/18 13:52:30 caleb Exp $
+
+*scala-2.5.1 (18 Jun 2007)
+
+  18 Jun 2007; Caleb Tennis <caleb@gentoo.org>
+  +files/scala-2.5.1-build.xml.patch, +scala-2.5.1.ebuild:
+  Version bump, with minor change to build.xml.patch
 
   06 May 2007; Alistair John Bush <ali_bush@gentoo.org> scala-2.4.0.ebuild:
   Added ~amd64 for bug 147599
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index d3140de829b3..6543bf0f81be 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -2,15 +2,24 @@ AUX scala-2.4.0-build.xml.patch 2980 RMD160 86d56cf747a0758e90b3aca886bfe6c2c7df
 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
 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
 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
-MISC ChangeLog 706 RMD160 2ce6e97cfeacd1fa6f1160705a37c53e2e1e9e8b SHA1 dc7104a29e8c610514ed409ce64681e54f66f989 SHA256 ef866a7ce49c7e8c282fdada1e310ee995f3b14ad739b73529a247dee7e7c13b
-MD5 4cf47faa27b9f564c83197774965381b ChangeLog 706
-RMD160 2ce6e97cfeacd1fa6f1160705a37c53e2e1e9e8b ChangeLog 706
-SHA256 ef866a7ce49c7e8c282fdada1e310ee995f3b14ad739b73529a247dee7e7c13b ChangeLog 706
+EBUILD scala-2.5.1.ebuild 2613 RMD160 458f8ccc2fbdf3a213ff98bedb77aaa19c342d05 SHA1 a012aa3dd368911301bca72e4147e7d4ef5fb6a1 SHA256 83705ff6de7abfeeba855b24a45c86f1419ae975bc896a64c253c371edc968d4
+MD5 ad86d53c655aa55c64e304d29662f08a scala-2.5.1.ebuild 2613
+RMD160 458f8ccc2fbdf3a213ff98bedb77aaa19c342d05 scala-2.5.1.ebuild 2613
+SHA256 83705ff6de7abfeeba855b24a45c86f1419ae975bc896a64c253c371edc968d4 scala-2.5.1.ebuild 2613
+MISC ChangeLog 891 RMD160 38733f4297f4eb8faa6ac2b41cc9f9b6271d57c8 SHA1 81dc43fae606d8e9c47ab791843906ae68c4bf77 SHA256 c722f2d3469e3b8d93c6807496d90905a88adbfe0669f96fb9d79d3a47c787dc
+MD5 2e7e03063a813074098bb0f218e46452 ChangeLog 891
+RMD160 38733f4297f4eb8faa6ac2b41cc9f9b6271d57c8 ChangeLog 891
+SHA256 c722f2d3469e3b8d93c6807496d90905a88adbfe0669f96fb9d79d3a47c787dc ChangeLog 891
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -18,3 +27,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 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
diff --git a/dev-lang/scala/files/digest-scala-2.5.1 b/dev-lang/scala/files/digest-scala-2.5.1
new file mode 100644
index 000000000000..1eb8c6faa2d8
--- /dev/null
+++ b/dev-lang/scala/files/digest-scala-2.5.1
@@ -0,0 +1,3 @@
+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/scala-2.5.1-build.xml.patch b/dev-lang/scala/files/scala-2.5.1-build.xml.patch
new file mode 100644
index 000000000000..fe5aa6533f33
--- /dev/null
+++ b/dev-lang/scala/files/scala-2.5.1-build.xml.patch
@@ -0,0 +1,79 @@
+--- 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 @@
+   <!-- 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 @@
+ 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/scala-2.5.1.ebuild b/dev-lang/scala/scala-2.5.1.ebuild
new file mode 100644
index 000000000000..7165005f151e
--- /dev/null
+++ b/dev-lang/scala/scala-2.5.1.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.5.1.ebuild,v 1.1 2007/06/18 13:52:30 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"
+	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"
+}