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

[Sergej Pupykin]

    Date: Thursday, May 8, 2014 @ 14:43:44
  Author: spupykin
Revision: 110830

Modified:
  scala/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-08 12:33:51 UTC (rev 110829)
+++ PKGBUILD	2014-05-08 12:43:44 UTC (rev 110830)
@@ -5,7 +5,7 @@
 pkgbase=scala
 pkgname=(scala scala-docs scala-sources)
 pkgver=2.11.0
-pkgrel=1
+pkgrel=2
 _distdate=20140415-183722
 _distsha=cac6383e66
 pkgdesc="A Java-interoperable language with object-oriented and functional features"
@@ -28,12 +28,9 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
   export ANT_OPTS="-Xms2500M -Xmx2500M -Xss8M -XX:MaxPermSize=1024M -XX:+UseParallelGC"
-
-  ant docs
-  ant dist-opt -Dbuild.release=true
-  ant distpack-opt -Dbuild.release=true
+  export M2_OPTS="-Dmaven.repo.local=/tmp"
+  ant build-opt pack.doc osgi.done -Dbuild.release=true -Duser.home=/tmp
 }
 
 package_scala() {
@@ -71,7 +68,7 @@
   pkgdesc="Scala sources"
   depends=()
 
-  cd ${srcdir}/scala-${pkgver}/dists/maven/$pkgver-${_distdate}-${_distsha}
+  cd ${srcdir}/scala-${pkgver}
   mkdir -p $pkgdir/usr/share/scala/
   find . -type f -name '*-src.jar' | while read f; do
     install -Dm0644 $f $pkgdir/usr/share/scala/src/`basename $f`