From ce962243ef29f480a8293365b3d4acafdabeb30d Mon Sep 17 00:00:00 2001
From: Eugene M <damagedone@gmx.com>
Date: Fri, 2 Oct 2020 00:07:26 +0100
Subject: [PATCH] system/Iosevka: Updated for version 3.6.1.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/Iosevka/Iosevka.SlackBuild |  7 +++----
 system/Iosevka/Iosevka.info       |  6 +++---
 system/Iosevka/README             | 17 -----------------
 system/Iosevka/doinst.sh          |  6 +++---
 system/Iosevka/slack-desc         |  4 ++--
 5 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/system/Iosevka/Iosevka.SlackBuild b/system/Iosevka/Iosevka.SlackBuild
index be13911bee..7ebfa0dcbb 100644
--- a/system/Iosevka/Iosevka.SlackBuild
+++ b/system/Iosevka/Iosevka.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Iosevka
-VERSION=${VERSION:-3.2.2}
+VERSION=${VERSION:-3.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,8 +40,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $TMP/$PRGNAM-$VERSION
-unzip -o $CWD/pkg-iosevka-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
+unzip -o $CWD/ttc-iosevka-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -51,7 +50,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/fonts/TTF
-cp -a ttf/*.ttf ttc/*.ttc $PKG/usr/share/fonts/TTF
+cp -a *.ttc $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
diff --git a/system/Iosevka/Iosevka.info b/system/Iosevka/Iosevka.info
index 73578e3a59..174b8c9653 100644
--- a/system/Iosevka/Iosevka.info
+++ b/system/Iosevka/Iosevka.info
@@ -1,8 +1,8 @@
 PRGNAM="Iosevka"
-VERSION="3.2.2"
+VERSION="3.6.1"
 HOMEPAGE="https://typeof.net/Iosevka/"
-DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v3.2.2/pkg-iosevka-3.2.2.zip"
-MD5SUM="827de688d4e6092233107ca3988c9ef3"
+DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v3.6.1/ttc-iosevka-3.6.1.zip"
+MD5SUM="76d222fbec9b4e2c26ae33cfb3b396bc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/Iosevka/README b/system/Iosevka/README
index 11fd308944..ccf6ccfb46 100644
--- a/system/Iosevka/README
+++ b/system/Iosevka/README
@@ -1,20 +1,3 @@
 Iosevka is an open-source, sans-serif, monospace quasi‑proportional
 typeface family, designed for writing code, using in terminals,
 and preparing technical documents.
-
-Iosevka provides a large variety of variants. Prebuilt variants are listed
-below. For all Monospace variants' packages, it will contain three spacing
-variants.
-
-Default: The default variant with ligatures. Various symbols, like arrows
-and geometric, are wide (2-column).
-
-Terminal (“Term”)：A narrower variant focusing terminal uses. Arrows and
-geometric symbols will be narrow to follow typical terminal usages.
-
-Fixed: Exact monospace font without ligatures and wide glyphs. Since some
-environments cannot interpret Iosevka or Iosevka Term as monospace, and
-have difficulties with ligatures included, you can use Iosevka Fixed as an
-alternative.
-
-Iosevka variant - Monospace, Default.
diff --git a/system/Iosevka/doinst.sh b/system/Iosevka/doinst.sh
index 883c47ac0a..2909ee40e1 100644
--- a/system/Iosevka/doinst.sh
+++ b/system/Iosevka/doinst.sh
@@ -1,10 +1,10 @@
 # Update the X font indexes:
+
 if [ -x /usr/bin/mkfontdir ]; then
   ( cd /usr/share/fonts/TTF
     mkfontscale .
     mkfontdir .
   )
-fi
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache -f
+
+  [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
 fi
diff --git a/system/Iosevka/slack-desc b/system/Iosevka/slack-desc
index d2113d77a5..540e5c73cf 100644
--- a/system/Iosevka/slack-desc
+++ b/system/Iosevka/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-Iosevka: Iosevka (Open source monospace coding font)
+Iosevka: Iosevka (Slender monospace sans-serif typeface)
 Iosevka:
 Iosevka: Iosevka is a monospace typeface inspired by Pragmata Pro, M+, and
 Iosevka: DIN Mono. It is designed to have a narrow shape to be space
 Iosevka: efficient and compatible to CJK characters.
 Iosevka:
-Iosevka:
 Iosevka: Homepage: https://typeof.net/Iosevka/
 Iosevka:
 Iosevka:
 Iosevka:
+Iosevka: