Support for older ARM architectures & more housekeeping

- Made the package multi-arch for ARM.
- Switched to BLAKE2 checksums.
- Minor housekeeping.
- Moved 'vivaldi-rpi' & 'vivaldi-arm64' from conflicts to replaces.
- Added 'pepper-flash' back in as an optional dependency, even though people really shouldn't be using this.
- Added myself as a maintainer.

2 files changed, 32 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd334052e421..f1f9cc50ae48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,10 @@
 pkgbase = vivaldi-arm-bin
 	pkgdesc = An advanced browser made with the power user in mind.
 	pkgver = 3.4.2066.94
-	pkgrel = 1
+	pkgrel = 2
 	url = https://vivaldi.com
+	arch = armv6h
+	arch = armv7h
 	arch = aarch64
 	license = custom
 	makedepends = w3m
@@ -16,16 +18,21 @@ pkgbase = vivaldi-arm-bin
 	depends = shared-mime-info
 	depends = hicolor-icon-theme
 	optdepends = vivaldi-ffmpeg-codecs: playback of proprietary video/audio
+	optdepends = pepper-flash: flash support
 	optdepends = libnotify: native notifications
 	provides = www-browser
-	provides = vivaldi
+	provides = vivaldi-stable
 	conflicts = vivaldi
-	conflicts = vivaldi-rpi
-	conflicts = vivaldi-arm64
+	replaces = vivaldi-rpi
+	replaces = vivaldi-arm64
 	options = !strip
 	options = !emptydirs
-	source = https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.94-1_arm64.deb
-	sha512sums = d3d1a061d35c7a0fad030b7115cd365860b1f23f5397d940f1d77f7681ba54a5a49e8e90e8156efd08a845d5bcebd77f83fcff3a43f0bf980b57bfa7df9ebd5b
+	source_armv6h = https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.94-1_armhf.deb
+	b2sums_armv6h = cb5cbb4e9dc739832eb177a58e5074ba0b09cfbb46c20fc2cd592c7b094da20ab9865f14ed56e549fbde1e0d2f1f1a8aa863de86a17fccd4fc38b63e04853e57
+	source_armv7h = https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.94-1_armhf.deb
+	b2sums_armv7h = cb5cbb4e9dc739832eb177a58e5074ba0b09cfbb46c20fc2cd592c7b094da20ab9865f14ed56e549fbde1e0d2f1f1a8aa863de86a17fccd4fc38b63e04853e57
+	source_aarch64 = https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.94-1_arm64.deb
+	b2sums_aarch64 = a1390f9ca072134ce422205bfc2ed3cdc3f0ba6b9fd151525fe2976884e075dd84f1f6a646840c998cadebd575aadfd7d2f64d3c912f10683e33d819b02525c3
 
 pkgname = vivaldi-arm-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index da7809cf3c20..f56b81cb0dd5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,36 @@
-# Maintainer: Felix Golatofski <contact@xdfr.de>
-# Contributor: Matthew Zilvar <mattzilvar@gmail.com>
+# Maintainer: Benjamin Feakins <feakster at posteo dot eu>
+# Contributor: Felix Golatofski <contact at xdfr dot de>
+# Contributor: Matthew Zilvar <mattzilvar at gmail.com>
 # Contributor: Térence Clastres <t dot clastres at gmail dot com>
 # Modified PKGBUILD from https://aur.archlinux.org/packages/vivaldi/
 
 pkgname=vivaldi-arm-bin
 _pkgname=vivaldi
 pkgver=3.4.2066.94
-_pkgver=3.4.2066.94-1
-pkgrel=1
+pkgrel=2
+_pkgrel=1
 pkgdesc='An advanced browser made with the power user in mind.'
+arch=('armv6h' 'armv7h' 'aarch64')
 url="https://vivaldi.com"
-options=('!strip' '!emptydirs')
 license=('custom')
-arch=('aarch64')
-provides=('vivaldi-stable')
-conflicts=('vivaldi' 'vivaldi-rpi' 'vivaldi-arm64')
+provides=('www-browser' 'vivaldi-stable')
+conflicts=('vivaldi')
+replaces=('vivaldi-rpi' 'vivaldi-arm64')
 depends=('gtk3' 'libcups' 'nss' 'alsa-lib' 'libxss' 'ttf-font' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme')
-makedepends=('w3m')
 optdepends=(
     'vivaldi-ffmpeg-codecs: playback of proprietary video/audio'
+    'pepper-flash: flash support'
     'libnotify: native notifications'
 )
-provides=('www-browser' 'vivaldi')
-source=("https://downloads.vivaldi.com/stable/vivaldi-stable_${_pkgver}_arm64.deb")
-sha512sums=('d3d1a061d35c7a0fad030b7115cd365860b1f23f5397d940f1d77f7681ba54a5a49e8e90e8156efd08a845d5bcebd77f83fcff3a43f0bf980b57bfa7df9ebd5b')
+makedepends=('w3m')
+options=('!strip' '!emptydirs')
+source_armhf=("https://downloads.vivaldi.com/stable/vivaldi-stable_${pkgver}-${_pkgrel}_armhf.deb")
+source_armv6h=("$source_armhf")
+source_armv7h=("$source_armhf")
+source_aarch64=("https://downloads.vivaldi.com/stable/vivaldi-stable_${pkgver}-${_pkgrel}_arm64.deb")
+b2sums_armv6h=('cb5cbb4e9dc739832eb177a58e5074ba0b09cfbb46c20fc2cd592c7b094da20ab9865f14ed56e549fbde1e0d2f1f1a8aa863de86a17fccd4fc38b63e04853e57')
+b2sums_armv7h=('cb5cbb4e9dc739832eb177a58e5074ba0b09cfbb46c20fc2cd592c7b094da20ab9865f14ed56e549fbde1e0d2f1f1a8aa863de86a17fccd4fc38b63e04853e57')
+b2sums_aarch64=('a1390f9ca072134ce422205bfc2ed3cdc3f0ba6b9fd151525fe2976884e075dd84f1f6a646840c998cadebd575aadfd7d2f64d3c912f10683e33d819b02525c3')
 
 prepare() {
     tar -xf data.tar.xz