Update to latest upstream with new weights etc.

2 files changed, 22 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b602a1da76a4..51606edcacd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 # Generated by mksrcinfo v8
-# Sun Mar 27 21:43:41 UTC 2016
+# Thu Feb 15 12:06:32 UTC 2018
 pkgbase = ttf-montserrat
-	pkgdesc = Gorgeous geometric font with extended latin support (Regular, Alternates, Subrayada)
-	pkgver = 1.0
-	pkgrel = 2
+	pkgdesc = Gorgeous geometric font with extended latin support (Regular, Alternates)
+	pkgver = 7.200
+	pkgrel = 1
 	url = http://montserrat.zkysky.com.ar/en
 	install = ttf.install
-	arch = i686
-	arch = x86_64
-	license = SIL Open Font
+	arch = any
+	license = custom:OFL
 	provides = ttf-montserrat
-	source = http://marvid.fr/~eeva/mirror/Montserrat.tar.gz
-	md5sums = 7722f9573b957b3278bef2ad928ad5b1
+	source = https://github.com/JulietaUla/Montserrat/archive/v7.200.tar.gz
+	sha256sums = 340125df4700876c5adf4df98c885dbe9b96c8a6a0ee634a520934c77ee097dc
 
 pkgname = ttf-montserrat
 
diff --git a/PKGBUILD b/PKGBUILD
index 5eb31672d1bb..87bd8e9f9d7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,28 @@
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
 # Contributor: scolobb <scolobb at colimite fr> #THX for the mirror
-# Maintainer: EEva <eeva+aur at marvid fr>
+# Contributor: EEva <eeva+aur at marvid fr>
 
 pkgname=ttf-montserrat
+_fontname=Montserrat
 provides=('ttf-montserrat')
-pkgdesc="Gorgeous geometric font with extended latin support (Regular, Alternates, Subrayada)"
+pkgdesc="Gorgeous geometric font with extended latin support (Regular, Alternates)"
 url="http://montserrat.zkysky.com.ar/en"
-pkgver=1.0
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('SIL Open Font')
+pkgver=7.200
+pkgrel=1
+arch=('any')
+license=('custom:OFL')
 depends=()
 install=ttf.install
 makedepends=()
-#source=('http://colimite.fr/aur-mirrors/Montserrat.tar.gz') #BACKUP
-source=('http://marvid.fr/~eeva/mirror/Montserrat.tar.gz')
-md5sums=('7722f9573b957b3278bef2ad928ad5b1')
+source=("https://github.com/JulietaUla/${_fontname}/archive/v${pkgver}.tar.gz")
+sha256sums=('340125df4700876c5adf4df98c885dbe9b96c8a6a0ee634a520934c77ee097dc')
 
 package() {
-  cd ${srcdir}/Montserrat-fontfamily
+  cd ${_fontname}-${pkgver}
 
   install -Dm644 OFL.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
 
-  mkdir -p ${pkgdir}/usr/share/fonts/TTF
-  install -m644 Montserrat-Black.ttf             "${pkgdir}/usr/share/fonts/TTF/Montserrat-Black.ttf"
-  install -m644 Montserrat-Bold.ttf              "${pkgdir}/usr/share/fonts/TTF/Montserrat-Bold.ttf"
-  install -m644 Montserrat-Light.ttf             "${pkgdir}/usr/share/fonts/TTF/Montserrat-Light.ttf"
-  install -m644 Montserrat-Regular.ttf           "${pkgdir}/usr/share/fonts/TTF/Montserrat-Regular.ttf"
-  install -m644 Montserrat-Thin.ttf              "${pkgdir}/usr/share/fonts/TTF/Montserrat-Thin.ttf"
-  install -m644 MontserratAlternates-Bold.ttf    "${pkgdir}/usr/share/fonts/TTF/MontserratAlternates-Bold.ttf"
-  install -m644 MontserratAlternates-Regular.ttf "${pkgdir}/usr/share/fonts/TTF/MontserratAlternates-Regular.ttf"
-  install -m644 MontserratSubrayada-Bold.ttf     "${pkgdir}/usr/share/fonts/TTF/MontserratSubrayada-Bold.ttf"
-  install -m644 MontserratSubrayada-Regular.ttf  "${pkgdir}/usr/share/fonts/TTF/MontserratSubrayada-Regular.ttf"
+  dst=${pkgdir}/usr/share/fonts/TTF
+  mkdir -p ${dst}
+  find ./fonts/ttf -name '*.ttf' -execdir install -m644 {} ${dst}/{} \;
 }