fixup! msys2-runtime: add a msys2-runtime-3.3 package for continued x…

…86 compatibility

Adjust the PKGBUILD to the new package name and mark it as conflicting with the main
`msys2-runtime` package.

This commit should be squashed before merging, but is provided separately from the previous
commit copying all the files to help with reviewing.

Signed-off-by: Matthias Aßhauer <[email protected]>

msys2-runtime-3.3/PKGBUILD

@@ -1,10 +1,10 @@
 # Maintainer: Alexey Pavlov <[email protected]>
 # Contributor: Ray Donnelly <[email protected]>
 
-pkgbase=msys2-runtime
-pkgname=('msys2-runtime' 'msys2-runtime-devel')
+pkgbase=msys2-runtime-3.3
+pkgname=('msys2-runtime-3.3' 'msys2-runtime-3.3-devel')
 pkgver=3.3.6
-pkgrel=4
+pkgrel=1
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('i686' 'x86_64')
 url="https://www.cygwin.com/"
@@ -289,11 +289,12 @@ build() {
   rm -rf "${srcdir}"/dest/etc
 }
 
-package_msys2-runtime() {
+package_msys2-runtime-3.3() {
   pkgdesc="Posix emulation engine for Windows"
   groups=('base')
   options=('!strip')
-  conflicts=('catgets' 'libcatgets')
+  provides=("msys2-runtime=${pkgver}")
+  conflicts=('catgets' 'libcatgets' 'msys2-runtime')
   replaces=('catgets' 'libcatgets')
   #install=msys2-runtime.install
 
@@ -308,12 +309,13 @@ package_msys2-runtime() {
   cp -rf "${srcdir}"/dest/usr/share "${pkgdir}"/usr/
 }
 
-package_msys2-runtime-devel() {
+package_msys2-runtime-3.3-devel() {
   pkgdesc="MSYS2 headers and libraries"
   groups=('msys2-devel')
   depends=("msys2-runtime=${pkgver}")
+  provides=("msys2-runtime-devel=${pkgver}")
   options=('staticlibs' '!strip')
-  conflicts=('libcatgets-devel')
+  conflicts=('libcatgets-devel' 'msys2-runtime-devel')
   replaces=('libcatgets-devel')
 
   mkdir -p "${pkgdir}"/usr/bin