2.51

4 files changed, 76 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4fbd18f29b22..f24917a44dd6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,35 @@
 pkgbase = ttf-comic-neue
-	pkgdesc = Comic Neue aspires to be the casual script choice for everyone including the typographically savvy.
-	pkgver = 2.5
+	pkgdesc = Casual font that fixes the shortcomings of Comic Sans
+	pkgver = 2.51
 	pkgrel = 1
-	url = http://comicneue.com
-	install = ttf-comic-neue.install
+	url = https://github.com/crozynski/comicneue
 	arch = any
-	license = custom:OFL
-	depends = fontconfig
-	source = http://comicneue.com/comic-neue-2.5.zip
-	source = ttf-comic-neue.install
-	sha256sums = 6496cfef47c67568fb74dfb0609239f9da2368001438573c0e29e3a33fa8e0d9
-	sha256sums = 2459fa08887f819049afac36d7e7e23d7b9f58eb39c35ce02b17ce1096885c16
+	license = OFL-1.1
+	source = ComicNeue-LICENSE-1fa9686.txt::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/OFL.txt
+	source = ComicNeue-Bold-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue/ComicNeue-Bold.ttf
+	source = ComicNeue-BoldItalic-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue/ComicNeue-BoldItalic.ttf
+	source = ComicNeue-Italic-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue/ComicNeue-Italic.ttf
+	source = ComicNeue-Light-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue/ComicNeue-Light.ttf
+	source = ComicNeue-LightItalic-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue/ComicNeue-LightItalic.ttf
+	source = ComicNeue-Regular-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue/ComicNeue-Regular.ttf
+	source = ComicNeueAngular-Bold-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-Bold.ttf
+	source = ComicNeueAngular-BoldItalic-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-BoldItalic.ttf
+	source = ComicNeueAngular-Italic-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-Italic.ttf
+	source = ComicNeueAngular-Light-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-Light.ttf
+	source = ComicNeueAngular-LightItalic-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-LightItalic.ttf
+	source = ComicNeueAngular-Regular-1fa9686.ttf::https://github.com/crozynski/comicneue/raw/1fa968608b1f4f7f1775824df3d2081fc93e2e9f/Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-Regular.ttf
+	sha256sums = 7c38a22e5878e60fe423360553e63dd7be23d29f1f60336034935dbfc96e8320
+	sha256sums = 3e7e5fccfd7e0788f317b43312151c1bd5cf058c9697a8d83eac3939050bd61e
+	sha256sums = 5c312c2a2fa64eee82f3b87fcfab8f3b12a5e59b043124401d322eb323cfbf16
+	sha256sums = e06bfd1552f5c9464c5665733ffd69239b0593885dbb9e059688a5900f78cf98
+	sha256sums = efb91c06dccc264f07f800c0691d40c94e8cfce6183daade0709268bec178f76
+	sha256sums = a6d36baee09c7025916ddb517835458d15ef890291507197a54875ccc096b927
+	sha256sums = a0ee5a37c8b27c4db0700137d928598b1e23b0089e1546a8961909176b779360
+	sha256sums = cee03f39ac83f957269ba2e5b3f38633109c5a34a05b7cf0a75764c1cc6e6fea
+	sha256sums = 48ae749cb2e522694c2912dc3be1dd20eca2735b1c5a2dce02788f345f112e8b
+	sha256sums = e30086fbee8befd17da2a2c32ca1274010558718b29e6889f6971e4885d07a12
+	sha256sums = 3b306a9f53674bb0423a5c63ef7102b1ec562786ac950f776d7e4ad6c4d23602
+	sha256sums = 88914050ace5ee82c48ff46aa0c5ea699ef0ffbf4baf0d792104dfe4f24f1de3
+	sha256sums = 3f3dc75cc9376e1434f1c19c315942240f0a2eb96f3f12fbfad0bc07f9f87f2f
 
 pkgname = ttf-comic-neue
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 4fbd8fc67724..befd931f3be6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,48 @@
-# Maintainer: Gatlin Johnson <gatlin@niltag.net>
+# Maintainer:
+# Contributor Gatlin Johnson <gatlin@niltag.net>
 
-pkgname=ttf-comic-neue
-pkgver=2.5
+_fontname="comic-neue"
+_pkgname="ttf-$_fontname"
+pkgname="$_pkgname"
+pkgver=2.51
 pkgrel=1
