Add ttf-noto, ttf-roboto-mono

3 files changed, 30 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0bd29aa13b76..02b75034017c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ttf-google-fonts-git
 	pkgdesc = TrueType fonts from the Google Fonts project
 	pkgver = 20150316
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/google/fonts
 	install = font.install
 	arch = any
@@ -28,33 +28,34 @@ pkgbase = ttf-google-fonts-git
 	provides = ttf-chromeos-fonts
 	provides = ttf-comfortaa
 	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-google-webfonts
 	provides = ttf-inconsolata
 	provides = ttf-kimberly_geswein_print
 	provides = ttf-lato
 	provides = ttf-lekton
 	provides = ttf-medievalsharp
+	provides = ttf-noto
 	provides = ttf-nova
 	provides = ttf-oldstandard
 	provides = ttf-opensans
 	provides = ttf-oxygen
 	provides = ttf-oxygen-git
-	provides = ttf-ptsans
 	provides = ttf-pt-mono
 	provides = ttf-pt-sans
+	provides = ttf-ptsans
 	provides = ttf-roboto
+	provides = ttf-roboto-mono
 	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-fira-mono
-	provides = ttf-fira-sans
-	provides = ttf-lato
 	provides = ttf-font
 	conflicts = adobe-source-code-pro-fonts
 	conflicts = adobe-source-sans-pro-fonts
@@ -72,33 +73,34 @@ pkgbase = ttf-google-fonts-git
 	conflicts = ttf-chromeos-fonts
 	conflicts = ttf-comfortaa
 	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-google-webfonts
 	conflicts = ttf-inconsolata
 	conflicts = ttf-kimberly_geswein_print
 	conflicts = ttf-lato
 	conflicts = ttf-lekton
 	conflicts = ttf-medievalsharp
+	conflicts = ttf-noto
 	conflicts = ttf-nova
 	conflicts = ttf-oldstandard
 	conflicts = ttf-opensans
 	conflicts = ttf-oxygen
 	conflicts = ttf-oxygen-git
-	conflicts = ttf-ptsans
 	conflicts = ttf-pt-mono
 	conflicts = ttf-pt-sans
+	conflicts = ttf-ptsans
 	conflicts = ttf-roboto
+	conflicts = ttf-roboto-mono
 	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-fira-mono
-	conflicts = ttf-fira-sans
-	conflicts = ttf-lato
 	source = git://github.com/google/fonts.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index e20cae29f1d6..63aa8c5065c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,5 @@
-# Maintainer:  Sebastian Stammler <stammler.s@gmail.com>
-#
-# Now pacman 4.1 ready!
-# For improvements/fixes to this package, please send me a
-# pull request on github: https://github.com/sebastianst/aur-packages
-#
+# Maintainer: Vlad M. <vlad@archlinux.net>
+# Contributor: Sebastian Stammler <stammler.s@gmail.com>
 # Contributor: Sarkasper <echo a2FzcGVyLm1lbnRlbkBnbXguY29tCg== | base64 -d>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Michalis Georgiou <mechmg93@gmail.comr>
@@ -11,7 +7,7 @@
 
 pkgname=ttf-google-fonts-git
 pkgver=20150316
-pkgrel=1
+pkgrel=2
 pkgdesc="TrueType fonts from the Google Fonts project"
 arch=('any')
 url="https://github.com/google/fonts"
@@ -39,33 +35,34 @@ conflicts=('adobe-source-code-pro-fonts'
            'ttf-chromeos-fonts'
            'ttf-comfortaa'
            'ttf-droid'
+           'ttf-fira-mono'
+           'ttf-fira-sans'
            'ttf-google-fonts-hg'
-           'ttf-google-webfonts'
            'ttf-google-webfonts-git'
            'ttf-google-webfonts-hg'
+           'ttf-google-webfonts'
            'ttf-inconsolata'
            'ttf-kimberly_geswein_print'
            'ttf-lato'
            'ttf-lekton'
            'ttf-medievalsharp'
+           'ttf-noto'
            'ttf-nova'
            'ttf-oldstandard'
            'ttf-opensans'
            'ttf-oxygen'
            'ttf-oxygen-git'
-           'ttf-ptsans'
            'ttf-pt-mono'
            'ttf-pt-sans'
+           'ttf-ptsans'
            'ttf-roboto'
+           'ttf-roboto-mono'
            'ttf-sil-fonts'
            'ttf-sortsmillgoudy'
            'ttf-source-code-pro'
            'ttf-source-sans-pro'
            'ttf-ubuntu-font-family'
-           'ttf-vollkorn'
-           'ttf-fira-mono'
-           'ttf-fira-sans'
-           'ttf-lato')
+           'ttf-vollkorn')
 provides=("${conflicts[@]}" 'ttf-font')
 source=("git://github.com/google/fonts.git")
 md5sums=('SKIP')
diff --git a/font.install b/font.install
index d5a636daedec..67445cf458e1 100644
--- a/font.install
+++ b/font.install
@@ -1,15 +1,15 @@
 post_install() {
-	echo -n "Updating font cache... "
-	fc-cache -fs > /dev/null
-	mkfontscale /usr/share/fonts/TTF
-	mkfontdir /usr/share/fonts/TTF
-	echo "done"
+  echo -n "Updating font cache... "
+  fc-cache -fs > /dev/null
+  mkfontscale /usr/share/fonts/TTF
+  mkfontdir /usr/share/fonts/TTF
+  echo "done"
 }
 
 post_upgrade() {
-	post_install $1
+  post_install $1
 }
 
 post_remove() {
-	post_install $1
+  post_install $1
 }