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

3 files changed, 75 insertions, 78 deletions

diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD
index 193899a20..f014e7238 100644
--- a/libre/icecat-l10n/PKGBUILD
+++ b/libre/icecat-l10n/PKGBUILD
@@ -4,6 +4,8 @@
 # Contributor: Luke Shumaker <lukeshu@parabola.nu>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
 
 _pkgbase=icecat
 pkgbase=${_pkgbase}-l10n
@@ -22,38 +24,41 @@ license=('MPL' 'GPL')
 depends=("$_pkgbase=$pkgver")
 makedepends=('unzip' 'zip')
 
-_src_url=http://ftp.gnu.org/gnu/gnuzilla/${pkgver%_*}/langpacks
-
 pkgname=()
-source=('region.properties'
+source=(region.properties
         languages.${CARCH}
         sha512sums.${CARCH})
 
-_languages_x86_64_shasum="c259b9886024281a92fa8c834c673cf0dd34480a1ba227209872c5e923841d7f343d45885e245fe33b8ca3d24c7f2b527e6c49d6c665133781825076ee4f2cf9"
-_languages_i686_shasum="215312aa1489de846eefd92881b09ded48da5b3340168f65b568d191d500c646023553d699ba1f4c5ec0d59b321facfebed14a910c0bcb385f4b729ab1a3fb2a"
-_languages_armv7h_shasum="215312aa1489de846eefd92881b09ded48da5b3340168f65b568d191d500c646023553d699ba1f4c5ec0d59b321facfebed14a910c0bcb385f4b729ab1a3fb2a"
-_languages_list_shasum="_languages_${CARCH}_shasum"
-
-_sha512sums_x86_64_shasum="776c748a73aea3766a0b4b69b0768bfaf6ad5294b7bb916497fe767c5b2c5ecd065f9e6793c7f6ee97287180664231332e980784a96efa47dd93f8a2f838093a"
-_sha512sums_i686_shasum="f37875c1e34337da36626de8e90921828acd347db72d6de4ccfbd000ae075ae038f1084c261a7328cd44c4aa02fd7fb68d32710c3a7b7f04ada374ad15e58492"
-_sha512sums_armv7h_shasum="f37875c1e34337da36626de8e90921828acd347db72d6de4ccfbd000ae075ae038f1084c261a7328cd44c4aa02fd7fb68d32710c3a7b7f04ada374ad15e58492"
-_sha512sums_list_shasum="_sha512sums_${CARCH}_shasum"
-
-# parse locales and package names from language list files
-source languages.${CARCH} # sets $_languages
+# load languages list and .xpi checksums
+source languages.${CARCH}  # sets $_languages
 source sha512sums.${CARCH} # sets $_sha512sums
+
+# compile package names and .xpi sources
+_src_url=http://ftp.gnu.org/gnu/gnuzilla/${pkgver%_*}/langpacks
 for _lang in "${_languages[@]}"; do
   _locale=${_lang%% *}
-  _pkgname=$pkgbase-${_locale,,}
+  _pkgname=${pkgbase}-${_locale,,}
 
-  pkgname+=($_pkgname)
-  source+=("$_src_url/$_pkgbase-${pkgver%_*}.$_locale.langpack.xpi")
+  pkgname+=(${_pkgname})
+  source+=(${_src_url}/${_pkgbase}-${pkgver%_*}.${_locale}.langpack.xpi)
 
-  eval "package_$_pkgname() {
-    _package $_lang
+  eval "package_${_pkgname}() {
+    _package ${_lang}
   }"
 done
 
+# compile checksums
+_languages_armv7h_shasum="215312aa1489de846eefd92881b09ded48da5b3340168f65b568d191d500c646023553d699ba1f4c5ec0d59b321facfebed14a910c0bcb385f4b729ab1a3fb2a"
+_languages_i686_shasum="215312aa1489de846eefd92881b09ded48da5b3340168f65b568d191d500c646023553d699ba1f4c5ec0d59b321facfebed14a910c0bcb385f4b729ab1a3fb2a"
+_languages_x86_64_shasum="c259b9886024281a92fa8c834c673cf0dd34480a1ba227209872c5e923841d7f343d45885e245fe33b8ca3d24c7f2b527e6c49d6c665133781825076ee4f2cf9"
+_sha512sums_armv7h_shasum="f37875c1e34337da36626de8e90921828acd347db72d6de4ccfbd000ae075ae038f1084c261a7328cd44c4aa02fd7fb68d32710c3a7b7f04ada374ad15e58492"
+_sha512sums_i686_shasum="f37875c1e34337da36626de8e90921828acd347db72d6de4ccfbd000ae075ae038f1084c261a7328cd44c4aa02fd7fb68d32710c3a7b7f04ada374ad15e58492"
+_sha512sums_x86_64_shasum="776c748a73aea3766a0b4b69b0768bfaf6ad5294b7bb916497fe767c5b2c5ecd065f9e6793c7f6ee97287180664231332e980784a96efa47dd93f8a2f838093a"
+sha512sums=('5d35275f6ccfbbce6ee37357e91df5a4d94b79dd6e78074c3b0e8640e190b0b7c1758186818b9e0ac681ca6c6859b5c84dbe4ca3d5ebbb350fd6a0d39f25252a' # region.properties
+            $(eval "echo \$_languages_${CARCH}_shasum")                                                                                        # languages.${CARCH}
+            $(eval "echo \$_sha512sums_${CARCH}_shasum")                                                                                       # sha512sums.${CARCH}
+            "${_sha512sums[@]}")
+
 # Don't extract anything
 noextract=(${source[@]%%::*})
 
