From 7bef2365c61e8153ad64f09c1726d6662e313ba4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 29 Mar 2017 17:45:29 +0000
Subject: xorg-fonts-misc: update to 1.0.3

---
 abs/core/xorg-fonts-misc/PKGBUILD       | 51 +++++++++++++++++++--------------
 abs/core/xorg-fonts-misc/xfonts.install | 15 ----------
 2 files changed, 30 insertions(+), 36 deletions(-)
 delete mode 100644 abs/core/xorg-fonts-misc/xfonts.install

diff --git a/abs/core/xorg-fonts-misc/PKGBUILD b/abs/core/xorg-fonts-misc/PKGBUILD
index ad87867..b0d9c99 100644
--- a/abs/core/xorg-fonts-misc/PKGBUILD
+++ b/abs/core/xorg-fonts-misc/PKGBUILD
@@ -1,15 +1,17 @@
-# $Id: PKGBUILD 150380 2012-02-17 10:25:47Z allan $
+# $Id$
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-fonts-misc
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.0.3
+pkgrel=5
 pkgdesc="X.org misc fonts"
 arch=(any)
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 license=('custom')
-depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
-install=xfonts.install
+depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
+replaces=('font-misc-ethiopic' 'font-misc-meltho')
+provides=('font-misc-ethiopic' 'font-misc-meltho')
+conflicts=('font-misc-ethiopic' 'font-misc-meltho')
 source=(${url}/releases/individual/font/font-arabic-misc-${pkgver}.tar.bz2
         ${url}/releases/individual/font/font-cursor-misc-${pkgver}.tar.bz2
         ${url}/releases/individual/font/font-daewoo-misc-${pkgver}.tar.bz2
@@ -17,23 +19,27 @@ source=(${url}/releases/individual/font/font-arabic-misc-${pkgver}.tar.bz2
         ${url}/releases/individual/font/font-isas-misc-${pkgver}.tar.bz2
         ${url}/releases/individual/font/font-jis-misc-${pkgver}.tar.bz2
         ${url}/releases/individual/font/font-micro-misc-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-misc-misc-1.1.0.tar.bz2
+        ${url}/releases/individual/font/font-misc-ethiopic-${pkgver}.tar.bz2
+        ${url}/releases/individual/font/font-misc-meltho-${pkgver}.tar.bz2
+        ${url}/releases/individual/font/font-misc-misc-1.1.2.tar.bz2
         ${url}/releases/individual/font/font-mutt-misc-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-schumacher-misc-1.1.0.tar.bz2
+        ${url}/releases/individual/font/font-schumacher-misc-1.1.2.tar.bz2
         ${url}/releases/individual/font/font-sony-misc-${pkgver}.tar.bz2
         ${url}/releases/individual/font/font-sun-misc-${pkgver}.tar.bz2)
-md5sums=('817ceb99636c873ad7679fe2a468678d'
-         '13c21c4d74155c662152a1a74f249d96'
-         '05597e2b193a7b7de2ca525468276b1d'
-         '05714516824c680ce747c6ef9d2fbbdd'
-         '88b5b32c5a27576e9d00675bcc966806'
-         '5835c99d056f4a29d7d6a5ae873cf00e'
-         '6350117efebe340f33e818f4a33e4e4b'
-         '878bfd4e9f14c1279cea3a8392e0dbdd'
-         'aab7ac62b960e77aa11d032bafe1d460'
-         '86f4b7d8b11a2e6da70884c59b5866a3'
-         '7b6f5117814599b86ed3470de6c62aa3'
-         '5a185c5549a650bf062d343e128682ca')
+sha256sums=('505d9b12a7093389e67a925dfda6346bde26d114c67f0cdca7aeda6e5d3344f4'
+            '17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635'
+            'bc65de70bee12698caa95b523d3b652c056347e17b68cc8b5d6bbdff235c4be8'
+            'e19ddf8b5f8de914d81675358fdfe37762e9ce524887cc983adef34f2850ff7b'
+            '5824ab4b485951107dd245b8f7717d2822f1a6dbf6cea98f1ac7f49905c0a867'
+            '2b18ce10b367ebafe95a17de799b6db9a24e2337188d124adaf68af05b1fac65'
+            '9a3381c10f32d9511f0ad4179df395914c50779103c16cddf7017f5220ed8db6'
+            '53cb1fd83afdbe7939c0eac34003676ee0e6023216892d98054db90b703c98a5'
+            '3721323f13855cf7ca609115a1f7b182491e9b2b9c6e01eb1a2c7f8edd480791'
+            'b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794'
+            'bd5f7adb34367c197773a9801df5bce7b019664941900b2a31fbfe1ff2830f8f'
+            'e444028656e0767e2eddc6d9aca462b16a2be75a47244dbc199b2c44eca87e5a'
+            '2043a326ba347c9da5ca1e9bc363e2521c3ea40b43b1f9662d333efd4867cff5'
+            '481f4fcbbf7005658b080b3cf342c8c76de752e77f47958b2b383de73266d2e0')
 
 build() {
   cd "${srcdir}"
@@ -60,4 +66,7 @@ package() {
     fi
   done
   rm -f ${pkgdir}/usr/share/fonts/*/fonts.*
-}
\ No newline at end of file
+  
+  # move .otf files to proper directory - FS#44250
+  mv ${pkgdir}/usr/share/fonts/misc/*.otf ${pkgdir}/usr/share/fonts/OTF/
+}
diff --git a/abs/core/xorg-fonts-misc/xfonts.install b/abs/core/xorg-fonts-misc/xfonts.install
deleted file mode 100644
index 7d21ab5..0000000
--- a/abs/core/xorg-fonts-misc/xfonts.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/misc
-  mkfontdir /usr/share/fonts/misc
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-- 
cgit v0.12

