Update To 2.13.10

2 files changed, 37 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2768dd62bb0..2e689e99fa17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = scala
 	pkgdesc = A Java-interoperable language with object-oriented and functional features
-	pkgver = 2.13.8
+	pkgver = 2.13.10
 	pkgrel = 1
 	url = https://www.scala-lang.org
 	arch = any
 	license = Apache
 	makedepends = git
 	makedepends = sbt
-	depends = java-environment=8
-	depends = java-runtime=8
-	source = scala-2.13.8.tar.gz::https://github.com/scala/scala/archive/v2.13.8.tar.gz
-	source = scala-docs-2.13.8.tar.xz::https://www.scala-lang.org/files/archive/scala-docs-2.13.8.txz
-	sha512sums = cba6a474ec0f1ec926b345b1905a79ea03055bb7dba3863d11002a18ee05dafd68d58e4351e253754fac6493c82dc117608613fba5dc2cc641ef23dc046ad3ee
-	sha512sums = 0b985701e6873d083203dfde88b5c695d449638933c42699c46fc88221ed7b83f14723b2903bfbc93a5406bf58a679c78c3427ce0651acd91b76fea78be47877
+	source = scala-2.13.10.tar.gz::https://github.com/scala/scala/archive/v2.13.10.tar.gz
+	source = scala-docs-2.13.10.tar.xz::https://www.scala-lang.org/files/archive/scala-docs-2.13.10.txz
+	sha512sums = 7a89ee746d892640faf0ad3a91715c91bd174acbae22fde7dcbc16a71c6bd84d4f448071fd497a778ef5aaba48c306150e591ad1d2c263764aeac79bcc021529
+	sha512sums = 0ccbae59327b7a2254115d729f08c75e80c3d0f07a4ebd0f7947307b1cbd4a77a9581a8baa6bba0f98472485b441e5daaf153b9c78c0613c7886e9dc3e8650b3
 
 pkgname = scala
-	depends = java-runtime
+	depends = java-runtime>=8
 	optdepends = scala-docs
 	optdepends = scala-sources
 	optdepends = graphviz: generate diagrams
diff --git a/PKGBUILD b/PKGBUILD
index 57e5aff3978f..1ecc9ae4e356 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,77 +1,76 @@
-# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
+# Maintainer: David Strawn <isomarcte at gmail dot com>
+# Contributor: Evgeniy Alekseev <arcanis at archlinux dot org>
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail dot com>
 # Contributor: Marcin Karpezo <sirmacik at gmail dot com>
 
+# shellcheck disable=SC2034
 pkgbase=scala
 pkgname=(scala scala-docs scala-sources)
-pkgver=2.13.8
+pkgver=2.13.10
+# shellcheck disable=SC2034
 pkgrel=1
-_watch="https://github.com/scala/scala/releases"
-_distdate=20190531-142000
-_distsha=43e040ff7e
-pkgdesc="A Java-interoperable language with object-oriented and functional features"
+pkgdesc='A Java-interoperable language with object-oriented and functional features'
+# shellcheck disable=SC2034
 arch=('any')
-url="https://www.scala-lang.org"
+# shellcheck disable=SC2034
+url='https://www.scala-lang.org'
+# shellcheck disable=SC2034
 license=('Apache')
-depends=('java-environment=8' 'java-runtime=8')
+# shellcheck disable=SC2034
 makedepends=('git' 'sbt')
+# shellcheck disable=SC2034
 source=("scala-${pkgver}.tar.gz::https://github.com/scala/scala/archive/v${pkgver}.tar.gz"
         "scala-docs-${pkgver}.tar.xz::https://www.scala-lang.org/files/archive/scala-docs-${pkgver}.txz")
