Clean out old versions.
authorDirkjan Ochtman <djc@gentoo.org>
Sun, 2 May 2010 11:44:49 +0000 (11:44 +0000)
committerDirkjan Ochtman <djc@gentoo.org>
Sun, 2 May 2010 11:44:49 +0000 (11:44 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

dev-lang/scala/ChangeLog
dev-lang/scala/Manifest
dev-lang/scala/scala-2.7.2.ebuild [deleted file]
dev-lang/scala/scala-2.7.3-r1.ebuild [deleted file]
dev-lang/scala/scala-2.7.3.ebuild [deleted file]
dev-lang/scala/scala-2.7.4-r1.ebuild [deleted file]
dev-lang/scala/scala-2.7.4.ebuild [deleted file]
dev-lang/scala/scala-2.7.5.ebuild [deleted file]

index c9d5c37efb87188009a3354b6d845fe55a75e2f0..fef50a45eaeaf9c59ec764d35bf1f2a630e057c1 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/scala
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.20 2010/05/02 11:41:07 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.21 2010/05/02 11:44:49 djc Exp $
+
+  02 May 2010; Dirkjan Ochtman <djc@gentoo.org> -scala-2.7.2.ebuild,
+  -scala-2.7.3.ebuild, -scala-2.7.3-r1.ebuild, -scala-2.7.4.ebuild,
+  -scala-2.7.4-r1.ebuild, -scala-2.7.5.ebuild:
+  Clean out old versions.
 
   02 May 2010; Dirkjan Ochtman <djc@gentoo.org>
   -files/scala-2.6.0-build.xml.patch, -files/scala-2.6.1-build.xml.patch:
index 0edb2f6e81211e1651c22821420e97293eef8fd8..3b5c4b8a1b199d5fbc15844292d833aafc075d83 100644 (file)
@@ -1,20 +1,6 @@
 AUX scala-2.7.3-build.xml.patch 417 RMD160 825678486a85872c365349c04f6fc104f894656c SHA1 2a253c198543b9bbfab58aa9ccad77ba511c97bf SHA256 8b8db8fba952309a2446cbac2734ceec1f18c2d3407768c22cf3291a0a0ea211
-DIST scala-2.7.2-gentoo-binary.tar.bz2 12691171 RMD160 47f663b0916cb0ddb2e4626c38ed199ab9826833 SHA1 15b86b3a581250dbd1e255f347bde06d328bf412 SHA256 28a6db309f17bb30e6fe2d494872266eea643cf037235fa2dc2bb184be86686e
-DIST scala-2.7.2.final-sources.tgz 26906402 RMD160 2ead1c774c08d64d6ab6280278faf5f65fa269af SHA1 3d792210adaa1ebbb0c2c6b74bb3eb7dc32a2311 SHA256 46d1d3d58b7f2a4c0547a1dde53f099d0169072c3db491ebb9e3992aada7bb56
-DIST scala-2.7.3-gentoo-binary.tar.bz2 12803852 RMD160 f94cbdc7181af668aa20bf3784f419a0532cba9c SHA1 b967226c9bad0bf6667091996fd54ac565688d47 SHA256 46007b02af540cdce49f477dbf4d57cadc6604777e5ad39c51e60f67998cbc51
-DIST scala-2.7.3.final-sources.tgz 29451311 RMD160 67e1085a1eabf1b7743a7c3d07f96c0f9fa62493 SHA1 074e7fa344002725f5ed0201e061318150aa0d25 SHA256 124f11edca82bbb11c0718e293e8e34deda41f0ab31878e996b822107b311f68
-DIST scala-2.7.4-gentoo-binary.tar.bz2 13664162 RMD160 61e514e90d58ddd584c37ec96bb15c3095eb59be SHA1 cfa3a23b72eaf6f3a0f2172f5d17a60b9c36e8b3 SHA256 9c71d76d1f1908ec9733fbfde5d1b01f63dee9ee9c937a2c62df011e041f518e
-DIST scala-2.7.4.final-sources.tgz 29500833 RMD160 1305974e084135a7ab2597d2dd5e7724667d7659 SHA1 cec8a9ee65f8f48026db0a77f77182bc8b76986e SHA256 3c2c92af6a9994c18a38c3fa6e2c3e65de9c06bff9d59e8c1e63e45965c7ac11
-DIST scala-2.7.5-gentoo-binary.tar.bz2 12807320 RMD160 e91a21b320a14c818b10f4112bfcdc318b790cf7 SHA1 8168d32ff55d3d25868370141a72e8b140caa0fe SHA256 d7ae7de17c7dd73df311951bae4b555f48affc68c160c4208bd8f29048b702dd
-DIST scala-2.7.5.final-sources.tgz 29456474 RMD160 b7fac2c3498e81c8834db8cfc4b893ef3c6567c7 SHA1 6717839f919e72d1ba48a86a5121db201f96e577 SHA256 1bf01f1128caf299fdf27a55f7da5f9a918a196038920c59817d5a3becd5d519
 DIST scala-2.7.7-gentoo-binary.tar.bz2 12977943 RMD160 0da512700a4025e4d620b93d0744457e389fbf02 SHA1 694687ae5a1c8f60e6c43c211c2385d60e50b4e6 SHA256 96989ff39cabd13022b74580c21b5a91764e523fc481f615aedbd5050c18de03
 DIST scala-2.7.7.final-sources.tgz 29551089 RMD160 c6cc31029ab62562b2ef9368fbf9702af29cb9d2 SHA1 ba85f2b60dd01da80be55593cee06e76d232100c SHA256 50fba7d6aadf5560347ab901f8c65765116d5ae2bee22bba3fce897d59a58ed0
-EBUILD scala-2.7.2.ebuild 3279 RMD160 aa323193807d7e9fb3671db1a2927ceb02b99d15 SHA1 b91f5a57bb72bd30a4f04da58b89a4e05154a76d SHA256 331f78a7464a337648114c3c5b397f6a1ec4c4db81c90e4e694f8c0875441f8f
-EBUILD scala-2.7.3-r1.ebuild 3263 RMD160 c18ac152419a59bf22ab9aaf52b6a0513165b251 SHA1 257b0a5a1ca40f44a3fd2ca35a138879da4cdf7c SHA256 7f608b36f883df757ee8bcc4d35940bf29796565a3ed748ba83d29ea4d2209d4
-EBUILD scala-2.7.3.ebuild 3386 RMD160 7b7f300e5a19d7bdb7d40d9603c8a721a7c8fcb5 SHA1 dee9e19706431d568d63813224abf415a5039e29 SHA256 7b40d7224933f9ca6046c076a3fc181524f8aed820db7d8e183836690a6ded01
-EBUILD scala-2.7.4-r1.ebuild 3180 RMD160 d665788a889d5ef288c9e09d8e63c457fe477b12 SHA1 57cc9ea6efa28c8c8bbd415cd5e60c295050cb02 SHA256 07ba7839d7c72c630b0a7c055d5c2711e073250afc438d048b40a7b0d58568be
-EBUILD scala-2.7.4.ebuild 3296 RMD160 87f09f17c82a206cd180c6133963b4b23bd65767 SHA1 612ed29f4c8634492b24d1ca038127b854d8650b SHA256 0dc8c0bc6d60feae0148d08a93c845655f79267bf7d6acd8afc017a2acb6ba31
-EBUILD scala-2.7.5.ebuild 3160 RMD160 e67be38e5221d07be347976a57b57d1916ccc6e4 SHA1 5c5f14d39eb4bbab2cd2999d567d05ed7a1a84de SHA256 e778a21c3e06da4be77ef3c9f1a6c70c70e5fb84b2d64481b759d7dfb1c9858e
 EBUILD scala-2.7.7.ebuild 3300 RMD160 7663fe14a0aa5dcb2019f4c475c5a1b385f6ea3d SHA1 88ebb6f1a17c24c9130277de36a0974b616a5341 SHA256 4afd32daf623e541e71f8ffd033cafa5522a03a0e6c7e313415963afe7615d7d
-MISC ChangeLog 3693 RMD160 9f7acfdb16f9418e27c780143897ea711294776c SHA1 483c43be7f99e1b60559ea4c9e22c71882de0fa9 SHA256 348fcf3b81daad8723328028dd7dd91eb1501b07c194e25ac7e01a9346d6a685
+MISC ChangeLog 3904 RMD160 ffa143030b853ea76c79d7444c599ca0a4035d7a SHA1 2cb20d65e92f915662e3f37454ec4fff7895a730 SHA256 a612146ef000fa9535b5f28768edfe1fdc548f9673a52924162537a2e86a6d2a
 MISC metadata.xml 317 RMD160 c068d6e3d0806587dc6262bd8162709fbd18b25e SHA1 d68298cc52c736cb3a300197daa86cf6d4618656 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94
diff --git a/dev-lang/scala/scala-2.7.2.ebuild b/dev-lang/scala/scala-2.7.2.ebuild
deleted file mode 100644 (file)
index 526f188..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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.2.ebuild,v 1.1 2009/01/11 03:38:27 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"
-}
diff --git a/dev-lang/scala/scala-2.7.3-r1.ebuild b/dev-lang/scala/scala-2.7.3-r1.ebuild
deleted file mode 100644 (file)
index 9cdecd9..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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-r1.ebuild,v 1.4 2009/02/14 21:05:59 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}/${P}-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() {
-       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
-       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.ScalaDoc
-}
diff --git a/dev-lang/scala/scala-2.7.3.ebuild b/dev-lang/scala/scala-2.7.3.ebuild
deleted file mode 100644 (file)
index 58c1039..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.2 2009/02/05 08:13:53 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"
-# 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() {
-       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
-       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"
-}
diff --git a/dev-lang/scala/scala-2.7.4-r1.ebuild b/dev-lang/scala/scala-2.7.4-r1.ebuild
deleted file mode 100644 (file)
index 4289b45..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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.4-r1.ebuild,v 1.1 2009/05/01 07:44:39 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
-}
diff --git a/dev-lang/scala/scala-2.7.4.ebuild b/dev-lang/scala/scala-2.7.4.ebuild
deleted file mode 100644 (file)
index 15b0d49..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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.4.ebuild,v 1.1 2009/04/30 19:29:39 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-$PV-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 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.Main "--pkg_args -doc"
-}
diff --git a/dev-lang/scala/scala-2.7.5.ebuild b/dev-lang/scala/scala-2.7.5.ebuild
deleted file mode 100644 (file)
index 97bac48..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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
-}