upgpkg: league-spartan-font-git 2.210.r0.gb901cb0-1

upstream release

Adopt to upstream build process using Fontship

2 files changed, 23 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 042ddc3f5e31..e011b0317ee0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 pkgbase = league-spartan-font-git
 	pkgdesc = A geometric sans-serif revival of ATF’s classic Spartan
-	pkgver = 2.201.r1.g3675ae1
-	pkgrel = 2
+	pkgver = 2.210.r0.gb901cb0
+	pkgrel = 1
 	url = https://www.theleagueofmoveabletype.com/league-spartan
 	arch = any
 	groups = lmt-fonts
 	license = OFL
-	makedepends = gftools
-	makedepends = python-fontmake
-	makedepends = sfnt2woff-zopfli
-	makedepends = ttfautohint
-	source = league-spartan-git::git+https://github.com/theleagueof/league-spartan.git
+	makedepends = fontship
+	makedepends = git
+	source = league-spartan-font-git::git+https://github.com/theleagueof/league-spartan.git
 	sha256sums = SKIP
 
 pkgname = otf-league-spartan-git
diff --git a/PKGBUILD b/PKGBUILD
index 6b3566ce039f..e6a4548fe6d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,34 +3,37 @@
 # Contributor: samæ <samæ at marvid dot fr>
 
 _name=league-spartan
+_fname=LeagueSpartan
 pkgbase=$_name-font-git
 pkgname=(otf-$_name-git ttf-$_name-git ttf-$_name-variable-git)
-pkgver=2.201.r1.g3675ae1
-pkgrel=2
+pkgver=2.210.r0.gb901cb0
+pkgrel=1
 pkgdesc='A geometric sans-serif revival of ATF’s classic Spartan'
 arch=('any')
 url="https://www.theleagueofmoveabletype.com/$_name"
 license=('OFL')
 groups=('lmt-fonts')
-makedepends=('gftools' 'python-fontmake' 'sfnt2woff-zopfli' 'ttfautohint')
-source=("$_name-git::git+https://github.com/theleagueof/$_name.git")
+makedepends=('fontship' 'git')
+source=("$pkgbase::git+https://github.com/theleagueof/$_name.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "$_name-git"
-    git describe --tags --abbrev=7 HEAD | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    cd "$pkgbase"
+    git describe --long --tags --abbrev=7 HEAD |
+        sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd "$_name-git"
-    ./build.sh
+    cd "$pkgbase"
+    fontship -q make
 }
 
 package_otf-league-spartan-git() {
     provides=("${pkgname%-git}" "${pkgbase%-git}")
     conflicts=("${pkgname%-git}")
-    cd "$_name-git"
-    install -Dm644 -t "$pkgdir/usr/share/fonts/OTF/" fonts/static/otf/*.otf
+    cd "$pkgbase"
+    export GLOBIGNORE='*-VF.otf'
+    install -Dm644 -t "$pkgdir/usr/share/fonts/OTF/" $_fname-*.otf
     install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" ofl{,-faq}.markdown
     install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" readme.markdown
 }
@@ -38,8 +41,9 @@ package_otf-league-spartan-git() {
 package_ttf-league-spartan-git() {
     provides=("${pkgname%-git}" "${pkgbase%-git}")
     conflicts=("${pkgname%-git}")
-    cd "$_name-git"
-    install -Dm644 -t "$pkgdir/usr/share/fonts/TTF/" fonts/static/ttf/*.ttf
+    cd "$pkgbase"
+    export GLOBIGNORE='*-VF.ttf'
+    install -Dm644 -t "$pkgdir/usr/share/fonts/TTF/" $_fname-*.ttf
     install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" ofl{,-faq}.markdown
     install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" readme.markdown
 }
@@ -47,8 +51,8 @@ package_ttf-league-spartan-git() {
 package_ttf-league-spartan-variable-git() {
     provides=("${pkgname%-git}" "${pkgbase%-git}-variable")
     conflicts=("${pkgname%-git}")
-    cd "$_name-git"
-    install -Dm644 -t "$pkgdir/usr/share/fonts/TTF/" fonts/variable/*.ttf
+    cd "$pkgbase"
+    install -Dm644 -t "$pkgdir/usr/share/fonts/TTF/" $_fname-VF.ttf
     install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" ofl{,-faq}.markdown
     install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" readme.markdown
 }