20160313-1: Upstream update

2 files changed, 61 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58510b7370b1..e6f9e8b2aca7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,36 @@
+# Generated by mksrcinfo v8
+# Sun Mar 13 15:22:55 UTC 2016
 pkgbase = otf-gfs-majuscule
 	pkgdesc = Open Font Majuscule typefaces, provided by the Greek Font Society
-	pkgver = 20110730
+	pkgver = 20160313
 	pkgrel = 1
-	url = http://www.greekfontsociety.gr/pages/gr_typefaces1.html
+	url = http://www.greekfontsociety.gr/typefaces/majuscule
 	install = otf-gfs-majuscule.install
 	arch = any
 	license = custom:OTF
 	depends = fontconfig
 	depends = xorg-font-utils
-	source = http://www.greekfontsociety.gr/GFS_AMBROSIA.zip
-	source = http://www.greekfontsociety.gr/GFS_FLEISCHMAN.zip
-	source = http://www.greekfontsociety.gr/GFS_EUSTACE.zip
-	source = http://www.greekfontsociety.gr/GFS_NICEFORE.zip
-	source = http://www.greekfontsociety.gr/GFS_JACKSON.zip
-	source = http://www.greekfontsociety.gr/GFS_GARALDUS.zip
-	source = http://www.greekfontsociety.gr/GFS_IGNACIO.zip
-	md5sums = 891a6e880ca0ef06223eedfab7c0e035
-	md5sums = adcb048bdca18dd243c0337bdb0c5ecd
-	md5sums = b54eea11af83c569b861a17800fb1945
-	md5sums = 02fcaf05448bb0df6696567975014132
-	md5sums = 73d235051292e23bc807c71d8c951e6b
-	md5sums = 7638996769c9162f0d8b8885c18af68f
+	noextract = GFS_Ignacio.zip
+	noextract = GFS_Garaldus.zip
+	noextract = GFS_Jackson.zip
+	noextract = GFS_Nicefore.zip
+	noextract = GFS_Eustace.zip
+	noextract = GFS_Fleischman.zip
+	noextract = GFS_Ambrosia.zip
+	source = http://www.greekfontsociety.gr/_assets/fonts/GFS_Ignacio.zip
+	source = http://www.greekfontsociety.gr/_assets/fonts/GFS_Garaldus.zip
+	source = http://www.greekfontsociety.gr/_assets/fonts/GFS_Jackson.zip
+	source = http://www.greekfontsociety.gr/_assets/fonts/GFS_Nicefore.zip
+	source = http://www.greekfontsociety.gr/_assets/fonts/GFS_Eustace.zip
+	source = http://www.greekfontsociety.gr/_assets/fonts/GFS_Fleischman.zip
+	source = http://www.greekfontsociety.gr/_assets/fonts/GFS_Ambrosia.zip
 	md5sums = ec397b1199ca79404adec355eeb5c163
+	md5sums = 7638996769c9162f0d8b8885c18af68f
+	md5sums = 73d235051292e23bc807c71d8c951e6b
+	md5sums = 02fcaf05448bb0df6696567975014132
+	md5sums = b54eea11af83c569b861a17800fb1945
+	md5sums = adcb048bdca18dd243c0337bdb0c5ecd
+	md5sums = 891a6e880ca0ef06223eedfab7c0e035
 
 pkgname = otf-gfs-majuscule
 
diff --git a/PKGBUILD b/PKGBUILD
index 314cf95795a5..0351ce1e32bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,49 @@
-# Maintainer: Angel Sartonev <a.sartonev at gmail dot com>
+# Maintainer: GordonGR <ntheo1979@gmail.com>
+# Contributor: Angel Sartonev <a.sartonev at gmail dot com>
 
 pkgname=otf-gfs-majuscule
-pkgver=20110730
+pkgver=20160313
 pkgrel=1
 pkgdesc='Open Font Majuscule typefaces, provided by the Greek Font Society'
 arch=(any)
-url='http://www.greekfontsociety.gr/pages/gr_typefaces1.html'
+url='http://www.greekfontsociety.gr/typefaces/majuscule'
 license=('custom:OTF')
 depends=('fontconfig' 'xorg-font-utils')
 install='otf-gfs-majuscule.install'
-source=('http://www.greekfontsociety.gr/GFS_AMBROSIA.zip'
-        'http://www.greekfontsociety.gr/GFS_FLEISCHMAN.zip'
-        'http://www.greekfontsociety.gr/GFS_EUSTACE.zip'
-        'http://www.greekfontsociety.gr/GFS_NICEFORE.zip'
-        'http://www.greekfontsociety.gr/GFS_JACKSON.zip'
-        'http://www.greekfontsociety.gr/GFS_GARALDUS.zip'
-        'http://www.greekfontsociety.gr/GFS_IGNACIO.zip')
-md5sums=('891a6e880ca0ef06223eedfab7c0e035'
-         'adcb048bdca18dd243c0337bdb0c5ecd'
-         'b54eea11af83c569b861a17800fb1945'
-         '02fcaf05448bb0df6696567975014132'
-         '73d235051292e23bc807c71d8c951e6b'
+source=("http://www.greekfontsociety.gr/_assets/fonts/GFS_Ignacio.zip"
+	"http://www.greekfontsociety.gr/_assets/fonts/GFS_Garaldus.zip"
+	"http://www.greekfontsociety.gr/_assets/fonts/GFS_Jackson.zip"
+	"http://www.greekfontsociety.gr/_assets/fonts/GFS_Nicefore.zip"
+	"http://www.greekfontsociety.gr/_assets/fonts/GFS_Eustace.zip"
+	"http://www.greekfontsociety.gr/_assets/fonts/GFS_Fleischman.zip"
+	"http://www.greekfontsociety.gr/_assets/fonts/GFS_Ambrosia.zip")
+
+md5sums=('ec397b1199ca79404adec355eeb5c163'
          '7638996769c9162f0d8b8885c18af68f'
-         'ec397b1199ca79404adec355eeb5c163')
-build() {
-  install -d $pkgdir/usr/share/fonts/OTF/
-  install -Dm644 $srcdir/GFS*/*otf $pkgdir/usr/share/fonts/OTF/
-  install -d $pkgdir/usr/share/licenses/$pkgname/
-  install -Dm644 $srcdir/GFS_AMBROSIA/OFL* $pkgdir/usr/share/licenses/$pkgname
+         '73d235051292e23bc807c71d8c951e6b'
+         '02fcaf05448bb0df6696567975014132'
+         'b54eea11af83c569b861a17800fb1945'
+         'adcb048bdca18dd243c0337bdb0c5ecd'
+         '891a6e880ca0ef06223eedfab7c0e035')
+
+noextract=(${source[@]##*/})
+
+package() {
+
+cd "$srcdir"
+
+unzip GFS_Ignacio.zip
+unzip GFS_Garaldus.zip
+unzip GFS_Jackson.zip
+unzip GFS_Nicefore.zip
+unzip GFS_Eustace.zip
+unzip GFS_Fleischman.zip
+unzip GFS_Ambrosia.zip
+
+install -d $pkgdir/usr/share/fonts/OTF/
+install -Dm644 $srcdir/GFS*/*otf $pkgdir/usr/share/fonts/OTF/
+install -d $pkgdir/usr/share/licenses/$pkgname/
+
 }
 
 
-# vim:set ts=2 sw=2 et: