Version bump and cleanup old versions.

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

4 files changed, 18 insertions, 144 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index 81a78720dd7d..25beaf59eef1 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.26 2011/06/03 11:16:33 ali_bush Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.27 2012/01/25 19:06:57 ali_bush Exp $
+
+*scala-2.9.1 (25 Jan 2012)
+
+  25 Jan 2012; Alistair Bush <ali_bush@gentoo.org> -scala-2.8.1.ebuild,
+  -scala-2.9.0-r1.ebuild, +scala-2.9.1.ebuild:
+  Version Bump and cleanup.
 
 *scala-2.9.0.1 (03 Jun 2011)
 
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index 2378d4648aae..1e9d07efd0ab 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -1,12 +1,9 @@
 AUX scala-2.7.3-build.xml.patch 417 RMD160 825678486a85872c365349c04f6fc104f894656c SHA1 2a253c198543b9bbfab58aa9ccad77ba511c97bf SHA256 8b8db8fba952309a2446cbac2734ceec1f18c2d3407768c22cf3291a0a0ea211
-DIST scala-2.8.1-gentoo-binary.tar.bz2 24790686 RMD160 ce8522c976d6ae02362900b5ad1b832fa9f83a69 SHA1 4b20cea283f2ce21c636e7bb25345deee91a3b7e SHA256 eb8e9d75a1de43b19e10df3a42a90807bb9eac100a4b6da9e8762c9027ee4d8d
-DIST scala-2.8.1.final-sources.tgz 41263128 RMD160 128ced6e335ead758193e3779787c57be59fa911 SHA1 271e108d729fbd4154dc6c412c72fb76e35f657d SHA256 fd7fb0208e0746d621421cf3c5a3f2daa1a73992ce5f740c477ff7a1d430dfce
-DIST scala-2.9.0-r1-gentoo-binary.tar.bz2 33219063 RMD160 73540945b53cd03910a6a99b3e5948a8748370d9 SHA1 ca0730ae1b626668693f3826dad2da5698007ffc SHA256 3d01fc8034ab93d5d2b1cce758ba36585f8ec7b3889eb8fd18a6e69a0fc28570
 DIST scala-2.9.0.1-gentoo-binary.tar.bz2 33234044 RMD160 46ebbe9554ca744408223fcf0350a17aab829633 SHA1 c759162ea88552a73f497a658e97c01fc3d591da SHA256 e44fbdace22ecf09aad8d10975c42758cc94e7d3caef9a30fe921b05188b8282
 DIST scala-2.9.0.1.tar.xz 29707920 RMD160 eb7fa1cc9dc4b006bbcbd3b420a98069158abc01 SHA1 0c68fb815907a07c30b9743db3936a2e02eae92f SHA256 97e0d2262e4df8f936c70670849299deba69e981f783250d819733e52dbe7f96
-DIST scala-2.9.0.final-sources.tgz 44548967 RMD160 9bc1a307d7b69095dbc219736589f427f8d7a62b SHA1 f7d3d4d0aef086394d83ccceb386790f2ac964f2 SHA256 b7a04b577e09c9785324ebdfcab2b65506f23f4cff401a30e6a8b70021fbdc5b
-EBUILD scala-2.8.1.ebuild 3436 RMD160 ebf53687b85e5b4c3abc2033509c163e9546aa5f SHA1 d57fb8fd20b33250448c6664c1e38e96af0dc9bd SHA256 4230c96ad720bbbefa43190e5cacfc47e030c052c25920f3f24741baa686998e
-EBUILD scala-2.9.0-r1.ebuild 3878 RMD160 1bd71ca33c1be131c7cf4a46aec028bb2c75a1a3 SHA1 476a850d120a0a5dc97ad471dc0d718c00c3ff8e SHA256 42910a34c0ea8d8f56d03db1d61cf7325f76511cbfbe7700cfe3093b7df1b645
+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
 EBUILD scala-2.9.0.1.ebuild 3889 RMD160 6ae28f695efc48217742f944c0f37ee71db58056 SHA1 e37a2e464798c3637afbc155315eb471ef0f29cd SHA256 4193799a5ee6b63411c20a99c4d7422d5a596d795236a508fe536a316ac2013d
-MISC ChangeLog 4668 RMD160 3e44e534c9d8b1b4c4bdcae132f61f4878400cf9 SHA1 87cb8467535d58e76fef2e24370fc835c5232518 SHA256 7ede285514a728582bc3927fc4800682501c05144d386d7a90a9194c88c4bebc
+EBUILD scala-2.9.1.ebuild 3893 RMD160 0df895ce824fef2e7549a017497c9c6fbb11b5af SHA1 f1b277f40849b57aeda9e40a14facbcad2c6f81f SHA256 ab0df0f2d60b092d5afdd7a0b99f2068acbf01699a395e52c871effd094f124e
+MISC ChangeLog 4844 RMD160 763d05d759b9c308e2ea8c83f49d30b83a8a7672 SHA1 99b81af38d340bd60e71d4127bc9dab484416e76 SHA256 26b48b99fff83c852aae3559b07dcb14ce48e4a4b781982f27ed05eafdaddfae
 MISC metadata.xml 317 RMD160 c068d6e3d0806587dc6262bd8162709fbd18b25e SHA1 d68298cc52c736cb3a300197daa86cf6d4618656 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94
diff --git a/dev-lang/scala/scala-2.8.1.ebuild b/dev-lang/scala/scala-2.8.1.ebuild
deleted file mode 100644
index a5b1c6473989..000000000000
--- a/dev-lang/scala/scala-2.8.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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.8.1.ebuild,v 1.3 2011/05/06 16:13:38 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"
-
-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? ( 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
-		dev-java/jline:0
-	)"
-RDEPEND=">=virtual/jre-1.6
-	dev-java/jline:0
-	!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."
-
-		if use amd64; then
-			CHECKREQS_MEMORY="1024"
-		else
-			CHECKREQS_MEMORY="512"
-		fi
-
-		check_reqs
-	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
-		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 -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
-}
-
-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
-
-	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
-
-	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
-}
diff --git a/dev-lang/scala/scala-2.9.0-r1.ebuild b/dev-lang/scala/scala-2.9.1.ebuild
index 03a3609bde17..1cfbcb2a79ae 100644
--- a/dev-lang/scala/scala-2.9.0-r1.ebuild
+++ b/dev-lang/scala/scala-2.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.0-r1.ebuild,v 1.1 2011/05/30 12:33:17 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.9.1.ebuild,v 1.1 2012/01/25 19:06:57 ali_bush Exp $
 
 EAPI="3"
 JAVA_PKG_IUSE="doc examples source"
@@ -17,8 +17,8 @@ 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 )
-	binary? ( http://dev.gentoo.org/~ali_bush/distfiles/${PF}-gentoo-binary.tar.bz2 )"
+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"
 KEYWORDS="~amd64 ~x86"
@@ -30,7 +30,8 @@ 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"