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

[Sergej Pupykin]

    Date: Tuesday, December 3, 2013 @ 17:58:18
  Author: spupykin
Revision: 102002

update trunk to devel version of scala

Modified:
  scala/trunk/PKGBUILD

----------+
 PKGBUILD |   48 +++++++++++++++++++-----------------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-03 16:51:56 UTC (rev 102001)
+++ PKGBUILD	2013-12-03 16:58:18 UTC (rev 102002)
@@ -4,10 +4,10 @@
 
 pkgbase=scala
 pkgname=(scala scala-docs scala-sources)
-pkgver=2.10.2
+pkgver=2.11.0M7
 pkgrel=1
-_distdate=20130606-103331
-_distsha=60d462ef6e
+_distdate=20131118-113951
+_distsha=c243435f11
 pkgdesc="A Java-interoperable language with object-oriented and functional features"
 arch=('any')
 url="http://www.scala-lang.org"
@@ -14,20 +14,13 @@
 license=('BSD')
 depends=('java-runtime')
 makedepends=('apache-ant' 'git')
-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')
+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')
 
-# workaround#1: build requires unicode
-#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}
+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
@@ -39,18 +32,17 @@
   ant dist-opt -Dbuild.release=true
 }
 
-package_scala()
-{
+package_scala() {
   depends=('java-runtime')
   optdepends=('scala-docs' 'scala-sources' 'graphviz: generate diagrams')
 
-  cd ${srcdir}/${pkgname}-${pkgver}/dists/latest/
+  cd ${srcdir}/${pkgname}-${pkgver/M/-M}/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 ${srcdir}/${pkgname}-${pkgver}/doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m0644 ${srcdir}/${pkgname}-${pkgver/M/-M}/doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
   rm -f $pkgdir/usr/share/scala/lib/scalacheck.jar
 
@@ -61,8 +53,7 @@
   ln -s ../share/scala/bin/scaladoc ${pkgdir}/usr/bin/scaladoc
 }
 
-package_scala-docs()
-{
+package_scala-docs() {
   replaces=('scala-doc' 'scala-devel-docs')
   pkgdesc="Scala documentation"
   depends=()
@@ -69,19 +60,18 @@
 
   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
+  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
 }
 
-package_scala-sources()
-{
+package_scala-sources() {
   replaces=('scala-src')
   pkgdesc="Scala sources"
-  depends=('scala')
+  depends=()
 
-  cd ${srcdir}/scala-${pkgver}/dists
+  cd ${srcdir}/scala-${pkgver/M/-M}/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
+  install -D -m0644 ${srcdir}/${pkgname}-${pkgver/M/-M}/doc/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }