[arch-commits] Commit in scala/trunk (PKGBUILD)

[Balló György]

    Date: Saturday, December 21, 2013 @ 21:43:27
  Author: bgyorgy
Revision: 102841

upgpkg: scala 2.10.3-1

Update to the latest stable version (2.10.3), use the released jar files (FS#33383)

Modified:
  scala/trunk/PKGBUILD

----------+
 PKGBUILD |   41 +++++++++++------------------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-21 18:35:57 UTC (rev 102840)
+++ PKGBUILD	2013-12-21 20:43:27 UTC (rev 102841)
@@ -4,48 +4,30 @@
 
 pkgbase=scala
 pkgname=(scala scala-docs scala-sources)
-pkgver=2.11.0M7
+pkgver=2.10.3
 pkgrel=1
-_distdate=20131118-113951
-_distsha=c243435f11
 pkgdesc="A Java-interoperable language with object-oriented and functional features"
 arch=('any')
 url="http://www.scala-lang.org"
 license=('BSD')
 depends=('java-runtime')
-makedepends=('apache-ant' 'git')
-source=("scala-$pkgver.tar.gz::https://github.com/scala/scala/archive/v${pkgver/M/-M}.tar.gz"
-	"http://www.scala-lang.org/files/archive/scala-docs-${pkgver/M/-M}.txz")
-md5sums=('675bfb36388f34be519858c47bdecc47'
-         '701fd61cf93386a484cdcbce2fa907e9')
+source=("http://www.scala-lang.org/files/archive/scala-${pkgver}.tgz"
+	"http://www.scala-lang.org/files/archive/scala-docs-${pkgver}.txz")
+md5sums=('7665a125ceb38c1ba32cbb9acba9070f'
+         '869af24fe0f5df49ff90982635d9aa23')
 
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver/M/-M}
-  chmod 0755 tools/*
-  echo -e "#!/bin/bash\necho ${_distdate}" >tools/get-scala-commit-date
-  echo -e "#!/bin/bash\necho ${_distsha}" >tools/get-scala-commit-sha
-
-  export ANT_OPTS="-Xms2500M -Xmx2500M -Xss8M -XX:MaxPermSize=1024M -XX:+UseParallelGC"
-
-  ant docs
-  ant dist.src
-  ant dist-opt -Dbuild.release=true
-}
-
 package_scala() {
   depends=('java-runtime')
   optdepends=('scala-docs' 'scala-sources' 'graphviz: generate diagrams')
 
-  cd ${srcdir}/${pkgname}-${pkgver/M/-M}/dists/latest/
+  cd ${srcdir}/${pkgbase}-${pkgver}
 
   install -d ${pkgdir}/usr/{bin,share} ${pkgdir}/usr/share/man/man1 ${pkgdir}/usr/share/scala/{bin,lib}
   cp -r {lib,misc} ${pkgdir}/usr/share/scala/
   cp -r man ${pkgdir}/usr/share/
   install -m 755 bin/{fsc,scala,scalac,scalap,scaladoc} ${pkgdir}/usr/share/scala/bin
-  install -D -m0644 ${srcdir}/${pkgname}-${pkgver/M/-M}/doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m0644 doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
-  rm -f $pkgdir/usr/share/scala/lib/scalacheck.jar
-
   ln -s ../share/scala/bin/fsc ${pkgdir}/usr/bin/fsc
   ln -s ../share/scala/bin/scala ${pkgdir}/usr/bin/scala
   ln -s ../share/scala/bin/scalac ${pkgdir}/usr/bin/scalac
@@ -60,8 +42,8 @@
 
   cd ${srcdir}
   mkdir -p $pkgdir/usr/share/doc/
-  cp -r scala-docs-${pkgver/M/-M} $pkgdir/usr/share/doc/scala
-  install -D -m0644 ${srcdir}/${pkgname}-${pkgver/M/-M}/doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  cp -r scala-docs-${pkgver} $pkgdir/usr/share/doc/scala
+  install -D -m0644 ${srcdir}/${pkgbase}-${pkgver}/doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_scala-sources() {
@@ -69,9 +51,8 @@
   pkgdesc="Scala sources"
   depends=()
 
-  cd ${srcdir}/scala-${pkgver/M/-M}/dists
-  cd latest
+  cd ${srcdir}/${pkgbase}-${pkgver}
   mkdir -p $pkgdir/usr/share/scala/
   cp -r src $pkgdir/usr/share/scala/src
-  install -D -m0644 ${srcdir}/${pkgname}-${pkgver/M/-M}/doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m0644 doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }