From 00d01d46a9b512973c7d4b0f07436e0e82e5dae0 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 4 Sep 2014 19:19:54 -0300
Subject: texlive-fontsextra: remove libre suffix and add complex pkgrel

---
 libre/texlive-fontsextra-libre/PKGBUILD            |  69 ---------
 .../texlive-fontsextra.maps                        | 158 ---------------------
 libre/texlive-fontsextra-libre/texlive.install     |  52 -------
 libre/texlive-fontsextra/PKGBUILD                  |  68 +++++++++
 libre/texlive-fontsextra/texlive-fontsextra.maps   | 158 +++++++++++++++++++++
 libre/texlive-fontsextra/texlive.install           |  52 +++++++
 6 files changed, 278 insertions(+), 279 deletions(-)
 delete mode 100644 libre/texlive-fontsextra-libre/PKGBUILD
 delete mode 100644 libre/texlive-fontsextra-libre/texlive-fontsextra.maps
 delete mode 100644 libre/texlive-fontsextra-libre/texlive.install
 create mode 100644 libre/texlive-fontsextra/PKGBUILD
 create mode 100644 libre/texlive-fontsextra/texlive-fontsextra.maps
 create mode 100644 libre/texlive-fontsextra/texlive.install

diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
deleted file mode 100644
index c678527ed..000000000
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Maintainer (Arch): Rémy Oudompheng <remy.archlinux.org>
-# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# Contributor: André Silva <emulatorman@parabola.nu>
-
-pkgname=texlive-fontsextra-libre
-_pkgname=texlive-fontsextra
-pkgver=2014.34817
-_revnr=${pkgver#2014.}
-pkgrel=1
-pkgdesc="TeX Live - all sorts of extra fonts, without nonfree add-on packages"
-license=('GPL')
-arch=(any)
-depends=('texlive-core')
-groups=('texlive-most')
-replaces=('texlive-fontsextra')
-conflicts=('texlive-fontsextra')
-provides=('texlive-fontsextra')
-url='http://tug.org/texlive/'
-mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip")
-noextract=("$_pkgname-$pkgver-src.zip")
-source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps")
-options=('!emptydirs')
-install=texlive.install
-mkmd5sums=('2094b82201b22a816f3b6fe09f373818')
-md5sums=('235925b615932426986d3c88bebe8a21'
-         '77a2d0f39da91c06a2e9ab6a230fe390')
-
-mksource() {
-   mkdir $_pkgname-$pkgver
-   pushd $_pkgname-$pkgver
-   bsdtar xfv ../$_pkgname-$pkgver-src.zip
-
-   # remove nonfree packages
-   # No specific free license.
-   rm -v ogham.tar.xz
-   # Remove them from package list.
-   sed -ri '/^ogham /d' CONTENTS
-
-   popd
-}
-
-build() {
-   cd $srcdir/$_pkgname-$pkgver
-   for p in *.tar.xz; do
-	   bsdtar -xf $p
-   done
-   rm -rf {tlpkg,doc,source} || true
-}
-
-package() {
-   cd $srcdir/$_pkgname-$pkgver
-   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 -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/'{}' \;
-   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/'{}' \;
-   fi
-   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-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
deleted file mode 100644
index e307c1303..000000000
--- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
+++ /dev/null
@@ -1,158 +0,0 @@
-Map Acorn.map
-Map Alegreya.map
-Map AnnSton.map
-Map AnonymousPro.map
-Map ArrowsADF.map
-Map ArtNouv.map
-Map ArtNouvc.map
-Map Baskervaldx.map
-Map BulletsADF.map
-Map Carrickc.map
-Map ClearSans.map
-Map CountriesOfEurope.map
-Map EBGaramond.map
-Map ESSTIX.map
-Map Eichenla.map
-Map Eileen.map
-Map EileenBl.map
-Map Elzevier.map
-Map GotIn.map
-Map GoudyIn.map
-Map Heuristica.map
-Map Kinigcap.map
-Map Konanur.map
-Map Kramer.map
-Map LibreBaskerville.map
-Map LibreCaslon.map
-Map LobsterTwo.map
-Map MnSymbol.map
-Map MorrisIn.map
-Map Nouveaud.map
-Map OrnementsADF.map
-Map PlayfairDisplay.map
-Map Raleway.map
-Map Romantik.map
-Map Rothdn.map
-Map RoyalIn.map
-Map Sanremo.map
-Map SourceCodePro.map
-Map SourceSansPro.map
-Map Starburst.map
-Map Typocaps.map
-Map XCharter.map
-Map Zallman.map
-Map accanthis.map
-Map antt.map
-Map ap.map
-Map archaicprw.map
-Map arev.map
-Map ascii.map
-Map aspectratio.map
-Map augie.map
-Map auncial.map
-Map aurical.map
-Map belleek.map
-Map bera.map
-Map bguq.map
-Map boondox.map
-Map cabin.map
-Map calligra.map
-Map cantarell.map
-Map ccicons.map
-Map cinzel.map
-Map clm.map
-Map cm-lgc.map
-Map cmin.map
-Map comfortaa.map
-Map cyklop.map
-Map dejavu-type1.map
-Map dictsym.map
-Map droid.map
-Map dstroke.map
-Map dutchcal.map
-Map epigrafica.map
-Map esvect.map
-Map fbb.map
-Map fdsymbol.map
-Map fetamont.map
-Map fge.map
-Map fira.map
-Map foekfont.map
-Map fonetika.map
-Map fourier-utopia-expert.map
-Map fourier.map
-Map frcursive.map
-Map gentium-type1.map
-Map gfsartemisia.map
-Map gfsbodoni.map
-Map gfscomplutum.map
-Map gfsdidot.map
-Map gfsneohellenic.map
-Map gfssolomos.map
-Map gillius.map
-Map gptimes.map
-Map hacm.map
-Map icelandic.map
-Map ipaex-type1.map
-Map iwona.map
-Map kpfonts.map
-Map kurier.map
-Map lato.map
-Map libertine.map
-Map linearA.map
-Map mathabx.map
-Map mdbch.map
-Map mdgreek.map
-Map mdici.map
-Map mdpgd.map
-Map mdpus.map
-Map mdput.map
-Map mdsymbol.map
-Map mdugm.map
-Map merriweather.map
-Map mintspirit.map
-Map newpx.map
-Map newtx.map
-Map newtxtt.map
-Map ocrb.map
-Map opensans.map
-Map overlock.map
-Map paratype-type1.map
-Map pbsi.map
-Map phaistos.map
-Map prodint.map
-Map pxtx.map
-Map quattrocento.map
-Map recycle.map
-Map roboto.map
-Map rsfso.map
-Map sansmathaccent.map
-Map sansmathfonts.map
-Map sqrcaps.map
-Map starfont.map
-Map stix.map
-Map superiors.map
-Map tfrupee.map
-Map uaq.map
-Map ugq.map
-Map universalis.map
-Map ybd.map
-Map ybv.map
-Map yes.map
-Map yfrak.map
-Map yly.map
-Map yrd.map
-Map yv1.map
-Map yv2.map
-Map yv3.map
-Map yvo.map
-Map yvt.map
-Map zi4.map
-MixedMap allrunes.map
-MixedMap bbold.map
-MixedMap cmll.map
-MixedMap hfbright.map
-MixedMap lxfonts.map
-MixedMap pigpen.map
-MixedMap semaf.map
-MixedMap trajan.map
diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra-libre/texlive.install
deleted file mode 100644
index bfd2222a0..000000000
--- a/libre/texlive-fontsextra-libre/texlive.install
+++ /dev/null
@@ -1,52 +0,0 @@
-PKGNAME="texlive-fontsextra"
-UPDMAP="etc/texmf/web2c/updmap.cfg"
-UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg"
-SYNCWITHTREES=''
-
-MAPFILE="var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
-
-post_install() {
-  TMPFILE=`mktemp`
-  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
-  cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
-  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
-  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
-  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo    ">>> texlive: updating the fontmap files with updmap..."
-  usr/bin/updmap-sys --quiet --nohash
-  echo    " done." 
-}
-
-post_upgrade() {
-  TMPFILE=`mktemp`
-  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
-  cp "$UPDMAP" "$TMPFILE"
-  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
-  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
-  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
-  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo    ">>> texlive: updating the fontmap files with updmap..."
-  usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
-  echo    " done." 
-}
-
-pre_remove() {
-for m in `cut -d' ' -f2 $MAPFILE`; do 
-  sed -i "/\s$m/d" $UPDMAP ; 
-done
-}
-
-post_remove() {
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo    ">>> texlive: updating the fontmap files with updmap..."
-  usr/bin/updmap-sys --quiet --nohash
-  echo    " done." 
-}
diff --git a/libre/texlive-fontsextra/PKGBUILD b/libre/texlive-fontsextra/PKGBUILD
new file mode 100644
index 000000000..9947d4baa
--- /dev/null
+++ b/libre/texlive-fontsextra/PKGBUILD
@@ -0,0 +1,68 @@
+# Maintainer (Arch): Rémy Oudompheng <remy.archlinux.org>
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: André Silva <emulatorman@parabola.nu>
+
+_pkgname=texlive-fontsextra-libre
+pkgname=texlive-fontsextra
+pkgver=2014.34817
+_revnr=${pkgver#2014.}
+pkgrel=1.parabola1
+pkgdesc="TeX Live - all sorts of extra fonts, without nonfree add-on packages"
+license=('GPL')
+arch=(any)
+depends=('texlive-core')
+groups=('texlive-most')
+replaces=('texlive-fontsextra-libre')
+conflicts=('texlive-fontsextra-libre')
+url='http://tug.org/texlive/'
+mksource=("ftp://ftp.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip")
+noextract=("$pkgname-$pkgver-src.zip")
+source=("https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz" "$pkgname.maps")
+options=('!emptydirs')
+install=texlive.install
+mkmd5sums=('2094b82201b22a816f3b6fe09f373818')
+md5sums=('235925b615932426986d3c88bebe8a21'
+         '77a2d0f39da91c06a2e9ab6a230fe390')
+
+mksource() {
+   mkdir $pkgname-$pkgver
+   pushd $pkgname-$pkgver
+   bsdtar xfv ../$pkgname-$pkgver-src.zip
+
+   # remove nonfree packages
+   # No specific free license.
+   rm -v ogham.tar.xz
+   # Remove them from package list.
+   sed -ri '/^ogham /d' CONTENTS
+
+   popd
+}
+
+build() {
+   cd $srcdir/$pkgname-$pkgver
+   for p in *.tar.xz; do
+	   bsdtar -xf $p
+   done
+   rm -rf {tlpkg,doc,source} || true
+}
+
+package() {
+   cd $srcdir/$pkgname-$pkgver
+   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 -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/'{}' \;
+   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/'{}' \;
+   fi
+   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
new file mode 100644
index 000000000..e307c1303
--- /dev/null
+++ b/libre/texlive-fontsextra/texlive-fontsextra.maps
@@ -0,0 +1,158 @@
+Map Acorn.map
+Map Alegreya.map
+Map AnnSton.map
+Map AnonymousPro.map
+Map ArrowsADF.map
+Map ArtNouv.map
+Map ArtNouvc.map
+Map Baskervaldx.map
+Map BulletsADF.map
+Map Carrickc.map
+Map ClearSans.map
+Map CountriesOfEurope.map
+Map EBGaramond.map
+Map ESSTIX.map
+Map Eichenla.map
+Map Eileen.map
+Map EileenBl.map
+Map Elzevier.map
+Map GotIn.map
+Map GoudyIn.map
+Map Heuristica.map
+Map Kinigcap.map
+Map Konanur.map
+Map Kramer.map
+Map LibreBaskerville.map
+Map LibreCaslon.map
+Map LobsterTwo.map
+Map MnSymbol.map
+Map MorrisIn.map
+Map Nouveaud.map
+Map OrnementsADF.map
+Map PlayfairDisplay.map
+Map Raleway.map
+Map Romantik.map
+Map Rothdn.map
+Map RoyalIn.map
+Map Sanremo.map
+Map SourceCodePro.map
+Map SourceSansPro.map
+Map Starburst.map
+Map Typocaps.map
+Map XCharter.map
+Map Zallman.map
+Map accanthis.map
+Map antt.map
+Map ap.map
+Map archaicprw.map
+Map arev.map
+Map ascii.map
+Map aspectratio.map
+Map augie.map
+Map auncial.map
+Map aurical.map
+Map belleek.map
+Map bera.map
+Map bguq.map
+Map boondox.map
+Map cabin.map
+Map calligra.map
+Map cantarell.map
+Map ccicons.map
+Map cinzel.map
+Map clm.map
+Map cm-lgc.map
+Map cmin.map
+Map comfortaa.map
+Map cyklop.map
+Map dejavu-type1.map
+Map dictsym.map
+Map droid.map
+Map dstroke.map
+Map dutchcal.map
+Map epigrafica.map
+Map esvect.map
+Map fbb.map
+Map fdsymbol.map
+Map fetamont.map
+Map fge.map
+Map fira.map
+Map foekfont.map
+Map fonetika.map
+Map fourier-utopia-expert.map
+Map fourier.map
+Map frcursive.map
+Map gentium-type1.map
+Map gfsartemisia.map
+Map gfsbodoni.map
+Map gfscomplutum.map
+Map gfsdidot.map
+Map gfsneohellenic.map
+Map gfssolomos.map
+Map gillius.map
+Map gptimes.map
+Map hacm.map
+Map icelandic.map
+Map ipaex-type1.map
+Map iwona.map
+Map kpfonts.map
+Map kurier.map
+Map lato.map
+Map libertine.map
+Map linearA.map
+Map mathabx.map
+Map mdbch.map
+Map mdgreek.map
+Map mdici.map
+Map mdpgd.map
+Map mdpus.map
+Map mdput.map
+Map mdsymbol.map
+Map mdugm.map
+Map merriweather.map
+Map mintspirit.map
+Map newpx.map
+Map newtx.map
+Map newtxtt.map
+Map ocrb.map
+Map opensans.map
+Map overlock.map
+Map paratype-type1.map
+Map pbsi.map
+Map phaistos.map
+Map prodint.map
+Map pxtx.map
+Map quattrocento.map
+Map recycle.map
+Map roboto.map
+Map rsfso.map
+Map sansmathaccent.map
+Map sansmathfonts.map
+Map sqrcaps.map
+Map starfont.map
+Map stix.map
+Map superiors.map
+Map tfrupee.map
+Map uaq.map
+Map ugq.map
+Map universalis.map
+Map ybd.map
+Map ybv.map
+Map yes.map
+Map yfrak.map
+Map yly.map
+Map yrd.map
+Map yv1.map
+Map yv2.map
+Map yv3.map
+Map yvo.map
+Map yvt.map
+Map zi4.map
+MixedMap allrunes.map
+MixedMap bbold.map
+MixedMap cmll.map
+MixedMap hfbright.map
+MixedMap lxfonts.map
+MixedMap pigpen.map
+MixedMap semaf.map
+MixedMap trajan.map
diff --git a/libre/texlive-fontsextra/texlive.install b/libre/texlive-fontsextra/texlive.install
new file mode 100644
index 000000000..bfd2222a0
--- /dev/null
+++ b/libre/texlive-fontsextra/texlive.install
@@ -0,0 +1,52 @@
+PKGNAME="texlive-fontsextra"
+UPDMAP="etc/texmf/web2c/updmap.cfg"
+UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg"
+SYNCWITHTREES=''
+
+MAPFILE="var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
+
+post_install() {
+  TMPFILE=`mktemp`
+  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
+  cp "$UPDMAP" "$TMPFILE"
+  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
+  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
+  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
+  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
+  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
+  echo    ">>> texlive: updating the filename database..."
+  usr/bin/mktexlsr
+  echo    ">>> texlive: updating the fontmap files with updmap..."
+  usr/bin/updmap-sys --quiet --nohash
+  echo    " done." 
+}
+
+post_upgrade() {
+  TMPFILE=`mktemp`
+  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
+  cp "$UPDMAP" "$TMPFILE"
+  echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
+  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
+  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
+  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
+  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
+  echo    ">>> texlive: updating the filename database..."
+  usr/bin/mktexlsr
+  echo    ">>> texlive: updating the fontmap files with updmap..."
+  usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
+  echo    " done." 
+}
+
+pre_remove() {
+for m in `cut -d' ' -f2 $MAPFILE`; do 
+  sed -i "/\s$m/d" $UPDMAP ; 
+done
+}
+
+post_remove() {
+  echo    ">>> texlive: updating the filename database..."
+  usr/bin/mktexlsr
+  echo    ">>> texlive: updating the fontmap files with updmap..."
+  usr/bin/updmap-sys --quiet --nohash
+  echo    " done." 
+}
-- 
cgit v1.2.3