rollback usr prefix, change replaces to conflicts

packages/wine-staging-git/.SRCINFO

@@ -130,6 +130,13 @@ pkgbase = wine-staging-git
 	optdepends = libusb-1.0-0-dev:i386: 32-bit USB support
 	optdepends = libv4l-dev:i386: 32-bit video capture support
 	conflicts = wine-staging
+	conflicts = wine
+	conflicts = wine64
+	conflicts = wine32:i386
+	conflicts = libwine
+	conflicts = libwine:i386
+	conflicts = wine-staging-i386:i386
+	conflicts = fonts-wine
 	license = LGPL-2.1-or-later
 	maintainer = xdavius <[email protected]>
 	source = git+https://gitlab.winehq.org/wine/wine-staging.git

packages/wine-staging-git/wine-staging-git.pacscript

@@ -6,21 +6,22 @@ pkgver="10.0"
 url="https://www.wine-staging.com"
 license=("LGPL-2.1-or-later")
 maintainer=("xdavius <[email protected]>")
-source=(
-  "git+https://gitlab.winehq.org/wine/wine-staging.git"
+
+source=("git+https://gitlab.winehq.org/wine/wine-staging.git"
   "git+https://gitlab.winehq.org/wine/wine.git"
   "30-win32-aliases.conf::https://aur.archlinux.org/cgit/aur.git/plain/30-win32-aliases.conf?h=wine-git"
-  "wine-binfmt.conf::https://aur.archlinux.org/cgit/aur.git/plain/wine-binfmt.conf?h=wine-git"
-)
-sha256sums=(
-  "SKIP"
+  "wine-binfmt.conf::https://aur.archlinux.org/cgit/aur.git/plain/wine-binfmt.conf?h=wine-git")
+sha256sums=("SKIP"
   "SKIP"
   "SKIP"
-  "SKIP"
-)
+  "SKIP")
+
 makedepends=("devscripts" "autotools-dev" "autoconf" "libjpeg-turbo8-dev | libjpeg62-turbo-dev" "libjpeg-turbo8-dev:i386 | libjpeg62-turbo-dev:i386" "libasound2-dev" "libpulse-dev" "libdbus-1-dev" "libfontconfig-dev" "libfreetype-dev" "libgnutls28-dev" "libpng-dev" "libtiff-dev" "libgl-dev" "libunwind-dev" "libxml2-dev" "libxslt1-dev" "libfaudio-dev" "libgstreamer1.0-dev" "libgstreamer-plugins-base1.0-dev" "libmpg123-dev" "libjxr-dev" "libosmesa6-dev" "libsdl2-dev" "libudev-dev" "libvkd3d-dev" "libvulkan-dev" "gcc-mingw-w64" "gcc-multilib" "g++-multilib" "flex" "bison" "libx11-dev" "libx11-dev:i386" "xorg-dev" "libfreetype-dev:i386" "oss4-dev | alsa-oss" "libasound2-dev:i386" "libpulse-dev:i386" "libdbus-1-dev:i386" "libfontconfig-dev:i386" "libfreetype-dev:i386" "libgnutls28-dev:i386" "libpng-dev:i386" "libtiff-dev:i386" "libgl-dev:i386" "libunwind-dev:i386" "libxml2-dev:i386" "libxslt1-dev:i386" "libgstreamer1.0-dev:i386" "libmpg123-dev:i386" "libosmesa6-dev:i386" "libsdl2-dev:i386" "libudev-dev:i386" "libvulkan-dev:i386" "libx11-dev:i386" "libwayland-dev")
+
 depends=("libjpeg-turbo8-dev | libjpeg62-turbo-dev" "libjpeg-turbo8-dev:i386 | libjpeg62-turbo-dev:i386" "libasound2-dev" "libpulse-dev" "libdbus-1-dev" "libfontconfig-dev" "libfreetype-dev" "libgnutls28-dev" "libpng-dev" "libtiff-dev" "libgl-dev" "libunwind-dev" "libxml2-dev" "libxslt1-dev" "libfaudio-dev" "libgstreamer1.0-dev" "libgstreamer-plugins-base1.0-dev" "libmpg123-dev" "libjxr-dev" "libosmesa6-dev" "libsdl2-dev" "libudev-dev" "libvkd3d-dev" "libvulkan-dev" "libx11-dev" "libx11-dev:i386" "xorg-dev" "libfreetype-dev:i386" "oss4-dev | alsa-oss" "libasound2-dev:i386" "libpulse-dev:i386" "libdbus-1-dev:i386" "libfontconfig-dev:i386" "libfreetype-dev:i386" "libgnutls28-dev:i386" "libpng-dev:i386" "libtiff-dev:i386" "libgl-dev:i386" "libunwind-dev:i386" "libxml2-dev:i386" "libxslt1-dev:i386" "libgstreamer1.0-dev:i386" "libmpg123-dev:i386" "libosmesa6-dev:i386" "libsdl2-dev:i386" "libudev-dev:i386" "libvulkan-dev:i386" "libx11-dev:i386")
-conflicts=("wine-staging")
+
+conflicts=("wine-staging" "wine" "wine64" "wine32:i386" "libwine" "libwine:i386" "wine-staging-i386:i386" "fonts-wine")
+
 optdepends=("liblcms2-dev: color management"
   "libcups2-dev: printing support"
   "libgphoto2-dev: still image support"
@@ -73,17 +74,17 @@ build() {
   ls -l
   cd "wine64-build"
   ../configure \
-    --prefix='/usr/local' \
-    --libdir='/usr/local/lib' \
+    --prefix='/usr' \
+    --libdir='/usr/lib' \
     --with-x \
     --with-gstreamer \
     --enable-win64
   make -j"${NCPU}"
 
   cd "../wine32-build"
   ../configure \
-    --prefix='/usr/local' \
-    --libdir='/usr/local/lib32' \
+    --prefix='/usr' \
+    --libdir='/usr/lib32' \
     --with-x \
     --with-gstreamer \
     --with-wine64="../wine64-build"
@@ -93,26 +94,24 @@ build() {
 package() {
   cd "${srcdir}"/wine
   cd "wine32-build"
-  mkdir -p "${pkgdir}/usr/local/lib32/wine"
-  make prefix="${pkgdir}/usr/local" \
-    libdir="${pkgdir}/usr/local/lib32" \
-    dlldir="${pkgdir}/usr/local/lib32/wine" \
+  mkdir -p "${pkgdir}/usr/lib32/wine"
+  make prefix="${pkgdir}/usr" \
+    libdir="${pkgdir}/usr/lib32" \
+    dlldir="${pkgdir}/usr/lib32/wine" \
     install
-  #uncomment to create wine32 binary if needed
-  #mv "${pkgdir}"/usr/local/bin/wine "${pkgdir}"/usr/local/bin/wine32
   cd "../wine64-build"
-  mkdir -p "${pkgdir}/usr/local/lib/wine"
-  make prefix="${pkgdir}/usr/local" \
-    libdir="${pkgdir}/usr/local/lib" \
-    dlldir="${pkgdir}/usr/local/lib/wine" \
+  mkdir -p "${pkgdir}/usr/lib/wine"
+  make prefix="${pkgdir}/usr" \
+    libdir="${pkgdir}/usr/lib" \
+    dlldir="${pkgdir}/usr/lib/wine" \
     install
 
-  install -d -m755 "${pkgdir}/usr/local/share/fontconfig/conf.default"
-  install -D -m644 "${srcdir}/30-win32-aliases.conf" "${pkgdir}/usr/local/share/fontconfig/conf.avail/30-win32-aliases.conf"
-  install -D -m644 "${srcdir}/30-win32-aliases.conf" "${pkgdir}/usr/local/share/fontconfig/conf.default/30-win32-aliases.conf"
+  install -d -m755 "${pkgdir}/usr/share/fontconfig/conf.default"
+  install -D -m644 "${srcdir}/30-win32-aliases.conf" "${pkgdir}/usr/share/fontconfig/conf.avail/30-win32-aliases.conf"
+  install -D -m644 "${srcdir}/30-win32-aliases.conf" "${pkgdir}/usr/share/fontconfig/conf.default/30-win32-aliases.conf"
 
-  install -D -m644 "${srcdir}/wine-binfmt.conf" "${pkgdir}/usr/local/lib/binfmt.d/wine.conf"
+  install -D -m644 "${srcdir}/wine-binfmt.conf" "${pkgdir}/usr/lib/binfmt.d/wine.conf"
 
-  i686-w64-mingw32-strip --strip-unneeded "${pkgdir}/usr/local/lib32/wine/i386-windows"/*.dll
-  x86_64-w64-mingw32-strip --strip-unneeded "${pkgdir}/usr/local/lib/wine/x86_64-windows"/*.dll
+  i686-w64-mingw32-strip --strip-unneeded "${pkgdir}/usr/lib32/wine/i386-windows"/*.dll
+  x86_64-w64-mingw32-strip --strip-unneeded "${pkgdir}/usr/lib/wine/x86_64-windows"/*.dll
 }

srclist

@@ -12699,6 +12699,13 @@ pkgbase = wine-staging-git
 	optdepends = libusb-1.0-0-dev:i386: 32-bit USB support
 	optdepends = libv4l-dev:i386: 32-bit video capture support
 	conflicts = wine-staging
+	conflicts = wine
+	conflicts = wine64
+	conflicts = wine32:i386
+	conflicts = libwine
+	conflicts = libwine:i386
+	conflicts = wine-staging-i386:i386
+	conflicts = fonts-wine
 	license = LGPL-2.1-or-later
 	maintainer = xdavius <[email protected]>
 	source = git+https://gitlab.winehq.org/wine/wine-staging.git