msys2-runtime-3.3: build as msys2-runtime on i686

So there is an automated upgrade path and users don't
have to manually switch to msys2-runtime-3.3.

msys2-runtime-3.3/PKGBUILD

@@ -2,9 +2,13 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
 
 pkgbase=msys2-runtime-3.3
-pkgname=('msys2-runtime-3.3' 'msys2-runtime-3.3-devel')
+if [ "$CARCH" == "i686" ]; then
+  pkgname=('msys2-runtime' 'msys2-runtime-devel')
+else
+  pkgname=('msys2-runtime-3.3' 'msys2-runtime-3.3-devel')
+fi
 pkgver=3.3.6
-pkgrel=13
+pkgrel=14
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('i686' 'x86_64')
 url="https://www.cygwin.com/"
@@ -300,6 +304,15 @@ package_msys2-runtime-3.3() {
   cp -rf "${srcdir}"/dest/usr/share "${pkgdir}"/usr/
 }
 
+package_msys2-runtime() {
+  pkgdesc="Posix emulation engine for Windows"
+  options=('!strip')
+  conflicts=('catgets' 'libcatgets')
+  replaces=('catgets' 'libcatgets')
+
+  package_msys2-runtime-3.3
+}
+
 package_msys2-runtime-3.3-devel() {
   pkgdesc="MSYS2 headers and libraries"
   depends=("msys2-runtime-3.3=${pkgver}")
@@ -318,3 +331,13 @@ package_msys2-runtime-3.3-devel() {
 
   cp -rLf "${srcdir}"/dest/usr/${CHOST}/lib "${pkgdir}"/usr/
 }
+
+package_msys2-runtime-devel() {
+  pkgdesc="MSYS2 headers and libraries"
+  depends=("msys2-runtime=${pkgver}")
+  options=('staticlibs' '!strip')
+  conflicts=('libcatgets-devel')
+  replaces=('libcatgets-devel')
+
+  package_msys2-runtime-3.3-devel
+}