Fix possible install problem for xelatex, and updated kpse search path.

Package-Manager: portage-2.1.2_rc1-r3

3 files changed, 21 insertions, 22 deletions

diff --git a/app-text/xetex/ChangeLog b/app-text/xetex/ChangeLog
index 3f845c1de536..dbec5391a36a 100644
--- a/app-text/xetex/ChangeLog
+++ b/app-text/xetex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xetex
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xetex/ChangeLog,v 1.10 2006/10/31 11:32:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xetex/ChangeLog,v 1.11 2006/11/06 00:59:18 joslwah Exp $
+
+  06 Nov 2006; Joshua <joslwah@gentoo.org> xetex-0.995.ebuild:
+  Fix possible installation bug for amd64.
+  Add xelatex to kpse search path for xelatex.  (bug 154035)
 
   31 Oct 2006; Christian Faulhammer <opfer@gentoo.org> xetex-0.995.ebuild:
   marked ~x86 as requested in bug #153132
diff --git a/app-text/xetex/Manifest b/app-text/xetex/Manifest
index af544c7dd457..570764e987f4 100644
--- a/app-text/xetex/Manifest
+++ b/app-text/xetex/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xetex-0.995-install.patch 1166 RMD160 0a4de2b632937926737930fce898704352bf5835 SHA1 66bf1c2fad9182b64214ba783725077023e19297 SHA256 3327ee8568ebd404997be9ecba9fdb87ad2576ea99434d60f8d09476d6edd601
 MD5 0b977f6e8eec6843e23e2fa3ba37d013 files/xetex-0.995-install.patch 1166
 RMD160 0a4de2b632937926737930fce898704352bf5835 files/xetex-0.995-install.patch 1166
@@ -10,14 +7,14 @@ MD5 5fb48b55c72233e81a27f86b8a18a4f7 files/xetex-0.995-rebuild.patch 2127
 RMD160 e97a4c9bf8d16bb162d4580ddb742e6ae77cbcb3 files/xetex-0.995-rebuild.patch 2127
 SHA256 140582d3197a0bc0302b5de5d588568b2e2cb97a81f650b713a298e8e22a5c26 files/xetex-0.995-rebuild.patch 2127
 DIST xetex-0.995.tar.gz 19482520 RMD160 d556b65a4fb7038589386a0cfe4f16d2d015f40e SHA1 f38b9efb031b978fb8f77653db71526c3d1f32f3 SHA256 eb9c997996ea0abe1d08e9f345d91a9e33079ff32b0496a124cb2e5614096977
-EBUILD xetex-0.995.ebuild 1557 RMD160 a31d4ca7425a343b316b20fd1b4ff3c0c9287941 SHA1 241cd7ec5d44dbc5ddd5065053a3d414b9aa5447 SHA256 3b403b97116c303a2ec6b8f0bd1cb9873ba32c809a2c618ad91ad69e2acf20d2
-MD5 cd689e3571a375914f309832a1d4acd3 xetex-0.995.ebuild 1557
-RMD160 a31d4ca7425a343b316b20fd1b4ff3c0c9287941 xetex-0.995.ebuild 1557
-SHA256 3b403b97116c303a2ec6b8f0bd1cb9873ba32c809a2c618ad91ad69e2acf20d2 xetex-0.995.ebuild 1557
-MISC ChangeLog 1563 RMD160 6f8af2eba326e97d27754f45c6649a660368890f SHA1 48330586edd2a937d4fe6dd6410366ed8139a003 SHA256 39907b122c30d21ffb5def0b5bec5795f88f603eba30f0928eb25ac6f2672a38
-MD5 137a142c84c89410551293972ece8310 ChangeLog 1563
-RMD160 6f8af2eba326e97d27754f45c6649a660368890f ChangeLog 1563
-SHA256 39907b122c30d21ffb5def0b5bec5795f88f603eba30f0928eb25ac6f2672a38 ChangeLog 1563
+EBUILD xetex-0.995.ebuild 1996 RMD160 06c3e3f5f0ec4fd05b51da25b972b19386bff9b1 SHA1 e761378644b1bca181d1b37cba1a8c2f5c16b438 SHA256 0fd7f350259f449e3f5869a499850cdb76bc28ada9b23b6fd40f3a0684323646
+MD5 480e82a2930e12578fb2ccac091da3c1 xetex-0.995.ebuild 1996
+RMD160 06c3e3f5f0ec4fd05b51da25b972b19386bff9b1 xetex-0.995.ebuild 1996
+SHA256 0fd7f350259f449e3f5869a499850cdb76bc28ada9b23b6fd40f3a0684323646 xetex-0.995.ebuild 1996
+MISC ChangeLog 1733 RMD160 8d4f1230354bd53d93f457d7282df8a49886e0ee SHA1 5971ad147b2ee5a7eadb184abc356d5705a283a1 SHA256 e92d5574100f1ec53b4626eed5a05cd93dc1da2be1e8de25f74a17b31c7eb429
+MD5 84dba59adba567cd6f502c01498e8c06 ChangeLog 1733
+RMD160 8d4f1230354bd53d93f457d7282df8a49886e0ee ChangeLog 1733
+SHA256 e92d5574100f1ec53b4626eed5a05cd93dc1da2be1e8de25f74a17b31c7eb429 ChangeLog 1733
 MISC metadata.xml 560 RMD160 2ec5e484c96d93a2135235577b5673fda33570fd SHA1 66d5bdc3ca7da322e4f1f9a58fd305f51e8808cc SHA256 a2e13b5149748c1f319150e6cc4c5ffc4d49d41b2e53490af34c8d7b14b4c656
 MD5 d60096908c5154c2fe428c8d1524bfd9 metadata.xml 560
 RMD160 2ec5e484c96d93a2135235577b5673fda33570fd metadata.xml 560
