Merge branch 'master' of ssh://gparabola/abslibre

11 files changed, 595 insertions, 72 deletions

diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index da573dce8..44ffecd3b 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -245,7 +245,7 @@ package() {
 
    # 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/
+   LD_PRELOAD="${pkgdir}/usr/lib/libkpathsea.so.6" PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/
    #############################################################
    # remove dangling symlinks
    _bibtexextra_scripts="bibexport"
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
new file mode 100644
index 000000000..ccf5c480f
--- /dev/null
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -0,0 +1,159 @@
+# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Maintainer: Rémy Oudompheng <remy@archlinux.org>
+
+pkgname=texlive-core-libre
+_pkgname=texlive-core
+pkgver=2011.23170
+_revnr=${pkgver#2011.}
+pkgrel=1
+pkgdesc="TeX Live core distribution"
+license=('GPL')
+arch=(any)
+depends=('texlive-bin-libre')
+optdepends=(
+  'perl:        for many useful tools'
+  'ruby:        for old ConTeXT MkII and epspdf'
+  'tk:          for texdoctk'
+  'python2:     for dviasm'
+  'ghostscript: for epstopdf, epspdf and other ConTeXt tools' 
+  'psutils:     to manipulate the output of dvips'
+  't1utils:     can be useful when installing Type1 fonts'
+)
+groups=('texlive-most')
+conflicts=('tetex' 'texlive-latex3' 'texlive-core')
+provides=('tetex' 'texlive-latex3' 'texlive-core')
+replaces=('tetex' 'texlive-latex3' 'texlive-core')
+url='http://tug.org/texlive/'
+source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
+        "${_pkgname}.maps")
+options=(!strip)
+install=texlive.install
+#backup=(etc/texmf/tex/context/config/cont-usr.tex)
+md5sums=('304e164e22f8dee41bfd6c2f4758e394'
+         '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}
+}
+
+build() {
+   cd "$srcdir/${pkgname}-${pkgver}"
+   echo -n "   --> extracting all packages... "
+   for p in *.tar.xz; do 
+     bsdtar -xf $p
+   done
+   echo "done"
+   rm -rf {tlpkg,doc,source,omega} || 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 -m755 -d $pkgdir/usr/share
+   wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
+   for dir in $wanteddirs; do
+     find $dir -type d -exec install -d -m755 $pkgdir/usr/share/texmf-dist/'{}' \;
+     find $dir -type f -exec install -m644 '{}' $pkgdir/usr/share/texmf-dist/'{}' \;
+   done
+   find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \;
+   find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \;
+   if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then
+     find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
+   fi
+   # use python2 for dviasm
+   sed -i 's/env python/env python2/' $pkgdir/usr/share/texmf-dist/scripts/dviasm/dviasm.py
+
+   # copy config file to texmf-config
+   #mkdir -p $pkgdir/etc/texmf/tex/context/config
+   #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 -rf $pkgdir/usr/share/texmf-dist/omega
+   rm -f $pkgdir/usr/share/texmf-dist/tex/plain/config/{omega,aleph}.ini
+   # more cleanup
+   rm -rf $pkgdir/usr/share/texmf-dist/scripts/context/stubs/mswin/
+
+    # link programs from /usr/share/texmf-dist/scripts
+    _linked_scripts="
+accfonts/mkt1font
+accfonts/vpl2ovp
+accfonts/vpl2vpl
+bundledoc/arlatex
+bundledoc/bundledoc
+context/perl/mptopdf.pl
+de-macro/de-macro
+dviasm/dviasm.py
+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.pl
+latexdiff/latexdiff-vc.pl
+latexdiff/latexrevise.pl
+latexmk/latexmk.pl
+luaotfload/mkluatexfontdb.lua
+mkjobtexmf/mkjobtexmf.pl
+oberdiek/pdfatfi.pl
+pdfcrop/pdfcrop.pl
+pdfjam/pdf180
+pdfjam/pdf270
+pdfjam/pdf90
+pdfjam/pdfbook
+pdfjam/pdfflip
+pdfjam/pdfjam
+pdfjam/pdfjam-pocketmod
+pdfjam/pdfjam-slides3up
+pdfjam/pdfjam-slides6up
+pdfjam/pdfjoin
+pdfjam/pdfnup
+pdfjam/pdfpun
+pkfix-helper/pkfix-helper
+pkfix/pkfix.pl
+purifyeps/purifyeps
+sty2dtx/sty2dtx.pl
+texcount/texcount.pl
+texdef/texdef.pl
+texdiff/texdiff
+texdirflatten/texdirflatten
+texloganalyser/texloganalyser
+thumbpdf/thumbpdf.pl
+"
+    install -m755 -d $pkgdir/usr/bin
+    for _script in ${_linked_scripts}; do
+        _scriptbase=$(basename $_script)
+        _scriptbase=${_scriptbase%.*}
+        ln -s /usr/share/texmf-dist/scripts/${_script} ${pkgdir}/usr/bin/${_scriptbase}
+    done
+    ln -s /usr/share/texmf-dist/scripts/listings-ext/listings-ext.sh ${pkgdir}/usr/bin/listings-ext.sh
+
+    # additional symlinks
+    ln -s epstopdf ${pkgdir}/usr/bin/repstopdf
+    ln -s pdfcrop ${pkgdir}/usr/bin/rpdfcrop
+}
diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core-libre/texlive-core.maps
new file mode 100644
index 000000000..553d07b72
--- /dev/null
+++ b/libre/texlive-core-libre/texlive-core.maps
@@ -0,0 +1,40 @@
+Map      euler.map
+Map charter.map
+Map fpls.map
+Map l7x-urwvn.map
+Map lm.map
+Map marvosym.map
+Map original-context-symbol.map
+Map pazo.map
+Map pxfonts.map
+Map qag.map
+Map qbk.map
+Map qcr.map
+Map qcs.map
+Map qhv.map
+Map qpl.map
+Map qtm.map
+Map qzc.map
+Map tabvar.map
+Map troff-updmap.map
+Map txfonts.map
+Map utopia.map
+MixedMap cm-super-t1.map
+MixedMap cm-super-t2a.map
+MixedMap cm-super-t2b.map
+MixedMap cm-super-t2c.map
+MixedMap cm-super-ts1.map
+MixedMap cm-super-x2.map
+MixedMap cm.map
+MixedMap cmextra.map
+MixedMap cmtext-bsr-interpolated.map
+MixedMap cyrillic.map
+MixedMap eurosym.map
+MixedMap latxfont.map
+MixedMap mflogo.map
+MixedMap rsfs.map
+MixedMap stmaryrd.map
+MixedMap symbols.map
+MixedMap tipa.map
+MixedMap wasy.map
+MixedMap yhmath.map
diff --git a/libre/texlive-texmf-libre/texlive.install b/libre/texlive-core-libre/texlive.install
index 3ec6158ba..a758c084d 100644
--- a/libre/texlive-texmf-libre/texlive.install
+++ b/libre/texlive-core-libre/texlive.install
@@ -1,10 +1,10 @@
-# From Arch's texlive-core.
-
-PKGNAME="texlive-texmf-libre"
+PKGNAME="texlive-core"
 UPDMAP="etc/texmf/web2c/updmap.cfg"
 UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg"
 SYNCWITHTREES=''
 
+MAPFILE="var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
+
 post_install() {
   TMPFILE=`mktemp`
   echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
@@ -23,7 +23,6 @@ post_install() {
   usr/bin/fmtutil-sys --all 1>/dev/null
   echo      " done." 
   echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-# TODO needs our documentation
 #  echo    "NB: To setup ConTeXt and the lua(la)tex font db,"
 #  echo    "    see http://wiki.archlinux.org/index.php/TeX_Live"
 }
@@ -48,4 +47,12 @@ post_upgrade() {
   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"
+  if [[ "$2" == 200* ]]; then
+    echo      "Important note. Some directories have moved:"
+    echo      " \$TEXMFSYSVAR    is now /var/lib/texmf (previously /usr/share/texmf-var)"
+    echo      " \$TEXMFSYSCONFIG is now /etc/texmf     (previously /usr/share/texmf-config)"
+    echo      "Please move and update the config files you had modified and delete the rest."
+    echo      "(Note however that updmap.cfg has been automatically copied and updated.)"
+  fi
 }
+
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
new file mode 100644
index 000000000..9d296dd35
--- /dev/null
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -0,0 +1,73 @@
+# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Maintainer: Rémy Oudompheng <remy.archlinux.org>
+
+pkgname=texlive-fontsextra-libre
+_pkgname=texlive-fontsextra
+pkgver=2011.22691
+_revnr=${pkgver#2011.}
+pkgrel=1
+pkgdesc="TeX Live - all sorts of extra fonts"
+license=('GPL')
+arch=(any)
+depends=('texlive-core')
+groups=('texlive-most')
+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")
+options=('!emptydirs')
+options=(!strip)
+install=texlive.install
+md5sums=('33f8fc7b7ff98c616a0a7a0b5844e603'
+         '5150fc36c158776c6317ac14bbd677ab')
+
+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}
+}
+
+build() {
+   cd "$srcdir/${pkgname}-${pkgver}"
+   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 -m755 -d $pkgdir/usr/share
+   wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
+   for dir in $wanteddirs; do
+     find $dir -type d -exec install -d -m755 $pkgdir/usr/share/texmf-dist/'{}' \;
+     find $dir -type f -exec install -m644 '{}' $pkgdir/usr/share/texmf-dist/'{}' \;
+   done
+   if [[ -d texmf-dist ]]; then
+     find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \;
+     find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \;
+   fi
+   if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then
+     find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
+   fi
+   
+   # remove stuff depending on omega/aleph
+   rm -rf $pkgdir/usr/share/texmf-dist/omega
+   find $pkgdir/ -wholename '*ocherokee*' -delete
+   find $pkgdir/ -wholename '*oinuit*' -delete
+}
diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
new file mode 100644
index 000000000..6bc0b19c2
--- /dev/null
+++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
@@ -0,0 +1,107 @@
+Map Acorn.map
+Map AnnSton.map
+Map ArrowsADF.map
+Map ArtNouv.map
+Map ArtNouvc.map
+Map BulletsADF.map
+Map Carrickc.map
+Map ESSTIX.map
+Map Eichenla.map
+Map Eileen.map
+Map EileenBl.map
+Map Elzevier.map
+Map GotIn.map
+Map GoudyIn.map
+Map Kinigcap.map
+Map Konanur.map
+Map Kramer.map
+Map MnSymbol.map
+Map MorrisIn.map
+Map Nouveaud.map
+Map OrnementsADF.map
+Map PTSans-type1.map
+Map PTSerif-type1.map
+Map Romantik.map
+Map Rothdn.map
+Map RoyalIn.map
+Map Sanremo.map
+Map Starburst.map
+Map Typocaps.map
+Map Zallman.map
+Map antt.map
+Map ap.map
+Map archaicprw.map
+Map arev.map
+Map ascii.map
+Map augie.map
+Map auncial.map
+Map aurical.map
+Map belleek.map
+Map bera.map
+Map boondox.map
+Map cantarell.map
+Map ccicons.map
+Map clm.map
+Map cm-lgc.map
+Map cmin.map
+Map comfortaa.map
+Map cyklop.map
+Map dictsym.map
+Map droid.map
+Map dstroke.map
+Map epigrafica.map
+Map esvect.map
+Map fdsymbol.map
+Map fge.map
+Map fi4.map
+Map foekfont.map
+Map fonetika.map
+Map fourier-utopia-expert.map
+Map fourier.map
+Map gfsartemisia.map
+Map gfsbodoni.map
+Map gfscomplutum.map
+Map gfsdidot.map
+Map gfsneohellenic.map
+Map gfssolomos.map
+Map gptimes.map
+Map icelandic.map
+Map iwona.map
+Map kpfonts.map
+Map kurier.map
+Map lato.map
+Map libertine.map
+Map linearA.map
+Map mathabx.map
+Map mdbch.map
+Map mdput.map
+Map mdugm.map
+Map ocrb.map
+Map pbsi.map
+Map phaistos.map
+Map prodint.map
+Map recycle.map
+Map sqrcaps.map
+Map starfont.map
+Map tfrupee.map
+Map uaq.map
+Map ugq.map
+Map ybd.map
+Map ybv.map
+Map yes.map
+Map yfrak.map
+Map yly.map
+Map yrd.map
+Map yv1.map
+Map yv2.map
+Map yv3.map
+Map yvo.map
+Map yvt.map
+MixedMap allrunes.map
+MixedMap bbold.map
+MixedMap cmll.map
+MixedMap hfbright.map
+MixedMap lxfonts.map
+MixedMap pigpen.map
+MixedMap semaf.map
+MixedMap trajan.map
diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra-libre/texlive.install
new file mode 100644
index 000000000..c2c5e8165
--- /dev/null
+++ b/libre/texlive-fontsextra-libre/texlive.install
@@ -0,0 +1,52 @@
+PKGNAME="texlive-fontsextra"
+UPDMAP="etc/texmf/web2c/updmap.cfg"
+UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg"
+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 shoud go"
+  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
+  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
+  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
+  echo    ">>> texlive: updating the filename database..."
+  usr/bin/mktexlsr
+  echo    ">>> texlive: updating the fontmap files with updmap..."
+  usr/bin/updmap-sys --quiet --nohash
+  echo    " done." 
+}
+
+post_upgrade() {
+  TMPFILE=`mktemp`
+  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
+  cp "$UPDMAP" "$TMPFILE"
+  echo    ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
+  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
+  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
+  echo    ">>> texlive: updating the filename database..."
+  usr/bin/mktexlsr
+  echo    ">>> texlive: updating the fontmap files with updmap..."
+  usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
+  echo    " done." 
+}
+
+pre_remove() {
+for m in `cut -d' ' -f2 $MAPFILE`; do 
+  sed -i "/\s$m/d" $UPDMAP ; 
+done
+}
+
+post_remove() {
+  echo    ">>> texlive: updating the filename database..."
+  usr/bin/mktexlsr
+  echo    ">>> texlive: updating the fontmap files with updmap..."
+  usr/bin/updmap-sys --quiet --nohash
+  echo    " done." 
+}
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
new file mode 100644
index 000000000..b4c34a637
--- /dev/null
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -0,0 +1,97 @@
+# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Maintainer: Firmicus <firmicus āt gmx dōt net>
+# Maintainer: Rémy Oudompheng <remy@archlinux.org>
+
+pkgname=texlive-latexextra-libre
+_pkgname=texlive-latexextra
+pkgver=2011.22931
+_revnr=${pkgver#2011.}
+pkgrel=1
+pkgdesc="TeX Live - Large collection of add-on packages for LaTeX"
+license=('GPL')
+arch=(any)
+depends=('texlive-core')
+optdepends=(
+  'texlive-pictures: to use the package overpic'
+  'openjdk6: for use by ppower4'
+)
+provides=('texlive-latexextra')
+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")
+options=('!emptydirs')
+options=(!strip)
+install=texlive.install
+md5sums=('243f308790ad95e40a80526fecfdb7c1'
+         '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}"
+   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 -m755 -d $pkgdir/usr/share
+   wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
+   for dir in $wanteddirs; do
+     find $dir -type d -exec install -d -m755 $pkgdir/usr/share/texmf-dist/'{}' \;
+     find $dir -type f -exec install -m644 '{}' $pkgdir/usr/share/texmf-dist/'{}' \;
+   done
+   if [[ -d texmf-dist ]]; then
+     find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \;
+     find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \;
+   fi
+   if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then
+     find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
+   fi
+   #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/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
+   ln -s /usr/share/texmf-dist/scripts/vpe/vpe.pl $pkgdir/usr/bin/vpe
+   # but ppower4 was a symlink to ppower4.tlu, which was broken, but this is far better:
+   (
+   cat <<"END"
+#!/bin/bash
+java -jar /usr/share/texmf-dist/scripts/ppower4/pp4p.jar $@
+END
+   ) > /tmp/ppower4 
+   install -m755 /tmp/ppower4 $pkgdir/usr/bin/
+   rm $pkgdir/usr/share/texmf-dist/scripts/glossaries/makeglossaries.bat
+   rm $pkgdir/usr/share/texmf-dist/scripts/pst-pdf/ps4pdf.bat*
+   rm $pkgdir/usr/share/texmf-dist/scripts/shipunov/biokey2html.bat
+}
diff --git a/libre/texlive-latexextra-libre/texlive-latexextra.maps b/libre/texlive-latexextra-libre/texlive-latexextra.maps
new file mode 100644
index 000000000..b97f37fdd
--- /dev/null
+++ b/libre/texlive-latexextra-libre/texlive-latexextra.maps
@@ -0,0 +1,3 @@
+Map epiolmec.map
+MixedMap esint.map
+MixedMap manfnt.map
diff --git a/libre/texlive-latexextra-libre/texlive.install b/libre/texlive-latexextra-libre/texlive.install
new file mode 100644
index 000000000..e8878db08
--- /dev/null
+++ b/libre/texlive-latexextra-libre/texlive.install
@@ -0,0 +1,52 @@
+PKGNAME="texlive-latexextra"
+UPDMAP="etc/texmf/web2c/updmap.cfg"
+UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg"
+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 shoud go"
+  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
+  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
+  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
+  echo    ">>> texlive: updating the filename database..."
+  usr/bin/mktexlsr
+  echo    ">>> texlive: updating the fontmap files with updmap..."
+  usr/bin/updmap-sys --quiet --nohash
+  echo    " done." 
+}
+
+post_upgrade() {
+  TMPFILE=`mktemp`
+  echo    ">>> texlive: saving updmap.cfg as $TMPFILE..."
+  cp "$UPDMAP" "$TMPFILE"
+  echo    ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+  echo    "             into /etc/texmf/web2c/updmap-local.cfg"
+  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
+  [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
+  echo    ">>> texlive: updating the filename database..."
+  usr/bin/mktexlsr
+  echo    ">>> texlive: updating the fontmap files with updmap..."
+  usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
+  echo    " done." 
+}
+
+pre_remove() {
+for m in `cut -d' ' -f2 $MAPFILE`; do 
+  sed -i "/\s$m/d" $UPDMAP ; 
+done
+}
+
+post_remove() {
+  echo    ">>> texlive: updating the filename database..."
+  usr/bin/mktexlsr
+  echo    ">>> texlive: updating the fontmap files with updmap..."
+  usr/bin/updmap-sys --quiet --nohash
+  echo    " done." 
+}
diff --git a/libre/texlive-texmf-libre/PKGBUILD b/libre/texlive-texmf-libre/PKGBUILD
deleted file mode 100644
index bd3dfa528..000000000
--- a/libre/texlive-texmf-libre/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Maintainer: Michał Masłowski
-
-pkgname=texlive-texmf-libre
-pkgver=2011
-pkgrel=1
-epoch=
-pkgdesc="TeXLive files used by TeX and related programs"
-arch=('any')
-url="http://tug.org/texlive/"
-license=('GPL')
-groups=()
-depends=('texlive-bin-libre')
-provides=('texlive-bibtexextra' 'texlive-core' 'texlive-fontsextra' 'texlive-formatsextra' 'texlive-games' 'texlive-genericextra' 'texlive-htmlxml' 'texlive-humanities' 'texlive-langcjk' 'texlive-langcyrillic' 'texlive-langextra' 'texlive-langgreek' 'texlive-latexextra' 'texlive-music' 'texlive-pictures' 'texlive-plainextra' 'texlive-pstricks' 'texlive-publishers' 'texlive-science')
-conflicts=('texlive-bibtexextra' 'texlive-core' 'texlive-fontsextra' 'texlive-formatsextra' 'texlive-games' 'texlive-genericextra' 'texlive-htmlxml' 'texlive-humanities' 'texlive-langcjk' 'texlive-langcyrillic' 'texlive-langextra' 'texlive-langgreek' 'texlive-latexextra' 'texlive-music' 'texlive-pictures' 'texlive-plainextra' 'texlive-pstricks' 'texlive-publishers' 'texlive-science')
-replaces=('texlive-bibtexextra' 'texlive-core' 'texlive-fontsextra' 'texlive-formatsextra' 'texlive-games' 'texlive-genericextra' 'texlive-htmlxml' 'texlive-humanities' 'texlive-langcjk' 'texlive-langcyrillic' 'texlive-langextra' 'texlive-langgreek' 'texlive-latexextra' 'texlive-music' 'texlive-pictures' 'texlive-plainextra' 'texlive-pstricks' 'texlive-publishers' 'texlive-science')
-backup=()
-options=()
-install=texlive.install
-source=($pkgname-$pkgver.tar.xz)
-noextract=()
-md5sums=('7575a6bee3a487bbcf7f8e1e1f215881')
-
-mksource() {
-    [ -f texlive-20110705-texmf.tar.xz ] || wget ftp://tug.org/historic/systems/texlive/2011/texlive-20110705-texmf.tar.xz
-    tar xf texlive-20110705-texmf.tar.xz
-    mv texlive-20110705-texmf "$pkgname-$pkgver"
-    cd "$pkgname-$pkgver"
-    # We have it in texlive-bin-libre
-    rm -rf texmf
-    # Generated files, are separately made after installation.
-    rm texmf-dist/ls-R
-    # MeX-licensed packages.
-    rm -rf texmf-dist/{fonts/{map/dvips,{type1,tfm,source}/public},doc/fonts}/cc-pl
-    rm -rf texmf-dist/fonts/{map/dvips,{type1,enc,tfm,source}/public}/cs
-    rm -rf texmf-dist/{doc,source,tex}/mex
-    # Includes code from nonfree PL fonts.  Probably some files could
-    # be useful without it, but the license requires including whole
-    # original source.
-    rm -rf  texmf-dist/{fonts/{tfm,source}/jknappen,doc/fonts}/ec
-    # Public domain, will be relicensed in next version.
-    rm -rf texmf-dist/{doc,source,tex}/context/third/{account,algorithmic,fixme,games,letter,ruby}
-    # No specific free license.
-    rm -rf texmf-dist/{doc,source,tex}/latex/{authoraftertitle,clock,fltpage,fnpara}
-    rm -rf texmf-dist/{fonts/{tfm,source}/public,doc/fonts,doc/latex}/{euro-ce,ogham}
-    # No explicit modification permission.
-    rm -rf texmf-dist/{doc,source,tex}/latex/cmdtrack
-    # Recommends nonfree software.
-    rm -rf texmf-dist/doc/generic/tex-virtual-academy-pl
-    # Recommends nonfree fonts and it's not obvious if no right to
-    # modify such document is needed.
-    rm -rf texmf-dist/doc/fonts/free-math-font-survey
-    # No modification.
-    rm -rf texmf-dist/doc/plain/gentle
-    cd ..
-    tar cJf "$pkgname-$pkgver.tar.xz" "$pkgname-$pkgver"
-}
-
-build() {
-  :
-}
-
-package() {
-  mkdir -p "$pkgdir/usr/share"
-  cp -R "$srcdir/$pkgname-$pkgver/texmf-dist" "$pkgdir/usr/share"
-}
-
-# vim:set ts=2 sw=2 et: