Upgrade to 1.008 from upstream repo

2 files changed, 43 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3dd64ba5f75..d57018ce57d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ttf-merriweather-sans
 	pkgdesc = A sans-serif typeface that is pleasant to read on screens by Sorkin Type Co
-	pkgver = 1.006
-	pkgrel = 4
+	pkgver = 1.008
+	pkgrel = 1
 	url = https://fonts.google.com/specimen/Merriweather+Sans
 	arch = any
 	license = custom:SIL Open Font License v1.1
@@ -10,24 +10,24 @@ pkgbase = ttf-merriweather-sans
 	depends = xorg-font-utils
 	conflicts = ttf-google-fonts-opinionated-git
 	conflicts = ttf-merriweather-sans-ib
-	source = MerriweatherSans-Bold-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Bold.ttf
-	source = MerriweatherSans-BoldItalic-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf
-	source = MerriweatherSans-ExtraBold-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-ExtraBold.ttf
-	source = MerriweatherSans-ExtraBoldItalic-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-ExtraBoldItalic.ttf
-	source = MerriweatherSans-Italic-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Italic.ttf
-	source = MerriweatherSans-Light-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Light.ttf
-	source = MerriweatherSans-LightItalic-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-LightItalic.ttf
-	source = MerriweatherSans-Regular-1.006.ttf::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/MerriweatherSans-Regular.ttf
-	source = ttf-merriweather-sans-1.006-OFL.txt::https://github.com/google/fonts/raw/982e9355296882ebb55e6f39117bb106a6a82b17/ofl/merriweathersans/OFL.txt
-	sha256sums = 9b17d0769b7f16eae06168007dfe129ca1be4e582d972949103daf9be393ba87
-	sha256sums = dc40cb2fb6d2e7d775cf63af674f137c74160d1de8af55d942192381a8eb7d2e
-	sha256sums = b3c4697d84a65397d98657ce2e934aa1dd0f9187776525b61ebf05e2779d4fef
-	sha256sums = f60fcb67bc5d4c5c087523c91c90303f1463790b34924942f8af02d2238be21b
-	sha256sums = 9ff9310de27fbcfeabd976f6925f75f4e67ba8afb31c9d76ccad4070ed383e98
-	sha256sums = 296f4c55d4df693b2ee8240184b2d8ff655c5f32944597f7733965dc76840d40
-	sha256sums = ff3b59fa8aca71e75e9aa329bf1e67bcf2fb4f5fa23edefba010c024941229f7
-	sha256sums = d8ca7e8e39b7e486d7545a0bbefdfe08dfd9b2ddaa672be07f48b16c46dbc24b
-	sha256sums = 22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276
+	source = MerriweatherSans-Black-1.008.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/8a1b078e3aeec6aecc856c3422898816af9b9dc7/fonts/ttfs/MerriweatherSans-Black.ttf
+	source = MerriweatherSans-Bold-1.008.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/8a1b078e3aeec6aecc856c3422898816af9b9dc7/fonts/ttfs/MerriweatherSans-Bold.ttf
+	source = MerriweatherSans-BoldItalic-1.008.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/8a1b078e3aeec6aecc856c3422898816af9b9dc7/fonts/ttfs/MerriweatherSans-BoldItalic.ttf
+	source = MerriweatherSans-Italic-1.008.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/8a1b078e3aeec6aecc856c3422898816af9b9dc7/fonts/ttfs/MerriweatherSans-Italic.ttf
+	source = MerriweatherSans-Light-1.008.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/8a1b078e3aeec6aecc856c3422898816af9b9dc7/fonts/ttfs/MerriweatherSans-Light.ttf
+	source = MerriweatherSans-LightItalic-1.008.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/8a1b078e3aeec6aecc856c3422898816af9b9dc7/fonts/ttfs/MerriweatherSans-LightItalic.ttf
+	source = MerriweatherSans-Regular-1.008.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/8a1b078e3aeec6aecc856c3422898816af9b9dc7/fonts/ttfs/MerriweatherSans-Regular.ttf
+	source = MerriweatherSans-UltraBoldItalic-1.008.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/8a1b078e3aeec6aecc856c3422898816af9b9dc7/fonts/ttfs/MerriweatherSans-UltraBoldItalic.ttf
+	source = ttf-merriweather-sans-1.008-OFL.txt::https://github.com/SorkinType/Merriweather-Sans/raw/8a1b078e3aeec6aecc856c3422898816af9b9dc7/OFL.txt
+	sha256sums = af690e015ff424d071721e6ad6af80f7c6386ba31abb47a2f389f197cb8a8a32
+	sha256sums = 5f81558a46b8c5f4ad6adcaa739f634af47218ae7d9ebe04f927ff6beb50fce0
+	sha256sums = f19e7d24d08196b48db236c15c267deaae68eaac5cf3f867d3de8a476bda61e9
+	sha256sums = 00c8297889d599864cc7f7ae55c4cd2719101c86bd791f6ef5b74d4bbe7bd14b
+	sha256sums = 3135cab712b7eede2cab5068c01cd819673e5a4274a8469d75a01265c5bbcc9f
+	sha256sums = 6323a0925f394f40e893791462a22ef32368bae8648cf90aaac501b4e304927a
+	sha256sums = 38919382a6e9c750affc4c851b7dac2d66c3c1e264b5676544ab0692fdae6369
+	sha256sums = 582dc62d2b45bdd565a905e13e182fb0996b9687b11c6687688bb7083ed19779
+	sha256sums = 6f3f956d48ae50afab7931fd82b88187d84d12d3a70d279e7ff3e2c963e11c43
 
 pkgname = ttf-merriweather-sans
 
