[icecat-l10n][icedove-l10n][iceweasel-l10n]: housekeeping

1 files changed, 25 insertions, 27 deletions

diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index a499bd143..e1e6688a2 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -34,8 +34,6 @@ url="https://wiki.parabola.nu/icedove"
 license=('MPL' 'GPL')
 makedepends=('unzip' 'zip')
 
-_src_url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/linux-x86_64/xpi
-
 pkgname=()
 source=(brand.dtd
         brand.properties
@@ -43,37 +41,44 @@ source=(brand.dtd
         languages.${CARCH}
         sha512sums.${CARCH})
 
-_languages_x86_64_shasum="048575a6fe88ee3de5ddd5c2419893d5c4cdc1f1a7b5f015647ddc59a5c385b7ab13c80bbdc65213b921d4224573c8159445dc06f37ab6612ec012927fe6e6c1"
-_languages_i686_shasum="048575a6fe88ee3de5ddd5c2419893d5c4cdc1f1a7b5f015647ddc59a5c385b7ab13c80bbdc65213b921d4224573c8159445dc06f37ab6612ec012927fe6e6c1"
-_languages_armv7h_shasum="048575a6fe88ee3de5ddd5c2419893d5c4cdc1f1a7b5f015647ddc59a5c385b7ab13c80bbdc65213b921d4224573c8159445dc06f37ab6612ec012927fe6e6c1"
-_languages_list_shasum="_languages_${CARCH}_shasum"
-
-_sha512sums_x86_64_shasum="0cde0eabb54642aa00dae4362bca31d9686103049b74c2859c1f7deb105c886d7134f62b8de9f11272567618bc3049c32e162b8b3eeec0037fc370ad60678e74"
-_sha512sums_i686_shasum="0cde0eabb54642aa00dae4362bca31d9686103049b74c2859c1f7deb105c886d7134f62b8de9f11272567618bc3049c32e162b8b3eeec0037fc370ad60678e74"
-_sha512sums_armv7h_shasum="1e63d7b4230d0e64b0ecd9637a913517d5371537de009affd928809742cc812622814c1861ebbd490c356abb2a60b8ecc736064b45e0aff5c517c236ce142dcb"
-_sha512sums_list_shasum="_sha512sums_${CARCH}_shasum"
+# load languages list and .xpi checksums
+source languages.${CARCH}  # sets $_languages
+source sha512sums.${CARCH} # sets $_sha512sums
 
-# parse locales and package names from language list files
+# compile package names and .xpi sources
 # NOTE: there is currently no localization for Iceowl:
 #       https://bugzilla.mozilla.org/show_bug.cgi?id=1469678
 #       might be temporarily fixable through this:
 #       https://gist.github.com/progandy/ce857358c4f3b8eb09887a085e4bea30
-source languages.${CARCH} # sets $_languages
-source sha512sums.${CARCH} # sets $_sha512sums
+_src_url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/linux-x86_64/xpi
 for _lang in "${_languages[@]}"; do
   _locale=${_lang%% *}
-  _pkgname=$pkgbase-${_locale,,}
-  # _calurl=https://ftp.mozilla.org/pub/calendar/lightning/candidates/$_calver-candidates/build1/linux-${_src_arch}
+  _pkgname=${pkgbase}-${_locale,,}
+  # _calurl=https://ftp.mozilla.org/pub/calendar/lightning/candidates/${_calver}-candidates/build1/linux-${_src_arch}
 
   pkgname+=($_pkgname)
-  source+=("$pkgbase-$pkgver-$_locale.xpi::$_src_url/$_locale.xpi")
-           # "$_calbase-l10n-$_calver-$_locale.xpi::$_calurl/lightning-$_calver.$_locale.linux-${_src_arch}.xpi")
+  source+=(${pkgbase}-${pkgver}-${_locale}.xpi::${_src_url}/${_locale}.xpi)
+           # ${_calbase}-l10n-${_calver}-${_locale}.xpi::${_calurl}/lightning-${_calver}.${_locale}.linux-${_src_arch}.xpi)
 
-  eval "package_$_pkgname() {
-    _package $_lang
+  eval "package_${_pkgname}() {
+    _package ${_lang}
   }"
 done
 
