Downgrade to 1.585 due to regression upstream

1 files changed, 20 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 434cb5bf084d..36a74959c469 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,33 @@
 # Maintainer: Tyler Swagar <buttpickle69@shaw.ca>
 
 pkgname=ttf-merriweather
-_commit='17311b9ddc3c17e073f9fbc4dbcbd844f8d49347'
-pkgver=2.001
+_commit='f397fbd6b930944cc6255d4771142b07110357f4'
+pkgver=1.585
 pkgrel=1
+epoch=1
 pkgdesc='A typeface that is pleasant to read on screens by Sorkin Type Co'
 arch=('any')
 url='http://sorkintype.com/'
 license=('custom:SIL Open Font License v1.1')
 depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
 conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git' 'ttf-merriweather-ib')
-source=("Merriweather-Black-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-Black.ttf"
-        "Merriweather-BlackItalic-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-BlackItalic.ttf"
-        "Merriweather-Bold-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-Bold.ttf"
-        "Merriweather-BoldItalic-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-BoldItalic.ttf"
-        "Merriweather-Italic-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-Italic.ttf"
-        "Merriweather-Light-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-Light.ttf"
-        "Merriweather-LightItalic-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-LightItalic.ttf"
-        "Merriweather-Regular-${pkgver}.ttf::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/fonts/ttf/Merriweather-Regular.ttf"
-        "${pkgname}-${pkgver}-OFL.txt::https://github.com/EbenSorkin/Merriweather/raw/${_commit}/OFL.txt")
-sha256sums=('9fbb4fe2db16613f6a1a6c3fac5c16e2642abf76cbcef1fd89f62f0d25faaf65'
-            '04f446a6425e5c6a019169da1c621ce3f1cb22ab43553c7f00b933080e0e5a26'
-            '07c866cc42802badf0a880658041570acf606eb2525bbd26ac4db202a2e129ad'
-            '8ae1576a1791e733fd1d02bc8da9a492e45b23fea224dbae098d88396068f2e5'
-            '5fb616e44968f566e5bd171247d47ab08239ea11ca02d3008cbffdcc3c3e3967'
-            '1ff545213d0e2b5f4c649a8122d41cc92ec4bbc97624eb58d40b4b554618d00e'
-            'f24beefcf02bfbf0337d26ce79676e2324d4972809318ee90193e3c5999a5a29'
-            '93fc8bdd56e2000b7dfee9e350a6c52cca1a4d546ff23b2b11ffd36879351f1d'
+source=("Merriweather-Black-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-Black.ttf"
+        "Merriweather-BlackItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-BlackItalic.ttf"
+        "Merriweather-Bold-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-Bold.ttf"
+        "Merriweather-BoldItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-BoldItalic.ttf"
+        "Merriweather-Italic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-Italic.ttf"
+        "Merriweather-Light-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-Light.ttf"
+        "Merriweather-LightItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-LightItalic.ttf"
+        "Merriweather-Regular-${pkgver}.ttf::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/Merriweather-Regular.ttf"
+        "${pkgname}-${pkgver}-OFL.txt::https://github.com/google/fonts/raw/${_commit}/ofl/merriweather/OFL.txt")
+sha256sums=('e27c601a95672f2c1c2ca4456d42a4f3b4b3df851f1cd37762de269734c3668a'
+            '99bb8d599887d14c86cb362945879f430dd901464239320088ccf65c5dbecf98'
+            '42a20efeb90321fcb1f52eece95252fab023ab68d919123783399ec55dac82d6'
+            '0f67952dfc62aed80e3507edde05a70ea1123225a4828dc4377323c25d349dd6'
+            '18ce2e027971190b2ed22b515b3005f326aa8f740cb015d1339bcd4ccc09af2b'
+            '290405c44ab2136698ec369d7b8f08de679add62f6e93afd7c7b0db15b0f778e'
+            'ef67327f6bc3bd87237c8f1e2fedc42b3f417718c7b0d4e6500f90314eae12d8'
+            'b96cf372e58cf65f0d2b71f63c13d4612bdd92bd69a2528c2df139a702387163'
             'a66f32f6cb05795b28fea487250d7616274178dcbb946ec198e9f8ef5b30cbc2')
 
 package() {