4 files changed, 30 insertions, 26 deletions
diff --git a/development/scala/profile.d/scala.csh b/development/scala/profile.d/scala.csh
index ac90ddc545766..c7258711dd91c 100644
--- a/development/scala/profile.d/scala.csh
+++ b/development/scala/profile.d/scala.csh
@@ -1,4 +1,2 @@
 #!/bin/csh
 setenv SCALA_HOME @LIBDIR@/scala
-setenv MANPATH ${MANPATH}:${SCALA_HOME}/man
-setenv PATH ${PATH}:${SCALA_HOME}/bin
diff --git a/development/scala/profile.d/scala.sh b/development/scala/profile.d/scala.sh
index a53787d41973d..bb58bb38243b1 100644
--- a/development/scala/profile.d/scala.sh
+++ b/development/scala/profile.d/scala.sh
@@ -1,4 +1,2 @@
 #!/bin/sh
 export SCALA_HOME=@LIBDIR@/scala
-export MANPATH="${MANPATH}:${SCALA_HOME}/man"
-export PATH="${PATH}:${SCALA_HOME}/bin"
diff --git a/development/scala/scala.SlackBuild b/development/scala/scala.SlackBuild
index d530573f2b245..b88f620786fc2 100644
--- a/development/scala/scala.SlackBuild
+++ b/development/scala/scala.SlackBuild
@@ -4,9 +4,10 @@
 
 # Written by Matthias Diehn Ingesman (matthias@pf-c.dk)
 # Public domain.
+# Updated by Andre Barboza <bmg.andre@gmail.com>
 
 PRGNAM=scala
-VERSION=${VERSION:-2.7.7.final}
+VERSION=${VERSION:-2.11.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -23,11 +24,10 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Binary repackaging, so no compile-flags needed
 if [ "$ARCH" = "x86_64" ]; then
-  LIBDIR="/usr/lib64"
+  LIBDIRSUFFIX="64"
 else
-  LIBDIR="/usr/lib"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -40,28 +40,36 @@ tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/$LIBDIR/$PRGNAM
-mv $TMP/$PRGNAM-$VERSION/{bin,lib,man,meta,misc,src} $PKG/$LIBDIR/$PRGNAM
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM $PKG/usr/{bin,man,doc}
+mv $TMP/$PRGNAM-$VERSION/{bin,lib} $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+(
+  cd $PKG/usr/bin
+  ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/bin/fsc
+  ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/bin/scala
+  ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/bin/scalac
+  ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/bin/scalap
+  ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/bin/scaladoc
+)
+rm $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/bin/*.bat
+mv $TMP/$PRGNAM-$VERSION/man $PKG/usr/
 
 # No need to install these with a .new extension
 mkdir -p $PKG/etc/profile.d
-sed "s%@LIBDIR@%$LIBDIR%" $CWD/profile.d/scala.sh > \
+sed "s%@LIBDIR@%/usr/lib$LIBDIRSUFFIX%" $CWD/profile.d/scala.sh > \
     $PKG/etc/profile.d/scala.sh
-sed "s%@LIBDIR@%$LIBDIR%" $CWD/profile.d/scala.csh > \
+sed "s%@LIBDIR@%/usr/lib$LIBDIRSUFFIX%" $CWD/profile.d/scala.csh > \
     $PKG/etc/profile.d/scala.csh
 chmod 0755 $PKG/etc/profile.d/*
 
-( cd $PKG/$LIBDIR/$PRGNAM/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $TMP/$PRGNAM-$VERSION/doc/ $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/scala/scala.info b/development/scala/scala.info
index c94040434b72d..10f6f683af37e 100644
--- a/development/scala/scala.info
+++ b/development/scala/scala.info
@@ -1,10 +1,10 @@
 PRGNAM="scala"
-VERSION="2.7.7.final"
+VERSION="2.11.7"
 HOMEPAGE="http://www.scala-lang.org/"
-DOWNLOAD="http://www.scala-lang.org/files/archive/scala-2.7.7.final.tgz"
-MD5SUM="5d2294d5aab72fec869c0ba666d28b7e"
+DOWNLOAD="http://downloads.typesafe.com/scala/2.11.7/scala-2.11.7.tgz"
+MD5SUM="ad81770762ec65099daf77493a591d7e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
-MAINTAINER="Matthias Diehn Ingesman"
-EMAIL="matthias@pf-c.dk"
+MAINTAINER="Andre Barboza"
+EMAIL="bmg.andre@gmail.com"