[texlive-fontsextra]: upgrade to v2020.55407

2 files changed, 51 insertions, 22 deletions

diff --git a/libre/texlive-fontsextra/PKGBUILD b/libre/texlive-fontsextra/PKGBUILD
index e514d988e..d7a794612 100644
--- a/libre/texlive-fontsextra/PKGBUILD
+++ b/libre/texlive-fontsextra/PKGBUILD
@@ -4,10 +4,15 @@
 # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 # Contributor: Michał Masłowski <mtjm@mtjm.eu>
 
+
+# parabola changes and rationale:
+#  - remvoe nonfree add-on packages
+
+
 _pkgname=texlive-fontsextra-libre
 pkgname=texlive-fontsextra
-pkgver=2018.49197
-_revnr=${pkgver#2018.}
+pkgver=2020.55407
+_revnr=${pkgver#2020.}
 pkgrel=1
 pkgrel+=.par1
 pkgdesc="TeX Live - all sorts of extra fonts"
@@ -16,19 +21,20 @@ license=('GPL')
 arch=(any)
 depends=('texlive-core')
 groups=('texlive-most')
-replaces=('texlive-fontsextra-libre')
-conflicts=('texlive-fontsextra-libre')
 url='http://tug.org/texlive/'
 mksource=("https://sources.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip")
-mksha256sums=('e30b2e1da56aa4e87e744e1bcfaaf55c00bf51a31fdd9e2b9176e2384b8d1229')
+mksha256sums=('25e1060c699f09e02924bf27902b162d7af5a6cc2d0c898f83c09ca0928d9060')
 noextract=("$pkgname-$pkgver-src.zip")
 source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz"{,.sig}
         "$pkgname.maps")
 options=('!emptydirs')
-sha256sums=('dce312ef2e8e6015d4aefd585e38ed0dcc95cff850b8f59c976277d39aca4e92' 'SKIP'
-            'b552b81af7c5e4d8327e3c77c0b2b44c4cdc4a720c23378444747956a3d3d50c')
-validpgpkeys=('1B8C5E87702444D3D825CC8086ED62396D5DBA58' # Omar Vega Ramos <ovruni@gnu.org.pe>
-              '38D33EF29A7691134357648733466E12EC7BA943') # Isaac David <isacdaavid@at@isacdaavid@dot@info>
+sha256sums=('c58eb0df24a6ee0b258ca3088f90ec51a20e5b000f645876913b3d84933537df'
+            'SKIP'
+            '6346b4a1fc5a2a2e744715ae2e9462a55255e229e59d0e00ab5957d34bd75f99')
+validpgpkeys=('1B8C5E87702444D3D825CC8086ED62396D5DBA58'  # Omar Vega Ramos
+              '38D33EF29A7691134357648733466E12EC7BA943'  # Isaac David
+              '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
+
 
 mksource() {
    mkdir $pkgname-$pkgver
@@ -56,21 +62,21 @@ prepare() {
 
 package() {
    cd $srcdir/$pkgname-$pkgver
-   install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
+   install -m755 -d "$pkgdir"/var/lib/texmf/arch/installedpkgs
    sed -i '/^#/d' CONTENTS
-   install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${pkgname}_${_revnr}.pkgs
-   install -m644 $srcdir/$pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
+   install -m644 CONTENTS "$pkgdir"/var/lib/texmf/arch/installedpkgs/${pkgname}_${_revnr}.pkgs
+   install -m644 "$srcdir"/$pkgname.maps "$pkgdir"/var/lib/texmf/arch/installedpkgs/
    install -m755 -d $pkgdir/usr/share
    wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
    for dir in $wanteddirs; do
-     find $dir -type d -exec install -d -m755 $pkgdir/usr/share/texmf-dist/'{}' \;
-     find $dir -type f -exec install -m644 '{}' $pkgdir/usr/share/texmf-dist/'{}' \;
+     find $dir -type d -exec install -d -m755 "$pkgdir"/usr/share/texmf-dist/'{}' \;
+     find $dir -type f -exec install -m644 '{}' "$pkgdir"/usr/share/texmf-dist/'{}' \;
    done
    if [[ -d texmf-dist ]]; then
-     find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \;
-     find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \;
+     find texmf-dist -type d -exec install -d -m755 "$pkgdir"/usr/share/'{}' \;
+     find texmf-dist -type f -exec install -m644 '{}' "$pkgdir"/usr/share/'{}' \;
    fi
-   if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then
-     find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
+   if [[ -d "$pkgdir"/usr/share/texmf-dist/scripts ]]; then
+     find "$pkgdir"/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
    fi
 }
diff --git a/libre/texlive-fontsextra/texlive-fontsextra.maps b/libre/texlive-fontsextra/texlive-fontsextra.maps
index 841272892..72137755b 100644
--- a/libre/texlive-fontsextra/texlive-fontsextra.maps
+++ b/libre/texlive-fontsextra/texlive-fontsextra.maps
@@ -1,5 +1,6 @@
 Map Acorn.map
 Map Alegreya.map
+Map AlgolRevived.map
 Map AnnSton.map
 Map AnonymousPro.map
 Map ArrowsADF.map
@@ -9,32 +10,42 @@ Map BaskervilleF.map
 Map BulletsADF.map
 Map Carrickc.map
 Map Chivo.map
+Map Clara.map
 Map ClearSans.map
 Map Cochineal.map
 Map Coelacanth.map
 Map ComicNeue.map
 Map ComicNeueAngular.map
 Map CormorantGaramond.map
-Map CountriesOfEurope.map
+Map CrimsonPro.map
 Map DSSerif.map
+Map Domitian.map
 Map EBGaramond-Maths.map
 Map EBGaramond.map
 Map ESSTIX.map
+Map ETbb.map
 Map Eichenla.map
 Map Eileen.map
 Map EileenBl.map
 Map Elzevier.map
+Map GaramondLibre.map
 Map GotIn.map
 Map GoudyIn.map
 Map Heuristica.map
+Map InriaSans.map
+Map InriaSerif.map
+Map Junicode.map
 Map Kinigcap.map
 Map Konanur.map
 Map Kramer.map
 Map LibreBaskerville.map
 Map LibreBodoni.map
 Map LibreCaslon.map
+Map LibreFranklin.map
+Map LinguisticsPro.map
 Map LobsterTwo.map
 Map MnSymbol.map
+Map Montserrat.map
 Map MorrisIn.map
 Map Nouveaud.map
 Map OldStandard.map
@@ -45,18 +56,23 @@ Map Romantik.map
 Map Rosario.map
 Map Rothdn.map
 Map RoyalIn.map
+Map STEP.map
 Map Sanremo.map
+Map ScholaX.map
 Map SourceCodePro.map
 Map SourceSansPro.map
 Map SourceSerifPro.map
 Map Starburst.map
 Map SticksTooText.map
 Map TXUprCal.map
+Map TheanoDidot.map
+Map TheanoModern.map
+Map TheanoOldStyle.map
 Map Typocaps.map
 Map XCharter.map
 Map Zallman.map
 Map accanthis.map
-Map algolrevived.map
+Map almendra.map
 Map antt.map
 Map ap.map
 Map archaicprw.map
@@ -72,6 +88,7 @@ Map belleek.map
 Map bera.map
 Map beuron.map
 Map bguq.map
+Map bitter.map
 Map boondox.map
 Map cabin.map
 Map caladea.map
@@ -86,12 +103,16 @@ Map cmexb.map
 Map cmin.map
 Map cmsrb.map
 Map comfortaa.map
+Map countriesofeurope.map
 Map crimson.map
+Map cuprum.map
 Map cyklop.map
 Map dante.map
 Map dejavu-type1.map
 Map dictsym.map
-Map droid.map
+Map droidsans.map
+Map droidsansmono.map
+Map droidserif.map
 Map dstroke.map
 Map dutchcal.map
 Map epigrafica.map
@@ -107,6 +128,7 @@ Map foekfont.map
 Map fonetika.map
 Map fontawesome.map
 Map fontawesome5.map
+Map forum.map
 Map fourier-utopia-expert.map
 Map fourier.map
 Map frcursive.map
@@ -133,6 +155,7 @@ Map libertinegc.map
 Map libertinus.map
 Map libertinust1math.map
 Map linearA.map
+Map marcellus.map
 Map mathabx.map
 Map mdbch.map
 Map mdgreek.map
@@ -145,7 +168,6 @@ Map mdugm.map
 Map merriweather.map
 Map miama.map
 Map mintspirit.map
-Map montserrat.map
 Map newpx.map
 Map newtx.map
 Map newtxsf.map
@@ -196,6 +218,7 @@ Map zi4.map
 MixedMap allrunes.map
 MixedMap bbold.map
 MixedMap cmll.map
+MixedMap cmupint.map
 MixedMap hfbright.map
 MixedMap lxfonts.map
 MixedMap pigpen.map