texlive-core-2016.41843-1.parabola1: updating version

2 files changed, 14 insertions, 28 deletions

diff --git a/libre/texlive-core/PKGBUILD b/libre/texlive-core/PKGBUILD
index a536e7591..c31da6b5f 100644
--- a/libre/texlive-core/PKGBUILD
+++ b/libre/texlive-core/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 270246 2016-06-19 22:36:27Z remy $
+# $Id: PKGBUILD 273844 2016-08-16 05:46:07Z remy $
 # Maintainer (Arch): Rémy Oudompheng <remy@archlinux.org>
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva <emulatorman@parabola.nu>
 
 _pkgname=texlive-core-libre
 pkgname=texlive-core
-pkgver=2016.41471
+pkgver=2016.41843
 _revnr=${pkgver#2016.}
 pkgrel=1.parabola1
 pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)"
@@ -24,9 +24,9 @@ optdepends=(
   't1utils:     can be useful when installing Type1 fonts'
 )
 groups=('texlive-most')
-conflicts=('tetex' 'texlive-latex3' 'texlive-core-libre')
-provides=('tetex' 'texlive-latex3')
-replaces=('tetex' 'texlive-latex3' 'texlive-core-libre')
+conflicts=('tetex' 'texlive-latex3' 'pdfjam' 'texlive-core-libre')
+provides=('tetex' 'texlive-latex3' 'pdfjam')
+replaces=('tetex' 'texlive-latex3' 'pdfjam' 'texlive-core-libre')
 url='http://tug.org/texlive/'
 mksource=("https://sources.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip")
 noextract=("$pkgname-$pkgver-src.zip")
@@ -47,8 +47,8 @@ backup=(etc/texmf/web2c/texmf.cnf \
 	etc/texmf/web2c/fmtutil.cnf \
 	etc/texmf/web2c/mktex.cnf \
 	etc/texmf/xdvi/XDvi)
-mkmd5sums=('7e73ca95a2c2da5cb59af6fbb2aa40fe')
-md5sums=('17cfba40330928df99a4dfae8ad420e7'
+mkmd5sums=('84c8d40322b98dc10994f8e378d62640')
+md5sums=('3224500e7d52f824d42f966c7f61a83f'
          '54a34f8ddbeccec2427e4d5763349f9b'
          '00d2e495f34c4e055b70c0ba13fcd891'
          '16ad4dc53deb00029baef1b01ba1d984'
@@ -136,12 +136,15 @@ package() {
    # 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/
@@ -161,10 +164,6 @@ package() {
    	  "$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
@@ -174,8 +173,6 @@ package() {
    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 ..."
@@ -195,11 +192,6 @@ package() {
    #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"
  
diff --git a/libre/texlive-core/texlive.install b/libre/texlive-core/texlive.install
index 3b5e32a57..282186ad0 100644
--- a/libre/texlive-core/texlive.install
+++ b/libre/texlive-core/texlive.install
@@ -6,10 +6,7 @@ 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    ">>> 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
@@ -20,7 +17,7 @@ post_install() {
   # We need to remove directory "." from luatex cache to avoid absurd
   # behaviour.
   for item in var/lib/texmf/luatex-cache/context/*/trees/*.lua; do
-    grep -F '["root"]="."' "$item" >/dev/null && rm -vf "$item" "${item%.lua}.luc"
+    grep -F '["root"]="."' "$item" >/dev/null && rm -f "$item" "${item%.lua}.luc"
   done
   echo    ">>> texlive: updating the fontmap files with updmap..."
   usr/bin/updmap-sys --quiet --nohash
@@ -34,9 +31,6 @@ post_install() {
 }
 
 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
@@ -48,7 +42,7 @@ post_upgrade() {
    # We need to remove directory "." from luatex cache to avoid absurd
   # behaviour.
   for item in var/lib/texmf/luatex-cache/context/*/trees/*.lua; do
-    grep -F '["root"]="."' "$item" >/dev/null && rm -vf "$item" "${item%.lua}.luc"
+    grep -F '["root"]="."' "$item" >/dev/null && rm -f "$item" "${item%.lua}.luc"
   done
   echo    ">>> texlive: updating the fontmap files with updmap..."
   usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES