Version Bump.

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

3 files changed, 150 insertions, 2 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index 7e8d2d1e6d88..646b90ec476b 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/scala
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.29 2012/01/31 09:22:41 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.30 2012/06/21 12:23:30 ali_bush Exp $
+
+*scala-2.9.2 (21 Jun 2012)
+
+  21 Jun 2012; Alistair Bush <ali_bush@gentoo.org> +scala-2.9.2.ebuild:
+  Version Bump.
 
   31 Jan 2012; Alistair Bush <ali_bush@gentoo.org> scala-2.9.1.ebuild:
   Update jdk dependency as errors building with jdk-1.7.
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index b81eab4374e5..ff57a70c1062 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -3,7 +3,10 @@ DIST scala-2.9.0.1-gentoo-binary.tar.bz2 33234044 RMD160 46ebbe9554ca744408223fc
 DIST scala-2.9.0.1.tar.xz 29707920 RMD160 eb7fa1cc9dc4b006bbcbd3b420a98069158abc01 SHA1 0c68fb815907a07c30b9743db3936a2e02eae92f SHA256 97e0d2262e4df8f936c70670849299deba69e981f783250d819733e52dbe7f96
 DIST scala-2.9.1-gentoo-binary.tar.bz2 33266793 RMD160 cb5b2ed3e595a41d291eb5ff6d3352ed71c16f4c SHA1 02835cf1aee091576698cfa0645ac588f42c0bcc SHA256 b118c285ba6655974a647a5a82e3e655487e55aff6a5b89ddf5295595d6c822a
 DIST scala-2.9.1.tar.xz 29728644 RMD160 e81a4a2f6997be79c7181bf16cf7529198e39aa2 SHA1 e2997a257801ea7ac666d8f90e7105713d3856d9 SHA256 4bbb439b2830560cd034eaf143357cb195b8bcd986e38749341ce541cbfa8e6a
+DIST scala-2.9.2-gentoo-binary.tar.bz2 32370003 RMD160 32dc7c61c382622f2b1207346243dd2d3a9f688f SHA1 ec74de83e6141914542a5e44957afdf11be3f185 SHA256 43e07596f28e723cf1e2d41ed95c312af8422059de8c229d18eadb46d487c9ca
+DIST scala-2.9.2.tar.gz 38434121 RMD160 8168e5781d38812eedfd79d0e16a6223b0f04645 SHA1 3d925defd4c72331022e94b0fca492535841805c SHA256 1b931103051f4f6b2f8788ac6f5392b5f29e1109e97f0e19340ff6185fbab4ad
 EBUILD scala-2.9.0.1.ebuild 3889 RMD160 6ae28f695efc48217742f944c0f37ee71db58056 SHA1 e37a2e464798c3637afbc155315eb471ef0f29cd SHA256 4193799a5ee6b63411c20a99c4d7422d5a596d795236a508fe536a316ac2013d
 EBUILD scala-2.9.1.ebuild 3902 RMD160 3e592fddb7c0a1e8c58283cabe8a792cf854744d SHA1 7b0ca2f925994b263f2540cc585c1a6f2dc7d598 SHA256 5850b0694255b672412d830f6bcabda4eb3506ad78a5cd6fc58c974606024fcb
-MISC ChangeLog 5092 RMD160 0f506471e4985460b2739a7b0f4ada69f2c2be60 SHA1 5ce950b234016123a35af10ee4746694a43171bb SHA256 16962a1b6cbb2b670526d2401b55d4bba604281b4e2f67c25d88c238e6ebfa71
+EBUILD scala-2.9.2.ebuild 3908 RMD160 ad23c85ba5972428981638120949020dec758fdd SHA1 47bfa295c6286286b35b1bb973a1052e1aeaf0ec SHA256 152b15cc004dcff188dae8536c38e10651485dad43e445c39d306210b41ab7fd
+MISC ChangeLog 5209 RMD160 fe80fd1c53958d6be6da238a0730a1c9cff21681 SHA1 dd3924368c9bbf2b2f52cdaec4c15443751a5f45 SHA256 2ceb7e98d079524c5074a93c38909c5f59bd54463af08c0007a3ba4d18491c4a
 MISC metadata.xml 317 RMD160 c068d6e3d0806587dc6262bd8162709fbd18b25e SHA1 d68298cc52c736cb3a300197daa86cf6d4618656 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94
diff --git a/dev-lang/scala/scala-2.9.2.ebuild b/dev-lang/scala/scala-2.9.2.ebuild
new file mode 100644
index 000000000000..26fcca98f944
--- /dev/null
+++ b/dev-lang/scala/scala-2.9.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.9.2.ebuild,v 1.1 2012/06/21 12:23:30 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="${PN}-sources-${PV}"
+
+# creating the binary:
+# JAVA_PKG_FORCE_VM="$available-1.6" 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? ( ${HOMEPAGE}downloads/distrib/files/${MY_P}.tgz -> ${P}.tar.gz )
+	binary? ( http://dev.gentoo.org/~ali_bush/distfiles/${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
+	)
+	app-arch/xz-utils"
+RDEPEND=">=virtual/jre-1.6
+	!dev-java/scala-bin"
+
+PDEPEND="emacs? ( app-emacs/scala-mode )"
+
+S="${WORKDIR}/${P}-sources"
+
+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."
+
+		CHECKREQS_MEMORY="1532M"
+
+		check-reqs_pkg_setup
+	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
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		#unset ANT_OPTS as this is set in the build.xml
+		#sets -X type variables which might come back to bite me
+		unset ANT_OPTS
+
+		# 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
+	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}/"
+
+	exeinto "${SCALADIR}/bin"
+	doexe $(find bin/ -type f ! -iname '*.bat')
+
+	#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
+
+	dodir /usr/bin
+	for b in $(find bin/ -type f ! -iname '*.bat'); do
+		#pushd "${D}/usr/bin" &>/dev/null
+		local _name=$(basename "${b}")
+		dosym "/usr/share/${JAVA_PKG_NAME}/bin/${_name}" "/usr/bin/${_name}"
+		#popd &>/dev/null
+	done
+	#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
+}