Make use of SELFAUTO variables in texmf.cnf file, so that we'll be closer to upstream's config file and it will be more robust if installed in another directory

(Portage version: 2.1.3.16)

2 files changed, 15 insertions, 9 deletions

diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog
index d996cfe7d4eb..7a2fbc942327 100644
--- a/app-text/texlive-core/ChangeLog
+++ b/app-text/texlive-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/texlive-core
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.16 2007/10/27 14:59:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.17 2007/10/27 17:21:39 aballier Exp $
+
+  27 Oct 2007; Alexis Ballier <aballier@gentoo.org>
+  files/2007/texmf.d/05searchpaths.cnf:
+  Make use of SELFAUTO variables in texmf.cnf file, so that we'll be closer to
+  upstream's config file and it will be more robust if installed in another
+  directory
 
   27 Oct 2007; Alexis Ballier <aballier@gentoo.org>
   files/2007/texmf.d/05searchpaths.cnf:
diff --git a/app-text/texlive-core/files/2007/texmf.d/05searchpaths.cnf b/app-text/texlive-core/files/2007/texmf.d/05searchpaths.cnf
index 7e47df4ec8d6..5c50d8970f3e 100644
--- a/app-text/texlive-core/files/2007/texmf.d/05searchpaths.cnf
+++ b/app-text/texlive-core/files/2007/texmf.d/05searchpaths.cnf
@@ -9,18 +9,18 @@
 
 % The tree containing the runtime files closely related to the specific
 % program version used:
-TEXMFMAIN = /usr/share/texmf
+TEXMFMAIN = $SELFAUTODIR/share/texmf
 
 % The main distribution tree:
-TEXMFDIST = /usr/share/texmf-dist
+TEXMFDIST = $SELFAUTODIR/share/texmf-dist
 
 % The Gentoo site tree
-TEXMFSITE = /usr/share/texmf-site
+TEXMFSITE = $SELFAUTODIR/share/texmf-site
 
 % A place for local additions to a "standard" texmf tree.
 % This tree is not used for local configuration maintained by
 % texconfig, it uses TEXMFCONFIG below.
-TEXMFLOCAL = /usr/local/share/texmf
+TEXMFLOCAL = $SELFAUTODIR/local/share/texmf
 
 % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
 % With teTeX-3.0 or later, this must be set.
@@ -32,7 +32,7 @@ TEXMFLOCAL = /usr/local/share/texmf
 % ebuilds will install their format files there.
 % If you do modify it, you'll have to face the consequences of having format
 % files out of control of the package manager.
-TEXMFSYSVAR = /var/lib/texmf
+TEXMFSYSVAR = $SELFAUTOPARENT/var/lib/texmf
 
 % TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
 % With teTeX-3.0 or later, this must be set.
@@ -40,7 +40,7 @@ TEXMFSYSVAR = /var/lib/texmf
 %   TEXMFSYSCONFIG = $TEXMFMAIN
 % For using a separate tree:
 %   TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
-TEXMFSYSCONFIG = /etc/texmf
+TEXMFSYSCONFIG = $SELFAUTOPARENT/etc/texmf
 
 % User texmf trees are allowed as follows.
 % This used to be HOMETEXMF.
@@ -82,7 +82,7 @@ SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST;$TEXMFSITE
 % Where generated fonts may be written.  This tree is used when the sources
 % were found in a system tree and either that tree wasn't writable, or the
 % varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = /var/tmp/texfonts
+VARTEXFONTS = $SELFAUTOPARENT/var/tmp/texfonts
 
 % Where to look for ls-R files.  There need not be an ls-R in the
 % directories in this path, but if there is one, Kpathsea will use it.
@@ -108,7 +108,7 @@ TEXMFDBS = $TEXMF;$VARTEXFONTS
 %
 % On some systems, there will be a system tree which contains all the font
 % files that may be created as well as the formats.  For example
-%   TEXMFVAR = /var/lib/texmf
+%   TEXMFVAR = $SELFAUTOPARENT/var/lib/texmf
 % is used on many Linux systems.  In this case, set VARTEXFONTS like this
 % VARTEXFONTS = $TEXMFVAR/fonts
 % and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR).