Update patch to deal with tetex-3. Previously only worked with tetex-2.

Package-Manager: portage-2.1.2_rc1-r1

3 files changed, 19 insertions, 15 deletions

diff --git a/app-text/xetex/ChangeLog b/app-text/xetex/ChangeLog
index ab51aaed69d5..8fdf7ed69417 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.2 2006/10/28 15:49:30 joslwah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xetex/ChangeLog,v 1.3 2006/10/29 09:07:44 joslwah Exp $
+
+  29 Oct 2006; Joshua <joslwah@gentoo.org> files/xetex-0.995-rebuild.patch:
+  Update patch to deal with tetex-3.  Previously only worked with tetex-2.
 
   28 Oct 2006; Joshua <joslwah@gentoo.org> ChangeLog:
   Update the patch for rebuilding the TeX links in version 0.995.  Now can 
diff --git a/app-text/xetex/Manifest b/app-text/xetex/Manifest
index de22bb899774..7251947643d3 100644
--- a/app-text/xetex/Manifest
+++ b/app-text/xetex/Manifest
@@ -2,19 +2,19 @@ AUX xetex-0.995-install.patch 779 RMD160 c2119799177184ada9da3b20867afcaa2c447ef
 MD5 b439f23d5561bbca223cce6b83554d4e files/xetex-0.995-install.patch 779
 RMD160 c2119799177184ada9da3b20867afcaa2c447ef4 files/xetex-0.995-install.patch 779
 SHA256 360bfebce9b515d639f7e3c9f453bb9ca51f19e226244af08e7c21ce51be2c41 files/xetex-0.995-install.patch 779
-AUX xetex-0.995-rebuild.patch 1838 RMD160 6f5d550208b541033d76c745eae93fd21d36cdbd SHA1 dbbccd4b232522bd76b7bc8f0c42c645088d7090 SHA256 1e708ba82b03f92dce7dee6586a9f6c85fa54b819c3cd624a00a7298c489ba7f
-MD5 57e841eefad25908ded46c5f691a8343 files/xetex-0.995-rebuild.patch 1838
-RMD160 6f5d550208b541033d76c745eae93fd21d36cdbd files/xetex-0.995-rebuild.patch 1838
-SHA256 1e708ba82b03f92dce7dee6586a9f6c85fa54b819c3cd624a00a7298c489ba7f files/xetex-0.995-rebuild.patch 1838
+AUX xetex-0.995-rebuild.patch 1878 RMD160 7c0c808b91f7fa88f19bc3e6bc4f0371ecbe2752 SHA1 e692fb61bc2a358445878aebd7531fd30c6ce1ff SHA256 e0c65271687d4d087c2e02b8f407f57fd58416b1d26022c9265dad3684d1694a
+MD5 67da10d892d423601bc79cc201dcc2f1 files/xetex-0.995-rebuild.patch 1878
+RMD160 7c0c808b91f7fa88f19bc3e6bc4f0371ecbe2752 files/xetex-0.995-rebuild.patch 1878
+SHA256 e0c65271687d4d087c2e02b8f407f57fd58416b1d26022c9265dad3684d1694a files/xetex-0.995-rebuild.patch 1878
 DIST xetex-0.995.tar.gz 19482520 RMD160 d556b65a4fb7038589386a0cfe4f16d2d015f40e SHA1 f38b9efb031b978fb8f77653db71526c3d1f32f3 SHA256 eb9c997996ea0abe1d08e9f345d91a9e33079ff32b0496a124cb2e5614096977
 EBUILD xetex-0.995.ebuild 2169 RMD160 29b0bff1594661b80aeaddeddfc75c2ae1328d28 SHA1 69927df2b2aa911ccaba141f12ff5775f967826d SHA256 488e1272cd743b132771f620747a0fa1ef6e66aca260a2291c9964af9ab32b8b
 MD5 49f6f0ae493ffaa5176adaf84e52f408 xetex-0.995.ebuild 2169
 RMD160 29b0bff1594661b80aeaddeddfc75c2ae1328d28 xetex-0.995.ebuild 2169
 SHA256 488e1272cd743b132771f620747a0fa1ef6e66aca260a2291c9964af9ab32b8b xetex-0.995.ebuild 2169