@@ -76,8 +81,3 @@ _package() {
   install -vDm644 langpack-$1@icecat.mozilla.org.xpi \
     "$pkgdir/usr/lib/icecat/browser/extensions/langpack-$1@icecat.mozilla.org.xpi"
 }
-
-sha512sums=('5d35275f6ccfbbce6ee37357e91df5a4d94b79dd6e78074c3b0e8640e190b0b7c1758186818b9e0ac681ca6c6859b5c84dbe4ca3d5ebbb350fd6a0d39f25252a'
-            "${!_languages_list_shasum}"
-            "${!_sha512sums_list_shasum}"
-            "${_sha512sums[@]}")
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[@]}")
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 7e3cb90a7..bc1cdcba8 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -9,6 +9,7 @@
 # Contributor: Luke Shumaker <lukeshu@parabola.nu>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
+# Contributor: bill-auger <bill-auger@programmer.net>
 
 
 # parabola changes and rationale:
@@ -31,11 +32,9 @@ pkgdesc="Language pack for ${_pkgbase^}"
 arch=('armv7h' 'i686' 'x86_64')
 url=https://wiki.parabola.nu/iceweasel
 license=(MPL GPL LGPL)
-depends=(iceweasel=$epoch:$pkgver)
+depends=(iceweasel=${epoch}:${pkgver})
 makedepends=('unzip' 'zip' 'mozilla-searchplugins')
 
-_src_url=https://ftp.mozilla.org/pub/firefox/releases/${pkgver}/linux-x86_64/xpi
-
 pkgname=()
 source=(brand.dtd
         brand.properties
@@ -43,31 +42,38 @@ source=(brand.dtd
         languages.${CARCH}
         sha512sums.${CARCH})
 
-_languages_x86_64_shasum="e27aa22697942c950c71a6466a70579d326bcce5cc547592c4b1fe0c9b4fa819f7fd7c2a354f2982d65d16f8bb7997635d9b9344d68330eec979e03258b5e5e7"
-_languages_i686_shasum="e27aa22697942c950c71a6466a70579d326bcce5cc547592c4b1fe0c9b4fa819f7fd7c2a354f2982d65d16f8bb7997635d9b9344d68330eec979e03258b5e5e7"
-_languages_armv7h_shasum="c259b9886024281a92fa8c834c673cf0dd34480a1ba227209872c5e923841d7f343d45885e245fe33b8ca3d24c7f2b527e6c49d6c665133781825076ee4f2cf9"
-_languages_list_shasum="_languages_${CARCH}_shasum"
-
-_sha512sums_x86_64_shasum="8e10ce99b914252cc08015959c40e845d55df0fb94de47a0e5f1c4c93d50bdc29c7bfbb058d205eaf91645c34c606fcb6d232e866e19c0601dac8ba3496f52ff"
-_sha512sums_i686_shasum="8e10ce99b914252cc08015959c40e845d55df0fb94de47a0e5f1c4c93d50bdc29c7bfbb058d205eaf91645c34c606fcb6d232e866e19c0601dac8ba3496f52ff"
-_sha512sums_armv7h_shasum="ba69d1ac848440397617011bf94fdffd83bdda39c21bcb6ddfcf621e76db380bf5ec0e2afe535e226efd450506dd90594f47ab12e84705efc09c3bf7cca31359"
-_sha512sums_list_shasum="_sha512sums_${CARCH}_shasum"
-
-# parse locales and package names from language list files
-source languages.${CARCH} # sets $_languages
+# load languages list and .xpi checksums
+source languages.${CARCH}  # sets $_languages
 source sha512sums.${CARCH} # sets $_sha512sums
+
+# compile package names and .xpi sources
+_src_url=https://ftp.mozilla.org/pub/firefox/releases/${pkgver}/linux-x86_64/xpi
 for _lang in "${_languages[@]}"; do
   _locale=${_lang%% *}
-  _pkgname=$pkgbase-${_locale,,}
+  _pkgname=${pkgbase}-${_locale,,}
 
   pkgname+=($_pkgname)
-  source+=("$pkgbase-$pkgver-$_locale.xpi::$_src_url/$_locale.xpi")
+  source+=(${pkgbase}-${pkgver}-${_locale}.xpi::${_src_url}/${_locale}.xpi)
 
-  eval "package_$_pkgname() {
-    _package $_lang
+  eval "package_${_pkgname}() {
+    _package ${_lang}
   }"
 done
 