diff --git a/PKGBUILD b/PKGBUILD
index b0a6c75c5acb..8a6c3e64696a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,43 @@
 # Maintainer: Tyler Swagar <buttpickle69@shaw.ca>
 
 pkgname=ttf-merriweather-sans
-_commit='982e9355296882ebb55e6f39117bb106a6a82b17'
-pkgver=1.006
-pkgrel=4
+_commit='8a1b078e3aeec6aecc856c3422898816af9b9dc7'
+pkgver=1.008
+pkgrel=1
 pkgdesc='A sans-serif typeface that is pleasant to read on screens by Sorkin Type Co'
 arch=('any')
 url='https://fonts.google.com/specimen/Merriweather+Sans'
 license=('custom:SIL Open Font License v1.1')
 depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
 conflicts=('ttf-google-fonts-opinionated-git' 'ttf-merriweather-sans-ib')
-source=("MerriweatherSans-Bold-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/MerriweatherSans-Bold.ttf"
-        "MerriweatherSans-BoldItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf"
-        "MerriweatherSans-ExtraBold-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/MerriweatherSans-ExtraBold.ttf"
-        "MerriweatherSans-ExtraBoldItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/MerriweatherSans-ExtraBoldItalic.ttf"
-        "MerriweatherSans-Italic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/MerriweatherSans-Italic.ttf"
-        "MerriweatherSans-Light-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/MerriweatherSans-Light.ttf"
-        "MerriweatherSans-LightItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/MerriweatherSans-LightItalic.ttf"
-        "MerriweatherSans-Regular-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/MerriweatherSans-Regular.ttf"
-        "${pkgname}-${pkgver}-OFL.txt::https://github.com/google/fonts/raw/${_commit}/ofl/merriweathersans/OFL.txt")
-sha256sums=('9b17d0769b7f16eae06168007dfe129ca1be4e582d972949103daf9be393ba87'
-            'dc40cb2fb6d2e7d775cf63af674f137c74160d1de8af55d942192381a8eb7d2e'
-            'b3c4697d84a65397d98657ce2e934aa1dd0f9187776525b61ebf05e2779d4fef'
-            'f60fcb67bc5d4c5c087523c91c90303f1463790b34924942f8af02d2238be21b'
-            '9ff9310de27fbcfeabd976f6925f75f4e67ba8afb31c9d76ccad4070ed383e98'
-            '296f4c55d4df693b2ee8240184b2d8ff655c5f32944597f7733965dc76840d40'
-            'ff3b59fa8aca71e75e9aa329bf1e67bcf2fb4f5fa23edefba010c024941229f7'
-            'd8ca7e8e39b7e486d7545a0bbefdfe08dfd9b2ddaa672be07f48b16c46dbc24b'
-            '22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276')
+source=("MerriweatherSans-Black-${pkgver}.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/${_commit}/fonts/ttfs/MerriweatherSans-Black.ttf"
+        "MerriweatherSans-Bold-${pkgver}.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/${_commit}/fonts/ttfs/MerriweatherSans-Bold.ttf"
+        "MerriweatherSans-BoldItalic-${pkgver}.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/${_commit}/fonts/ttfs/MerriweatherSans-BoldItalic.ttf"
+        "MerriweatherSans-Italic-${pkgver}.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/${_commit}/fonts/ttfs/MerriweatherSans-Italic.ttf"
+        "MerriweatherSans-Light-${pkgver}.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/${_commit}/fonts/ttfs/MerriweatherSans-Light.ttf"
+        "MerriweatherSans-LightItalic-${pkgver}.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/${_commit}/fonts/ttfs/MerriweatherSans-LightItalic.ttf"
+        "MerriweatherSans-Regular-${pkgver}.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/${_commit}/fonts/ttfs/MerriweatherSans-Regular.ttf"
+        "MerriweatherSans-UltraBoldItalic-${pkgver}.ttf::https://github.com/SorkinType/Merriweather-Sans/raw/${_commit}/fonts/ttfs/MerriweatherSans-UltraBoldItalic.ttf"
+        "${pkgname}-${pkgver}-OFL.txt::https://github.com/SorkinType/Merriweather-Sans/raw/${_commit}/OFL.txt")
+sha256sums=('af690e015ff424d071721e6ad6af80f7c6386ba31abb47a2f389f197cb8a8a32'
+            '5f81558a46b8c5f4ad6adcaa739f634af47218ae7d9ebe04f927ff6beb50fce0'
+            'f19e7d24d08196b48db236c15c267deaae68eaac5cf3f867d3de8a476bda61e9'
+            '00c8297889d599864cc7f7ae55c4cd2719101c86bd791f6ef5b74d4bbe7bd14b'
+            '3135cab712b7eede2cab5068c01cd819673e5a4274a8469d75a01265c5bbcc9f'
+            '6323a0925f394f40e893791462a22ef32368bae8648cf90aaac501b4e304927a'
+            '38919382a6e9c750affc4c851b7dac2d66c3c1e264b5676544ab0692fdae6369'
+            '582dc62d2b45bdd565a905e13e182fb0996b9687b11c6687688bb7083ed19779'
+            '6f3f956d48ae50afab7931fd82b88187d84d12d3a70d279e7ff3e2c963e11c43')
 
 package() {
   install -dm 755 "${pkgdir}/usr/share/fonts/TTF"
+  install -m 644 MerriweatherSans-Black-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-Black.ttf"
   install -m 644 MerriweatherSans-Bold-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-Bold.ttf"
   install -m 644 MerriweatherSans-BoldItalic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-BoldItalic.ttf"
-  install -m 644 MerriweatherSans-ExtraBold-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-ExtraBold.ttf"
-  install -m 644 MerriweatherSans-ExtraBoldItalic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-ExtraBoldItalic.ttf"
   install -m 644 MerriweatherSans-Italic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-Italic.ttf"
   install -m 644 MerriweatherSans-Light-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-Light.ttf"
   install -m 644 MerriweatherSans-LightItalic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-LightItalic.ttf"
   install -m 644 MerriweatherSans-Regular-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-Regular.ttf"
+  install -m 644 MerriweatherSans-UltraBoldItalic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/MerriweatherSans-UltraBoldItalic.ttf"
   install -Dm644 ${pkgname}-${pkgver}-OFL.txt "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
 }