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

[Sergej Pupykin]

    Date: Thursday, August 15, 2013 @ 12:17:30
  Author: spupykin
Revision: 95660

Modified:
  scala/trunk/PKGBUILD

----------+
 PKGBUILD |   38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-15 10:14:33 UTC (rev 95659)
+++ PKGBUILD	2013-08-15 10:17:30 UTC (rev 95660)
@@ -4,18 +4,18 @@
 
 pkgbase=scala
 pkgname=(scala scala-docs scala-sources)
-pkgver=2.10.1
+pkgver=2.10.2
 pkgrel=1
-_distdate=20130312-235900
-_distsha=33e32179fd
+_distdate=20130606-103331
+_distsha=60d462ef6e
 pkgdesc="A Java-interoperable language with object-oriented and functional features"
 arch=('any')
 url="http://www.scala-lang.org"
-license=('custom')
+license=('BSD')
 depends=('java-runtime')
 makedepends=('apache-ant' 'git')
-source=(http://www.scala-lang.org/downloads/distrib/files/scala-sources-$pkgver.tgz
-	http://www.scala-lang.org/downloads/distrib/files/scala-docs-$pkgver.txz)
+source=("scala-$pkgver.tar.gz::https://github.com/scala/scala/archive/v$pkgver.tar.gz"
+	"http://www.scala-lang.org/downloads/distrib/files/scala-docs-$pkgver.txz")
 md5sums=('352476f0129bae79269f4881bb2e4853'
          '81cd7033dd767109681f577449b2980e')
 
@@ -23,18 +23,20 @@
 #export LC_ALL=en_US.UTF-8
 #export LANG=en_US.UTF-8
 # workaround#2: set nobody's homedir to /tmp in chroot if using devtools
+md5sums=('9b0354aa4994f108a4f32476c7eb4324'
+         'c580980ffe37988de453a83c083aa7d6')
 
 build(){
-    cd ${srcdir}/${pkgname}-${pkgver}-sources
-    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
+  cd ${srcdir}/${pkgname}-${pkgver}
+  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"
+  export ANT_OPTS="-Xms2500M -Xmx2500M -Xss8M -XX:MaxPermSize=1024M -XX:+UseParallelGC"
 
-    ant docs
-    ant dist.src
-    ant dist-opt -Dbuild.release=true
+  ant docs
+  ant dist.src
+  ant dist-opt -Dbuild.release=true
 }
 
 package_scala()
@@ -42,13 +44,13 @@
   depends=('java-runtime')
   optdepends=('scala-docs' 'scala-sources' 'graphviz: generate diagrams')
 
-  cd ${srcdir}/${pkgname}-${pkgver}-sources/dists/latest/
+  cd ${srcdir}/${pkgname}-${pkgver}/dists/latest/
 
   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 doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m0644 ${srcdir}/${pkgname}-${pkgver}/doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
   rm -f $pkgdir/usr/share/scala/lib/scalacheck.jar
 
@@ -68,6 +70,7 @@
   cd ${srcdir}
   mkdir -p $pkgdir/usr/share/doc/
   cp -r scala-docs-$pkgver $pkgdir/usr/share/doc/scala
+  install -D -m0644 ${srcdir}/${pkgname}-${pkgver}/doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
 package_scala-sources()
@@ -76,8 +79,9 @@
   pkgdesc="Scala sources"
   depends=('scala')
 
-  cd ${srcdir}/scala-${pkgver}-sources/dists
+  cd ${srcdir}/scala-${pkgver}/dists
   cd latest
   mkdir -p $pkgdir/usr/share/scala/
   cp -r src $pkgdir/usr/share/scala/src
+  install -D -m0644 ${srcdir}/${pkgname}-${pkgver}/doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }