Cleanup formatting and add epoch for version change

2 files changed, 37 insertions, 164 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ac083b42262..531ea2cdb64a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,6 +2,7 @@ pkgbase = ttf-google-fonts-git
 	pkgdesc = TrueType fonts from the Google Fonts project (git version)
 	pkgver = r1193.4930cafe
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/google/fonts
 	arch = any
 	license = various
@@ -14,109 +15,72 @@ pkgbase = ttf-google-fonts-git
 	depends = xorg-mkfontscale
 	provides = adobe-source-code-pro-fonts
 	provides = adobe-source-sans-pro-fonts
-	provides = googlefontdirectory
 	provides = jsmath-fonts
 	provides = lohit-fonts
-	provides = oldstand-font
-	provides = openarch_fonts
-	provides = otf-bitter
-	provides = otf-goudy
 	provides = ttf-andika
 	provides = ttf-anonymous-pro
-	provides = ttf-cantarell
 	provides = ttf-cardo
-	provides = ttf-chromeos-fonts
 	provides = ttf-comfortaa
 	provides = ttf-croscore
 	provides = ttf-droid
 	provides = ttf-fira-mono
 	provides = ttf-fira-sans
-	provides = ttf-google-fonts-hg
-	provides = ttf-google-webfonts
-	provides = ttf-google-webfonts-git
-	provides = ttf-google-webfonts-hg
 	provides = ttf-inconsolata
-	provides = ttf-kimberly_geswein_print
 	provides = ttf-lato
 	provides = ttf-lora-cyrillic
 	provides = ttf-lekton
 	provides = ttf-medievalsharp
 	provides = ttf-merriweather
 	provides = ttf-merriweather-sans
-	provides = ttf-noto
 	provides = ttf-nova
-	provides = ttf-oldstandard
 	provides = ttf-opensans
 	provides = ttf-oswald
-	provides = ttf-overpass
 	provides = ttf-oxygen
 	provides = ttf-oxygen-git
-	provides = ttf-pt-mono
-	provides = ttf-pt-sans
-	provides = ttf-ptsans
+	provides = ttf-pt-fonts
 	provides = ttf-quintessential
 	provides = ttf-roboto
 	provides = ttf-roboto-mono
 	provides = ttf-signika
 	provides = ttf-sil-fonts
-	provides = ttf-sortsmillgoudy
-	provides = ttf-source-code-pro
-	provides = ttf-source-sans-pro
-	provides = ttf-ubuntu-font-family
-	provides = ttf-vollkorn
-	provides = ttf-font
+	provides = ttf-source-code-pro-ibx
+	provides = ttf-source-sans-pro-ibx
+	provides = ttf-ubuntu-font-family-ib
+	provides = ttf-vollkorn-ibx
 	conflicts = adobe-source-code-pro-fonts
 	conflicts = adobe-source-sans-pro-fonts
-	conflicts = googlefontdirectory
 	conflicts = jsmath-fonts
 	conflicts = lohit-fonts
-	conflicts = oldstand-font
-	conflicts = openarch_fonts
-	conflicts = otf-bitter
-	conflicts = otf-goudy
 	conflicts = ttf-andika
 	conflicts = ttf-anonymous-pro
-	conflicts = ttf-cantarell
 	conflicts = ttf-cardo
-	conflicts = ttf-chromeos-fonts
 	conflicts = ttf-comfortaa
 	conflicts = ttf-croscore
 	conflicts = ttf-droid
 	conflicts = ttf-fira-mono
 	conflicts = ttf-fira-sans
-	conflicts = ttf-google-fonts-hg
-	conflicts = ttf-google-webfonts
-	conflicts = ttf-google-webfonts-git
-	conflicts = ttf-google-webfonts-hg
 	conflicts = ttf-inconsolata
-	conflicts = ttf-kimberly_geswein_print
 	conflicts = ttf-lato
 	conflicts = ttf-lora-cyrillic
 	conflicts = ttf-lekton
 	conflicts = ttf-medievalsharp
 	conflicts = ttf-merriweather
 	conflicts = ttf-merriweather-sans
-	conflicts = ttf-noto
 	conflicts = ttf-nova
-	conflicts = ttf-oldstandard
 	conflicts = ttf-opensans
 	conflicts = ttf-oswald
