PKGBUILD cleanup

3 files changed, 14 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d84191f3bf5c..656af11cb4cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = ttf-bookerly
-	pkgdesc = Amazon's new typeface for Kindle
+	pkgdesc = Amazon's new typeface for Kindle.
 	pkgver = 4.21.0.65
-	pkgrel = 2
+	pkgrel = 3
 	url = https://play.google.com/store/apps/details?id=com.google.android.apps.books
-	install = ttf.install
 	arch = any
 	license = unknown
 	depends = fontconfig
+	depends = xorg-fonts-encodings
 	depends = xorg-font-utils
+	depends = unzip
 	noextract = amazonkindle.apk
 	source = amazonkindle.apk::https://www.apkmirrordownload.com/wp-content/themes/apkmirrordownload/download.php?type=apk&id=130701
 	sha256sums = 1b3e1f6f857032ef847e61a69b431b55b916648da18694f6b061e27d16db09b7
diff --git a/PKGBUILD b/PKGBUILD
index 75cdda6a74b8..3916a1cc3ac2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,26 @@
-# Maintainer: C. R. Daley <crdaley at gmail dot com>
-#Contributor: Previous maintainer's name <address at domain dot tld>
-#Contributor: Andrejs Mivreņiks <gim at fastmail dot fm>
-pkgname=ttf-bookerly
+# Maintainer: LightDot <lightdot -a-t- g m a i l>
+# Contributor: C. R. Daley <crdaley at gmail dot com>
+# Contributor: Andrejs Mivreņiks <gim at fastmail dot fm>
+
+_fnt_name=bookerly
+pkgname=ttf-${_fnt_name}
 pkgver=4.21.0.65
-pkgrel=2
-pkgdesc="Amazon's new typeface for Kindle"
+pkgrel=3
+pkgdesc="Amazon's new typeface for Kindle."
 arch=('any')
 url="https://play.google.com/store/apps/details?id=com.google.android.apps.books"
 license=('unknown')
-depends=('fontconfig' 'xorg-font-utils')
-install='ttf.install'
+depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils' 'unzip')
 source=("amazonkindle.apk::https://www.apkmirrordownload.com/wp-content/themes/apkmirrordownload/download.php?type=apk&id=130701")
 noextract=("amazonkindle.apk")
 sha256sums=('1b3e1f6f857032ef847e61a69b431b55b916648da18694f6b061e27d16db09b7')
 
 prepare() {
-        unzip amazonkindle.apk
+  unzip amazonkindle.apk
 }
 
 package() {
   cd "$srcdir/assets"
-
-  # Prepare destination directory
   install -dm755 "$pkgdir/usr/share/fonts/TTF"
-
-  # Install fonts
   install -m644 Bookerly*.ttf "$pkgdir/usr/share/fonts/TTF"
 }
-
diff --git a/ttf.install b/ttf.install
deleted file mode 100644
index 724145fffa8a..000000000000
--- a/ttf.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -s > /dev/null
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}