diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : scala
-version : 2.12.4
-release : 4
+version : 2.13.2
+release : 5
source :
- - https://github.com/scala/scala/archive/v2.12.4.tar.gz : 9d1eaf570f95204a8894ab941070354b1672904a903ae3d1b45df201ddd1ed7d
+ - https://github.com/scala/scala/archive/v2.13.2.tar.gz : 54fc3ef0c86534aafe7be9fb52daad18e82bbd920c4b90585c4f4f33cbb9274f
license : BSD-3-Clause
component : programming
summary : Scala Language Toolchain
@@ -16,14 +16,28 @@
- openjdk-8
networking : yes
build : |
- sbt -Dsbt.global.base=./.sbt/ -Dsbt.ivy.home=./.ivy2/ -Divy.home=./.ivy2/ dist/mkPack publishDists
+ # Unfortunately we need to build the whole doc to get manpages.
+ sbt -Divy.home=$workdir/.ivy2 \
+ -Dsbt.global.base=$workdir/.sbt \
+ -Dsbt.ivy.home=$workdir/.ivy2 \
+ -Duser.home=$workdir/.java \
+ enableOptimizer package doc
install : |
- cd build/pack
- install -d $installdir/usr/bin
- install -d $installdir/usr/share/scala
- cp -R lib $installdir/usr/share/scala
- for pak in fsc scala scalac scaladoc scalap; do
- install -D -m 00755 "bin/$pak" "$installdir/usr/share/scala/bin/$pak";
- ln -s "/usr/share/scala/bin/$pak" "$installdir/usr/bin/$pak";
- install -D -m 00644 "../quick/classes/scala-dist/man/man1/$pak.1" "$installdir/usr/share/man/man1/$pak.1";
+ cd build
+
+ install -dm00755 $installdir/usr/share/scala
+ cp -a pack/lib $installdir/usr/share/scala
+
+ pushd pack/bin
+ rm *.bat
+ install -dm00755 $installdir/usr/bin
+ for cmd in *; do
+ # Set JAVACMD at line 2 of every command (i.e. after shabang)
+ sed '2iJAVACMD=/usr/lib64/openjdk-8/bin/java' -i $cmd
+
+ install -Dm00755 $cmd -t $installdir/usr/share/scala/bin
+ ln -s /usr/share/scala/bin/$cmd $installdir/usr/bin/$cmd
done
+ popd
+
+ cp -a quick/classes/scala-dist/man $installdir/usr/share
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,15 +2,15 @@
scala
- Joshua Strobl
- joshua@stroblindustries.com
+ Fabio Forni
+ livingsilver94.solus@redaril.me
BSD-3-Clause
programming
Scala Language Toolchain
Scala Language Toolchain
- https://solus-project.com/sources/README.Solus
+ https://getsol.us/sources/README.Solus
scala
@@ -19,18 +19,40 @@
programming
- /usr/bin
- /usr/share/man
- /usr/share/scala
+ /usr/bin/fsc
+ /usr/bin/scala
+ /usr/bin/scalac
+ /usr/bin/scaladoc
+ /usr/bin/scalap
+ /usr/share/man/man1/fsc.1
+ /usr/share/man/man1/scala.1
+ /usr/share/man/man1/scalac.1
+ /usr/share/man/man1/scaladoc.1
+ /usr/share/man/man1/scalap.1
+ /usr/share/scala/bin/fsc
+ /usr/share/scala/bin/scala
+ /usr/share/scala/bin/scalac
+ /usr/share/scala/bin/scaladoc
+ /usr/share/scala/bin/scalap
+ /usr/share/scala/lib/repl.jar
+ /usr/share/scala/lib/scala-compiler-doc.jar
+ /usr/share/scala/lib/scala-compiler-interactive.jar
+ /usr/share/scala/lib/scala-compiler.jar
+ /usr/share/scala/lib/scala-library.jar
+ /usr/share/scala/lib/scala-partest.jar
+ /usr/share/scala/lib/scala-reflect.jar
+ /usr/share/scala/lib/scala-repl-frontend.jar
+ /usr/share/scala/lib/scala-testkit.jar
+ /usr/share/scala/lib/scalap.jar
-
- 2018-01-20
- 2.12.4
+
+ 2020-04-25
+ 2.13.2
Packaging update
- Joshua Strobl
- joshua@stroblindustries.com
+ Fabio Forni
+ livingsilver94.solus@redaril.me
\ No newline at end of file