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

4 files changed, 41 insertions, 38 deletions

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)"