-MISC ChangeLog 507 RMD160 ca84a5bb0163e77eb8155f47375f3f367c79de7d SHA1 3ec917ace07d67efcf0f1ca2da68dff2d7b379f0 SHA256 ffd278c37e5060697fd0f26ae1d8c69529d9b335f7e522d3ccdafb2eae368295
-MD5 d4979076a3aeabc026b5a47eeaf01134 ChangeLog 507
-RMD160 ca84a5bb0163e77eb8155f47375f3f367c79de7d ChangeLog 507
-SHA256 ffd278c37e5060697fd0f26ae1d8c69529d9b335f7e522d3ccdafb2eae368295 ChangeLog 507
+MISC ChangeLog 659 RMD160 6f23bc7dd87b3d6fa0269e65a767e516767ae3f7 SHA1 6fdc886990724f306170bc6f8fb7b37a6a295f3a SHA256 0aa30e351d8440fbd6859753e28375603dc0cac469f95e6679a1a6f66ee18b3b
+MD5 f8568bd00a15d2f4cdd9c9db03b90314 ChangeLog 659
+RMD160 6f23bc7dd87b3d6fa0269e65a767e516767ae3f7 ChangeLog 659
+SHA256 0aa30e351d8440fbd6859753e28375603dc0cac469f95e6679a1a6f66ee18b3b ChangeLog 659
 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/files/xetex-0.995-rebuild.patch b/app-text/xetex/files/xetex-0.995-rebuild.patch
index 797698089cd1..7103a195dd3e 100644
--- a/app-text/xetex/files/xetex-0.995-rebuild.patch
+++ b/app-text/xetex/files/xetex-0.995-rebuild.patch
@@ -1,9 +1,10 @@
---- rebuild-formats	2006-08-23 03:41:00.000000000 +0800
-+++ rebuild-formats.gentoo	2006-10-28 18:15:12.000000000 +0800
-@@ -6,8 +6,9 @@
+--- rebuild-formats	2006-10-29 14:49:00.451130216 +0800
++++ rebuild-formats.gentoo	2006-10-29 15:32:28.929331049 +0800
+@@ -6,8 +6,10 @@
  
  # ensure our entries are present in fmtutil.cnf
  fmtutil_cnf=`kpsewhich --format="web2c files" fmtutil.cnf`
++mkdir -p `dirname ${D}${fmtutil_cnf}`
 +cp ${fmtutil_cnf} ${D}${fmtutil_cnf}
  if [ "`fgrep -c xetex ${fmtutil_cnf}`" == "0" ]; then
 -	cat >> ${fmtutil_cnf} <<-__EOT__;
@@ -11,7 +12,7 @@
  
  	# XeTeX formats
  	xetex	xetex	-	*xetex.ini
-@@ -21,7 +22,7 @@
+@@ -21,7 +23,7 @@
  if [ -L ${texbin} ]; then
  	texbin=`readlink ${texbin}`
  fi
@@ -20,7 +21,7 @@
  
  # ensure ${texbindir} is in the PATH so that fmtutil can find new xetex
  # (normal usage may rely on a symlink, which doesn't yet exist)
-@@ -29,7 +30,8 @@
+@@ -29,7 +31,8 @@
  
  # patch fmtutil from teTeX 2.x so it doesn't confuse xetex with an etex engine
  # (discarding any error message in case we have teTeX 3 or an already-patched teTeX 2)
@@ -30,7 +31,7 @@
  
  # use system-wide setup if available
  fmtutil=`type -p fmtutil-sys` || fmtutil=`type -p fmtutil`
-@@ -37,9 +39,9 @@
+@@ -37,9 +40,9 @@
  formats="xetex xelatex"
  for f in ${formats}; do
  # enable our entries if necessary (in case of pre-existing disabled ones)