housekeeping - nornmalize per-arch version evals across PKGBUILDs

4 files changed, 23 insertions, 11 deletions

diff --git a/libre/gstreamer/PKGBUILD b/libre/gstreamer/PKGBUILD
index 46f5b0651..0cc0e3b50 100644
--- a/libre/gstreamer/PKGBUILD
+++ b/libre/gstreamer/PKGBUILD
@@ -56,9 +56,9 @@ _pkgrel_i686=3.0    #       try to remove the LOCs with comment: "# n/a in v1.20
 _prev_ver=1.22.4        # current version of 'gst-plugins-bad' in parabola repos (x86_64)
 _prev_ver_armv7h=1.22.1 # current version of 'gst-plugins-bad' in parabola repos (armv7h)
 _prev_ver_i686=1.16.2   # current version of 'gst-plugins-bad' in parabola repos (i686)
-[[ "${CARCH}" != x86_64 ]] && eval "pkgver=\$_pkgver_${CARCH}"      # our different arches do not
-[[ "${CARCH}" != x86_64 ]] && eval "pkgrel=\$_pkgrel_${CARCH}"      # always roll at the same speed
-[[ "${CARCH}" != x86_64 ]] && eval "_prev_ver=\$_prev_ver_${CARCH}"
+eval "[[ -v _pkgver_${CARCH}   ]] && pkgver=\$_pkgver_${CARCH}" # our different arches do not
+eval "[[ -v _pkgrel_${CARCH}   ]] && pkgrel=\$_pkgrel_${CARCH}" # always roll at the same speed
+eval "[[ -v _prev_ver_${CARCH} ]] && _prev_ver=\$_prev_ver_${CARCH}" # self-dep
 pkgrel+=.parabola1
 pkgdesc="Multimedia graph framework"
 url="https://gstreamer.freedesktop.org/"
@@ -119,7 +119,9 @@ b2sums=('036f5ddfff4d5a5b859da2d9ef491cd07b1f3a525df3d2e0037c49be1180c22a8d9592e
         # 'gstreamer-docs' n/a
         # 'gstreamer-docs' n/a
         'c64482a040ada8c2ba6433b6d9aa8619e53866b2d9b512cc91dff2e32d6c405339ec22e909dbce197595521c014b1bdad661e92b9d092f8e14c51c9cde7a74da'
-) # n/a    '829686c230d75bf4124366162c754ddc37d7ed49fb797e504ca5cf3e9a5db621d15911d9c8db3439348f442fb873c1c3e29683cfe9f47c1a0b00e7e48c4db21f')
+) # n/a '829686c230d75bf4124366162c754ddc37d7ed49fb797e504ca5cf3e9a5db621d15911d9c8db3439348f442fb873c1c3e29683cfe9f47c1a0b00e7e48c4db21f')
+_b2sum_i686=('518a025591e2d03296197dd4b6d30dbdd1a4c2b1d435df62cf451f13c1233c7fc1ad877344765c7b5c863e4886b7df750096fdb8835151cccf9618590801f1ea')
+eval "[[ -v _b2sum_${CARCH} ]] && b2sums[0]=\$_b2sum_${CARCH}" # upstream source-ball
 validpgpkeys=(
   D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller <tim@gstreamer-foundation.org>
 )
diff --git a/libre/libxfce4ui/PKGBUILD b/libre/libxfce4ui/PKGBUILD
index 4b23a8e9e..6f1d0ca7a 100644
--- a/libre/libxfce4ui/PKGBUILD
+++ b/libre/libxfce4ui/PKGBUILD
@@ -12,6 +12,10 @@
 pkgname=libxfce4ui
 pkgver=4.18.4
 pkgrel=1
+_pkgver_i686=4.18.3
+_pkgrel_i686=1.0
+eval "[[ -v _pkgver_${CARCH} ]] && pkgver=\$_pkgver_${CARCH}" # our different arches do not
+eval "[[ -v _pkgrel_${CARCH} ]] && pkgrel=\$_pkgrel_${CARCH}" # always roll at the same speed
 pkgrel+=.parabola1
 pkgdesc="Widgets library for the Xfce desktop environment"
 arch=('x86_64')