-pkgdesc="Comic Neue aspires to be the casual script choice for everyone including the typographically savvy."
+pkgdesc="Casual font that fixes the shortcomings of Comic Sans"
+url="https://github.com/crozynski/comicneue"
+license=('OFL-1.1')
 arch=('any')
-license=('custom:OFL')
-url="http://comicneue.com"
-install=ttf-comic-neue.install
-source=("http://comicneue.com/comic-neue-${pkgver}.zip" ttf-comic-neue.install)
-sha256sums=('6496cfef47c67568fb74dfb0609239f9da2368001438573c0e29e3a33fa8e0d9'
-            '2459fa08887f819049afac36d7e7e23d7b9f58eb39c35ce02b17ce1096885c16')
+
+_commit="1fa968608b1f4f7f1775824df3d2081fc93e2e9f" # 2.51
+
+source=("ComicNeue-LICENSE-${_commit::7}.txt"::"$url/raw/$_commit/OFL.txt")
+sha256sums=('7c38a22e5878e60fe423360553e63dd7be23d29f1f60336034935dbfc96e8320')
+
+_files=(
+  Fonts/TTF/ComicNeue/ComicNeue-Bold.ttf::'3e7e5fccfd7e0788f317b43312151c1bd5cf058c9697a8d83eac3939050bd61e'
+  Fonts/TTF/ComicNeue/ComicNeue-BoldItalic.ttf::'5c312c2a2fa64eee82f3b87fcfab8f3b12a5e59b043124401d322eb323cfbf16'
+  Fonts/TTF/ComicNeue/ComicNeue-Italic.ttf::'e06bfd1552f5c9464c5665733ffd69239b0593885dbb9e059688a5900f78cf98'
+  Fonts/TTF/ComicNeue/ComicNeue-Light.ttf::'efb91c06dccc264f07f800c0691d40c94e8cfce6183daade0709268bec178f76'
+  Fonts/TTF/ComicNeue/ComicNeue-LightItalic.ttf::'a6d36baee09c7025916ddb517835458d15ef890291507197a54875ccc096b927'
+  Fonts/TTF/ComicNeue/ComicNeue-Regular.ttf::'a0ee5a37c8b27c4db0700137d928598b1e23b0089e1546a8961909176b779360'
+  Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-Bold.ttf::'cee03f39ac83f957269ba2e5b3f38633109c5a34a05b7cf0a75764c1cc6e6fea'
+  Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-BoldItalic.ttf::'48ae749cb2e522694c2912dc3be1dd20eca2735b1c5a2dce02788f345f112e8b'
+  Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-Italic.ttf::'e30086fbee8befd17da2a2c32ca1274010558718b29e6889f6971e4885d07a12'
+  Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-Light.ttf::'3b306a9f53674bb0423a5c63ef7102b1ec562786ac950f776d7e4ad6c4d23602'
+  Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-LightItalic.ttf::'88914050ace5ee82c48ff46aa0c5ea699ef0ffbf4baf0d792104dfe4f24f1de3'
+  Fonts/TTF/ComicNeue-Angular/ComicNeueAngular-Regular.ttf::'3f3dc75cc9376e1434f1c19c315942240f0a2eb96f3f12fbfad0bc07f9f87f2f'
+)
+
+for i in "${_files[@]}"; do
+  _dl_path="${i%::*}"
+  _file="${_dl_path##*/}"
+  _hash="${i#*::}"
+  source+=("${_file%.ttf}-${_commit::7}.ttf"::"$url/raw/$_commit/$_dl_path")
+  sha256sums+=("$_hash")
+done
 
 package() {
-  install -D -m644 ${srcdir}/comic-neue-${pkgver}/OFL.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -d "${pkgdir}/usr/share/fonts/OTF"
-  install -m644 ${srcdir}/comic-neue-${pkgver}/OTF/ComicNeue/*.otf "${pkgdir}/usr/share/fonts/OTF/"
+  for i in ComicNeue*-${_commit::7}.ttf; do
+    install -Dm644 "$i" "$pkgdir/usr/share/fonts/$_fontname/${i%-${_commit::7}.ttf}.ttf"
+  done
+
+  install -Dm644 "ComicNeue-LICENSE-${_commit::7}.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/ttf-comic-neue.install b/ttf-comic-neue.install
deleted file mode 100644
index 309a51b29340..000000000000
--- a/ttf-comic-neue.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  post_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  echo -n "==> Rebuilding font cache... "
-  fc-cache -s &> /dev/null
-  mkfontscale /usr/share/fonts/OTF
-  mkfontdir /usr/share/fonts/OTF
-  echo "done"
-}