Version bump, clean and fix #269169

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 37 insertions, 278 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/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
 }