Fix sans; factor serif out to another repo

1 files changed, 13 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 42151dab56ba..1a647b773596 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,19 @@
-pkgname=('ttf-astra-sans' 'ttf-astra-serif')
-pkgver=1001
-pkgrel=2
-pkgdesc="Free russian sans-serif fonts by Astra"
+# Maintainer: Sibidanov Vadim <RobusGrobus95@gmail.com>
+pkgname=ttf-astra-sans
+pkgver=20200412
+pkgrel=1
+pkgdesc='Free sans-serif metric-compatible Times New Roman replacement by Paratype'
 arch=(any)
 depends=(fontconfig xorg-font-utils)
-source=("http://astra-linux.su/images/fonts/PTAstraSans&Serif_TTF_ver${pkgver}.zip")
-md5sums=('31b30481edf94b82ff33c4129e60e48a')
+url='https://www.paratype.ru/fonts/pt/pt-astra-sans'
+source=('http://webfonts.ru/original/ptastrasans/ptastrasans.zip')
+md5sums=('2ae34184e3545c7a6803d93ff2d9c148')
 license=('OFL')
 install=$pkgname.install
 
-package_ttf-astra-sans() {
-  install -Dm644 $srcdir/PTAstraSans-Bold.ttf "$pkgdir"/usr/share/fonts/TTF/AstraSans-Bold.ttf
-  install -Dm644 $srcdir/PTAstraSans-BoldItalic.ttf "$pkgdir"/usr/share/fonts/TTF/AstraSans-BoldItalic.ttf
-  install -Dm644 $srcdir/PTAstraSans-Italic.ttf "$pkgdir"/usr/share/fonts/TTF/AstraSans-Italic.ttf
-  install -Dm644 $srcdir/PTAstraSans-Regular.ttf "$pkgdir"/usr/share/fonts/TTF/AstraSans-Regular.ttf
-}
-
-package_ttf-astra-serif() {
-  install -Dm644 $srcdir/PTAstraSerif-Bold.ttf "$pkgdir"/usr/share/fonts/TTF/AstraSerif-Bold.ttf
-  install -Dm644 $srcdir/PTAstraSerif-BoldItalic.ttf "$pkgdir"/usr/share/fonts/TTF/AstraSerif-BoldItalic.ttf
-  install -Dm644 $srcdir/PTAstraSerif-Italic.ttf "$pkgdir"/usr/share/fonts/TTF/AstraSerif-Italic.ttf
-  install -Dm644 $srcdir/PTAstraSerif-Regular.ttf "$pkgdir"/usr/share/fonts/TTF/AstraSerif-Regular.ttf
+package() {
+  install -Dm644 "${srcdir}/PTAstraSans-Bold.ttf" "${pkgdir}/usr/share/fonts/TTF/AstraSans-Bold.ttf"
+  install -Dm644 "${srcdir}/PTAstraSans-BoldItalic.ttf" "${pkgdir}/usr/share/fonts/TTF/AstraSans-BoldItalic.ttf"
+  install -Dm644 "${srcdir}/PTAstraSans-Italic.ttf" "${pkgdir}/usr/share/fonts/TTF/AstraSans-Italic.ttf"
+  install -Dm644 "${srcdir}/PTAstraSans-Regular.ttf" "${pkgdir}/usr/share/fonts/TTF/AstraSans-Regular.ttf"
 }