[gentoo-commits] gentoo-x86 commit in dev-lang/scala: ChangeLog scala-2.7.5.ebuild scala-2.6.1-r1.ebuild scala-2.6.0.ebuild scala-2.6.1.ebuild

[Alistair Bush (ali_bush)]

ali_bush    09/06/05 08:45:18

  Modified:             ChangeLog
  Added:                scala-2.7.5.ebuild
  Removed:              scala-2.6.1-r1.ebuild scala-2.6.0.ebuild
                        scala-2.6.1.ebuild
  Log:
  Version bump, clean and fix #269169
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.17                 dev-lang/scala/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?r1=1.16&r2=1.17

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog	1 May 2009 07:44:39 -0000	1.16
+++ ChangeLog	5 Jun 2009 08:45:17 -0000	1.17
@@ -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@g.o> -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)
 



1.1                  dev-lang/scala/scala-2.7.5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.5.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.5.ebuild?rev=1.1&content-type=text/plain

Index: scala-2.7.5.ebuild
===================================================================
# 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.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-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
		eant all.clean 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
}