Fix dependency issue by using bundled jline classes that have been refactored into new packages and tty issues.

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

3 files changed, 149 insertions, 2 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index ceef64d16f67..a046c73ab0f5 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.24 2011/05/18 10:43:38 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.25 2011/05/30 12:33:17 ali_bush Exp $
+
+*scala-2.9.0-r1 (30 May 2011)
+
+  30 May 2011; Alistair Bush <ali_bush@gentoo.org> +scala-2.9.0-r1.ebuild:
+  Fix dependency issue by using bundled jline classes that have been refactored
+  into new packages and tty issues.
 
 *scala-2.9.0 (18 May 2011)
 
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index d5593a311c03..26b03bf2717e 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -4,9 +4,11 @@ DIST scala-2.7.7.final-sources.tgz 29551089 RMD160 c6cc31029ab62562b2ef9368fbf97
 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-gentoo-binary.tar.bz2 33159659 RMD160 820487de8c5f0bb72be7f7f2182127ce57a5228b SHA1 c49b2e41c175a4b12973debac73c6004ec2d2b27 SHA256 bf0f98123d5d24cca124424db2a54b62b2457653e542f117d0a3b5a3bb2f18cd
+DIST scala-2.9.0-r1-gentoo-binary.tar.bz2 33219063 RMD160 73540945b53cd03910a6a99b3e5948a8748370d9 SHA1 ca0730ae1b626668693f3826dad2da5698007ffc SHA256 3d01fc8034ab93d5d2b1cce758ba36585f8ec7b3889eb8fd18a6e69a0fc28570
 DIST scala-2.9.0.final-sources.tgz 44548967 RMD160 9bc1a307d7b69095dbc219736589f427f8d7a62b SHA1 f7d3d4d0aef086394d83ccceb386790f2ac964f2 SHA256 b7a04b577e09c9785324ebdfcab2b65506f23f4cff401a30e6a8b70021fbdc5b
 EBUILD scala-2.7.7.ebuild 3300 RMD160 7663fe14a0aa5dcb2019f4c475c5a1b385f6ea3d SHA1 88ebb6f1a17c24c9130277de36a0974b616a5341 SHA256 4afd32daf623e541e71f8ffd033cafa5522a03a0e6c7e313415963afe7615d7d
 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
 EBUILD scala-2.9.0.ebuild 3741 RMD160 1fa9582731427834a7e06277b9f6803d83ef4574 SHA1 4dd49315207dc7d29c734fbb736dc555b51045ba SHA256 8e21d6dd1c3595d659cef98ac85f13058d9e6a5815112c075d96796d1ca68163
-MISC ChangeLog 4253 RMD160 c073d4223892cf6b95b2a5dacc670a3a2ac3a9f7 SHA1 f294fa80cddb96e201dfe70ab4090977fed683d6 SHA256 7e92fe00519478aad0cf28f6fcc3569b796b2857fcf11fff84ce848e236ca88c
+MISC ChangeLog 4476 RMD160 b4b3b3a6e0624fced2a956accd0503ec5eeaff17 SHA1 2515b1b546b9beb81b81367cd9ba657137192639 SHA256 afcf6ad0d8c13ce855a22cb9f6c9ce36472ee74b380013e60b0009bdcb5c58a2
 MISC metadata.xml 317 RMD160 c068d6e3d0806587dc6262bd8162709fbd18b25e SHA1 d68298cc52c736cb3a300197daa86cf6d4618656 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94
diff --git a/dev-lang/scala/scala-2.9.0-r1.ebuild b/dev-lang/scala/scala-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..03a3609bde17
--- /dev/null
+++ b/dev-lang/scala/scala-2.9.0-r1.ebuild
@@ -0,0 +1,139 @@
+# 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-r1.ebuild,v 1.1 2011/05/30 12:33:17 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"
+
+# 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? ( http://dev.gentoo.org/~ali_bush/distfiles/${PF}-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
+	)"
+RDEPEND=">=virtual/jre-1.6
+	!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."
+
+		CHECKREQS_MEMORY="1532"
+
+		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
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		#unset ANT_OPTS as this is set in the build.xml
+		#sets -X type variables which might come back to bite me
+		unset ANT_OPTS
+
+		# 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
+	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}/"
+
+	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"
+		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
+
+	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
+}