Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 104 insertions, 119 deletions

diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index a002aa3f7..b35911f2c 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,16 +1,18 @@
-# $Id: PKGBUILD 185904 2013-05-19 18:27:14Z remy $
+# $Id: PKGBUILD 193968 2013-09-09 10:10:47Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: francois <francois.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=texlive-bin-libre
-pkgver=2012.0
-pkgrel=12
+pkgver=2013.30973
+pkgrel=4
 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('t1lib' 'gd' 'poppler>=0.22.0' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2')
+depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.24.0'
+         'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
+         'icu' 'harfbuzz' 'harfbuzz-icu')
 makedepends=('perl' 'clisp' 'ffcall')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
@@ -19,34 +21,11 @@ replaces=('texlive-bin')
 options=('!libtool' '!strip')
 url='http://tug.org/texlive/'
 install="texlive.install"
-source=('texmf.cnf'
-        'fix-fontforge-encoding.patch'
-        '09-texlive-fonts.conf'
-        'poppler-0.20.patch'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz'
-        'luatex-r4449-radical-rule-thickness.patch'
+source=('fix-fontforge-encoding.patch'
+        "http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
 )
-backup=(etc/texmf/web2c/texmf.cnf \
-    etc/texmf/chktex/chktexrc \
-	etc/texmf/dvipdfm/config/config \
-	etc/texmf/dvipdfmx/dvipdfmx.cfg \
-	etc/texmf/dvips/config/config.ps \
-	etc/texmf/tex/generic/config/language.dat \
-	etc/texmf/tex/generic/config/language.def \
-	etc/texmf/tex/generic/config/pdftexconfig.tex \
-	etc/texmf/ttf2pk/ttf2pk.cfg \
-	etc/texmf/web2c/fmtutil.cnf \
-	etc/texmf/web2c/mktex.cnf \
-	etc/texmf/xdvi/XDvi)
-
-md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
-         'bfb9716aa00c86c08cd31e5b32edeb98'
-         '393a4bf67adc7ca5df2b386759d1a637'
-         'e3a664d5a7f0923f35060fe9d25d2573'
-         'ac2c3c3aa765581f8504e21a5edbfb9f'
-         'f315a860158cfc952c82a6d759961024'
-         '5190f3295eb9a604c5f17f5bd607299b')
+md5sums=('bfb9716aa00c86c08cd31e5b32edeb98'
+         '0a8ffd5c0002a080a4202057b1f106c6')
 
 build() {
    cd "$srcdir"
@@ -57,12 +36,7 @@ build() {
    fi
 
    # this patch removes spurious error message with locale "xx_YY.utf8"
-   patch -Np0 -i fix-fontforge-encoding.patch
-   # fix build with poppler >= 0.20
-   patch -Np0 -i poppler-0.20.patch
-   # fix radical rule thickness regression in Luatex
-   # http://tex.stackexchange.com/q/61952/729
-   patch -Np0 -i luatex-r4449-radical-rule-thickness.patch
+   #patch -Np0 -i fix-fontforge-encoding.patch
    # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
    sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c
    #############################################################
@@ -98,7 +72,11 @@ build() {
      --with-system-poppler \
      --with-system-xpdf \
      --with-system-freetype2 \
-     --without-system-graphite \
+     --with-system-pixman \
+     --with-system-cairo \
+     --with-system-harfbuzz \
+     --with-system-graphite \
+     --with-system-icu \
      --with-freetype2-libdir=/usr/lib \
      --with-freetype2-include=/usr/include/freetype2 \
      --with-xdvi-x-toolkit=xaw \
@@ -117,64 +95,6 @@ build() {
 
 package() {
    cd "$srcdir"
-   #############################################################
-   ### install texmf tree
-   echo "-------------------------------------------------------"
-   echo "--> installing the texmf tree"
-   echo "-------------------------------------------------------"
-   install -m755 -d "$pkgdir"/usr/share
-   cp -r texmf "$pkgdir"/usr/share/
-   install -d -m755 "$pkgdir"/etc/texmf/web2c
-   install -d -m755 "$pkgdir"/etc/texmf/chktex
-   install -d -m755 "$pkgdir"/etc/texmf/dvips/config
-   install -d -m755 "$pkgdir"/etc/texmf/dvipdfm/config
-   install -d -m755 "$pkgdir"/etc/texmf/dvipdfmx
-   install -d -m755 "$pkgdir"/etc/texmf/tex/generic/config
-   install -d -m755 "$pkgdir"/etc/texmf/ttf2pk
-   install -d -m755 "$pkgdir"/etc/texmf/xdvi
-   install -d -m755 "$pkgdir"/etc/fonts/conf.avail
-   install -m644 "$srcdir"/09-texlive-fonts.conf "$pkgdir"/etc/fonts/conf.avail/
-   # move man files to /usr/share/man
-   for i in 1 5; do
-     install -d -m755 "$pkgdir"/usr/share/man/man$i
-     mv "$pkgdir"/usr/share/texmf/doc/man/man$i/*.$i "$pkgdir"/usr/share/man/man$i/
-   done
-   # move info files to /usr/share/info
-   install -d -m755 "$pkgdir"/usr/share/info
-   mv "$pkgdir"/usr/share/texmf/doc/info/*.info "$pkgdir"/usr/share/info/
-   rm -rf "$pkgdir"/usr/share/texmf/doc/{man,info}
-   # copy config files to $TEXMFCONFIG tree
-   cp -a "$pkgdir"/usr/share/texmf/chktex/chktexrc \
-     	"$pkgdir"/etc/texmf/chktex/
-   cp -a "$pkgdir"/usr/share/texmf/web2c/mktex.cnf \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf/web2c/updmap.cfg \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf/dvips/config/config.ps \
-   	  "$pkgdir"/etc/texmf/dvips/config/
-   cp -a "$pkgdir"/usr/share/texmf/dvipdfm/config/config \
-   	  "$pkgdir"/etc/texmf/dvipdfm/config/
-   cp -a "$pkgdir"/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
-   	  "$pkgdir"/etc/texmf/dvipdfmx/
-   cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.dat \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.def \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf/ttf2pk/ttf2pk.cfg \
-   	  "$pkgdir"/etc/texmf/ttf2pk/
-   cp -a "$pkgdir"/usr/share/texmf/xdvi/XDvi \
-   	  "$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
-   # Don't list formats which need removed packages to work.
-   sed -i '/csplain\|mex\|jadetex/d' "$pkgdir"/etc/texmf/web2c/fmtutil.cnf
 
    #############################################################
    ### install
@@ -189,61 +109,104 @@ package() {
    make DESTDIR="${pkgdir}" texmf="$pkgdir"/usr/share/texmf install
    rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist}
 
-   # replace upstream texmf.cnf with ours
-   rm -f "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
-   install -m644 "$srcdir"/texmf.cnf "$pkgdir"/etc/texmf/web2c/texmf.cnf
-   # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c
-   # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter
-   ln -sf /etc/texmf/web2c/texmf.cnf "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
-   # fix location of TEXMFCACHE for luatools
-   sed -i 's#texlive2010#texlive#' "$pkgdir"/usr/share/texmf/web2c/texmfcnf.lua
-   ## remove aleph from fmtutil.cnf
-   sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf
-
    ## install Perl libraries
    mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive
    install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "${pkgdir}/usr/share/tlpkg/TeXLive"
 
-   # create symlinks for formats 
-   echo "--> Create symlinks for TeX formats ..."
-   PATH="$PATH:${pkgdir}/usr/bin" texlinks -f "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf "$pkgdir"/usr/bin/
+   ## symlink engines by hand. texlinks has moved to texlive-core...
+   mkdir -p ${pkgdir}/usr/bin
+   ln -s eptex ${pkgdir}/usr/bin/platex
+   ln -s euptex ${pkgdir}/usr/bin/uplatex
+   ln -s luatex ${pkgdir}/usr/bin/dvilualatex
+   ln -s luatex ${pkgdir}/usr/bin/dviluatex
+   ln -s luatex ${pkgdir}/usr/bin/lualatex
+   ln -s pdftex ${pkgdir}/usr/bin/amstex
+   ln -s pdftex ${pkgdir}/usr/bin/cslatex
+   ln -s pdftex ${pkgdir}/usr/bin/csplain
+   ln -s pdftex ${pkgdir}/usr/bin/eplain
+   ln -s pdftex ${pkgdir}/usr/bin/etex
+   ln -s pdftex ${pkgdir}/usr/bin/jadetex
+   ln -s pdftex ${pkgdir}/usr/bin/latex
+   ln -s pdftex ${pkgdir}/usr/bin/mex
+   ln -s pdftex ${pkgdir}/usr/bin/mllatex
+   ln -s pdftex ${pkgdir}/usr/bin/mltex
+   ln -s pdftex ${pkgdir}/usr/bin/pdfetex
+   ln -s pdftex ${pkgdir}/usr/bin/pdfcslatex
+   ln -s pdftex ${pkgdir}/usr/bin/pdfcsplain
+   ln -s pdftex ${pkgdir}/usr/bin/pdfjadetex
+   ln -s pdftex ${pkgdir}/usr/bin/pdflatex
+   ln -s pdftex ${pkgdir}/usr/bin/pdfmex
+   ln -s pdftex ${pkgdir}/usr/bin/pdfxmltex
+   ln -s pdftex ${pkgdir}/usr/bin/texsis
+   ln -s pdftex ${pkgdir}/usr/bin/utf8mex
+   ln -s pdftex ${pkgdir}/usr/bin/xmltex
+   ln -s xetex ${pkgdir}/usr/bin/xelatex
+
    #############################################################
    # remove dangling symlinks
    _bibtexextra_scripts="
 bibexport
 listbib
+multibibliography
 urlbst
 "
    _core_scripts="
+a2ping
+a5toa4
+adhocfilelist
 afm2afm
+allcm
+allec
+allneeded
+arara
 arlatex
 autoinst
 bundledoc
 checkcites
-cmap2enc
+chkweb
+context
 ctanify
 ctanupload
+ctxtools
 de-macro
+deweb
 dosepsbin
+dtxgen
+dvi2fax
 dviasm
+dvired
+e2pall
 epstopdf
 findhyph
-font2afm
+fmtutil
+fmtutil-sys
+fontinst
 fragmaster
 installfont-tl
+kpsepath
+kpsetool
+kpsewhere
+kpsexpand
 latex2man
 latexdiff
 latexdiff-vc
 latexfileversion
 latexmk
+latexpand
 latexrevise
 listings-ext.sh
+ltxfileinfo
+lua2dox_filter
+luaotfload-tool
+luatools
 match_parens
 mf2pt1
 mkjobtexmf
 mkluatexfontdb
 mkt1font
+mktexfmt
 mptopdf
+mtxrun
 ot2kpx
 pdf180
 pdf270
@@ -259,27 +222,49 @@ pdfjam-slides6up
 pdfjoin
 pdfnup
 pdfpun
-pfm2kpx
+pfarrei
 pkfix
 pkfix-helper
+ps2eps
+ps2frag
+pslatex
+pstopdf
 purifyeps
 repstopdf
 rpdfcrop
-showglyphs
+rungs
+simpdftex
 sty2dtx
+texconfig
+texconfig-dialog
+texconfig-sys
 texcount
 texdef
 texdiff
 texdirflatten
+texdoc
+texdoctk
+texexec
+texindy
+texlinks
 texliveonfly
 texloganalyser
-typeoutfileinfo
+texmfstart
 thumbpdf
+typeoutfileinfo
+updmap
+updmap-sys
 vpl2ovp
 vpl2vpl
+xindy
 "
    _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
-   _langcjk_scripts="convbkmk updmap-setup-kanji"
+   _langcyrillic_scripts="rubibtex rumakeindex"
+   _langcjk_scripts="convbkmk ptex2pdf
+kanji-fontmap-creator
+kanji-config-updmap
+kanji-config-updmap-sys
+"
    _langextra_scripts="ebong"
    _langgreek_scripts="mkgrkindex"
    _latexextra_scripts="
@@ -288,7 +273,6 @@ exceltex
 makeglossaries
 pdfannotextractor
 perltex
-ppower4
 ps4pdf
 splitindex
 svn-multi
@@ -302,6 +286,7 @@ vpe"
         ${_core_scripts}       \
         ${_htmlxml_scripts}    \
         ${_langcjk_scripts}    \
+        ${_langcyrillic_scripts} \
         ${_langextra_scripts}  \
         ${_langgreek_scripts}  \
         ${_latexextra_scripts} \
@@ -309,8 +294,8 @@ vpe"
         ${_pictures_scripts}   \
         ${_pstricks_scripts}   \
         ${_science_scripts}    \
-        tlmgr biber; do  # biber is not built from source
-     rm -f "$pkgdir"/usr/bin/$s
+        tlmgr; do
+       ! readlink -e "$pkgdir"/usr/bin/$s && rm "$pkgdir"/usr/bin/$s
    done
    ###################################################################
 }