@@ -23,6 +27,8 @@ depends=('libxfce4util' 'gtk3' 'xfconf' 'libsm' 'startup-notification'
 makedepends=('intltool' 'gobject-introspection' 'vala')
 source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
 sha256sums=('87eefe797c6d26de3f754de48872faf131f1b5fc93fb88e22f5c7886a842cb4c')
+_sha256sum_i686='afa3a46eeed3ab612d2f7e1308edaf5819f6c33ccc16c13080efabd58f010abd'
+eval "[[ -v _sha256sum_${CARCH} ]] && sha256sums[0]=\$_sha256sum_${CARCH}" # upstream source-ball
 
 
 _version_constraint() # (dep_pkgname [precision])
diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD
index cb36a3070..6b91b2b7c 100644
--- a/libre/opencv/PKGBUILD
+++ b/libre/opencv/PKGBUILD
@@ -20,8 +20,8 @@ pkgver=4.7.0
 pkgrel=6
 _pkgver_i686=4.5.5
 _pkgrel_i686=4.0
-[[ "${CARCH}" == i686 ]] && eval "pkgver=\$_pkgver_${CARCH}" # our different arches do not
-[[ "${CARCH}" == i686 ]] && eval "pkgrel=\$_pkgrel_${CARCH}" # always roll at the same speed
+eval "[[ -v _pkgver_${CARCH} ]] && pkgver=\$_pkgver_${CARCH}" # our different arches do not
+eval "[[ -v _pkgrel_${CARCH} ]] && pkgrel=\$_pkgrel_${CARCH}" # always roll at the same speed
 pkgrel+=.parabola1
 pkgdesc='Open Source Computer Vision Library'
 pkgdesc="${pkgdesc/Open Source/}"
@@ -50,7 +50,11 @@ source=(https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgve
 sha256sums=('8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973'
             '42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584'
             'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
-mksha256sums=(${sha256sums[*]})
+_sums_i686=('8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973'  # upstream source-ball
+            '42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584') # contrib source-ball
+eval "[[ -v _sums_${CARCH} ]] && sha256sums=( \${_sums_${CARCH}[*]} ${sha256sums[*]:2} )"
+
+mksha256sums=( ${sha256sums[*]} )
 sha256sums=('00ee9f3fa2428366cefa1d29f717136abfad38d46f2f748508a599db7e57894e'
             SKIP)
 validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
diff --git a/nonprism/kio/PKGBUILD b/nonprism/kio/PKGBUILD
index 48df7805d..4c12410fc 100644
--- a/nonprism/kio/PKGBUILD
+++ b/nonprism/kio/PKGBUILD
@@ -20,8 +20,8 @@ pkgrel=1
 pkgrel+=.parabola1
 _pkgver_i686=5.105.0
 _pkgrel_i686=1.0.parabola2
-eval "[[ \"\$_pkgver_${CARCH}\" ]] && pkgver=\$_pkgver_${CARCH}" # our different arches do not
-eval "[[ \"\$_pkgrel_${CARCH}\" ]] && pkgrel=\$_pkgrel_${CARCH}" # our different arches do not
+eval "[[ -v _pkgver_${CARCH} ]] && pkgver=\$_pkgver_${CARCH}" # our different arches do not
+eval "[[ -v _pkgrel_${CARCH} ]] && pkgrel=\$_pkgrel_${CARCH}" # always roll at the same speed
 pkgdesc='Resource and network access abstraction'
 pkgdesc+=', with privacy-respecting search engines only'
 arch=(x86_64)
@@ -53,8 +53,8 @@ sha256sums+=('31910ab7393e67609f15e04a57f6406f63e6dae58b01bce0787741bc5958f292'
              '45af1a8588246c64c2e306237ef605406c5289c2ff53b5f459315c40c8e5099b'
              '0264268855ac59872fe6bde4ce5c7d5f4a9b4d6936f3c2f870fc9a34de323c54'
              '0a494a6bd652533b2ac1ea6a139e8b7295da29f840e5d0d7b2aa7e18886887ef')
-_sha256sum_i686='1f971115d3cc488973f74222c9ae3722ac630fa8c02c00d4ba22eb03ceb8677d' # upstream source-ball
-[[ "${CARCH/i686/}" ]] || eval "sha256sums[0]=\$_sha256sum_${CARCH}"               # upstream source-ball
+_sha256sum_i686='1f971115d3cc488973f74222c9ae3722ac630fa8c02c00d4ba22eb03ceb8677d'
+eval "[[ -v _sha256sum_${CARCH} ]] && sha256sums[0]=\$_sha256sum_${CARCH}" # upstream source-ball
 validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>
 options=(debug)