Date: Tuesday, November 8, 2016 @ 14:10:17 Author: spupykin Revision: 195143
upgpkg: scala 2.12.0-1 upd Modified: scala/trunk/PKGBUILD ----------+ PKGBUILD | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-08 12:56:13 UTC (rev 195142) +++ PKGBUILD 2016-11-08 14:10:17 UTC (rev 195143) @@ -4,21 +4,21 @@ pkgbase=scala pkgname=(scala scala-docs scala-sources) -pkgver=2.11.8 +pkgver=2.12.0 pkgrel=1 _watch="https://github.com/scala/scala/releases"; -_distdate=20160309-060100 -_distsha=1706a37eb8 +_distdate=20161021-070700 +_distsha=8684ae833d 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') +depends=('java-runtime>=8' 'java-environment>=8') +makedepends=('sbt' 'git') source=("scala-$pkgver.tar.gz::https://github.com/scala/scala/archive/v${pkgver}.tar.gz"; - "http://www.scala-lang.org/files/archive/scala-docs-${pkgver}.txz";) -md5sums=('64c5160e6e98561096e004636463f3f0' - '7d8bc6cc70e15f03e6c9255415268de3') + "scala-docs-${pkgver}.tar.xz::http://www.scala-lang.org/files/archive/scala-docs-${pkgver}.txz";) +md5sums=('e5fd7aa6c5dc5651a2cfced262774741' + 'ef17ef72d522e12f00e3be211288633e') prepare() { cd "$srcdir"/${pkgname}-${pkgver} @@ -29,10 +29,7 @@ build() { cd "$srcdir"/${pkgname}-${pkgver} - export ANT_OPTS="-Xms2500M -Xmx2500M -Xss8M -XX:MaxPermSize=1024M -XX:+UseParallelGC" - export M2_OPTS="-Dmaven.repo.local=/tmp" - # Need to change builduser's home in /etc/passwd. It should be writable. - ant build-opt pack.doc osgi.done -Dbuild.release=true -Duser.home=/tmp + sbt dist/mkPack } package_scala() { @@ -43,7 +40,7 @@ install -d "$pkgdir"/usr/{bin,share} "$pkgdir"/usr/share/man/man1 "$pkgdir"/usr/share/scala/{bin,lib} cp -r lib "$pkgdir"/usr/share/scala/ - cp -r man "$pkgdir"/usr/share/ +# cp -r target/scala-dist/resource_managed/main/man "$pkgdir"/usr/share/ install -m 755 bin/{fsc,scala,scalac,scalap,scaladoc} "$pkgdir"/usr/share/scala/bin install -D -m0644 "$srcdir"/scala-${pkgver}/doc/LICENSE.md "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.md @@ -59,9 +56,9 @@ pkgdesc="Scala documentation" depends=() - cd "$srcdir" + cd "$srcdir"/scala-${pkgver} mkdir -p "$pkgdir"/usr/share/doc/ - cp -r scala-docs-${pkgver} "$pkgdir"/usr/share/doc/scala + cp -r api "$pkgdir"/usr/share/doc/scala install -D -m0644 "$srcdir"/scala-${pkgver}/doc/LICENSE.md "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.md } @@ -72,7 +69,7 @@ cd "$srcdir"/scala-${pkgver} mkdir -p "$pkgdir"/usr/share/scala/ - find . -type f -name '*-src.jar' | while read f; do + find . -type f -name '*-sources.jar' | while read f; do install -Dm0644 $f "$pkgdir"/usr/share/scala/src/`basename $f` done install -D -m0644 "$srcdir"/scala-${pkgver}/doc/LICENSE.md "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.md
