texlive-latexextra-libre-2013.30964-1: updating version

2 files changed, 10 insertions, 18 deletions

diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index 184adb743..4d26a0884 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183221 2013-04-18 23:52:31Z remy $
+# $Id: PKGBUILD 189264 2013-07-01 21:36:52Z remy $
 # Maintainer: Firmicus <firmicus āt gmx dōt net>
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,8 +6,8 @@
 
 pkgname=texlive-latexextra-libre
 _pkgname=texlive-latexextra
-pkgver=2012.29701
-_revnr=${pkgver#2012.}
+pkgver=2013.30964
+_revnr=${pkgver#2013.}
 pkgrel=1
 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX, without nonfree add-on packages"
 license=('GPL')
@@ -15,18 +15,18 @@ arch=(any)
 depends=('texlive-core')
 optdepends=(
   'texlive-pictures: to use the package overpic'
-  'openjdk6: for use by ppower4'
+  'jdk7-openjdk: for use by ppower4'
 )
 provides=('texlive-latexextra')
 replaces=('texlive-latexextra')
 conflicts=('texlive-latexextra')
 groups=('texlive-most')
 url='http://tug.org/texlive/'
-source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
+source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('1b67842cdc5debc80730fced7ce369ce'
+md5sums=('64386dfe9fc40f2d4edc7c653d716bdf'
          '9e4825f47dac663dd62c4bfa67899e84')
 
 build() {
@@ -64,19 +64,11 @@ package() {
    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/perltex/perltex.pl "$pkgdir"/usr/bin/perltex
+   ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl "$pkgdir"/usr/bin/perltex
    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/splitindex/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.install b/libre/texlive-latexextra-libre/texlive.install
index 3416a2732..befc29143 100644
--- a/libre/texlive-latexextra-libre/texlive.install
+++ b/libre/texlive-latexextra-libre/texlive.install
@@ -11,7 +11,7 @@ post_install() {
   cp "$UPDMAP" "$TMPFILE"
   echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
   cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
   [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
   echo    ">>> texlive: updating the filename database..."
@@ -27,7 +27,7 @@ post_upgrade() {
   cp "$UPDMAP" "$TMPFILE"
   echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP
   cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
   [ -f "$UPDMAPLOCAL" ] && cat "$UPDMAPLOCAL" >> $UPDMAP
   echo    ">>> texlive: updating the filename database..."