Version bump, clean and fix #269169

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

5 files changed, 41 insertions, 285 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index b4b896bb7f12..b6727ec20859 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.16 2009/05/01 07:44:39 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.17 2009/06/05 08:45:17 ali_bush Exp $
+
+*scala-2.7.5 (05 Jun 2009)
+
+  05 Jun 2009; Alistair Bush <ali_bush@gentoo.org> -scala-2.6.0.ebuild,
+  -scala-2.6.1.ebuild, -scala-2.6.1-r1.ebuild, +scala-2.7.5.ebuild:
+  Version bump, clean and fix #269169
 
 *scala-2.7.4-r1 (01 May 2009)
 
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index 5b5e99a78d04..2f430408af75 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -1,22 +1,19 @@
 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
 AUX scala-2.7.3-build.xml.patch 417 RMD160 825678486a85872c365349c04f6fc104f894656c SHA1 2a253c198543b9bbfab58aa9ccad77ba511c97bf SHA256 8b8db8fba952309a2446cbac2734ceec1f18c2d3407768c22cf3291a0a0ea211
-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
 DIST scala-2.7.2-gentoo-binary.tar.bz2 12691171 RMD160 47f663b0916cb0ddb2e4626c38ed199ab9826833 SHA1 15b86b3a581250dbd1e255f347bde06d328bf412 SHA256 28a6db309f17bb30e6fe2d494872266eea643cf037235fa2dc2bb184be86686e
 DIST scala-2.7.2.final-sources.tgz 26906402 RMD160 2ead1c774c08d64d6ab6280278faf5f65fa269af SHA1 3d792210adaa1ebbb0c2c6b74bb3eb7dc32a2311 SHA256 46d1d3d58b7f2a4c0547a1dde53f099d0169072c3db491ebb9e3992aada7bb56
 DIST scala-2.7.3-gentoo-binary.tar.bz2 12803852 RMD160 f94cbdc7181af668aa20bf3784f419a0532cba9c SHA1 b967226c9bad0bf6667091996fd54ac565688d47 SHA256 46007b02af540cdce49f477dbf4d57cadc6604777e5ad39c51e60f67998cbc51
 DIST scala-2.7.3.final-sources.tgz 29451311 RMD160 67e1085a1eabf1b7743a7c3d07f96c0f9fa62493 SHA1 074e7fa344002725f5ed0201e061318150aa0d25 SHA256 124f11edca82bbb11c0718e293e8e34deda41f0ab31878e996b822107b311f68
 DIST scala-2.7.4-gentoo-binary.tar.bz2 13664162 RMD160 61e514e90d58ddd584c37ec96bb15c3095eb59be SHA1 cfa3a23b72eaf6f3a0f2172f5d17a60b9c36e8b3 SHA256 9c71d76d1f1908ec9733fbfde5d1b01f63dee9ee9c937a2c62df011e041f518e
 DIST scala-2.7.4.final-sources.tgz 29500833 RMD160 1305974e084135a7ab2597d2dd5e7724667d7659 SHA1 cec8a9ee65f8f48026db0a77f77182bc8b76986e SHA256 3c2c92af6a9994c18a38c3fa6e2c3e65de9c06bff9d59e8c1e63e45965c7ac11
-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
+DIST scala-2.7.5-gentoo-binary.tar.bz2 12807320 RMD160 e91a21b320a14c818b10f4112bfcdc318b790cf7 SHA1 8168d32ff55d3d25868370141a72e8b140caa0fe SHA256 d7ae7de17c7dd73df311951bae4b555f48affc68c160c4208bd8f29048b702dd
+DIST scala-2.7.5.final-sources.tgz 29456474 RMD160 b7fac2c3498e81c8834db8cfc4b893ef3c6567c7 SHA1 6717839f919e72d1ba48a86a5121db201f96e577 SHA256 1bf01f1128caf299fdf27a55f7da5f9a918a196038920c59817d5a3becd5d519
 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 3027 RMD160 371228ec0244d226141c2dbe3774e7859594deb0 SHA1 aa5f0bbd6fd38fade5ada242612baeba8f5175d0 SHA256 f479cf1cf9174d346e52561bfca6b72e86adc4554f9bbc4e99fa1afbcb923e15
+EBUILD scala-2.7.5.ebuild 3160 RMD160 e67be38e5221d07be347976a57b57d1916ccc6e4 SHA1 5c5f14d39eb4bbab2cd2999d567d05ed7a1a84de SHA256 e778a21c3e06da4be77ef3c9f1a6c70c70e5fb84b2d64481b759d7dfb1c9858e
+MISC ChangeLog 3234 RMD160 717a2114454f7c8628166735142dc57ba9fac68e SHA1 c114c197b425b88fb81b747be9cf9c0089e1ae82 SHA256 7bbc9766f8181cac32be3e0466ea9b6eb8635719fbc3ef34c646431fee25347c
 MISC metadata.xml 317 RMD160 c068d6e3d0806587dc6262bd8162709fbd18b25e SHA1 d68298cc52c736cb3a300197daa86cf6d4618656 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94
