Wed Jun 27 03:40:51 UTC 2012

9 files changed, 140 insertions, 174 deletions

diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 31b440c9d..68c71284c 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 159191 2012-05-17 14:36:30Z remy $
+# $Id: PKGBUILD 162397 2012-06-26 20:13:46Z 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 <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=texlive-bin-libre
-pkgver=2011.3
-_luatex_ver=0.70.1
-pkgrel=7
+pkgver=2012.0
+pkgrel=1
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib')
+depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2')
 makedepends=('perl' 'clisp' 'ffcall')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
@@ -23,11 +22,9 @@ install="texlive.install"
 source=('texmf.cnf'
         'fix-fontforge-encoding.patch'
         '09-texlive-fonts.conf'
-        'luatex-poppler-0.20.patch'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20111210.tar.xz'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20111210.tar.xz'
-        # "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2"
-        'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz'
+        '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'
 )
 backup=(etc/texmf/web2c/texmf.cnf \
   etc/texmf/chktex/chktexrc \
@@ -46,10 +43,9 @@ backup=(etc/texmf/web2c/texmf.cnf \
 md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
          'bfb9716aa00c86c08cd31e5b32edeb98'
          '393a4bf67adc7ca5df2b386759d1a637'
-         '52ce57c02e30a25036b6a3175c566b78'
-         'c7bb38c0ab30c2b64cf4cf83a736b35c'
-         '5d8f06a3683ce88a3c33e15f5ba6a858'
-         'e7f0197559ef865d8c01683dab3b8526')
+         'e3a664d5a7f0923f35060fe9d25d2573'
+         'ac2c3c3aa765581f8504e21a5edbfb9f'
+         'f315a860158cfc952c82a6d759961024')
 
 build() {
    if [ "${CARCH}" != "i686" ]; then
@@ -57,50 +53,11 @@ build() {
      export CXXFLAGS="${CXXFLAGS} -fPIC"
    fi
 
-   cd "$srcdir"
-   # Building LuaTeX
-   # cd luatex-beta-${_luatex_ver}
-   cd luatex
-   patch -p0 -i ../fix-fontforge-encoding.patch
-   patch -Np0 -i ../luatex-poppler-0.20.patch
-  (cd source && ./texk/web2c/luatexdir/getluatexsvnversion.sh)
-   mkdir build
-   cd build
-   ../source/configure --prefix=/usr -C \
-     --disable-native-texlive-build \
-     --with-banner-add="/Parabola GNU/Linux-libre" \
-    --enable-cxx-runtime-hack \
-    --disable-all-pkgs \
-    --disable-dump-share \
-    --disable-ptex \
-    --enable-luatex  \
-    --without-system-ptexenc \
-    --without-system-graphite \
-    --without-system-icu \
-    --without-system-kpathsea \
-    --with-system-freetype2 \
-    --with-system-poppler \
-    --with-freetype2-libdir=/usr/lib \
-    --with-freetype2-include=/usr/include/freetype2 \
-    --with-system-gd \
-    --with-system-libpng \
-    --without-system-teckit \
-    --with-system-zlib \
-    --with-system-zziplib \
-    --with-system-t1lib \
-    --disable-shared \
-    --disable-largefile \
-    --disable-ipc \
-    --without-mf-x-toolkit \
-    --without-x
-   make
-   make -C libs/obsdcompat
-   make -C texk/kpathsea
-   make -C texk/web2c luatex
-
-   cd "$srcdir"
+    cd "$srcdir"
    # this patch removes spurious error message with locale "xx_YY.utf8"
-   patch -p0 -i fix-fontforge-encoding.patch
+   patch -Np0 -i fix-fontforge-encoding.patch
+   # fix build with poppler >= 0.20
+   patch -Np0 -i poppler-0.20.patch
    # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
    sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c
    #############################################################
@@ -127,22 +84,22 @@ build() {
      --disable-t1utils \
      --disable-bibtexu \
      --disable-xz \
-     --without-system-zlib \
-     --without-system-zziplib \
-     --without-system-pnglib \
+     --with-system-zlib \
+     --with-system-zziplib \
+     --with-system-pnglib \
      --with-system-ncurses \
      --with-system-t1lib \
-     --without-system-gd \
-     --without-system-poppler \
-     --without-system-xpdf \
-     --without-system-freetype2 \
+     --with-system-gd \
+     --with-system-poppler \
+     --with-system-xpdf \
+     --with-system-freetype2 \
      --without-system-graphite \
      --with-freetype2-libdir=/usr/lib \
      --with-freetype2-include=/usr/include/freetype2 \
      --with-xdvi-x-toolkit=xaw \
      --disable-dump-share \
      --disable-aleph \
-     --disable-luatex \
+     --enable-luatex \
      --with-clisp-runtime=default \
      --enable-xindy --disable-xindy-rules --disable-xindy-docs
    #############################################################
@@ -238,13 +195,6 @@ package() {
    ## remove aleph from fmtutil.cnf
    sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf
 
-   ## install luatex binary
-   #install -m755 "$srcdir"/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex "$pkgdir"/usr/bin/
-   install -m755 "$srcdir"/luatex/build/texk/web2c/luatex "$pkgdir"/usr/bin/
-   cd "$pkgdir"/usr/bin
-   /bin/ln -s luatex texlua
-   /bin/ln -s luatex texluac
-
    ## install Perl libraries
    mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive
    install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive
@@ -256,6 +206,7 @@ package() {
    # remove dangling symlinks
    _bibtexextra_scripts="
 bibexport
+listbib
 urlbst
 "
    _core_scripts="
@@ -263,6 +214,7 @@ afm2afm
 arlatex
 autoinst
 bundledoc
+checkcites
 cmap2enc
 ctanify
 ctanupload
@@ -277,6 +229,7 @@ installfont-tl
 latex2man
 latexdiff
 latexdiff-vc
+latexfileversion
 latexmk
 latexrevise
 listings-ext.sh
@@ -315,31 +268,36 @@ texdiff
 texdirflatten
 texliveonfly
 texloganalyser
+typeoutfileinfo
 thumbpdf
 vpl2ovp
 vpl2vpl
 "
    _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
+   _langcjk_scripts="convbkmk updmap-setup-kanji"
    _langextra_scripts="ebong"
    _langgreek_scripts="mkgrkindex"
-   _latexextra_scripts="authorindex \
-makeglossaries \
-pdfannotextractor \
-pdfthumb \
-perltex \
-ppower4 \
-ps4pdf \
-splitindex \
-svn-multi \
+   _latexextra_scripts="
+authorindex
+exceltex
+exceltex
+makeglossaries
+pdfannotextractor
+perltex
+ppower4
+ps4pdf
+splitindex
+svn-multi
 vpe"
-   _music_scripts="musixtex musixflx"
+   _music_scripts="m-tx musixtex musixflx pmx2pdf"
    _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic"
-   _pstricks_scripts="pst2pdf"
+   _pstricks_scripts="pedigree pst2pdf"
    _science_scripts="ulqda"
    for s in \
         ${_bibtexextra_scripts} \
         ${_core_scripts}       \
         ${_htmlxml_scripts}    \
+        ${_langcjk_scripts}    \
         ${_langextra_scripts}  \
         ${_langgreek_scripts}  \
         ${_latexextra_scripts} \
diff --git a/libre/texlive-bin-libre/poppler-0.20.patch b/libre/texlive-bin-libre/poppler-0.20.patch
new file mode 100644
index 000000000..3bd8183ab
--- /dev/null
+++ b/libre/texlive-bin-libre/poppler-0.20.patch
@@ -0,0 +1,22 @@
+--- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig	2011-10-06 06:14:20.000000000 +0000
++++ source/texk/web2c/luatexdir/lua/lepdflib.cc	2012-05-17 11:30:26.327236883 +0000
+@@ -1433,7 +1433,7 @@
+ 
+ static int m_Object_getTypeName(lua_State * L)
+ {
+-    char *s;
++    const char *s;
+     udstruct *uin;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+--- source/texk/web2c/pdftexdir/pdftosrc.cc.orig	2012-06-24 17:12:34.376329435 +0200
++++ source/texk/web2c/pdftexdir/pdftosrc.cc	2012-06-24 17:12:25.490003152 +0200
+@@ -134,7 +134,7 @@
+         exit(1);
+     }
+     if (extract_xref_table) {
+-        int size = xref->getSize();
++        int size = xref->getNumObjects();
+         int i;
+         for (i = 0; i < size; i++) {
+             if (xref->getEntry(i)->offset == 0xffffffff)
diff --git a/libre/texlive-core-libre/.directory b/libre/texlive-core-libre/.directory
new file mode 100644
index 000000000..9d572f361
--- /dev/null
+++ b/libre/texlive-core-libre/.directory
@@ -0,0 +1,5 @@
+[Dolphin]
+Timestamp=2012,6,26,20,37,17
+
+[Settings]
+HiddenFilesShown=true
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index eb120c0ad..ad5f4e365 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -1,11 +1,12 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=texlive-core-libre
 _pkgname=texlive-core
-pkgver=2011.24722
-_revnr=${pkgver#2011.}
-pkgrel=1.1
+pkgver=2012.26892
+_revnr=${pkgver#2012.}
+pkgrel=1
 pkgdesc="TeX Live core distribution"
 license=('GPL')
 arch=(any)
@@ -24,35 +25,27 @@ conflicts=('tetex' 'texlive-latex3' 'texlive-core')
 provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
 replaces=('tetex' 'texlive-latex3' 'texlive-core')
 url='http://tug.org/texlive/'
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
+source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip"
         "${_pkgname}.maps")
 options=(!strip)
 install=texlive.install
 #backup=(etc/texmf/tex/context/config/cont-usr.tex)
-md5sums=('3cf22c52c9b2719d23ad1479e0ae3b3a'
-         '490872c9981c40d20721de1e2fccccb8')
-
-mksource() {
-    [ -f texlive-core-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/texlive-core-$pkgver-src.zip
-    mkdir ${pkgname}-${pkgver}
-    pushd ${pkgname}-${pkgver}
-    bsdtar xf ../texlive-core-$pkgver-src.zip
-    # remove nonfree packages
-    # MeX licensed packages.
-    rm {cc-pl,cs,ec,mex,pl}.tar.xz
-    # Public domain, will be relicensed.
-    rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz
-    # No specific free license.
-    rm euro-ce.tar.xz
-    # Remove them from package list.
-    sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS
-    popd
-    tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}
-    rm -rf ${pkgname}-${pkgver}
-}
+md5sums=('c913b3c01bdcf81da80e4833cd4cc691'
+         '82c03f7226e1df4440f30c89c05ee653')
 
 build() {
-   cd "$srcdir/${pkgname}-${pkgver}"
+   cd "$srcdir"
+
+   # remove nonfree packages
+   # MeX licensed packages.
+   rm {cc-pl,cs,ec,mex,pl}.tar.xz
+   # Public domain, will be relicensed.
+   rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz
+   # No specific free license.
+   rm euro-ce.tar.xz
+   # Remove them from package list.
+   sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS
+
    echo -n "   --> extracting all packages... "
    for p in *.tar.xz; do 
      bsdtar -xf $p
@@ -62,11 +55,10 @@ build() {
 }
 
 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 -m644 $_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
@@ -87,8 +79,9 @@ package() {
    #	  $pkgdir/etc/texmf/tex/context/config/cont-usr.tex
    
    # remove obsolete stuff (we don't provide the omega and aleph binaries anyway)
-   #rm -rf $pkgdir/usr/share/texmf-dist/omega
    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"
    # more cleanup
    rm -rf $pkgdir/usr/share/texmf-dist/scripts/context/stubs/mswin/
 
@@ -100,6 +93,7 @@ accfonts/vpl2vpl
 bundledoc/arlatex
 bundledoc/bundledoc
 context/perl/mptopdf.pl
+checkcites/checkcites.lua
 ctanify/ctanify
 ctanupload/ctanupload.pl
 de-macro/de-macro
@@ -108,17 +102,14 @@ epstopdf/epstopdf.pl
 findhyph/findhyph
 fontools/afm2afm
 fontools/autoinst
-fontools/cmap2enc
-fontools/font2afm
 fontools/ot2kpx
-fontools/pfm2kpx
-fontools/showglyphs
 fragmaster/fragmaster.pl
 installfont/installfont-tl
 latex2man/latex2man
 latexdiff/latexdiff-vc.pl
 latexdiff/latexdiff.pl
 latexdiff/latexrevise.pl
+latexfileversion/latexfileversion
 latexmk/latexmk.pl
 luaotfload/mkluatexfontdb.lua
 match_parens/match_parens
@@ -148,6 +139,7 @@ texdiff/texdiff
 texdirflatten/texdirflatten
 texloganalyser/texloganalyser
 thumbpdf/thumbpdf.pl
+typeoutfileinfo/typeoutfileinfo.sh
 texliveonfly/texliveonfly.py
 "
     install -m755 -d $pkgdir/usr/bin
diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core-libre/texlive-core.maps
index 553d07b72..013f15e94 100644
--- a/libre/texlive-core-libre/texlive-core.maps
+++ b/libre/texlive-core-libre/texlive-core.maps
@@ -4,6 +4,7 @@ Map fpls.map
 Map l7x-urwvn.map
 Map lm.map
 Map marvosym.map
+Map mathpple.map
 Map original-context-symbol.map
 Map pazo.map
 Map pxfonts.map
@@ -19,6 +20,7 @@ Map tabvar.map
 Map troff-updmap.map
 Map txfonts.map
 Map utopia.map
+MixedMap ccpl.map
 MixedMap cm-super-t1.map
 MixedMap cm-super-t2a.map
 MixedMap cm-super-t2b.map
@@ -28,10 +30,14 @@ MixedMap cm-super-x2.map
 MixedMap cm.map
 MixedMap cmextra.map
 MixedMap cmtext-bsr-interpolated.map
+MixedMap csother.map
+MixedMap cstext.map
 MixedMap cyrillic.map
 MixedMap eurosym.map
 MixedMap latxfont.map
 MixedMap mflogo.map
+MixedMap plother.map
+MixedMap pltext.map
 MixedMap rsfs.map
 MixedMap stmaryrd.map
 MixedMap symbols.map
diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core-libre/texlive.install
index a758c084d..601c4af19 100644
--- a/libre/texlive-core-libre/texlive.install
+++ b/libre/texlive-core-libre/texlive.install
@@ -23,8 +23,8 @@ post_install() {
   usr/bin/fmtutil-sys --all 1>/dev/null
   echo      " done." 
   echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-#  echo    "NB: To setup ConTeXt and the lua(la)tex font db,"
-#  echo    "    see http://wiki.archlinux.org/index.php/TeX_Live"
+  echo    "NB: To setup ConTeXt and the lua(la)tex font db,"
+  echo    "    see http://wiki.archlinux.org/index.php/TeX_Live"
 }
 
 post_upgrade() {
@@ -45,8 +45,8 @@ post_upgrade() {
   usr/bin/fmtutil-sys --all 1>/dev/null
   echo      " done." 
   echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-#  echo    "NB: To setup ConTeXt and the lua(la)tex font db,"
-#  echo    "    see http://wiki.archlinux.org/index.php/TeX_Live"
+  echo    "NB: To setup ConTeXt and the lua(la)tex font db,"
+  echo    "    see http://wiki.archlinux.org/index.php/TeX_Live"
   if [[ "$2" == 200* ]]; then
     echo      "Important note. Some directories have moved:"
     echo      " \$TEXMFSYSVAR    is now /var/lib/texmf (previously /usr/share/texmf-var)"
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index 5565b19b5..cabf58619 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -1,10 +1,11 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Maintainer: Rémy Oudompheng <remy.archlinux.org>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=texlive-fontsextra-libre
 _pkgname=texlive-fontsextra
-pkgver=2011.24706
-_revnr=${pkgver#2011.}
+pkgver=2012.26866
+_revnr=${pkgver#2012.}
 pkgrel=1
 pkgdesc="TeX Live - all sorts of extra fonts"
 license=('GPL')
@@ -15,31 +16,20 @@ replaces=('texlive-fontsextra')
 conflicts=('texlive-fontsextra')
 provides=('texlive-fontsextra')
 url='http://tug.org/texlive/'
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
-        "${_pkgname}.maps")
+source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('d4bd3dbc8c422d049b082d0e8c70d088'
-         '6e84e4a8ee6a25adec39cd6310d9bef2')
-
-mksource() {
-    [ -f ${_pkgname}-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/${_pkgname}-$pkgver-src.zip
-    mkdir ${pkgname}-${pkgver}
-    pushd ${pkgname}-${pkgver}
-    bsdtar xf ../${_pkgname}-$pkgver-src.zip
-    # remove nonfree packages
-    # No specific free license.
-    rm ogham.tar.xz
-    # Remove them from package list.
-    sed -ri '/^ogham /d' CONTENTS
-    popd
-    tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}
-    rm -rf ${pkgname}-${pkgver}
-}
+md5sums=('f75e552c4573ce73d3eee03fffee723f'
+         '4a2f2b3b4527655fb47ab0d59b01bfea')
 
 build() {
-   cd "$srcdir/${pkgname}-${pkgver}"
+   cd "$srcdir"
+   # remove nonfree packages
+   # No specific free license.
+   rm ogham.tar.xz
+   # Remove them from package list.
+   sed -ri '/^ogham /d' CONTENTS
    for p in *.tar.xz; do
 	   bsdtar -xf $p
    done
@@ -47,11 +37,11 @@ build() {
 }
 
 package() {
-   cd "$srcdir/${pkgname}-${pkgver}"
+   cd "$srcdir"
    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 -m644 $_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
diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
index 4ef977ffa..fbced973a 100644
--- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
+++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
@@ -5,6 +5,7 @@ Map ArtNouv.map
 Map ArtNouvc.map
 Map BulletsADF.map
 Map Carrickc.map
+Map CountriesOfEurope.map
 Map ESSTIX.map
 Map Eichenla.map
 Map Eileen.map
@@ -31,6 +32,7 @@ Map ap.map
 Map archaicprw.map
 Map arev.map
 Map ascii.map
+Map aspectratio.map
 Map augie.map
 Map auncial.map
 Map aurical.map
@@ -77,7 +79,9 @@ Map linearA.map
 Map mathabx.map
 Map mdbch.map
 Map mdput.map
+Map mdsymbol.map
 Map mdugm.map
+Map ntx.map
 Map ocrb.map
 Map opensans.map
 Map paratype-type1.map
@@ -87,6 +91,7 @@ Map prodint.map
 Map pxtx.map
 Map recycle.map
 Map rsfso.map
+Map sansmathaccent.map
 Map sqrcaps.map
 Map starfont.map
 Map tfrupee.map
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index 2093836c9..063a9e899 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -1,11 +1,12 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Maintainer: Firmicus <firmicus āt gmx dōt net>
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=texlive-latexextra-libre
 _pkgname=texlive-latexextra
-pkgver=2011.24718
-_revnr=${pkgver#2011.}
+pkgver=2012.26807
+_revnr=${pkgver#2012.}
 pkgrel=1
 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX"
 license=('GPL')
@@ -20,44 +21,31 @@ replaces=('texlive-latexextra')
 conflicts=('texlive-latexextra')
 groups=('texlive-most')
 url='http://tug.org/texlive/'
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
-        "${_pkgname}.maps")
+source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('adab55bb38506c25f3176af64cf30f27'
+md5sums=('868dc1824391768e120fdd71ba28e520'
          '9e4825f47dac663dd62c4bfa67899e84')
 
-mksource() {
-    [ -f ${_pkgname}-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/${_pkgname}-$pkgver-src.zip
-    mkdir ${pkgname}-${pkgver}
-    pushd ${pkgname}-${pkgver}
-    bsdtar xf ../${_pkgname}-$pkgver-src.zip
-    # remove nonfree packages
-    # No specific free license.
-    rm {authoraftertitle,clock,fltpage,fnpara}.tar.xz
-    # No explicit modification permission.
-    rm cmdtrack.tar.xz
-    # Remove them from package list.
-    sed -ri '/^(authoraftertitle|clock+fltpage|fnpara|cmdtrack) /d' CONTENTS
-    popd
-    tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}
-    rm -rf ${pkgname}-${pkgver}
-}
-
 build() {
-   cd "$srcdir/${pkgname}-${pkgver}"
+   # remove nonfree packages
+   # No specific free license.
+   rm {authoraftertitle,clock,fltpage,fnpara}.tar.xz
+   # No explicit modification permission.
+   rm cmdtrack.tar.xz
+   # Remove them from package list.
+   sed -ri '/^(authoraftertitle|clock+fltpage|fnpara|cmdtrack) /d' CONTENTS
    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 -m644 $_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
@@ -74,11 +62,11 @@ package() {
    #add symlinks that were in texlive-bin:
    install -m755 -d $pkgdir/usr/bin
    ln -s /usr/share/texmf-dist/scripts/authorindex/authorindex $pkgdir/usr/bin/authorindex
+   ln -s /usr/share/texmf-dist/scripts/exceltex/exceltex $pkgdir/usr/bin/exceltex
    ln -s /usr/share/texmf-dist/scripts/glossaries/makeglossaries $pkgdir/usr/bin/makeglossaries
    ln -s /usr/share/texmf-dist/scripts/pax/pdfannotextractor.pl $pkgdir/usr/bin/pdfannotextractor
    ln -s /usr/share/texmf-dist/scripts/ppower4/pdfthumb.tlu $pkgdir/usr/bin/pdfthumb
    ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl $pkgdir/usr/bin/perltex
-   #ln -s /usr/share/texmf-dist/scripts/ppower4/ppower4.tlu $pkgdir/usr/bin/ppower4
    ln -s /usr/share/texmf-dist/scripts/pst-pdf/ps4pdf $pkgdir/usr/bin/ps4pdf
    ln -s /usr/share/texmf-dist/scripts/splitindex/perl/splitindex.pl $pkgdir/usr/bin/splitindex
    ln -s /usr/share/texmf-dist/scripts/svn-multi/svn-multi.pl $pkgdir/usr/bin/svn-multi