Version Bump and cleanup.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

3 files changed, 33 insertions, 155 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index a046c73ab0f5..81a78720dd7d 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/scala
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.25 2011/05/30 12:33:17 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.26 2011/06/03 11:16:33 ali_bush Exp $
+
+*scala-2.9.0.1 (03 Jun 2011)
+
+  03 Jun 2011; Alistair Bush <ali_bush@gentoo.org> -scala-2.7.7.ebuild,
+  -scala-2.9.0.ebuild, +scala-2.9.0.1.ebuild:
+  Version Bump and cleanup older versions.
 
 *scala-2.9.0-r1 (30 May 2011)
 
diff --git a/dev-lang/scala/scala-2.7.7.ebuild b/dev-lang/scala/scala-2.7.7.ebuild
deleted file mode 100644
index 27eef75e814c..000000000000
--- a/dev-lang/scala/scala-2.7.7.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.7.7.ebuild,v 1.2 2010/01/09 14:29:08 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-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
-		# reported in bugzilla that multiple launches use less resources
-		# https://bugs.gentoo.org/show_bug.cgi?id=282023
-		eant all.clean
-		eant build
-		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}/"
-
-	#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
-}
diff --git a/dev-lang/scala/scala-2.9.0.ebuild b/dev-lang/scala/scala-2.9.0.1.ebuild
index 3b27a07b0af0..82b2cde1f54c 100644
--- a/dev-lang/scala/scala-2.9.0.ebuild
+++ b/dev-lang/scala/scala-2.9.0.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.9.0.ebuild,v 1.1 2011/05/18 10:43:38 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.9.0.1.ebuild,v 1.1 2011/06/03 11:16:33 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="${P}.final-sources"
+MY_P="${P}-sources"
 
 # creating the binary:
 # JAVA_PKG_FORCE_VM="$available-1.5" USE="doc examples source" ebuild scala-*.ebuild compile
@@ -17,7 +17,7 @@ MY_P="${P}.final-sources"
 
 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 )
+SRC_URI="!binary? ( ${HOMEPAGE}downloads/distrib/files/${MY_P}.txz -> ${P}.tar.xz )
 	binary? ( http://dev.gentoo.org/~ali_bush/distfiles/${P}-gentoo-binary.tar.bz2 )"
 LICENSE="BSD"
 SLOT="0"
@@ -30,10 +30,9 @@ DEPEND=">=virtual/jdk-1.6
 	java-virtuals/jdk-with-com-sun
 	!binary? (
 		dev-java/ant-contrib:0
-		dev-java/jline:0
-	)"
+	)
+	app-arch/xz-utils"
 RDEPEND=">=virtual/jre-1.6
-	dev-java/jline:0
 	!dev-java/scala-bin"
 
 PDEPEND="emacs? ( app-emacs/scala-mode )"
@@ -64,7 +63,6 @@ java_prepare() {
 		rm -v ant/ant-contrib.jar || die
 		java-pkg_jar-from --into ant --build-only ant-contrib
 		popd &> /dev/null
-		java-pkg_jar-from jline
 	fi
 }
 
@@ -80,10 +78,6 @@ src_compile() {
 		eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \
 			newlibs newforkjoin build-opt
 		eant dist.done
-
-		#TODO figure out why build doesn't work with jline.
-		cp jline.jar dists/latest/lib/ || die
-		cp jline.jar lib/ || die
 	else
 		einfo "Skipping compilation, USE=binary is set."
 	fi
@@ -93,18 +87,21 @@ 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}"
-}
+#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"
@@ -128,9 +125,16 @@ src_install() {
 		use examples && java-pkg_doexamples "${docdir}/examples"
 	fi
 
-	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
+	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
 }