Scala 3.0.0-M1 released!

2 files changed, 53 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a06c6db0c5d..7d88ae127eed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,20 @@
 pkgbase = scala-dotty
 	pkgdesc = Research compiler that will become Scala 3
-	pkgver = 0.27.0RC1
+	pkgver = 3.0.0M1
 	pkgrel = 1
 	url = http://dotty.epfl.ch
 	arch = any
-	license = BSD
-	depends = java-environment>=8
-	depends = java-environment<=11
-	source = https://github.com/lampepfl/dotty/releases/download/0.27.0-RC1/dotty-0.27.0-RC1.tar.gz
-	sha1sums = c7b08e2d8a9473e2fba929992c44c390e5a88793
-	sha256sums = f8dac1ff8b67e479f77a54d6581e24861cf284244f87e7a76a358abe24886eb1
-	sha512sums = 498fac83c3788016d840c16e3a0ad5fa7f121c3a1ea8572a81663a88e432937fea97f3d45a56055df20a77ccf3d33588674ffbfed2654b6b534cf658bd0ddfb6
+	license = Apache
+	depends = java-environment>=11
+	source = https://github.com/lampepfl/dotty/releases/download/3.0.0-M1/scala3-3.0.0-M1.tar.gz
+	sha1sums = 4c796383b0fa0534b61434336062f8526d874e79
+	sha256sums = a231276ac330928080f73afc27a61ea2a53a70a75ad91dcf97ad2fba6e27c134
+	sha512sums = a2f7af9155873c9765d9c57df1bdf3d4a9297f8ee5d02df7fa6e7f84106b9fb42312f76134e98160c899ff94b2a31cc23fb9045840f773c33277e1b8ccd7c278
 
 pkgname = scala-dotty
 
+pkgname = scala3
+	depends = scala-dotty
+	provides = scala=3.0.0M1
+	conflicts = scala
+
diff --git a/PKGBUILD b/PKGBUILD
index 982b42b9d84d..c6566c8800e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,49 @@
-# Maintainer: Mikael Blomstrand <mikael ÅT mbloms DÖT se>
+# Maintainer: Mikael Blomstrand <gmail: chawlindel>
 # Contributor: Jendrik Wenke <jendrikwenke+aur at gmail dot com>
 
-pkgname=scala-dotty
-_reltag=0.27.0-RC1
+pkgbase=scala-dotty
+pkgname=('scala-dotty' 'scala3')
+_reltag=3.0.0-M1
 pkgver=${_reltag//-/}
 pkgrel=1
 pkgdesc='Research compiler that will become Scala 3'
 arch=('any')
 url='http://dotty.epfl.ch'
-license=('BSD')
-depends=('java-environment>=8' 'java-environment<=11')
-source=("https://github.com/lampepfl/dotty/releases/download/${_reltag}/dotty-${_reltag}.tar.gz")
-sha1sums=('c7b08e2d8a9473e2fba929992c44c390e5a88793')
-sha256sums=('f8dac1ff8b67e479f77a54d6581e24861cf284244f87e7a76a358abe24886eb1')
-sha512sums=('498fac83c3788016d840c16e3a0ad5fa7f121c3a1ea8572a81663a88e432937fea97f3d45a56055df20a77ccf3d33588674ffbfed2654b6b534cf658bd0ddfb6')
-
-package() {
-       install -d "${pkgdir}/usr/bin" "${pkgdir}/usr/share/scala-dotty/bin"
-       cp -r "${srcdir}/dotty-${_reltag}/lib" "${pkgdir}/usr/share/scala-dotty"
-       install -m755 "${srcdir}/dotty-${_reltag}/bin/"* "${pkgdir}/usr/share/scala-dotty/bin"
-       ln -s "../share/scala-dotty/bin/dotc" "${pkgdir}/usr/bin/dotc"
-       ln -s "../share/scala-dotty/bin/dotd" "${pkgdir}/usr/bin/dotd"
-       ln -s "../share/scala-dotty/bin/dotr" "${pkgdir}/usr/bin/dotr"
+license=('Apache')
+#depends=('java-environment>=8' 'java-environment<=11')
+depends=('java-environment>=11')
+source=("https://github.com/lampepfl/dotty/releases/download/${_reltag}/scala3-${_reltag}.tar.gz")
+sha1sums=('4c796383b0fa0534b61434336062f8526d874e79')
+sha256sums=('a231276ac330928080f73afc27a61ea2a53a70a75ad91dcf97ad2fba6e27c134')
+sha512sums=('a2f7af9155873c9765d9c57df1bdf3d4a9297f8ee5d02df7fa6e7f84106b9fb42312f76134e98160c899ff94b2a31cc23fb9045840f773c33277e1b8ccd7c278')
+
+package_scala-dotty() {
+	msg2 "WARNING: These binaries require Java 11 or later."
+
+	install -d "${pkgdir}/usr/bin" "${pkgdir}/usr/share/scala3/bin"
+	cp -r "${srcdir}/scala3-${_reltag}/lib" "${pkgdir}/usr/share/scala3"
+	install -m755 "${srcdir}/scala3-${_reltag}/bin/"* "${pkgdir}/usr/share/scala3/bin"
+
+	# Scala 3 symlinks in /usr/bin
+	ln -s "../share/scala3/bin/scala"  "${pkgdir}/usr/bin/scala3"
+	ln -s "../share/scala3/bin/scalac" "${pkgdir}/usr/bin/scalac3"
+	ln -s "../share/scala3/bin/scalad" "${pkgdir}/usr/bin/scalad3"
+
+	# Provide dotty simlinks for convenience
+	ln -s scala3  "${pkgdir}/usr/bin/dotr"
+	ln -s scalac3 "${pkgdir}/usr/bin/dotc"
+	ln -s scalad3 "${pkgdir}/usr/bin/dotd"
+}
+
+package_scala3() {
+	provides=(scala=$pkgver)
+	conflicts=(scala)
+	depends=(scala-dotty)
+
+	install -d "${pkgdir}/usr/bin"
+
+	# Symlink scala -> scala3, etv.
+	ln -s scalac3 "${pkgdir}/usr/bin/scalac"
+	ln -s scalad3 "${pkgdir}/usr/bin/scalad"
+	ln -s scala3  "${pkgdir}/usr/bin/scala"
 }