@@ -25,10 +22,3 @@ SHA256 a2e13b5149748c1f319150e6cc4c5ffc4d49d41b2e53490af34c8d7b14b4c656 metadata
 MD5 f1db48cece96f7f4c65a53a72957191f files/digest-xetex-0.995 241
 RMD160 a35ce3ec7fff49a9ec6f0686cd2db4402d8b0af1 files/digest-xetex-0.995 241
 SHA256 96b3d78141e6dc960387b20f7ab2e48ce3ddf087e6c1db2f6cc5a340ca97faaf files/digest-xetex-0.995 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFRzRENQqtfCuFneMRAu29AJ4o5Y0E4/i8LOBEnCuVbxiUa3DWtgCeN/8M
-dxgcTmX6iPaOBXExtT/5Ciw=
-=FsW1
------END PGP SIGNATURE-----
diff --git a/app-text/xetex/xetex-0.995.ebuild b/app-text/xetex/xetex-0.995.ebuild
index 3d9826d7187c..a7878d554726 100644
--- a/app-text/xetex/xetex-0.995.ebuild
+++ b/app-text/xetex/xetex-0.995.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xetex/xetex-0.995.ebuild,v 1.7 2006/10/31 11:32:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xetex/xetex-0.995.ebuild,v 1.8 2006/11/06 00:59:18 joslwah Exp $
 
 inherit eutils
 
@@ -42,7 +42,7 @@ pkg_preinst()
 {
 	pwd
 	cd ${S}
-	ln -sf ${D}usr/share/texmf-site/tex/generic/hyphen ${D}usr/share/texmf/tex/generic/hyphen
+	mv ${D}usr/share/texmf-site/tex/generic/hyphen ${D}usr/share/texmf/tex/generic/hyphen
 	texhash "${D}usr/share/texmf"
 	sh ./rebuild-formats
 
@@ -54,7 +54,12 @@ pkg_preinst()
 		mv "${D}${fmtutil}" "${D}${fmtutil_real}"
 	fi
 
-	rm ${D}usr/share/texmf/tex/generic/hyphen
+	mv ${D}usr/share/texmf/tex/generic/hyphen ${D}usr/share/texmf-site/tex/generic/hyphen
+
+	### Add xetex to the search path for xelatex, if not already done.
+	mkdir -p ${D}etc/texmf/web2c
+	egrep -q 'TEXINPUTS.xelatex = .;\$TEXMF/tex/{xelatex,latex,generic,}//' /etc/texmf/web2c/texmf.cnf || \
+		sed -e 's/TEXINPUTS.xelatex = .;$TEXMF\/tex\/{latex,generic,}\/\//TEXINPUTS.xelatex = .;$TEXMF\/tex\/{xelatex,latex,generic,}\/\//' /etc/texmf/web2c/texmf.cnf > ${D}etc/texmf/web2c/texmf.cnf
 
 }