-sha512sums=('cba6a474ec0f1ec926b345b1905a79ea03055bb7dba3863d11002a18ee05dafd68d58e4351e253754fac6493c82dc117608613fba5dc2cc641ef23dc046ad3ee'
-            '0b985701e6873d083203dfde88b5c695d449638933c42699c46fc88221ed7b83f14723b2903bfbc93a5406bf58a679c78c3427ce0651acd91b76fea78be47877')
+# shellcheck disable=SC2034
+sha512sums=('7a89ee746d892640faf0ad3a91715c91bd174acbae22fde7dcbc16a71c6bd84d4f448071fd497a778ef5aaba48c306150e591ad1d2c263764aeac79bcc021529'
+            '0ccbae59327b7a2254115d729f08c75e80c3d0f07a4ebd0f7947307b1cbd4a77a9581a8baa6bba0f98472485b441e5daaf153b9c78c0613c7886e9dc3e8650b3')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  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"
+  chmod 0755 "${srcdir:?}/${pkgbase}-${pkgver}/tools"/*
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}" || exit 1
   sbt dist/mkPack packageSrc packageDoc
 }
 
 package_scala() {
-  depends=('java-runtime')
+  depends=('java-runtime>=8')
   optdepends=('scala-docs'
               'scala-sources'
               'graphviz: generate diagrams')
 
-  cd "${srcdir}/${pkgname}-${pkgver}/build/pack"
+  cd "${srcdir}/scala-${pkgver}/build/pack" || exit 1
 
-  install -d "${pkgdir}/usr/"{bin,share} "${pkgdir}/usr/share/man/man1" "${pkgdir}/usr/share/scala/"{bin,lib}
+  install -d "${pkgdir:?}/usr/"{bin,share} "${pkgdir}/usr/share/man/man1" "${pkgdir}/usr/share/scala/"{bin,lib}
   cp -r lib "${pkgdir}/usr/share/scala/"
   install -m755 bin/{fsc,scala,scalac,scalap,scaladoc} "${pkgdir}/usr/share/scala/bin"
-  install -Dm0644 "${srcdir}/scala-${pkgver}/doc/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
 
-  ln -s "../share/scala/bin/fsc" "${pkgdir}/usr/bin/fsc"
-  ln -s "../share/scala/bin/scala" "${pkgdir}/usr/bin/scala"
-  ln -s "../share/scala/bin/scalac" "${pkgdir}/usr/bin/scalac"
-  ln -s "../share/scala/bin/scalap" "${pkgdir}/usr/bin/scalap"
-  ln -s "../share/scala/bin/scaladoc" "${pkgdir}/usr/bin/scaladoc"
+  ln -s '../share/scala/bin/fsc' "${pkgdir}/usr/bin/fsc"
+  ln -s '../share/scala/bin/scala' "${pkgdir}/usr/bin/scala"
+  ln -s '../share/scala/bin/scalac' "${pkgdir}/usr/bin/scalac"
+  ln -s '../share/scala/bin/scalap' "${pkgdir}/usr/bin/scalap"
+  ln -s '../share/scala/bin/scaladoc' "${pkgdir}/usr/bin/scaladoc"
 }
 
 package_scala-docs() {
   replaces=('scala-doc' 'scala-devel-docs')
-  pkgdesc="Scala documentation"
+  pkgdesc='Scala documentation'
   depends=()
 
-  cd "${srcdir}/scala-${pkgver}"
+  cd "${srcdir}/scala-${pkgver}" || exit 1
   mkdir -p "${pkgdir}/usr/share/doc/"
   cp -r api "${pkgdir}/usr/share/doc/scala"
-  install -Dm0644 "${srcdir}/scala-${pkgver}/doc/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
 }
 
 package_scala-sources() {
   replaces=('scala-src')
-  pkgdesc="Scala sources"
+  pkgdesc='Scala sources'
   depends=()
 
-  cd "${srcdir}/scala-${pkgver}"
+  cd "${srcdir}/scala-${pkgver}" || exit 1
   mkdir -p "${pkgdir}/usr/share/scala/"
-  find . -type f -name '*-sources.jar' | while read f; do
-    install -Dm0644 "${f}" "${pkgdir}/usr/share/scala/src/$(basename -- ${f})"
+  find . -type f -name '*-sources.jar' | while read -r f; do
+    install -Dm0644 "${f}" "${pkgdir}/usr/share/scala/src/$(basename -- "${f}")"
   done
-  install -Dm0644 "${srcdir}/scala-${pkgver}/doc/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
 }