diff options
author | Caleb Tennis <caleb@gentoo.org> | 2007-06-18 13:52:30 +0000 |
---|---|---|
committer | Caleb Tennis <caleb@gentoo.org> | 2007-06-18 13:52:30 +0000 |
commit | 147d37f9a251834ec2922f7dcc7193fc0bc1196b (patch) | |
tree | 270ea5b5f6d2a2e486095e92d9bc0b055815528c /dev-lang | |
parent | Call webapp_pkg_setup() at the end of pkg_setup() (#182402). (diff) | |
download | gentoo-2-147d37f9a251834ec2922f7dcc7193fc0bc1196b.tar.gz gentoo-2-147d37f9a251834ec2922f7dcc7193fc0bc1196b.tar.bz2 gentoo-2-147d37f9a251834ec2922f7dcc7193fc0bc1196b.zip |
Version bump, with minor change to build.xml.patch
(Portage version: 2.1.2.7)
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/scala/ChangeLog | 8 | ||||
-rw-r--r-- | dev-lang/scala/files/digest-scala-2.5.1 | 3 | ||||
-rw-r--r-- | dev-lang/scala/files/scala-2.5.1-build.xml.patch | 79 | ||||
-rw-r--r-- | dev-lang/scala/scala-2.5.1.ebuild | 105 |
4 files changed, 194 insertions, 1 deletions
diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog index 3d836c2045be..338ab88f6d57 100644 --- a/dev-lang/scala/ChangeLog +++ b/dev-lang/scala/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/scala # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.2 2007/05/06 00:38:40 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.3 2007/06/18 13:52:30 caleb Exp $ + +*scala-2.5.1 (18 Jun 2007) + + 18 Jun 2007; Caleb Tennis <caleb@gentoo.org> + +files/scala-2.5.1-build.xml.patch, +scala-2.5.1.ebuild: + Version bump, with minor change to build.xml.patch 06 May 2007; Alistair John Bush <ali_bush@gentoo.org> scala-2.4.0.ebuild: Added ~amd64 for bug 147599 diff --git a/dev-lang/scala/files/digest-scala-2.5.1 b/dev-lang/scala/files/digest-scala-2.5.1 new file mode 100644 index 000000000000..1eb8c6faa2d8 --- /dev/null +++ b/dev-lang/scala/files/digest-scala-2.5.1 @@ -0,0 +1,3 @@ +MD5 6e0c63a6e8d7d1612d1b9c53649388b0 scala-2.5.1-final-sources.tgz 24199025 +RMD160 550a0b189e227551330f3642a93be8ab95ea71f0 scala-2.5.1-final-sources.tgz 24199025 +SHA256 cc2aec40da68666d29f2298de2c3909d72dc653c75d620a1a53fc4452a95f0a4 scala-2.5.1-final-sources.tgz 24199025 diff --git a/dev-lang/scala/files/scala-2.5.1-build.xml.patch b/dev-lang/scala/files/scala-2.5.1-build.xml.patch new file mode 100644 index 000000000000..fe5aa6533f33 --- /dev/null +++ b/dev-lang/scala/files/scala-2.5.1-build.xml.patch @@ -0,0 +1,79 @@ +--- build.xml.orig 2007-06-18 09:19:50.000000000 -0400 ++++ build.xml 2007-06-18 09:20:19.000000000 -0400 +@@ -85,11 +85,13 @@ + <!-- Setting-up Ant contrib tasks --> + <taskdef resource="net/sf/antcontrib/antlib.xml" + classpath="${ant-contrib.jar}"/> ++ <!-- + <fail message="External library ${ant-contrib.jar} requires the optional Ant tasks to be installed"> + <condition><not><and> + <available file="${ant.home}/lib/ant-nodeps.jar"/> + </and></not></condition> + </fail> ++ --> + </target> + + <!-- =========================================================================== +@@ -784,7 +786,7 @@ + DOCUMENTATION + ============================================================================ --> + +- <target name="docs" depends="setup.quick" ++ <target name="docs" depends="setup.quick" if="do.docs" + description="Generated the API for library sources"> + <mkdir dir="${api-lib.dir}"/> + <quickdoc +@@ -802,7 +804,7 @@ + </quickdoc> + </target> + +- <target name="docs.compiler" depends="setup.quick" ++ <target name="docs.compiler" depends="setup.quick" if="do.docs" + description="Generated the API for compiler sources"> + <mkdir dir="${api-comp.dir}"/> + <quickdoc +@@ -886,7 +888,7 @@ + + <target name="dist.patch" depends="init"> + <propertyfile file="${number.file}"> +- <entry key="version.patch" type="int" default="0" operation="+"/> ++ <entry key="version.patch" type="int" default="0"/> + </propertyfile> + <property file="${number.file}"/> + <property name="version.number" +@@ -896,7 +898,7 @@ + + <target name="dist.minor" depends="init"> + <propertyfile file="${number.file}"> +- <entry key="version.minor" type="int" default="0" operation="+"/> ++ <entry key="version.minor" type="int" default="0"/> + <entry key="version.patch" type="int" value="0"/> + </propertyfile> + <property file="${number.file}"/> +@@ -1045,7 +1047,7 @@ + <copy todir="${dist.current.dir}/doc/scala"> + <fileset dir="${docs.dir}" includes="README,LICENSE"/> + </copy> +- <copy todir="${dist.current.dir}/doc/scala/api"> ++ <copy todir="${dist.current.dir}/doc/scala/api" failonerror="false"> + <fileset dir="${api-lib.dir}"/> + </copy> + <copy todir="${dist.current.dir}/doc/scala/examples"> +@@ -1066,7 +1068,7 @@ + </target> + + <!-- Create the SBaz packages --> +- <target name="build.sbaz" depends="build.dist"> ++ <target name="build.sbaz" depends="build.dist" if="do.archive"> + <property name="sbaz.universe" value="http://scala.epfl.ch/downloads/packages"/> + <mkdir dir="${dist.dir}"/> + <!-- Create the Scala library package --> +@@ -1120,7 +1122,7 @@ + </quicksbaz> + </target> + +- <target name="build.archive" depends="build.dist"> ++ <target name="build.archive" depends="build.dist" if="do.archive"> + <tar + destfile="${dist.dir}/scala-${version.number}.tgz" + compression="gzip"> diff --git a/dev-lang/scala/scala-2.5.1.ebuild b/dev-lang/scala/scala-2.5.1.ebuild new file mode 100644 index 000000000000..7165005f151e --- /dev/null +++ b/dev-lang/scala/scala-2.5.1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.5.1.ebuild,v 1.1 2007/06/18 13:52:30 caleb Exp $ + +JAVA_PKG_IUSE="doc examples source" +WANT_ANT_TASKS="ant-nodeps" +inherit check-reqs java-pkg-2 java-ant-2 versionator + +MY_P="${P}-final" + +DESCRIPTION="The Scala Programming Language" +HOMEPAGE="http://www.scala-lang.org/" +SRC_URI="http://www.scala-lang.org/downloads/distrib/files/${MY_P}-sources.tgz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +DEPEND=">=virtual/jdk-1.5 + dev-java/ant-contrib" +RDEPEND=">=virtual/jre-1.5" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + java-pkg-2_pkg_setup + + debug-print "Checking for sufficient physical RAM" + + if use amd64; then + CHECKREQS_MEMORY="1024" + else + CHECKREQS_MEMORY="512" + fi + check_reqs +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # remove check for ant-nodeps.jar in ant-core/lib; make docs opt-in; + # don't increase version; don't create dist archives + epatch "${FILESDIR}/${P}-build.xml.patch" + + cd lib || die + # other jars are needed for bootstrap + rm -v ant-contrib.jar || die + java-pkg_jar-from --build-only ant-contrib +} + +src_compile() { + if use amd64; then + export ANT_OPTS="-Xmx1024M -Xms1024M" + else + export ANT_OPTS="-Xmx512M -Xms512M" + fi + local target + if [[ "$(get_version_component_range 3)" == "0" ]]; + then + target="minor" + else + target="patch" + fi + eant dist.${target} $(use_doc -Ddo.docs=true) +} + +src_test() { + bash ${S}/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/${MY_P} || 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 lib/*-src.jar + fi + + rm lib/*-src.jar + java-pkg_dojar lib/*.jar + + doman man/man1/*.1 || die + local docdir="doc/${PN}" + dodoc "${docdir}"/{LICENSE,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" +} |