Remove quoting for Xbootclasspath as it doesnt work with latest java-config. The quotes arent needed because the path cant contain spaces. Fixes bug

Package-Manager: portage-2.1.4.1

3 files changed, 154 insertions, 2 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index b5eded35998a..cc37e217d16a 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/scala
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.6 2008/01/21 12:41:36 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.7 2008/02/09 16:13:45 betelgeuse Exp $
+
+*scala-2.6.1-r1 (09 Feb 2008)
+
+  09 Feb 2008; Petteri Räty <betelgeuse@gentoo.org> +scala-2.6.1-r1.ebuild:
+  Remove quoting for Xbootclasspath as it doesnt work with latest java-config.
+  The quotes arent needed because the path cant contain spaces. Fixes bug
 
 *scala-2.6.1 (21 Jan 2008)
 
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index ddcd1c2e9e05..fe23f41b7d80 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scala-2.6.0-build.xml.patch 2964 RMD160 481e726ad79546bc42d929f4c647f8ee28b32a1a SHA1 7c4364306da9ffaee8dfadb455e60e30d53cf553 SHA256 70a4de1065377003c48ecf8a4ea78a61ddc54dad7f8d05f49f30361b7032ca70
 AUX scala-2.6.1-build.xml.patch 2979 RMD160 2802d77c5ee835aa5f39e09f48ffc6a19f676686 SHA1 05b9ba1bd5b5311a10bc84f8825eeb207a864b94 SHA256 09182f2d72a225a098d560aa3853b05a8e58aef12dad414b1a133f134a0efab6
 DIST scala-2.6.0-final-sources.tgz 25405348 RMD160 56cfa9cd224c5599ab4a5c7fd81019581dcbf2e2 SHA1 16b15d62c66fbe9790dd58e0fdf6130c4dadf727 SHA256 afb33197c51cc9f6bd0283a3bdafb3f0721cc0cfb855df5d3b9abb5914c669a3
 DIST scala-2.6.1-final-sources.tgz 26459400 RMD160 e7f2e12d52e1a371c92f46165a3845af98a43c85 SHA1 122aa50760723649e5eadf4cd99f08c57be27879 SHA256 04cac1fff3550d362ea2f1ff4cdcaef9b45819aadc39ce599bfa0f465110dd4e
 DIST scala-2.6.1-gentoo-binary.tar.bz2 9440893 RMD160 f958b094ba1202644022de2275ad57faa5ba2c0f SHA1 c02d2afec9e42e0fca3af8dc2f69ce12bac00d81 SHA256 12443ed9cd42dcc740ee27d2b69f7c91f0104c1893152579b47426284c1a79c0
 EBUILD scala-2.6.0.ebuild 2623 RMD160 62a530badc945c153eaf86764fb06b0df166f24f SHA1 4ae3a01a7f6f5ded3b809cdb0cb2c29bd90041b6 SHA256 82132e0091ace8367d099cc65430d393061debc51304556cb7df49cc15aa3997
+EBUILD scala-2.6.1-r1.ebuild 3552 RMD160 3d4befdc56f44258dbcca7e510c199122461e712 SHA1 c996a0e75108fbc32cba89e0fb829e290514616e SHA256 c0c7ff3138e54156b643d91c7e322b5566ad88ead65e2a731c1e0ab8acacd312
 EBUILD scala-2.6.1.ebuild 3553 RMD160 20d71aa1d0811cca85808fd6b8c8ab1d564928d6 SHA1 a63affea5bb28e39963dd926d97128eea7998baa SHA256 176bfcf885824139129bb10fe7e9be7d5253dab5bbc382d7a443af60038448e6
-MISC ChangeLog 1607 RMD160 68d1d4def3060dfa9c9f803b9482ea318967c0d7 SHA1 8672f2e2b7018b2c6f344542351c498519b65b73 SHA256 4b83376c0ea400633a0aed39423b2aed1cee0565230f3cf2e49e14814b3648e2
+MISC ChangeLog 1873 RMD160 4976cc082d7987a387f454c9c152aa94e2b87ae0 SHA1 cb3911e4ac8bdac0111329f43373b861ed076e2a SHA256 6e9452aa3bf5b8931664f17ab85fa80d5c2f6b2c1181fa636aec55512fb74f66
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHrdBBcxLzpIGCsLQRAvl2AJ9QrUnMyms4xP9tTJPQEp8MOVHbmQCfbYxT
++4NLCIr7xW2pG01Yz9dCr1M=
+=VjYM
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/scala/scala-2.6.1-r1.ebuild b/dev-lang/scala/scala-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..412bb409bc26
--- /dev/null
+++ b/dev-lang/scala/scala-2.6.1-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.6.1-r1.ebuild,v 1.1 2008/02/09 16:13:45 betelgeuse 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"
+
+# creating the binary:
+# JAVA_PKG_FORCE_VM="$available-1.4" USE="doc examples source" ebuild scala-*.ebuild compile
+# cd $WORDKIR
+# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 dists 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}-sources.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.4
+	!binary? (
+		dev-java/ant-contrib
+		dev-java/jline
+	)"
+RDEPEND=">=virtual/jre-1.4
+	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
+		# 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 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
+		if use amd64; then
+			export ANT_OPTS="-Xmx1024M -Xms1024M"
+		else
+			export ANT_OPTS="-Xmx512M -Xms512M -Xss1024k"
+		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)
+	else
+		einfo "Skipping compilation, USE=binary is set."
+	fi
+}
+
+src_test() {
+	bash 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 || die
+	java-pkg_dojar lib/*.jar
+	use binary && java-pkg_register-dependency jline
+
+	doman man/man1/*.1 || die
+	local docdir="doc/${PN}"
+	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.Main "--pkg_args -doc"
+}