[Lunar-commits] <moonbase> texlive: fix stumbles broken texlive update

[Michael 'v4hn' Goerner]

commit 95774ec50e9a4117caad1e69b75cef8ed4e0c52e
Author: Michael 'v4hn' Goerner <v4hn at lunar-linux.org>
Date:   Wed Aug 31 14:40:05 2011 +0200

    texlive: fix stumbles broken texlive update
---
 doc-tools/texlive/BUILD   |    9 ++++-----
 doc-tools/texlive/DETAILS |    9 +++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/doc-tools/texlive/BUILD b/doc-tools/texlive/BUILD
index 6c74527..928cde7 100644
--- a/doc-tools/texlive/BUILD
+++ b/doc-tools/texlive/BUILD
@@ -1,8 +1,7 @@
 (
-
-  # Patch from http://scmweb.sourcemage.org/?p=smgl/grimoire.git;a=tree;f=latex/texlive
-  # Use Linux-sensible directories
-  patch_it $SOURCE_CACHE/$SOURCE2 0  &&
+  # Use /usr/share as root
+  sedit 's:^\(TEXMFROOT = \)\$SELFAUTOPARENT:\1 /usr/share:' texk/kpathsea/texmf.cnf &&
+  sedit 's:^\(TEXMFLOCAL = \).*$:\1 \$TEXMFROOT/texmf-local:' texk/kpathsea/texmf.cnf &&
 
   # Fonts dir
   sedit 's:^\(OSFONTDIR =\).*:\1 /usr/share/fonts:' texk/kpathsea/texmf.cnf  &&
@@ -42,6 +41,6 @@
   default_build  &&
 
   # Idea from http://projects.archlinux.org/svntogit/packages.git/tree/texlive-bin/trunk/
-  install -m644 $SOURCE_CACHE/$SOURCE3 /etc/fonts/conf.d/09-texlive-fonts.conf
+  install -m644 $SOURCE_CACHE/$SOURCE2 /etc/fonts/conf.d/09-texlive-fonts.conf
 
 ) > $C_FIFO 2>&1
diff --git a/doc-tools/texlive/DETAILS b/doc-tools/texlive/DETAILS
index 80dc4c2..1b16b7d 100644
--- a/doc-tools/texlive/DETAILS
+++ b/doc-tools/texlive/DETAILS
@@ -2,17 +2,14 @@
          VERSION=20110705
           SOURCE=$MODULE-$VERSION-source.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-source
-         SOURCE2=texlive-20091107-texmf.cnf_fix.patch
-         SOURCE3=texlive-20100722-09-texlive-fonts.conf
+         SOURCE2=texlive-20100722-09-texlive-fonts.conf
       SOURCE_URL=ftp://tug.org/historic/systems/texlive/${VERSION:0:4}
      SOURCE2_URL=$PATCH_URL
-     SOURCE3_URL=$PATCH_URL
       SOURCE_VFY=sha1:7a47cfe847801c86c98da8ade181baf97339f6e4
-     SOURCE2_VFY=sha1:807b2d96c86b24cb0743909c13e08172925eee85
-     SOURCE3_VFY=sha1:a36517f4250915b011740c7790fba749fde3aaff
+     SOURCE2_VFY=sha1:a36517f4250915b011740c7790fba749fde3aaff
         WEB_SITE=http://www.tug.org/texlive/
          ENTERED=20100805
-         UPDATED=20110830
+         UPDATED=20110831
            SHORT="TeX distribution that includes web2c, pdfTeX, e-Tex and more"
 
 # Text from http://www.tug.org/texlive/