upgpkg: ttf-adobe-source-fonts 20220300900-1

upstream release

refactor: revise ttf-adobe-source-fonts pkgbuild, update packages to latest releases

2 files changed, 48 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 627ada55cf62..b0a18eeffe67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,19 @@
 pkgbase = ttf-adobe-source-fonts
-	pkgdesc = TTF versions of Adobe's Source fonts (includes variable and non-variable versions of Source Sans 3, Source Serif 4, and Source Code Pro). Also includes the latest versions under old names (Source Sans Pro, 3.006R; Source Serif Pro, 3.001R).
-	pkgver = 3.028R+4.004R+2.038R+ro+1.058R+it+1.018R+VAR
-	pkgrel = 6
+	pkgdesc = TTF versions of Adobe's Source fonts (includes Source Sans, Source Serif, and Source Code Pro).
+	pkgver = 20220300900
+	pkgrel = 1
 	url = https://github.com/adobe-fonts
 	arch = any
-	license = custom
-	provides = ttf-sourcesanspro
+	license = custom:SIL
 	conflicts = ttf-sourcesanspro
-	source = source-sans-pro-3.028R.tar.gz::https://github.com/adobe-fonts/source-sans-pro/archive/3.028R.tar.gz
-	source = source-sans-pro-3.006R.tar.gz::https://github.com/adobe-fonts/source-sans-pro/archive/3.006R.tar.gz
-	source = source-serif-4.004R.tar.gz::https://github.com/adobe-fonts/source-serif/archive/4.004R.tar.gz
-	source = source-serif-3.001R.tar.gz::https://github.com/adobe-fonts/source-serif/archive/3.001R.tar.gz
-	source = source-code-pro-2.038R-ro-1.058R-it-1.018R-VAR.tar.gz::https://github.com/adobe-fonts/source-code-pro/archive/2.038R-ro/1.058R-it/1.018R-VAR.tar.gz
-	sha256sums = 12faf267e40f1be46daf44afce47facd6efb996e2f2f5abe0a3dde161d54e251
-	sha256sums = a384e8c3246490bb5eaf79eb9eb9e41d7f2d167bb7d36280156ec77ae8ddfda1
-	sha256sums = dfb364735699cb830caad534cf7741234804d28e4b6fc5e4736b2401f6131aba
-	sha256sums = 6be29a6ecc275d39f77d608fba576ee1976287f65823bde61309dc907023410c
+	noextract = ttf-adobe-source-fonts-20220300900-source-code-pro.tar.gz
+	noextract = ttf-adobe-source-fonts-20220300900-source-serif.tar.gz
+	noextract = ttf-adobe-source-fonts-20220300900-source-sans.tar.gz
+	source = ttf-adobe-source-fonts-20220300900-source-code-pro.tar.gz::https://github.com/adobe-fonts/source-code-pro/archive/refs/tags/2.038R-ro/1.058R-it/1.018R-VAR.tar.gz
+	source = ttf-adobe-source-fonts-20220300900-source-serif.tar.gz::https://github.com/adobe-fonts/source-serif/archive/refs/tags/4.004R.tar.gz
+	source = ttf-adobe-source-fonts-20220300900-source-sans.tar.gz::https://github.com/adobe-fonts/source-sans/archive/refs/tags/3.046R.tar.gz
 	sha256sums = d8f879fefd66ecb7291ea2d73984b9c0a97fb499424e58290ba6b81787d0c725
+	sha256sums = dfb364735699cb830caad534cf7741234804d28e4b6fc5e4736b2401f6131aba
+	sha256sums = 7a0a3a0c9ff2740380eddc28a53b4b0dc99491da5f900f4add5af2d1a18e06bc
 
 pkgname = ttf-adobe-source-fonts
-
diff --git a/PKGBUILD b/PKGBUILD
index a873c0a04be3..81d03ff1491d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,43 @@
-# Maintainer: Johann Gründl <mail@johanngruendl.at>
+# Maintainer: Winston Astrachan <winston dot astrachan at gmail dot com>
+# Contributor: Johann Gründl <mail at johanngruendl dot at>
 
 pkgname=ttf-adobe-source-fonts
-_relver_sans3=3.028R
-_relver_sanspro=3.006R
-_relver_serif4=4.004R
-_relver_serifpro=3.001R
-_relver_code=2.038R-ro/1.058R-it/1.018R-VAR
-pkgver=${_relver_sans3//[\-\/]/+}+${_relver_serif4//[\-\/]/+}+${_relver_code//[\-\/]/+}
-_sans=source-sans-pro
-_serif=source-serif
-_code=source-code-pro
-_tarname_sans3=${_sans}-${_relver_sans3//\//-}
-_tarname_sanspro=${_sans}-${_relver_sanspro//\//-}
-_tarname_serif4=${_serif}-${_relver_serif4//\//-}
-_tarname_serifpro=${_serif}-${_relver_serifpro//\//-}
-_tarname_code=${_code}-${_relver_code//\//-}
-pkgrel=6
-pkgdesc="TTF versions of Adobe's Source fonts (includes variable and non-variable versions of Source Sans 3, Source Serif 4, and Source 
-Code Pro). Also includes the latest versions under old names (Source Sans Pro, 3.006R; Source Serif Pro, 3.001R)."
+pkgver=20220300900  # because there are three different versions installed by this package, pkgver does not adhere to the upstream version
+_pkgver_source_code_pro="2.038R-ro/1.058R-it/1.018R-VAR"
+_pkgver_source_serif="4.004R"
+_pkgver_source_sans="3.046R"
+pkgrel=1
+pkgdesc="TTF versions of Adobe's Source fonts (includes Source Sans, Source Serif, and Source Code Pro)."
+arch=('any')
 url="https://github.com/adobe-fonts"
-arch=(any)
-license=(custom)
+license=('custom:SIL')
 conflicts=('ttf-sourcesanspro')
-provides=('ttf-sourcesanspro')
-source=(
-"$_tarname_sans3.tar.gz::https://github.com/adobe-fonts/$_sans/archive/$_relver_sans3.tar.gz"
-"$_tarname_sanspro.tar.gz::https://github.com/adobe-fonts/$_sans/archive/$_relver_sanspro.tar.gz"
-"$_tarname_serif4.tar.gz::https://github.com/adobe-fonts/$_serif/archive/$_relver_serif4.tar.gz"
-"$_tarname_serifpro.tar.gz::https://github.com/adobe-fonts/$_serif/archive/$_relver_serifpro.tar.gz"
-"$_tarname_code.tar.gz::https://github.com/adobe-fonts/$_code/archive/$_relver_code.tar.gz"
-)
-sha256sums=(
-'12faf267e40f1be46daf44afce47facd6efb996e2f2f5abe0a3dde161d54e251'
-'a384e8c3246490bb5eaf79eb9eb9e41d7f2d167bb7d36280156ec77ae8ddfda1'
-'dfb364735699cb830caad534cf7741234804d28e4b6fc5e4736b2401f6131aba'
-'6be29a6ecc275d39f77d608fba576ee1976287f65823bde61309dc907023410c'
-'d8f879fefd66ecb7291ea2d73984b9c0a97fb499424e58290ba6b81787d0c725'
-)
+source=("${pkgname}-${pkgver}-source-code-pro.tar.gz::https://github.com/adobe-fonts/source-code-pro/archive/refs/tags/${_pkgver_source_code_pro}.tar.gz"
+        "${pkgname}-${pkgver}-source-serif.tar.gz::https://github.com/adobe-fonts/source-serif/archive/refs/tags/${_pkgver_source_serif}.tar.gz"
+        "${pkgname}-${pkgver}-source-sans.tar.gz::https://github.com/adobe-fonts/source-sans/archive/refs/tags/${_pkgver_source_sans}.tar.gz")
+noextract=("${source[@]%%::*}")
+sha256sums=('d8f879fefd66ecb7291ea2d73984b9c0a97fb499424e58290ba6b81787d0c725'
+            'dfb364735699cb830caad534cf7741234804d28e4b6fc5e4736b2401f6131aba'
+            '7a0a3a0c9ff2740380eddc28a53b4b0dc99491da5f900f4add5af2d1a18e06bc')
+
+prepare() {
+    for archive in "${source[@]%%::*}"; do
+        for pattern in "*TTF/*.ttf" "*VAR/*.ttf" "*LICENSE.md"; do
+            tar -xf $archive --wildcards $pattern
+        done
+    done
+}
 
 package() {
-  cd ./$_tarname_sans3
-  install -d "$pkgdir/usr/share/fonts/${pkgname}"
-  install -t "$pkgdir/usr/share/fonts/${pkgname}" -m644 TTF/*.ttf
-  install -t "$pkgdir/usr/share/fonts/${pkgname}" -m644 VAR/*.ttf
-  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE-sans3"
-  cd ../$_tarname_sanspro
-  install -d "$pkgdir/usr/share/fonts/${pkgname}"
-  install -t "$pkgdir/usr/share/fonts/${pkgname}" -m644 TTF/*.ttf
-  install -t "$pkgdir/usr/share/fonts/${pkgname}" -m644 VAR/*.ttf
-  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE-sans-pro"
-  cd ../$_tarname_serif4
-  install -d "$pkgdir/usr/share/fonts/${pkgname}"
-  install -t "$pkgdir/usr/share/fonts/${pkgname}" -m644 TTF/*.ttf
-  install -t "$pkgdir/usr/share/fonts/${pkgname}" -m644 VAR/*.ttf
-  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE-serif"
-  cd ../$_tarname_serifpro
-  install -d "$pkgdir/usr/share/fonts/${pkgname}"
-  install -t "$pkgdir/usr/share/fonts/${pkgname}" -m644 TTF/*.ttf
-  install -t "$pkgdir/usr/share/fonts/${pkgname}" -m644 VAR/*.ttf
-  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE-serif"
-  cd ../$_tarname_code
-  install -d "$pkgdir/usr/share/fonts/${pkgname}"
-  install -t "$pkgdir/usr/share/fonts/${pkgname}" -m644 TTF/*.ttf
-  install -t "$pkgdir/usr/share/fonts/${pkgname}" -m644 VAR/*.ttf
-  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE-code"
+    cd $srcdir
+    for path in *; do
+        if [ -d $path ]; then
+            install -Dm644 $path/TTF/*.ttf -t "${pkgdir}/usr/share/fonts/${pkgname}"
+            install -Dm644 $path/VAR/*.ttf -t "${pkgdir}/usr/share/fonts/${pkgname}"
+        fi
+    done
+
+    # the license for all fonts in the "source" family is shared
+    license_files=(*/LICENSE.md)
+    install -Dm644 "${license_files[0]}" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }