Version bump again.

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

3 files changed, 136 insertions, 2 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index 0165e759d15c..b4b896bb7f12 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,11 @@
 # 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.15 2009/04/30 19:29:39 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.16 2009/05/01 07:44:39 ali_bush Exp $
+
+*scala-2.7.4-r1 (01 May 2009)
+
+  01 May 2009; Alistair Bush <ali_bush@gentoo.org> +scala-2.7.4-r1.ebuild:
+  Bump scala again. this time based on 2.7.3-r1.
 
 *scala-2.7.4 (30 Apr 2009)
 
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index dd554c5ef35b..5b5e99a78d04 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -16,6 +16,7 @@ EBUILD scala-2.6.1.ebuild 3553 RMD160 20d71aa1d0811cca85808fd6b8c8ab1d564928d6 S
 EBUILD scala-2.7.2.ebuild 3279 RMD160 aa323193807d7e9fb3671db1a2927ceb02b99d15 SHA1 b91f5a57bb72bd30a4f04da58b89a4e05154a76d SHA256 331f78a7464a337648114c3c5b397f6a1ec4c4db81c90e4e694f8c0875441f8f
 EBUILD scala-2.7.3-r1.ebuild 3263 RMD160 c18ac152419a59bf22ab9aaf52b6a0513165b251 SHA1 257b0a5a1ca40f44a3fd2ca35a138879da4cdf7c SHA256 7f608b36f883df757ee8bcc4d35940bf29796565a3ed748ba83d29ea4d2209d4
 EBUILD scala-2.7.3.ebuild 3386 RMD160 7b7f300e5a19d7bdb7d40d9603c8a721a7c8fcb5 SHA1 dee9e19706431d568d63813224abf415a5039e29 SHA256 7b40d7224933f9ca6046c076a3fc181524f8aed820db7d8e183836690a6ded01
+EBUILD scala-2.7.4-r1.ebuild 3180 RMD160 d665788a889d5ef288c9e09d8e63c457fe477b12 SHA1 57cc9ea6efa28c8c8bbd415cd5e60c295050cb02 SHA256 07ba7839d7c72c630b0a7c055d5c2711e073250afc438d048b40a7b0d58568be
 EBUILD scala-2.7.4.ebuild 3296 RMD160 87f09f17c82a206cd180c6133963b4b23bd65767 SHA1 612ed29f4c8634492b24d1ca038127b854d8650b SHA256 0dc8c0bc6d60feae0148d08a93c845655f79267bf7d6acd8afc017a2acb6ba31
-MISC ChangeLog 2871 RMD160 002148b777b3d86010ad706e31bf53339709e281 SHA1 d34a142b4e86a105704e55fe67366efdb8c1585b SHA256 601971d1e07bf1a9a36da8a760ab59013d23066fc9282ccbba291dc2dce85c93
+MISC ChangeLog 3027 RMD160 371228ec0244d226141c2dbe3774e7859594deb0 SHA1 aa5f0bbd6fd38fade5ada242612baeba8f5175d0 SHA256 f479cf1cf9174d346e52561bfca6b72e86adc4554f9bbc4e99fa1afbcb923e15
 MISC metadata.xml 317 RMD160 c068d6e3d0806587dc6262bd8162709fbd18b25e SHA1 d68298cc52c736cb3a300197daa86cf6d4618656 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94
diff --git a/dev-lang/scala/scala-2.7.4-r1.ebuild b/dev-lang/scala/scala-2.7.4-r1.ebuild
new file mode 100644
index 000000000000..4289b4510be5
--- /dev/null
+++ b/dev-lang/scala/scala-2.7.4-r1.ebuild
@@ -0,0 +1,128 @@
+# 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.4-r1.ebuild,v 1.1 2009/05/01 07:44:39 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 emacs"
+# 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
+	!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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if ! use binary; then
+
+		epatch "${FILESDIR}/${PN}-2.7.3-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() {
+	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
+	use binary && java-pkg_register-dependency jline
+
+	doman man/man1/*.1 || die
+
+	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"
+
+	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
+}