From 5d039079832b82f39184b7bc047fba4a5ae74d30 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Mon, 2 Dec 2019 01:37:51 -0500
Subject: [icedove-extension-enigmail]: split arches

---
 libre/icedove-extension-enigmail/PKGBUILD | 32 ++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'libre/icedove-extension-enigmail')

diff --git a/libre/icedove-extension-enigmail/PKGBUILD b/libre/icedove-extension-enigmail/PKGBUILD
index fde4788f8..e93ab18f3 100644
--- a/libre/icedove-extension-enigmail/PKGBUILD
+++ b/libre/icedove-extension-enigmail/PKGBUILD
@@ -15,11 +15,14 @@
 
 _pkgname=thunderbird-extension-enigmail
 pkgname=icedove-extension-enigmail
-_pkgver_x86_64=2.1.3 # this is actually an 'any' package
-_pkgver_i686=2.0.9   # but our different arches do not always roll at the same speed
+_pkgver_x86_64=2.1.3
+_pkgver_i686=2.0.9
 _pkgver_armv7h=2.0.9
-eval "pkgver=\$_pkgver_${CARCH}"
-pkgrel=1
+_pkgrel_x86_64=1
+_pkgrel_i686=1
+_pkgrel_armv7h=1
+eval "pkgver=\$_pkgver_${CARCH}" # this is actually an 'any' package
+eval "pkgrel=\$_pkgrel_${CARCH}" # but our different arches do not always roll at the same speed
 pkgdesc="OpenPGP message encryption and authentication for Icedove"
 arch=('armv7h' 'i686' 'x86_64')
 url="https://www.enigmail.net/"
@@ -30,20 +33,27 @@ conflicts=($_pkgname)
 provides=($_pkgname)
 source=("https://www.enigmail.net/download/source/enigmail-${pkgver}.tar.gz"{,.asc}
         "0001-preferences-disable-pEpAutoDownload-by-default.patch")
-sha512sums=('270c46c282af9e8770ea509c55b0bc315ce715839b1751aa1a0b1ed8374e7ec93333bf8a6d4112adcbacc526d481ad2b276dc12099c48cc9c22fc8409de8d6d0'
-            'SKIP'
-            'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2')
+sha512sums_x86_64=('270c46c282af9e8770ea509c55b0bc315ce715839b1751aa1a0b1ed8374e7ec93333bf8a6d4112adcbacc526d481ad2b276dc12099c48cc9c22fc8409de8d6d0'
+                   'SKIP'
+                   'baebd963400574db89be747a4419534f945bdc64136d4014656ff98a9615a23984bca724da3f3840670979aab08ce441eee067921e21d0cb216938a20ed785b2')
+sha256sums_i686=(0)
+sha256sums_armv7h=(0)
 validpgpkeys=('4F9F89F5505AC1D1A260631CDB1187B9DD5F693B') # Patrick Brunschwig <patrick@enigmail.net>
 
 
 _version_constraint() # (dep_pkgname)
 {
   local dep_pkgname=$1
-  local version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1)
-  version=${version%-*}
-  local version_inc=${version%.*}.$(( ${version##*.} + 1 ))
+  local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1)
 
-  echo -n "${dep_pkgname}>=${version}" "${dep_pkgname}<${version_inc}"
+  if   [[ -z "${full_version}" ]] || [[ "${full_version}" =~ ' ' ]]
+  then echo "ERROR: _version_constraint() full_version='${full_version}'" >&2
+       exit 1
+  else local version=${full_version%-*}
+       local version_inc=${version%.*}.$(( ${version##*.} + 1 ))
+
+       echo -n "${dep_pkgname}>=${version}" "${dep_pkgname}<${version_inc}"
+  fi
 }
 
 prepare() {
-- 
cgit v1.2.3