Updated to fix issues raised in #250688. Thanks abachn.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

3 files changed, 147 insertions, 1 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index f8ed9aebc517..5c3b68e3b630 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/scala
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.11 2009/02/05 08:13:53 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.12 2009/02/11 11:21:55 ali_bush Exp $
+
+*scala-2.7.3-r1 (11 Feb 2009)
+
+  11 Feb 2009; Alistair Bush <ali_bush@gentoo.org>
+  +files/scala-2.7.3-build.xml.patch, +scala-2.7.3-r1.ebuild:
+  Updated to fix issues raised in #250688. Thanks abachn.
 
   05 Feb 2009; Alistair Bush <ali_bush@gentoo.org> scala-2.7.3.ebuild:
   Fixed #257581.
diff --git a/dev-lang/scala/files/scala-2.7.3-build.xml.patch b/dev-lang/scala/files/scala-2.7.3-build.xml.patch
new file mode 100644
index 000000000000..3401bac3b057
--- /dev/null
+++ b/dev-lang/scala/files/scala-2.7.3-build.xml.patch
@@ -0,0 +1,10 @@
+--- build.xml.orig	2009-02-11 22:47:38.000000000 +1300
++++ build.xml	2009-02-11 22:47:58.000000000 +1300
+@@ -627,7 +627,6 @@
+       <!-- filemode / dirmode: see trac ticket #1294 -->
+       <zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/>
+       <zipfileset dirmode="755" filemode="644" src="${msil.jar}"/>
+-      <zipfileset dirmode="755" filemode="644" src="${jline.jar}"/>
+     </jar>
+   </target>
+   
diff --git a/dev-lang/scala/scala-2.7.3-r1.ebuild b/dev-lang/scala/scala-2.7.3-r1.ebuild
new file mode 100644
index 000000000000..89a5ba1b1c89
--- /dev/null
+++ b/dev-lang/scala/scala-2.7.3-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.7.3-r1.ebuild,v 1.1 2009/02/11 11:21:55 ali_bush 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-sources"
+
+# creating the binary:
+# JAVA_PKG_FORCE_VM="$available-1.5" USE="doc examples source" ebuild scala-*.ebuild compile
+# cd $WORDKIR
+# fix dist/latest link.
+# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/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}.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.5
+	!binary? (
+		dev-java/ant-contrib
+		dev-java/jline
+	)"
+RDEPEND=">=virtual/jre-1.5
+	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
+
+		epatch "${FILESDIR}/${P}-build.xml.patch"
+
+		cd lib || die
+		# other jars are needed for bootstrap
+		rm -v 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
+		eant all.clean dist.done
+	else
+		einfo "Skipping compilation, USE=binary is set."
+	fi
+}
+
+src_test() {
+	eant test.suite || 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}" \
+		--java_args "-Xmx256M -Xms32M -Dscala.home=\\\"${SCALADIR}\\\" -Denv.emacs=\\\"\${EMACS}\\\""
+}
+
+src_install() {
+	if use binary ; then
+		cd dists/scala-2.7.3.r0-b20090118133557 || die
+	else
+		cd dists/latest || die
+	fi
+
+	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 src/*-src.jar
+	fi
+
+	java-pkg_dojar lib/*.jar
+	use binary && java-pkg_register-dependency jline
+
+	doman man/man1/*.1 || die
+
+	local docdir="doc/${PN}-devel-docs"
+	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.ScalaDoc
+}