Small update to fix collisions with tetex-3.

Package-Manager: portage-2.1.2_rc1-r1

3 files changed, 22 insertions, 25 deletions

diff --git a/app-text/xetex/ChangeLog b/app-text/xetex/ChangeLog
index 7b583a2b62f9..4731f1887721 100644
--- a/app-text/xetex/ChangeLog
+++ b/app-text/xetex/ChangeLog
@@ -1,6 +1,9 @@
 # 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.5 2006/10/29 12:35:02 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xetex/ChangeLog,v 1.6 2006/10/30 00:55:21 joslwah Exp $
+
+  30 Oct 2006; Joshua <joslwah@gentoo.org> xetex-0.995.ebuild:
+  Small update to fix collisions with tetex-3.
 
   29 Oct 2006; Ferris McCormick <fmccor@gentoo.org> xetex-0.995.ebuild:
   Add ~sparc keyword (Bug #153132).
diff --git a/app-text/xetex/Manifest b/app-text/xetex/Manifest
index 5f2a9fac0b55..a7de55288d72 100644
--- a/app-text/xetex/Manifest
+++ b/app-text/xetex/Manifest
@@ -7,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 2175 RMD160 7c6409c409f242d0bf68166f9543c26c662cff52 SHA1 e953fa0f5853926e51e11d95eeb05a2b9b31b3f2 SHA256 5a88912fcebaa3594d3a839bcc5a682d3416c306f9a11f57e42b57757d66e1a5
-MD5 ee12310dc043a612a5560da1022cb84f xetex-0.995.ebuild 2175
-RMD160 7c6409c409f242d0bf68166f9543c26c662cff52 xetex-0.995.ebuild 2175
-SHA256 5a88912fcebaa3594d3a839bcc5a682d3416c306f9a11f57e42b57757d66e1a5 xetex-0.995.ebuild 2175
-MISC ChangeLog 917 RMD160 dd4a000b5173c19edcaeac6fd66c064f8e932f00 SHA1 cd260bd4dfe1b1a5b21eeb7454c113cdc23d20ce SHA256 5b4e25ddf5e7ef87e1bdda5f9477b7344543784d3446523af22c408d944147fd
-MD5 a615cc6e0c48b1059a4c2ed9de22f4cc ChangeLog 917
-RMD160 dd4a000b5173c19edcaeac6fd66c064f8e932f00 ChangeLog 917
-SHA256 5b4e25ddf5e7ef87e1bdda5f9477b7344543784d3446523af22c408d944147fd ChangeLog 917
+EBUILD xetex-0.995.ebuild 1164 RMD160 90c479ea0a17ef40119937628143b47b28be37b0 SHA1 5be35f048581660321f4cdd37927bc675bac4710 SHA256 20b1dcf743474dddf4a060300e3c1cadf3ae417c9500c407beff4197a1b0c649
+MD5 056a932286db25513dfd37ee8d1d1d3a xetex-0.995.ebuild 1164
+RMD160 90c479ea0a17ef40119937628143b47b28be37b0 xetex-0.995.ebuild 1164
+SHA256 20b1dcf743474dddf4a060300e3c1cadf3ae417c9500c407beff4197a1b0c649 xetex-0.995.ebuild 1164
+MISC ChangeLog 1029 RMD160 c9da8dddeb20741c59d97b66b71ef40dcdcc9186 SHA1 66c6de06a77bea685f5924099471a25fc8314147 SHA256 a3208bdf471156f6a110dca96d0f815b5b48a3e35249b5bb484f879ba7e55e76
+MD5 70e748d649fdf39ab1d6e28b68d6da76 ChangeLog 1029
+RMD160 c9da8dddeb20741c59d97b66b71ef40dcdcc9186 ChangeLog 1029
+SHA256 a3208bdf471156f6a110dca96d0f815b5b48a3e35249b5bb484f879ba7e55e76 ChangeLog 1029
 MISC metadata.xml 560 RMD160 2ec5e484c96d93a2135235577b5673fda33570fd SHA1 66d5bdc3ca7da322e4f1f9a58fd305f51e8808cc SHA256 a2e13b5149748c1f319150e6cc4c5ffc4d49d41b2e53490af34c8d7b14b4c656
 MD5 d60096908c5154c2fe428c8d1524bfd9 metadata.xml 560
 RMD160 2ec5e484c96d93a2135235577b5673fda33570fd metadata.xml 560
diff --git a/app-text/xetex/xetex-0.995.ebuild b/app-text/xetex/xetex-0.995.ebuild
index 0e309c2540c0..fc2b8e63e0ef 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.2 2006/10/29 12:35:02 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xetex/xetex-0.995.ebuild,v 1.3 2006/10/30 00:55:21 joslwah Exp $
 
 inherit eutils
 
@@ -28,27 +28,21 @@ src_compile() {
 }
 
 src_install() {
-	# Short term hack instead of patching.  Change to a patch later.
-#	sed -e 's/texbindir=`/texbindir=${D}`/' \
-#		-e '/cp -pf Work\/texk\/web2c\/xetex ${texbindir}\/xetex/i mkdir -p ${texbindir}' \
-#		-e 's/texmflocal=`kpsewhich --var-value TEXMFLOCAL`/texmflocal=${D}usr\/share\/texmf/' \
-#		-e 's/.\/rebuild-formats/-x .\/rebuild-formats.gentoo/' install-xetex >install-xetex.gentoo
-#	sed -e '/ fmtutil.cnf`/a cp ${fmtutil_cnf} ${D}${fmtutil_cnf}' \
-#		-e 's/cat >> ${fmtutil_cnf}/cat >>${D}${fmtutil_cnf}/' \
-#		-e 's/texbindir=`/texbindir=${D}`/' \
-#		-e '/patch -N -r/i cp `which fmtutil` .' \
-#		-e 's/-p0 `which fmtutil`/-p0 fmtutil/' \
-#		-e 's/${fmtutil} --enablefmt ${f}/TEXMFLOCAL=${D}usr\/share\/texmf .\/fmtutil --fmtdir ${D}usr\/share\/texmf\/web2c --cnffile ${D}${fmtutil_cnf} --enablefmt ${f}/' \
-#		-e 's/${fmtutil} --byfmt ${f}/TEXMFLOCAL=${D}usr\/share\/texmf .\/fmtutil --fmtdir ${D}usr\/share\/texmf\/web2c --cnffile ${D}${fmtutil_cnf} --byfmt ${f}/' \
-#		-e 's/texlinks --silent/texlinks --silent --cnffile ${D}${fmtutil_cnf} ${D}usr\/share\/texmf\/web2c/' rebuild-formats >rebuild-formats.gentoo
 	sh -x install-xetex || die
 
 	# Need to softlink xelatex to xetex.
 	cd ${D}/usr/bin
 	ln -s xetex xelatex
+}
 
-	# Do we need to worry about /usr/share/texmf being explicit?  
-	# What happens if this doesn't match the tex install place?
+pkg_preinst()
+{
+	fmtutil=`kpsewhich --format="web2c files" fmtutil.cnf`
+	if [ -L $fmtutil ] ; then
+		fmtutil_real=`readlink "${fmtutil}"`
+		mkdir -p ${D}`dirname "${fmtutil_real}"`
+		mv "${D}${fmtutil}" "${D}${fmtutil_real}"
+	fi
 }
 
 pkg_postinst()