* [gentoo-commits] gentoo-x86 commit in dev-lang/scala: ChangeLog scala-2.7.3.ebuild
@ 2009-01-18 4:16 Alistair Bush (ali_bush)
0 siblings, 0 replies; 2+ messages in thread
From: Alistair Bush (ali_bush) @ 2009-01-18 4:16 UTC (permalink / raw
To: gentoo-commits
ali_bush 09/01/18 04:16:30
Modified: ChangeLog
Added: scala-2.7.3.ebuild
Log:
Version Bump.
(Portage version: 2.1.6.6/cvs/Linux 2.6.28-gentoo x86_64)
Revision Changes Path
1.10 dev-lang/scala/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?r1=1.9&r2=1.10
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog 11 Jan 2009 03:38:27 -0000 1.9
+++ ChangeLog 18 Jan 2009 04:16:30 -0000 1.10
@@ -1,6 +1,11 @@
# 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.9 2009/01/11 03:38:27 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.10 2009/01/18 04:16:30 ali_bush Exp $
+
+*scala-2.7.3 (18 Jan 2009)
+
+ 18 Jan 2009; Alistair Bush <ali_bush@gentoo.org> +scala-2.7.3.ebuild:
+ Version Bump
*scala-2.7.2 (11 Jan 2009)
1.1 dev-lang/scala/scala-2.7.3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.3.ebuild?rev=1.1&content-type=text/plain
Index: scala-2.7.3.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.3.ebuild,v 1.1 2009/01/18 04:16:30 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
# 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"
# 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"
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
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
if use amd64; then
export ANT_OPTS="-Xmx1024M -Xms1024M"
else
export ANT_OPTS="-Xmx512M -Xms512M -Xss1024k"
fi
#Try setting -Djava.flags="${ANT_OPTS}"
eant clean docsclean dist.done $(use_doc docs)
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/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 "${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"
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/scala: ChangeLog scala-2.7.3.ebuild
@ 2009-02-05 8:13 Alistair Bush (ali_bush)
0 siblings, 0 replies; 2+ messages in thread
From: Alistair Bush (ali_bush) @ 2009-02-05 8:13 UTC (permalink / raw
To: gentoo-commits
ali_bush 09/02/05 08:13:53
Modified: ChangeLog scala-2.7.3.ebuild
Log:
Fixed #257581
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Revision Changes Path
1.11 dev-lang/scala/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?r1=1.10&r2=1.11
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 18 Jan 2009 04:16:30 -0000 1.10
+++ ChangeLog 5 Feb 2009 08:13:53 -0000 1.11
@@ -1,6 +1,9 @@
# 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.10 2009/01/18 04:16:30 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.11 2009/02/05 08:13:53 ali_bush Exp $
+
+ 05 Feb 2009; Alistair Bush <ali_bush@gentoo.org> scala-2.7.3.ebuild:
+ Fixed #257581.
*scala-2.7.3 (18 Jan 2009)
1.2 dev-lang/scala/scala-2.7.3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.3.ebuild?r1=1.1&r2=1.2
Index: scala-2.7.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.7.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scala-2.7.3.ebuild 18 Jan 2009 04:16:30 -0000 1.1
+++ scala-2.7.3.ebuild 5 Feb 2009 08:13:53 -0000 1.2
@@ -1,6 +1,6 @@
# 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.3.ebuild,v 1.1 2009/01/18 04:16:30 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.7.3.ebuild,v 1.2 2009/02/05 08:13:53 ali_bush Exp $
JAVA_PKG_IUSE="doc examples source"
WANT_ANT_TASKS="ant-nodeps"
@@ -11,6 +11,7 @@
# 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"
@@ -95,7 +96,12 @@
}
src_install() {
- cd dists/latest || die
+ if use binary ; then
+ cd dists/scala-2.7.3.r0-b20090118133557 || die
+ else
+ cd dists/latest || die
+ fi
+
local SCALADIR="/usr/share/${PN}/"
#sources are .scala so no use for java-pkg_dosrc
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-02-05 8:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-05 8:13 [gentoo-commits] gentoo-x86 commit in dev-lang/scala: ChangeLog scala-2.7.3.ebuild Alistair Bush (ali_bush)
-- strict thread matches above, loose matches on Subject: below --
2009-01-18 4:16 Alistair Bush (ali_bush)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox