summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD10
2 files changed, 13 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cadf3a948dd2..f94779bb4bd1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
# Generated by mksrcinfo v8
-# Tue Sep 6 13:06:25 UTC 2016
+# Sat Feb 23 23:40:02 UTC 2019
pkgbase = scala_2.10
pkgdesc = A Java-interoperable language with object-oriented and functional features. This is the maintenance version of Scala 2.10.
- pkgver = 2.10.6
+ pkgver = 2.10.7
pkgrel = 1
url = http://www.scala-lang.org
arch = any
license = BSD
- depends = jdk7
+ depends = java-environment>=7
conflicts = scala
conflicts = scala-docs
conflicts = scala-sources
- conflicts = jdk8
- source = http://www.scala-lang.org/files/archive/scala-2.10.6.tgz
- source = http://www.scala-lang.org/files/archive/scala-docs-2.10.6.txz
- md5sums = d79dc9fdc627b73289306bdaec81ca98
- md5sums = 0a6a0598e365a4dea2541efa3e9e5ef7
+ conflicts = java-environment<7
+ source = http://www.scala-lang.org/files/archive/scala-2.10.7.tgz
+ source = http://www.scala-lang.org/files/archive/scala-docs-2.10.7.txz
+ md5sums = b280e2f87b14c0acdc5209067973426d
+ md5sums = eb716abee9c16831b9c499e63437db0e
pkgname = scala_2.10
depends = java-runtime<=7
diff --git a/PKGBUILD b/PKGBUILD
index 9788fb5a923a..bec5f7227ded 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,19 @@
pkgbase=scala_2.10
pkgname=(scala_2.10 scala-docs_2.10 scala-sources_2.10)
-pkgver=2.10.6
+pkgver=2.10.7
pkgrel=1
pkgdesc="A Java-interoperable language with object-oriented and functional features. This is the maintenance version of Scala 2.10."
arch=('any')
url="http://www.scala-lang.org"
license=('BSD')
# for Java 8 incompatibility, see scala issue SI-8852
-depends=('jdk7')
-conflicts=('scala' 'scala-docs' 'scala-sources' 'jdk8')
+depends=('java-environment>=7')
+conflicts=('scala' 'scala-docs' 'scala-sources' 'java-environment<7')
source=("http://www.scala-lang.org/files/archive/scala-${pkgver}.tgz"
"http://www.scala-lang.org/files/archive/scala-docs-${pkgver}.txz")
-md5sums=('d79dc9fdc627b73289306bdaec81ca98'
- '0a6a0598e365a4dea2541efa3e9e5ef7')
+md5sums=('b280e2f87b14c0acdc5209067973426d'
+ 'eb716abee9c16831b9c499e63437db0e')
package_scala_2.10() {
depends=('java-runtime<=7')