[Lunar-commits] <moonbase> Revert "texlive: version bumped to 20100722."

[Florin Braescu]

commit 3ea90bae00b502e2d0676cbb2c2d9d9b38589308
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Wed Sep 8 22:31:08 2010 +0300

    Revert "texlive: version bumped to 20100722."
    
    This reverts commit e5785d082d75b62088f6348878c459163762a7a1.
    
    texlive: revert it.
    
    Need more work to run properly.
---
 zbeta/texlive/BUILD     |    6 +++++-
 zbeta/texlive/CONFLICTS |    1 +
 zbeta/texlive/DETAILS   |   23 +++++++++++++++--------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/zbeta/texlive/BUILD b/zbeta/texlive/BUILD
index 152c0d6..2375057 100644
--- a/zbeta/texlive/BUILD
+++ b/zbeta/texlive/BUILD
@@ -1,5 +1,9 @@
 (
 
+  # Patches from http://scmweb.sourcemage.org/?p=smgl/grimoire.git;a=tree;f=latex/texlive
+  patch_it $SOURCE_CACHE/$SOURCE2 1  &&
+  patch_it $SOURCE_CACHE/$SOURCE3 0  &&
+
   # Hide warnings about unable to find its own config files
   export KPATHSEA_WARNING=0  &&
 
@@ -26,6 +30,6 @@
   ln -sfn mf /usr/bin/mf-nowin  &&
 
   # Idea from http://repos.archlinux.org/wsvn/packages/texlive-bin/trunk/
-  install -m644 $SOURCE_CACHE/$SOURCE2 /etc/fonts/conf.d/09-texlive-fonts.conf
+  install -m644 $SOURCE_CACHE/$SOURCE4 /etc/fonts/conf.d/09-texlive-fonts.conf
 
 ) > $C_FIFO 2>&1
diff --git a/zbeta/texlive/CONFLICTS b/zbeta/texlive/CONFLICTS
index 66a9e6f..7afbb65 100644
--- a/zbeta/texlive/CONFLICTS
+++ b/zbeta/texlive/CONFLICTS
@@ -1 +1,2 @@
 conflicts teTeX
+conflicts teTeX-texmf
diff --git a/zbeta/texlive/DETAILS b/zbeta/texlive/DETAILS
index 7d1c3f8..2b35920 100644
--- a/zbeta/texlive/DETAILS
+++ b/zbeta/texlive/DETAILS
@@ -1,22 +1,29 @@
           MODULE=texlive
-         VERSION=20100722
+         VERSION=20091107
           SOURCE=$MODULE-$VERSION-source.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-source
-         SOURCE2=texlive-20091107-09-texlive-fonts.conf
-      SOURCE_URL=ftp://tug.org/historic/systems/texlive/2010
+         SOURCE2=texlive-20091107-fix_scripts_3.patch
+         SOURCE3=texlive-20091107-texmf.cnf_fix.patch
+         SOURCE4=texlive-20091107-09-texlive-fonts.conf
+      SOURCE_URL=ftp://tug.org/historic/systems/texlive/2009/
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:c5573c0617f1a44235212277959f48fb76590542
-     SOURCE2_VFY=sha1:7277db188ded00af37364d03bbcf9614b851c847
-        WEB_SITE=http://www.tug.org/texlive
+     SOURCE3_URL=$PATCH_URL
+     SOURCE4_URL=$PATCH_URL
+      SOURCE_VFY=sha1:3e11287f16595209181dc2e0ae7c23809e2e73ee
+     SOURCE2_VFY=sha1:f32083249d4503589536ae39bbe8bf9d943e631e
+     SOURCE3_VFY=sha1:807b2d96c86b24cb0743909c13e08172925eee85
+     SOURCE4_VFY=sha1:7277db188ded00af37364d03bbcf9614b851c847
+        WEB_SITE=http://www.tug.org/texlive/
          ENTERED=20100805
-         UPDATED=20100908
+         UPDATED=20100805
            SHORT="TeX distribution that includes web2c, pdfTeX, e-Tex and more"
 
+# Text from http://www.tug.org/texlive/
 cat << EOF
 TeX Live is an easy way to get up and running with the TeX document
 production system. It provides a comprehensive TeX system with binaries
 for most flavors of Unix, including GNU/Linux, and also Windows. It
 includes all the major TeX-related programs, macro packages, and fonts
 that are free software, including support for many languages around the
-world.
+world. 
 EOF