+# compile checksums
+_languages_armv7h_shasum="048575a6fe88ee3de5ddd5c2419893d5c4cdc1f1a7b5f015647ddc59a5c385b7ab13c80bbdc65213b921d4224573c8159445dc06f37ab6612ec012927fe6e6c1"
+_languages_i686_shasum="048575a6fe88ee3de5ddd5c2419893d5c4cdc1f1a7b5f015647ddc59a5c385b7ab13c80bbdc65213b921d4224573c8159445dc06f37ab6612ec012927fe6e6c1"
+_languages_x86_64_shasum="048575a6fe88ee3de5ddd5c2419893d5c4cdc1f1a7b5f015647ddc59a5c385b7ab13c80bbdc65213b921d4224573c8159445dc06f37ab6612ec012927fe6e6c1"
+_sha512sums_armv7h_shasum="1e63d7b4230d0e64b0ecd9637a913517d5371537de009affd928809742cc812622814c1861ebbd490c356abb2a60b8ecc736064b45e0aff5c517c236ce142dcb"
+_sha512sums_i686_shasum="0cde0eabb54642aa00dae4362bca31d9686103049b74c2859c1f7deb105c886d7134f62b8de9f11272567618bc3049c32e162b8b3eeec0037fc370ad60678e74"
+_sha512sums_x86_64_shasum="0cde0eabb54642aa00dae4362bca31d9686103049b74c2859c1f7deb105c886d7134f62b8de9f11272567618bc3049c32e162b8b3eeec0037fc370ad60678e74"
+sha512sums=('75d15604c01e76acd6d1dfd872ebc23296c8e76ed936f4a20a5616a73fa42a04a5a509946a4b728e6c052cc7f2ae81306a48cd27b4b1aae63d2d6a3cbff2ade6' # brand.dtd
+            '934b0e299f1366d19b3a88f572971a36c94213004182fc3de1d2400a5de987aeb57821ad3f5ba8cda81655fcf24394e1779936541acbed646709a6417be3165b' # brand.properties
+            'd3120b7e0072b1951ea8d5cdd950fca2ed6bcc4dca2a93a3d40e88bfde0cab288590cb03e7d1359201072c21331fe422bfc3440a38effc1f164155d82c2a0b76' # region.properties
+            $(eval "echo \$_languages_${CARCH}_shasum")                                                                                        # languages.${CARCH}
+            $(eval "echo \$_sha512sums_${CARCH}_shasum")                                                                                       # sha512sums.${CARCH}
+            "${_sha512sums[@]}")
+
 # Don't extract anything
 noextract=(${source[@]%%::*})
 
@@ -126,10 +131,3 @@ _package() {
   install -vDm644 langpack-$1@$_pkgbase.mozilla.org.xpi \
     "$pkgdir/usr/lib/$_pkgbase/extensions/langpack-$1@$_pkgbase.mozilla.org.xpi"
 }
-
-sha512sums=('75d15604c01e76acd6d1dfd872ebc23296c8e76ed936f4a20a5616a73fa42a04a5a509946a4b728e6c052cc7f2ae81306a48cd27b4b1aae63d2d6a3cbff2ade6'
-            '934b0e299f1366d19b3a88f572971a36c94213004182fc3de1d2400a5de987aeb57821ad3f5ba8cda81655fcf24394e1779936541acbed646709a6417be3165b'
-            'd3120b7e0072b1951ea8d5cdd950fca2ed6bcc4dca2a93a3d40e88bfde0cab288590cb03e7d1359201072c21331fe422bfc3440a38effc1f164155d82c2a0b76'
-            "${!_languages_list_shasum}"
-            "${!_sha512sums_list_shasum}"
-            "${_sha512sums[@]}")