Version Bump.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

3 files changed, 143 insertions, 3 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index fef50a45eaea..d53e14fd039f 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/scala
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.21 2010/05/02 11:44:49 djc Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.22 2011/04/29 10:35:26 ali_bush Exp $
+
+*scala-2.8.1 (29 Apr 2011)
+
+  29 Apr 2011; Alistair Bush <ali_bush@gentoo.org> +scala-2.8.1.ebuild:
+  Version Bump.
 
   02 May 2010; Dirkjan Ochtman <djc@gentoo.org> -scala-2.7.2.ebuild,
   -scala-2.7.3.ebuild, -scala-2.7.3-r1.ebuild, -scala-2.7.4.ebuild,
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index 3b5c4b8a1b19..66af2be2f253 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -1,6 +1,9 @@
 AUX scala-2.7.3-build.xml.patch 417 RMD160 825678486a85872c365349c04f6fc104f894656c SHA1 2a253c198543b9bbfab58aa9ccad77ba511c97bf SHA256 8b8db8fba952309a2446cbac2734ceec1f18c2d3407768c22cf3291a0a0ea211
 DIST scala-2.7.7-gentoo-binary.tar.bz2 12977943 RMD160 0da512700a4025e4d620b93d0744457e389fbf02 SHA1 694687ae5a1c8f60e6c43c211c2385d60e50b4e6 SHA256 96989ff39cabd13022b74580c21b5a91764e523fc481f615aedbd5050c18de03
 DIST scala-2.7.7.final-sources.tgz 29551089 RMD160 c6cc31029ab62562b2ef9368fbf9702af29cb9d2 SHA1 ba85f2b60dd01da80be55593cee06e76d232100c SHA256 50fba7d6aadf5560347ab901f8c65765116d5ae2bee22bba3fce897d59a58ed0
+DIST scala-2.8.1-gentoo-binary.tar.bz2 24790686 RMD160 ce8522c976d6ae02362900b5ad1b832fa9f83a69 SHA1 4b20cea283f2ce21c636e7bb25345deee91a3b7e SHA256 eb8e9d75a1de43b19e10df3a42a90807bb9eac100a4b6da9e8762c9027ee4d8d
+DIST scala-2.8.1.final-sources.tgz 41263128 RMD160 128ced6e335ead758193e3779787c57be59fa911 SHA1 271e108d729fbd4154dc6c412c72fb76e35f657d SHA256 fd7fb0208e0746d621421cf3c5a3f2daa1a73992ce5f740c477ff7a1d430dfce
 EBUILD scala-2.7.7.ebuild 3300 RMD160 7663fe14a0aa5dcb2019f4c475c5a1b385f6ea3d SHA1 88ebb6f1a17c24c9130277de36a0974b616a5341 SHA256 4afd32daf623e541e71f8ffd033cafa5522a03a0e6c7e313415963afe7615d7d
-MISC ChangeLog 3904 RMD160 ffa143030b853ea76c79d7444c599ca0a4035d7a SHA1 2cb20d65e92f915662e3f37454ec4fff7895a730 SHA256 a612146ef000fa9535b5f28768edfe1fdc548f9673a52924162537a2e86a6d2a
+EBUILD scala-2.8.1.ebuild 3447 RMD160 243618489bea175e908708efe43d4a153d56df51 SHA1 94e076146294c8a0ae6d6525485136f961d4b9e6 SHA256 ae86e4eba001c14081cc8e86cdbb46766e8dad195441425905e0c253e27eb4e7
+MISC ChangeLog 4026 RMD160 99b1667d1e0aa906ce7364f49351dbf6b64c569c SHA1 73d82a5deb64793572586a67335587ea19dfa394 SHA256 a5335780c49fc572bf4b60e66db3556e0817b09f8a19cb101b65341ea760513f
 MISC metadata.xml 317 RMD160 c068d6e3d0806587dc6262bd8162709fbd18b25e SHA1 d68298cc52c736cb3a300197daa86cf6d4618656 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94
diff --git a/dev-lang/scala/scala-2.8.1.ebuild b/dev-lang/scala/scala-2.8.1.ebuild
new file mode 100644
index 000000000000..f3d4abe34bdb
--- /dev/null
+++ b/dev-lang/scala/scala-2.8.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.8.1.ebuild,v 1.1 2011/04/29 10:35:26 ali_bush Exp $
+
+EAPI="3"
+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"
+
+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? ( http://dev.gentoo.org/~ali_bush/${P}-gentoo-binary.tar.bz2 )"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary emacs"
+# one fails with 1.7, two with 1.4 (blackdown)
+#RESTRICT="test"
+
+DEPEND=">=virtual/jdk-1.6
+	java-virtuals/jdk-with-com-sun
+	!binary? (
+		dev-java/ant-contrib:0
+		dev-java/jline:0
+	)"
+RDEPEND=">=virtual/jre-1.6
+	dev-java/jline:0
+	!dev-java/scala-bin"
+
+PDEPEND="emacs? ( app-emacs/scala-mode )"
+
+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
+}
+
+java_prepare() {
+	if ! use binary; then
+		pushd lib &> /dev/null
+		# other jars are needed for bootstrap
+		#rm -v jline.jar ant/ant-contrib.jar #cldcapi10.jar midpapi10.jar msil.jar *.dll || die
+		rm -v ant/ant-contrib.jar || die
+		java-pkg_jar-from --into ant --build-only ant-contrib
+		popd &> /dev/null
+		java-pkg_jar-from jline
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		# reported in bugzilla that multiple launches use less resources
+		# https://bugs.gentoo.org/show_bug.cgi?id=282023
+		eant all.clean
+		eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \
+			newlibs newforkjoin build-opt
+		eant dist.done
+
+		#TODO figure out why build doesn't work with jline.
+		cp jline.jar dists/latest/lib/ || die
+		cp jline.jar lib/ || die
+	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() {
+	cd dists/latest || 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 src/*-src.jar
+	fi
+
+	java-pkg_dojar lib/*.jar
+
+	doman man/man1/*.1 || die
+
+	#docs and examples are not contained in the binary tgz anymore
+	if ! use binary; then
+		local docdir="doc/${PN}-devel-docs"
+		dodoc doc/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"
+	fi
+
+	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
+	scala_launcher scalap scala.tools.scalap.Main
+}