Refactoring generation of the texmf-update script from tetex to tetex-{2,3},

see bug #106626.
Reverting to mv from dosym in handling texmf.d

3 files changed, 86 insertions, 46 deletions

diff --git a/eclass/tetex-2.eclass b/eclass/tetex-2.eclass
index e704afcca532..534738f6c145 100644
--- a/eclass/tetex-2.eclass
+++ b/eclass/tetex-2.eclass
@@ -1,9 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tetex-2.eclass,v 1.5 2005/12/04 22:19:46 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tetex-2.eclass,v 1.6 2006/02/01 19:49:49 ehmsen Exp $
 #
 # Author: Jaromir Malenko <malenko@email.cz>
 # Author: Mamoru KOMACHI <usata@gentoo.org>
+# Author: Martin Ehmsen <ehmsen@gentoo.org>
+# Author: Alexandre Buisse <nattfodd@gentoo.org>
 #
 # A generic eclass to install tetex 2.0.x distributions.
 
@@ -18,7 +20,42 @@ tetex-2_src_unpack() {
 	cd ${S}/texmf
 
 	unpack ${TETEX_TEXMF_SRC}
-	sed -i -e "s/-sys//g" ${T}/texmf-update || die
+
+	# create update script
+	cat >${T}/texmf-update<<'EOF'
+#!/bin/bash
+#
+# Utility to update Gentoo teTeX distribution configuration files
+#
+
+PATH=/bin:/usr/bin
+
+for conf in texmf.cnf fmtutil.cnf updmap.cfg
+do
+	if [ -d "/etc/texmf/${conf/.*/.d}" ]
+	then
+		echo "Generating /etc/texmf/web2c/${conf} from /etc/texmf/${conf/.*/.d} ..."
+		cat /etc/texmf/${conf/.*/.d}/* > "/etc/texmf/web2c/${conf}"
+	fi
+done
+
+# configure
+echo "Configuring teTeX ..."
+mktexlsr &>/dev/null
+texconfig init &>/dev/null
+texconfig confall &>/dev/null
+texconfig font rw &>/dev/null
+texconfig font vardir /var/cache/fonts &>/dev/null
+texconfig font options varfonts &>/dev/null
+updmap &>/dev/null
+
+# generate
+echo "Generating format files ..."
+fmtutil --missing &>/dev/null
+echo
+echo "Use 'texconfig font ro' to disable font generation for users"
+echo
+EOF
 
 	# fix up misplaced listings.sty in the 2.0.2 archive.
 	# this should be fixed in the next release <obz@gentoo.org>
diff --git a/eclass/tetex-3.eclass b/eclass/tetex-3.eclass
index 3cde1b69db63..a8b2968b8b13 100644
--- a/eclass/tetex-3.eclass
+++ b/eclass/tetex-3.eclass
@@ -1,9 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tetex-3.eclass,v 1.9 2006/01/22 16:23:54 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tetex-3.eclass,v 1.10 2006/02/01 19:49:49 ehmsen Exp $
 #
 # Author: Jaromir Malenko <malenko@email.cz>
 # Author: Mamoru KOMACHI <usata@gentoo.org>
+# Author: Martin Ehmsen <ehmsen@gentoo.org>
+# Author: Alexandre Buisse <nattfodd@gentoo.org>
 #
 # A generic eclass to install tetex 3.x distributions.
 
@@ -48,6 +50,41 @@ tetex-3_src_unpack() {
 
 	tetex_src_unpack
 
+	# create update script
+	cat >${T}/texmf-update<<'EOF'
+#!/bin/bash
+#
+# Utility to update Gentoo teTeX distribution configuration files
+#
+
+PATH=/bin:/usr/bin
+
+for conf in texmf.cnf fmtutil.cnf updmap.cfg
+do
+	if [ -d "/etc/texmf/${conf/.*/.d}" ]
+	then
+		echo "Generating /etc/texmf/web2c/${conf} from /etc/texmf/${conf/.*/.d} ..."
+		cat /etc/texmf/${conf/.*/.d}/* > "/etc/texmf/web2c/${conf}"
+	fi
+done
+
+# configure
+echo "Configuring teTeX ..."
+mktexlsr &>/dev/null
+texconfig-sys init &>/dev/null
+texconfig-sys confall &>/dev/null
+texconfig-sys font rw &>/dev/null
+texconfig-sys font vardir /var/cache/fonts &>/dev/null
+updmap-sys &>/dev/null
+
+# generate
+echo "Generating format files ..."
+fmtutil-sys --missing &>/dev/null
+echo
+echo "Use 'texconfig font ro' to disable font generation for users"
+echo
+EOF
+
 	# need to fix up the hyperref driver, see bug #31967
 	sed -i -e "/providecommand/s/hdvips/hypertex/" \
 		${S}/texmf/tex/latex/hyperref/hyperref.cfg
@@ -112,9 +149,9 @@ tetex-3_src_install() {
 	dodir /etc/texmf/{updmap.d,fmtutil.d,texmf.d}
 	#cp ${D}/usr/share/texmf/web2c/updmap.cfg ${D}/etc/texmf/updmap.d/00updmap.cfg
 	dosym /etc/texmf/web2c/updmap.cfg ${TEXMF_PATH}/web2c/updmap.cfg
-	dosym /usr/share/texmf/web2c/updmap.cfg /etc/texmf/updmap.d/00updmap.cfg
-	dosym /etc/texmf/web2c/fmtutil.cnf /etc/texmf/fmtutil.d/00fmtutil.cnf
-	dosym /etc/texmf/web2c/texmf.cnf /etc/texmf/texmf.d/00texmf.cnf
+	mv ${D}/usr/share/texmf/web2c/updmap.cfg ${D}/etc/texmf/updmap.d/00updmap.cfg
+	mv ${D}/etc/texmf/web2c/fmtutil.cnf ${D}/etc/texmf/fmtutil.d/00fmtutil.cnf
+	mv ${D}/etc/texmf/web2c/texmf.cnf ${D}/etc/texmf/texmf.d/00texmf.cnf
 
 	# xdvi
 	if useq X ; then
diff --git a/eclass/tetex.eclass b/eclass/tetex.eclass
index c3c3f1bbf4ae..e2346198d627 100644
--- a/eclass/tetex.eclass
+++ b/eclass/tetex.eclass
@@ -1,9 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tetex.eclass,v 1.42 2005/12/11 23:07:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tetex.eclass,v 1.43 2006/02/01 19:49:48 ehmsen Exp $
 #
 # Author: Jaromir Malenko <malenko@email.cz>
 # Author: Mamoru KOMACHI <usata@gentoo.org>
+# Author: Martin Ehmsen <ehmsen@gentoo.org>
+# Author: Alexandre Buisse <nattfodd@gentoo.org>
 #
 # A generic eclass to install tetex distributions. This shouldn't be
 # inherited directly in any ebuilds. It should be inherited from
@@ -91,42 +93,6 @@ tetex_src_unpack() {
 			mkdir ${S}/texmf; cd ${S}/texmf
 			umask 022
 			unpack ${TETEX_TEXMF}
-
-			# create update script
-			cat >${T}/texmf-update<<'EOF'
-#!/bin/bash
-#
-# Utility to update Gentoo teTeX distribution configuration files
-#
-
-PATH=/bin:/usr/bin
-
-for conf in texmf.cnf fmtutil.cnf updmap.cfg
-do
-	if [ -d "/etc/texmf/${conf/.*/.d}" ]
-	then
-		echo "Generating /etc/texmf/web2c/${conf} from /etc/texmf/${conf/.*/.d} ..."
-		cat /etc/texmf/${conf/.*/.d}/* > "/etc/texmf/web2c/${conf}"
-	fi
-done
-
-# configure
-echo "Configuring teTeX ..."
-mktexlsr &>/dev/null
-texconfig-sys init &>/dev/null
-texconfig-sys confall &>/dev/null
-texconfig-sys font rw &>/dev/null
-texconfig-sys font vardir /var/cache/fonts &>/dev/null
-texconfig-sys font options varfonts &>/dev/null
-updmap-sys &>/dev/null
-
-# generate
-echo "Generating format files ..."
-fmtutil-sys --missing &>/dev/null
-echo
-echo "Use 'texconfig font ro' to disable font generation for users"
-echo
-EOF
 			;;
 		patch)
 			# Do not run config. Also fix local texmf tree.