[arch-commits] Commit in texlive-core/trunk (PKGBUILD)

[Rémy Oudompheng]

    Date: Tuesday, August 16, 2016 @ 05:46:07
  Author: remy
Revision: 273844

Update to 2016.41843-1

Also clean up the PKGBUILD:
- fmtutil.cnf was not cleaned from aleph/lamda properly
- updmap commands were confusing and useless

Modified:
  texlive-core/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-16 05:44:41 UTC (rev 273843)
+++ PKGBUILD	2016-08-16 05:46:07 UTC (rev 273844)
@@ -2,7 +2,7 @@
 # Maintainer: Rémy Oudompheng <remy at archlinux.org>
 
 pkgname=texlive-core
-pkgver=2016.41471
+pkgver=2016.41843
 _revnr=${pkgver#2016.}
 pkgrel=1
 pkgdesc="TeX Live core distribution"
@@ -21,9 +21,9 @@
   't1utils:     can be useful when installing Type1 fonts'
 )
 groups=('texlive-most')
-conflicts=('tetex' 'texlive-latex3')
-provides=('tetex' 'texlive-latex3')
-replaces=('tetex' 'texlive-latex3')
+conflicts=('tetex' 'texlive-latex3' 'pdfjam')
+provides=('tetex' 'texlive-latex3' 'pdfjam')
+replaces=('tetex' 'texlive-latex3' 'pdfjam')
 url='http://tug.org/texlive/'
 source=("https://sources.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip"
         "$pkgname.maps"
@@ -42,7 +42,7 @@
 	etc/texmf/web2c/fmtutil.cnf \
 	etc/texmf/web2c/mktex.cnf \
 	etc/texmf/xdvi/XDvi)
-md5sums=('7e73ca95a2c2da5cb59af6fbb2aa40fe'
+md5sums=('84c8d40322b98dc10994f8e378d62640'
          '54a34f8ddbeccec2427e4d5763349f9b'
          'df537245012f3e5f05bdc55644b7a3df'
          '16ad4dc53deb00029baef1b01ba1d984'
@@ -93,12 +93,15 @@
    # Remove manpages (already in texlive-bin).
    rm -rf "$pkgdir"/usr/share/texmf-dist/doc/man
 
+   ## remove aleph from fmtutil.cnf
+   sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil.cnf
+
    # copy config files to $TEXMFCONFIG tree
    cp -a "$pkgdir"/usr/share/texmf-dist/chktex/chktexrc \
      	"$pkgdir"/etc/texmf/chktex/
    cp -a "$pkgdir"/usr/share/texmf-dist/web2c/mktex.cnf \
    	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf-dist/web2c/updmap.cfg \
+   cp -a "$pkgdir"/usr/share/texmf-dist/web2c/updmap-hdr.cfg \
    	  "$pkgdir"/etc/texmf/web2c/
    cp -a "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil.cnf \
    	  "$pkgdir"/etc/texmf/web2c/
@@ -118,11 +121,7 @@
    	  "$pkgdir"/etc/texmf/xdvi/
    # remove TL specific warnings in the language.{dat,def} files:
    sed -i -e '/DO NOT EDIT/,+3 d' "$pkgdir"/etc/texmf/tex/generic/config/language.*
-   # clean updmap.cfg
-   sed -i '/^\(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg
-   sed -i '/^#! \(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg
 
-
    # replace upstream texmf.cnf with ours
    rm -f "$pkgdir"/usr/share/texmf-dist/web2c/texmf.cnf
    install -m644 "$srcdir"/texmf.cnf "$pkgdir"/etc/texmf/web2c/texmf.cnf
@@ -131,8 +130,6 @@
    ln -sf /etc/texmf/web2c/texmf.cnf "$pkgdir"/usr/share/texmf-dist/web2c/texmf.cnf
    # replace upstream texmfcnf.lua with ours
    install -m644 "$srcdir"/texmfcnf.lua "$pkgdir"/usr/share/texmf-dist/web2c/texmfcnf.lua
-   ## remove aleph from fmtutil.cnf
-   sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil.cnf
 
    # create symlinks for formats 
    echo "--> Create symlinks for TeX formats ..."
@@ -152,11 +149,6 @@
    #cp -a $pkgdir/usr/share/texmf-dist/tex/context/config/cont-usr.tex \
    #	  $pkgdir/etc/texmf/tex/context/config/cont-usr.tex
    
-   # remove obsolete stuff (we don't provide the omega and aleph binaries anyway)
-   rm -f $pkgdir/usr/share/texmf-dist/tex/plain/config/{omega,aleph}.ini
-   #sed -i '/cherokee\.map/d; /oinuit\.map/d; /omega\.map/d' \
-   #    "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg"
-
    # remove upstream updmap.cfg: it contains too many maps.
    rm "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg"