updated package

2 files changed, 25 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7dc6f9df56f4..e6eff728787c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,29 @@
 pkgbase = citra-bin
 	pkgdesc = An experimental open-source Nintendo 3DS emulator/debugger
-	pkgver = 1659_20201207_3f13e1c
+	pkgver = 1720_20210801_c40871f
 	pkgrel = 1
 	url = https://citra-emu.org
 	arch = x86_64
 	license = GPL2
 	conflicts = citra-git
 	conflicts = citra-qt-git
-	conflicts = citra-nightly-bin
-	conflicts = citra-qt-nightly-bin
-	conflicts = citra-bin
-	conflicts = citra-qt
 	conflicts = citra-canary-bin
 	conflicts = citra-qt-canary-bin
-	replaces = citra-nightly-bin
-	replaces = citra-qt-nightly-bin
-	source = https://github.com/citra-emu/citra-nightly/releases/download/nightly-1659/citra-linux-20201207-3f13e1c.tar.xz
+	source = https://github.com/citra-emu/citra-nightly/releases/download/nightly-1720/citra-linux-20210801-c40871f.tar.xz
 	source = https://raw.githubusercontent.com/citra-emu/citra/master/dist/citra.desktop
-	sha256sums = 299ddcf80dbc65f203553ff4bb4b4a289cad576eb9b86c663b1b685eb17d9297
-	sha256sums = 93bd8f799877eba7dd87ed7a4c29607d78c42b8769626c1d479f7e34fb7b39e2
+	sha256sums = cda618f525fde86358b33c24c2ef65b929ff9f414b4d2bef2bb4e38c87a3a188
+	sha256sums = b4c9433fbcbb1b9ddf19f009252e89d8d653ebac7f67d5d0beb49259f583ab69
 
 pkgname = citra-bin
 	depends = ffmpeg-compat-57
 	depends = libsndio-61-compat
 	depends = sdl2
-	provides = citra
+	conflicts = citra-git
+	conflicts = citra-qt-git
+	conflicts = citra-canary-bin
+	conflicts = citra-qt-canary-bin
+	conflicts = citra-qt-bin
+	replaces = citra-nightly-bin
 
 pkgname = citra-qt-bin
 	depends = ffmpeg-compat-57
@@ -34,5 +33,10 @@ pkgname = citra-qt-bin
 	depends = desktop-file-utils
 	optdepends = libxkbcommon-x11: for X11 support
 	optdepends = qt5-wayland: for Wayland support
-	provides = citra-qt
-
+	conflicts = citra-git
+	conflicts = citra-qt-git
+	conflicts = citra-canary-bin
+	conflicts = citra-qt-canary-bin
+	conflicts = citra-bin
+	replaces = citra-qt
+	replaces = citra-qt-nightly-bin
diff --git a/PKGBUILD b/PKGBUILD
index 699ad8404f84..84741627307a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,9 @@
 pkgbase='citra-bin'
 pkgname=('citra-bin' 'citra-qt-bin')
 pkgrel=1
-pkgver=1659_20201207_3f13e1c
+pkgver=1720_20210801_c40871f
 pkgdesc="An experimental open-source Nintendo 3DS emulator/debugger"
-conflicts=('citra-git' 'citra-qt-git' 'citra-nightly-bin' 'citra-qt-nightly-bin' 'citra-bin' 'citra-qt' 'citra-canary-bin' 'citra-qt-canary-bin')
-replaces=("citra-nightly-bin" "citra-qt-nightly-bin")
+conflicts=('citra-git' 'citra-qt-git' 'citra-canary-bin' 'citra-qt-canary-bin')
 license=('GPL2')
 arch=('x86_64')
 url="https://citra-emu.org"
@@ -17,13 +16,13 @@ _ref="$(echo $pkgver | cut -d'_' -f2)-$(echo $pkgver | cut -d'_' -f3)"
 source=("https://github.com/citra-emu/citra-nightly/releases/download/nightly-$_nightly_id/citra-linux-$_ref.tar.xz"
         "https://raw.githubusercontent.com/citra-emu/citra/master/dist/citra.desktop")
 
-sha256sums=('299ddcf80dbc65f203553ff4bb4b4a289cad576eb9b86c663b1b685eb17d9297'
-            '93bd8f799877eba7dd87ed7a4c29607d78c42b8769626c1d479f7e34fb7b39e2')
+sha256sums=('cda618f525fde86358b33c24c2ef65b929ff9f414b4d2bef2bb4e38c87a3a188'
+            'b4c9433fbcbb1b9ddf19f009252e89d8d653ebac7f67d5d0beb49259f583ab69')
 
 package_citra-bin() {
     depends=('ffmpeg-compat-57' 'libsndio-61-compat' 'sdl2')
-    provides=('citra')
-
+    replaces=('citra-nightly-bin')
+    conflicts+=( 'citra-qt-bin' )
 
     cd "${srcdir}/citra-linux-${_ref}"
     install -Dm755 -t "${pkgdir}/usr/bin" citra
@@ -34,8 +33,8 @@ package_citra-qt-bin() {
     depends=('ffmpeg-compat-57' 'qt5-multimedia' 'libsndio-61-compat' 'sdl2' 'desktop-file-utils')
     optdepends=('libxkbcommon-x11: for X11 support'
 	        'qt5-wayland: for Wayland support')
-    provides=('citra-qt')
-
+    replaces=('citra-qt' 'citra-qt-nightly-bin')
+    conflicts+=( 'citra-bin' )
 
     cd "${srcdir}/citra-linux-${_ref}"
     install -Dm755 -t "${pkgdir}/usr/bin" citra-qt