diff --git a/dev-lang/scala/scala-2.6.0.ebuild b/dev-lang/scala/scala-2.6.0.ebuild
deleted file mode 100644
index 8185a2c3e4e6..000000000000
--- a/dev-lang/scala/scala-2.6.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.6.0.ebuild,v 1.1 2007/12/17 17:48:13 caleb Exp $
-
-JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-nodeps"
-inherit check-reqs java-pkg-2 java-ant-2 versionator
-
-MY_P="${P}-final"
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="http://www.scala-lang.org/downloads/distrib/files/${MY_P}-sources.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-contrib"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	debug-print "Checking for sufficient physical RAM"
-
-	if use amd64; then
-		CHECKREQS_MEMORY="1024"
-	else
-		CHECKREQS_MEMORY="512"
-	fi
-	check_reqs
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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 || die
-	java-pkg_jar-from --build-only ant-contrib
-}
-
-src_compile() {
-	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)
-}
-
-src_test() {
-	bash ${S}/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
-	java-pkg_dojar lib/*.jar
-
-	doman man/man1/*.1 || die
-	local docdir="doc/${PN}"
-	dodoc "${docdir}"/{LICENSE,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"
-}
diff --git a/dev-lang/scala/scala-2.6.1.ebuild b/dev-lang/scala/scala-2.6.1.ebuild
deleted file mode 100644
index 1a915b27bc1e..000000000000
--- a/dev-lang/scala/scala-2.6.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.ebuild,v 1.1 2008/01/21 12:41:36 caster 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"
-}
diff --git a/dev-lang/scala/scala-2.6.1-r1.ebuild b/dev-lang/scala/scala-2.7.5.ebuild
index 412bb409bc26..97bac48958f8 100644
--- a/dev-lang/scala/scala-2.6.1-r1.ebuild
+++ b/dev-lang/scala/scala-2.7.5.ebuild
@@ -1,36 +1,40 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.6.1-r1.ebuild,v 1.1 2008/02/09 16:13:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.7.5.ebuild,v 1.1 2009/06/05 08:45:17 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"
+MY_P="${P}.final-sources"
 
 # creating the binary:
-# JAVA_PKG_FORCE_VM="$available-1.4" USE="doc examples source" ebuild scala-*.ebuild compile
+# JAVA_PKG_FORCE_VM="$available-1.5" USE="doc examples source" ebuild scala-*.ebuild compile
 # cd $WORDKIR
-# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 dists docs/TODO
+# 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}-sources.tgz )
+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"
+IUSE="binary emacs"
 # one fails with 1.7, two with 1.4 (blackdown)
 RESTRICT="test"
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.5
 	!binary? (
 		dev-java/ant-contrib
 		dev-java/jline
 	)"
-RDEPEND=">=virtual/jre-1.4
-	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}"
 
@@ -51,6 +55,7 @@ pkg_setup() {
 		else
 			CHECKREQS_MEMORY="512"
 		fi
+
 		check_reqs
 	fi
 }
@@ -60,13 +65,12 @@ src_unpack() {
 	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"
+
+		epatch "${FILESDIR}/${PN}-2.7.3-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
+		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
@@ -74,53 +78,42 @@ src_unpack() {
 
 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)
+		eant all.clean dist.done
 	else
 		einfo "Skipping compilation, USE=binary is set."
 	fi
 }
 
 src_test() {
-	bash test/scalatest || die "Some tests aren't passed"
+	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}" ${3} \
-		--java_args "-Xmx256M -Xms16M -Xbootclasspath/a:${bcp} -Dscala.home=\\\"${SCALADIR}\\\" -Denv.classpath=\\\"\${CLASSPATH}\\\""
+	java-pkg_dolauncher "${1}" --main "${2}" \
+		--java_args "-Xmx256M -Xms32M -Dscala.home=${SCALADIR} -Denv.emacs=${EMACS}"
 }
 
 src_install() {
-	cd dists/${MY_P} || die
+	cd dists/latest || die
+
 	local SCALADIR="/usr/share/${PN}/"
 
-	# sources are .scala so no use for java-pkg_dosrc
+	#sources are .scala so no use for java-pkg_dosrc
 	if use source; then
 		dodir "${SCALADIR}/src"
 		insinto "${SCALADIR}/src"
-		doins lib/*-src.jar
+		doins src/*-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
+
+	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
@@ -131,5 +124,5 @@ src_install() {
 	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"
+	scala_launcher scaladoc scala.tools.nsc.ScalaDoc
 }