-	conflicts = ttf-overpass
 	conflicts = ttf-oxygen
 	conflicts = ttf-oxygen-git
-	conflicts = ttf-pt-mono
-	conflicts = ttf-pt-sans
-	conflicts = ttf-ptsans
+	conflicts = ttf-pt-fonts
 	conflicts = ttf-quintessential
 	conflicts = ttf-roboto
 	conflicts = ttf-roboto-mono
 	conflicts = ttf-signika
 	conflicts = ttf-sil-fonts
-	conflicts = ttf-sortsmillgoudy
-	conflicts = ttf-source-code-pro
-	conflicts = ttf-source-sans-pro
-	conflicts = ttf-ubuntu-font-family
-	conflicts = ttf-vollkorn
+	conflicts = ttf-source-code-pro-ibx
+	conflicts = ttf-source-sans-pro-ibx
+	conflicts = ttf-ubuntu-font-family-ib
+	conflicts = ttf-vollkorn-ibx
 	conflicts = ttf-arabeyes-fonts
 	source = git+https://github.com/google/fonts.git
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 391637080953..55adade645b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,124 +11,32 @@
 pkgname=ttf-google-fonts-git
 pkgver=r1193.4930cafe
 pkgrel=1
+epoch=1
 pkgdesc="TrueType fonts from the Google Fonts project (git version)"
-arch=('any')
+arch=(any)
 url="https://github.com/google/fonts"
-license=('various')
+license=(various)
+
 # About why "cantarell-fonts" and "noto-fonts" is a dependency see comment in package() function.
-depends=('cantarell-fonts'
-         'fontconfig'
-         'noto-fonts'
-         'xorg-fonts-encodings'
-         'xorg-mkfontdir'
-         'xorg-mkfontscale')
-makedepends=('git')
-conflicts=('adobe-source-code-pro-fonts'
-           'adobe-source-sans-pro-fonts'
-           'googlefontdirectory'
-           'jsmath-fonts'
-           'lohit-fonts'
-           'oldstand-font'
-           'openarch_fonts'
-           'otf-bitter'
-           'otf-goudy'
-           'ttf-andika'
-           'ttf-anonymous-pro'
-           'ttf-cantarell'
-           'ttf-cardo'
-           'ttf-chromeos-fonts'
-           'ttf-comfortaa'
-           'ttf-croscore'
-           'ttf-droid'
-           'ttf-fira-mono'
-           'ttf-fira-sans'
-           'ttf-google-fonts-hg'
-           'ttf-google-webfonts'
-           'ttf-google-webfonts-git'
-           'ttf-google-webfonts-hg'
-           'ttf-inconsolata'
-           'ttf-kimberly_geswein_print'
-           'ttf-lato'
-           'ttf-lora-cyrillic'
-           'ttf-lekton'
-           'ttf-medievalsharp'
-           'ttf-merriweather'
-           'ttf-merriweather-sans'
-           'ttf-noto'
-           'ttf-nova'
-           'ttf-oldstandard'
-           'ttf-opensans'
-           'ttf-oswald'
-           'ttf-overpass'
-           'ttf-oxygen'
-           'ttf-oxygen-git'
-           'ttf-pt-mono'
-           'ttf-pt-sans'
-           'ttf-ptsans'
-           'ttf-quintessential'
-           'ttf-roboto'
-           'ttf-roboto-mono'
-           'ttf-signika'
-           'ttf-sil-fonts'
-           'ttf-sortsmillgoudy'
-           'ttf-source-code-pro'
-           'ttf-source-sans-pro'
-           'ttf-ubuntu-font-family'
-           'ttf-vollkorn'
-           'ttf-arabeyes-fonts')
-provides=('adobe-source-code-pro-fonts'
-          'adobe-source-sans-pro-fonts'
-          'googlefontdirectory'
-          'jsmath-fonts'
-          'lohit-fonts'
-          'oldstand-font'
-          'openarch_fonts'
-          'otf-bitter'
-          'otf-goudy'
-          'ttf-andika'
-          'ttf-anonymous-pro'
-          'ttf-cantarell'
-          'ttf-cardo'
-          'ttf-chromeos-fonts'
-          'ttf-comfortaa'
-          'ttf-croscore'
-          'ttf-droid'
-          'ttf-fira-mono'
-          'ttf-fira-sans'
-          'ttf-google-fonts-hg'
-          'ttf-google-webfonts'
-          'ttf-google-webfonts-git'
-          'ttf-google-webfonts-hg'
-          'ttf-inconsolata'
-          'ttf-kimberly_geswein_print'
-          'ttf-lato'
-          'ttf-lora-cyrillic'
-          'ttf-lekton'
-          'ttf-medievalsharp'
-          'ttf-merriweather'
-          'ttf-merriweather-sans'
-          'ttf-noto'
-          'ttf-nova'
-          'ttf-oldstandard'
-          'ttf-opensans'
-          'ttf-oswald'
-          'ttf-overpass'
-          'ttf-oxygen'
-          'ttf-oxygen-git'
-          'ttf-pt-mono'
-          'ttf-pt-sans'
-          'ttf-ptsans'
-          'ttf-quintessential'
-          'ttf-roboto'
-          'ttf-roboto-mono'
-          'ttf-signika'
-          'ttf-sil-fonts'
-          'ttf-sortsmillgoudy'
-          'ttf-source-code-pro'
-          'ttf-source-sans-pro'
-          'ttf-ubuntu-font-family'
-          'ttf-vollkorn'
-          'ttf-font')
+depends=(cantarell-fonts fontconfig noto-fonts xorg-fonts-encodings xorg-mkfontdir
+         xorg-mkfontscale)
+makedepends=(git)
+conflicts=(adobe-source-code-pro-fonts adobe-source-sans-pro-fonts jsmath-fonts
+           lohit-fonts ttf-andika ttf-anonymous-pro ttf-cardo ttf-comfortaa
+           ttf-croscore ttf-droid ttf-fira-mono ttf-fira-sans ttf-inconsolata
+           ttf-lato ttf-lora-cyrillic ttf-lekton ttf-medievalsharp ttf-merriweather
+           ttf-merriweather-sans ttf-nova ttf-opensans ttf-oswald ttf-oxygen
+           ttf-oxygen-git ttf-pt-fonts ttf-quintessential ttf-roboto ttf-roboto-mono
+           ttf-signika ttf-sil-fonts ttf-source-code-pro-ibx ttf-source-sans-pro-ibx
+           ttf-ubuntu-font-family-ib ttf-vollkorn-ibx ttf-arabeyes-fonts)
+provides=(adobe-source-code-pro-fonts adobe-source-sans-pro-fonts jsmath-fonts
+          lohit-fonts ttf-andika ttf-anonymous-pro ttf-cardo ttf-comfortaa
+          ttf-croscore ttf-droid ttf-fira-mono ttf-fira-sans ttf-inconsolata ttf-lato
+          ttf-lora-cyrillic ttf-lekton ttf-medievalsharp ttf-merriweather
+          ttf-merriweather-sans ttf-nova ttf-opensans ttf-oswald ttf-oxygen
+          ttf-oxygen-git ttf-pt-fonts ttf-quintessential ttf-roboto ttf-roboto-mono
+          ttf-signika ttf-sil-fonts ttf-source-code-pro-ibx ttf-source-sans-pro-ibx
+          ttf-ubuntu-font-family-ib ttf-vollkorn-ibx)
 source=("git+${url}.git")
 sha512sums=('SKIP')
 
@@ -139,7 +47,7 @@ pkgver() {
 }
 
 package() {
-    install -dm755 ${pkgdir}/usr/share/fonts/TTF
+    install -dm755 "$pkgdir/usr/share/fonts/TTF"
     find . -type f -name \*.[Tt][Tt][Ff] -exec install -Dm644 '{}' ${pkgdir}/usr/share/fonts/TTF \;
 
     # remove Cantarell fonts because Google ships the original Cantarell
@@ -149,7 +57,8 @@ package() {
     # cantarell-fonts package installs its fonts into /usr/share/fonts/cantarell/
     # and because cantarell-fonts installs .otf files instead of .ttf files
     find ${pkgdir}/usr/share/fonts/TTF -type f -name "Cantarell-*.ttf" -delete
+
     # remove Noto fonts because noto-fonts package have more fonts than this package
     # and also noto-fonts install it's fonts in /usr/share/fonts/noto.
     find ${pkgdir}/usr/share/fonts/TTF -type f -name "Noto*.ttf" -delete
-    }
+}