New packaging: Scala 3 is packaged as scala3

scala-dotty provides symlinks to scala3

2 files changed, 10 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 605e39a8f396..0b1a08ab6cf5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = scala-dotty
 	pkgdesc = The Scala 3 compiler, also known as Dotty.
 	pkgver = 3.0.0M1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://dotty.epfl.ch
 	arch = any
 	license = Apache
@@ -12,10 +12,7 @@ pkgbase = scala-dotty
 	sha512sums = c074b821a315722066f6f11b9931361b4e4e8923f2f8ca3f3e58a85b6fe8b2abef159770ae377a3d1520d6704723a3230c9ee8d19e47a8b4593163cac1bfa54d
 
 pkgname = scala-dotty
+	depends = scala3
 
 pkgname = scala3
-	pkgdesc = Symlinks for using Scala 3 instead of Scala 2.
-	depends = scala-dotty
-	provides = scala=3.0.0M1
-	conflicts = scala
 
diff --git a/PKGBUILD b/PKGBUILD
index a3b560351bb0..82b24c1681a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=scala-dotty
 pkgname=('scala-dotty' 'scala3')
 _reltag=3.0.0-M1
 pkgver=${_reltag//-/}
-pkgrel=2
+pkgrel=3
 pkgdesc='The Scala 3 compiler, also known as Dotty.'
 arch=('any')
 url='http://dotty.epfl.ch'
@@ -16,7 +16,7 @@ sha1sums=('72fd39d697524d5e129a7793ca21fce0cea0cbd9')
 sha256sums=('3e92c7f72779a645af61fdd63da3f4073518ed3471e26aec553a6d858c1387d1')
 sha512sums=('c074b821a315722066f6f11b9931361b4e4e8923f2f8ca3f3e58a85b6fe8b2abef159770ae377a3d1520d6704723a3230c9ee8d19e47a8b4593163cac1bfa54d')
 
-package_scala-dotty() {
+package_scala3() {
 	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"
@@ -25,24 +25,15 @@ package_scala-dotty() {
 	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() {
-	# In the future scala-dotty will be renamed scala3
-	provides=(scala=$pkgver)
-	conflicts=(scala)
-	depends=(scala-dotty)
-	pkgdesc='Symlinks for using Scala 3 instead of Scala 2.'
+package_scala-dotty() {
+	depends=(scala3)
 
 	install -d "${pkgdir}/usr/bin"
 
-	# Symlink scala -> scala3, etc.
-	ln -s scalac3 "${pkgdir}/usr/bin/scalac"
-	ln -s scalad3 "${pkgdir}/usr/bin/scalad"
-	ln -s scala3  "${pkgdir}/usr/bin/scala"
+	# 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"
 }