+# compile checksums
+_languages_armv7h_shasum="c259b9886024281a92fa8c834c673cf0dd34480a1ba227209872c5e923841d7f343d45885e245fe33b8ca3d24c7f2b527e6c49d6c665133781825076ee4f2cf9"
+_languages_i686_shasum="e27aa22697942c950c71a6466a70579d326bcce5cc547592c4b1fe0c9b4fa819f7fd7c2a354f2982d65d16f8bb7997635d9b9344d68330eec979e03258b5e5e7"
+_languages_x86_64_shasum="e27aa22697942c950c71a6466a70579d326bcce5cc547592c4b1fe0c9b4fa819f7fd7c2a354f2982d65d16f8bb7997635d9b9344d68330eec979e03258b5e5e7"
+_sha512sums_armv7h_shasum="ba69d1ac848440397617011bf94fdffd83bdda39c21bcb6ddfcf621e76db380bf5ec0e2afe535e226efd450506dd90594f47ab12e84705efc09c3bf7cca31359"
+_sha512sums_i686_shasum="8e10ce99b914252cc08015959c40e845d55df0fb94de47a0e5f1c4c93d50bdc29c7bfbb058d205eaf91645c34c606fcb6d232e866e19c0601dac8ba3496f52ff"
+_sha512sums_x86_64_shasum="8e10ce99b914252cc08015959c40e845d55df0fb94de47a0e5f1c4c93d50bdc29c7bfbb058d205eaf91645c34c606fcb6d232e866e19c0601dac8ba3496f52ff"
+sha512sums=('bfe82e11a3a1b8006b58a54897f297bd17191ca2e7b08f95d66ec6bfe356caf9eb4d96b3dde5f36db0331d012bde2f03e7087aad1e087800b404f82fa9d786ad' # brand.dtd
+            'a1a7e44f3358b131157d2acec243d35ef234e42a6522edfa5b2be9b497a65b2227c64b7fb989c0780c55333c0075f8f2198d99cde8f602bb3f9b8619dc57ab2c' # brand.properties
+            '31d33e90be1b5c0e76a0c374684f9a7b4076f7bcca8b76309048b2e3fc7f27c0bc8a2a9f9e66bd8c51fe8780a52a1011c540b071dc82f78d72a1d5ad29fee4f9' # region.properties
+            $(eval "echo \$_languages_${CARCH}_shasum")                                                                                        # languages.${CARCH}
+            $(eval "echo \$_sha512sums_${CARCH}_shasum")                                                                                       # sha512sums.${CARCH}
+            "${_sha512sums[@]}")
+
 # Don't extract anything
 noextract=(${source[@]%%::*})
 
@@ -101,10 +107,3 @@ _package() {
   install -Dm644 $pkgbase-$pkgver-$1.xpi \
     "$pkgdir/usr/lib/iceweasel/browser/extensions/langpack-$1@firefox.mozilla.org.xpi"
 }
-
-sha512sums=('bfe82e11a3a1b8006b58a54897f297bd17191ca2e7b08f95d66ec6bfe356caf9eb4d96b3dde5f36db0331d012bde2f03e7087aad1e087800b404f82fa9d786ad'  # brand.dtd
-            'a1a7e44f3358b131157d2acec243d35ef234e42a6522edfa5b2be9b497a65b2227c64b7fb989c0780c55333c0075f8f2198d99cde8f602bb3f9b8619dc57ab2c'  # brand.properties
-            '31d33e90be1b5c0e76a0c374684f9a7b4076f7bcca8b76309048b2e3fc7f27c0bc8a2a9f9e66bd8c51fe8780a52a1011c540b071dc82f78d72a1d5ad29fee4f9'  # region.properties
-            "${!_languages_list_shasum}"
-            "${!_sha512sums_list_shasum}"
-            "${_sha512sums[@]}")