6 files changed, 44 insertions, 38 deletions
diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD
index a53fcdf1c..67bd9677f 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 280614 2016-11-13 08:36:20Z remy $
+# $Id: PKGBUILD 281690 2016-11-21 06:27:04Z remy $
 # Maintainer (Arch): Rémy Oudompheng <remy@archlinux.org>
 # Contributor (Arch): francois <francois.archlinux.org>
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
@@ -7,7 +7,7 @@
 
 pkgname=texlive-bin
 pkgver=2016.41290
-pkgrel=7.parabola1
+pkgrel=8.parabola1
 license=('GPL')
 arch=('i686' 'x86_64' 'armv7h')
 makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler=0.47.0'
@@ -20,12 +20,15 @@ source=("https://sources.archlinux.org/other/texlive/texlive-bin-source-${pkgver
         "mktexlsr.script"
         "texlive-updmap.hook"
         "texlive-updmap.script"
-)
+        "texlive-fmtutil.hook"
+        "texlive-fmtutil.script")
 md5sums=('7303361f2d441eb5c962a996fd77e8fa'
-         '7bc9cef52d3b0c15d2364b7d8658faa6'
+         'a4e54f0cb05f401728b2b230fd63b300'
          '2bbbef810687f4b2804a4b8cb91ce02f'
-         'c18cbbd000aac60813b1695aa058964f'
-         'c64d77b5111a26b9995263b49df4937c')
+         '0ecdbd88cae12dbeb5d0d63127c5fc38'
+         'c64d77b5111a26b9995263b49df4937c'
+         '582af708588fd09eeaa0f08111e60091'
+         '3f05fa08f84b94fcb3a76be271116a95')
 
 build() {
    cd "$srcdir"
@@ -110,7 +113,6 @@ package() {
    replaces=('texlive-bin-libre' 'texlive-bin-parabola')
    optdepends=('ed: for texconfig'
                'biber: for bibliography processing')
-   install="texlive.install"
    options=('!strip')
 
    cd "$srcdir"
@@ -161,8 +163,10 @@ package() {
    ## install pacman hooks
    install -D -m644 ${srcdir}/mktexlsr.hook "$pkgdir/usr/share/libalpm/hooks/mktexlsr.hook"
    install -D -m644 ${srcdir}/texlive-updmap.hook "$pkgdir/usr/share/libalpm/hooks/texlive-updmap.hook"
+   install -D -m644 ${srcdir}/texlive-fmtutil.hook "$pkgdir/usr/share/libalpm/hooks/texlive-fmtutil.hook"
    install -D -m755 ${srcdir}/mktexlsr.script "$pkgdir/usr/share/libalpm/scripts/mktexlsr"
    install -D -m755 ${srcdir}/texlive-updmap.script "$pkgdir/usr/share/libalpm/scripts/texlive-updmap"
+   install -D -m755 ${srcdir}/texlive-fmtutil.script "$pkgdir/usr/share/libalpm/scripts/texlive-fmtutil"
 
    #############################################################
    # remove dangling symlinks
diff --git a/libre/texlive-bin/mktexlsr.hook b/libre/texlive-bin/mktexlsr.hook
index 5ce4cc929..f1a3b8b38 100644
--- a/libre/texlive-bin/mktexlsr.hook
+++ b/libre/texlive-bin/mktexlsr.hook
@@ -3,6 +3,7 @@ Type = File
 Operation = Install
 Operation = Upgrade
 Operation = Remove
+Target = usr/bin/mktexlsr
 Target = etc/texmf/*
 Target = usr/share/texmf/*
 Target = usr/share/texmf-dist/*
diff --git a/libre/texlive-bin/texlive-fmtutil.hook b/libre/texlive-bin/texlive-fmtutil.hook
new file mode 100644
index 000000000..cb5bcc932
--- /dev/null
+++ b/libre/texlive-bin/texlive-fmtutil.hook
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = var/lib/texmf/arch/installedpkgs/*.fmts
+
+[Action]
+Description = Updating TeXLive format files...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/texlive-fmtutil
+
diff --git a/libre/texlive-bin/texlive-fmtutil.script b/libre/texlive-bin/texlive-fmtutil.script
new file mode 100644
index 000000000..0e3b94393
--- /dev/null
+++ b/libre/texlive-bin/texlive-fmtutil.script
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+FMTUTIL="etc/texmf/web2c/fmtutil.cnf"
+FMTUTILLOCAL="etc/texmf/web2c/fmtutil-local.cnf"
+
+cp usr/share/texmf-dist/web2c/fmtutil-hdr.cnf $FMTUTIL
+for file in var/lib/texmf/arch/installedpkgs/*.fmts; do
+    echo >> $FMTUTIL
+    echo "# $file" >> $FMTUTIL
+    cat $file >> $FMTUTIL
+done
+if [[ -f "$FMTUTILLOCAL" ]]; then
+    echo >> $FMTUTIL
+    echo "# $FMTUTILLOCAL" >> $FMTUTIL
+    cat "$FMTUTILLOCAL" >> $FMTUTIL
+fi
+
+/usr/bin/fmtutil-sys --all --cnffile $FMTUTIL > /dev/null
+
diff --git a/libre/texlive-bin/texlive-updmap.hook b/libre/texlive-bin/texlive-updmap.hook
index 7b8798a0c..8bacce9a1 100644
--- a/libre/texlive-bin/texlive-updmap.hook
+++ b/libre/texlive-bin/texlive-updmap.hook
@@ -3,6 +3,7 @@ Type = File
 Operation = Install
 Operation = Upgrade
 Operation = Remove
+Target = usr/bin/tex
 Target = var/lib/texmf/arch/installedpkgs/*.maps
 
 [Action]
diff --git a/libre/texlive-bin/texlive.install b/libre/texlive-bin/texlive.install
deleted file mode 100644
index 22d2ad1fb..000000000
--- a/libre/texlive-bin/texlive.install
+++ /dev/null
@@ -1,31 +0,0 @@
-post_install() {
-  if [[ -f usr/bin/mktexlsr ]]; then
-    echo    ">>> texlive: updating the filename database..."
-    usr/bin/mktexlsr
-  fi
-  if [[ -f usr/bin/fmtutil-sys ]]; then
-    echo -n   "creating all formats..."
-    usr/bin/fmtutil-sys --all 1>/dev/null
-    echo      " done." 
-    echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-  fi
-}
-
-post_upgrade() {
-  local corename corever _pacout
-  if [[ -f usr/bin/mktexlsr ]]; then
-    echo    ">>> texlive: updating the filename database..."
-    usr/bin/mktexlsr
-  fi
-  _pacout=$(pacman -Q texlive-core 2>/dev/null)
-  read corename corever <<< ${_pacout}
-  # only recreate formats if texlive-core has right version
-  if [[ ${corever} == 2016* ]]; then
-      if [[ -f usr/bin/fmtutil-sys ]]; then
-        echo -n   "recreating all formats..."
-        usr/bin/fmtutil-sys --all 1>/dev/null
-        echo      " done." 
-        echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-      fi
-  fi
-}