Include kpathsea/version.h when available. Fixes a build failure with TeX Live 2010.

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

4 files changed, 56 insertions, 11 deletions

diff --git a/dev-tex/cjk-latex/ChangeLog b/dev-tex/cjk-latex/ChangeLog
index 208aa95d82c8..8118b84882e7 100644
--- a/dev-tex/cjk-latex/ChangeLog
+++ b/dev-tex/cjk-latex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/cjk-latex
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/ChangeLog,v 1.43 2009/08/05 00:07:12 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/ChangeLog,v 1.44 2010/10/10 16:42:18 aballier Exp $
+
+  10 Oct 2010; Alexis Ballier <aballier@gentoo.org> cjk-latex-4.8.2.ebuild,
+  +files/cjk-latex-4.8.2-kpathsea_version.patch:
+  Include kpathsea/version.h when available. Fixes a build failure with TeX
+  Live 2010.
 
   05 Aug 2009; Alexis Ballier <aballier@gentoo.org> -cjk-latex-4.8.1.ebuild:
   remove old
diff --git a/dev-tex/cjk-latex/Manifest b/dev-tex/cjk-latex/Manifest
index 48cefe2f1035..e70b86e49fd9 100644
--- a/dev-tex/cjk-latex/Manifest
+++ b/dev-tex/cjk-latex/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cjk-latex-4.8.2-kpathsea_version.patch 1211 RMD160 3d71f8db0053de3a017871644f36d556055ecee7 SHA1 08467a19e0af657bd45e59961b7ca7590740dcd3 SHA256 70f57755bc40a1c85dc487c1c8175416405dfdb63809aac39bf6446047625613
 DIST cjk-4.8.2-doc.tar.gz 2243205 RMD160 291c6d57dbef52537e712aa9b4f6f0cfa41b8e67 SHA1 95690d4dd7a820e729bd125507db05c808ab4f37 SHA256 d4eb32896e9f0e69c6f8ae81fd9d0aa0257390eb1d2b028173625995bcb9c00c
 DIST cjk-4.8.2-fonts.zip 20384230 RMD160 0c1d363af352c48bf6f24067699a9559e208f517 SHA1 f1e7ae35757241af267d2a086bfec2d82b081925 SHA256 1625582b13a5f46532b5f7d0b0f25a9f72960017ad9b1074fbcf70cbbf45efb4
 DIST cjk-4.8.2.tar.gz 553425 RMD160 184a890fb360b0c2ddd8f45fbd50f1b34ca22c51 SHA1 0b288469a56e3e30e7aa8b559f2b710f9525836c SHA256 2108856bafbf6eb44b65500122ae540d863fb1e4196485682be4d88244f16dd6
-EBUILD cjk-latex-4.8.2.ebuild 3478 RMD160 ec281fb513097fda2932d2736eced38cb897e825 SHA1 227bd82bb1fcb6e17ebec7e3f15c6d1853bf04b9 SHA256 c2fbbd33a27e36ea230dd1a7feb0dd749ef5c7d70daab676dfe391ba6fddee6b
-MISC ChangeLog 4866 RMD160 330438ef184bdb620a2e9eec81cc78e2d3d7470c SHA1 c293e85c7fbb23b2f9bb867e84b390b4ab707297 SHA256 cd462585b6d6479eadfb460848a64ee54ca33204fc557c66536229eaffa16612
+EBUILD cjk-latex-4.8.2.ebuild 3583 RMD160 5b8bb2a0399bf46bee5b0bd4b0980b7499fc9836 SHA1 704af92158cc1ad64d00024734112e4d6b8af454 SHA256 d4a7057b97136011c8d22dca226747ce3d6459bf5de6e2eb0ad9d4be1c52f0ba
+MISC ChangeLog 5081 RMD160 95119103049a8537c27283683506422549d799d6 SHA1 1bbfe0c577713886dd7f3d3713e040df9044ae95 SHA256 b901f4e0c06c20d136415424ec49f5c918d7e521fdd558fea871be5833dec2ef
 MISC metadata.xml 173 RMD160 2a5c18ac36394027f647f337410df755f5d37369 SHA1 98f3803fec9ccaf2574571b904292027095f5273 SHA256 f489b81a91c6b9b653122719caac14c4f1cfd63d26d4b100abf1a995db71d9c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkp4zTsACgkQvFcC4BYPU0r8vACfVolIJF7fPRH80jXLy+hEnSn5
-od0Anjjlc3HHLA4MJuRVJb/50ztBMPGA
-=AANn
+iEYEARECAAYFAkyx7PAACgkQvFcC4BYPU0oj5wCfTvwZuFtjin0gohMfOCffxak2
+3h4AoMcnFoMhwDuKb5gTktIlVInFWbIR
+=JkOn
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild b/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild
index 8cbbb974a647..ac0cee2c2a99 100644
--- a/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild,v 1.7 2009/05/28 16:12:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild,v 1.8 2010/10/10 16:42:18 aballier Exp $
 
-inherit latex-package elisp-common toolchain-funcs multilib
+inherit latex-package elisp-common toolchain-funcs multilib eutils autotools
 
 MY_P="${P/-latex/}"
 
@@ -36,6 +36,9 @@ src_unpack() {
 	sed -i -e "/^pk_files/s/no/yes/" \
 		-e "/^dpi_x/s/300/500/" \
 		texmf/hbf2gf/*.cfg || die
+	epatch "${FILESDIR}/${P}-kpathsea_version.patch"
+	cd "${S}/utils/hbf2gf"
+	eautoreconf
 }
 
 src_compile() {
diff --git a/dev-tex/cjk-latex/files/cjk-latex-4.8.2-kpathsea_version.patch b/dev-tex/cjk-latex/files/cjk-latex-4.8.2-kpathsea_version.patch
new file mode 100644
index 000000000000..dfbd0c3a28a6
--- /dev/null
+++ b/dev-tex/cjk-latex/files/cjk-latex-4.8.2-kpathsea_version.patch
@@ -0,0 +1,36 @@
+Include kpathsea/version.h when available. Fixes a build failure with TeX Live
+2010.
+
+Index: cjk-4.8.2/utils/hbf2gf/configure.ac
+===================================================================
+--- cjk-4.8.2.orig/utils/hbf2gf/configure.ac
++++ cjk-4.8.2/utils/hbf2gf/configure.ac
+@@ -79,6 +79,7 @@ if test -n "$kpathsea_include" -o -n "$k
+ 
+   AC_CHECK_HEADER(kpathsea/c-auto.h, ,[
+                   AC_MSG_ERROR([Can't find kpathsea include files! Use --with-kpathsea-include option.])])
++  AC_CHECK_HEADERS([kpathsea/version.h])
+ else
+   CPPFLAGS="$CPPFLAGS -I$srcdir"
+ fi
+Index: cjk-4.8.2/utils/hbf2gf/hbf2gf.w
+===================================================================
+--- cjk-4.8.2.orig/utils/hbf2gf/hbf2gf.w
++++ cjk-4.8.2/utils/hbf2gf/hbf2gf.w
+@@ -2500,12 +2500,16 @@ be used instead.
+ @
+ @<Global variables@>=
+ #if defined(HAVE_LIBKPATHSEA)
++#if defined(HAVE_KPATHSEA_VERSION_H)
++#include <kpathsea/version.h>
++#else
+ #ifdef KPSEDLL
+ /* this is kpathsea 3.3 and newer */
+ extern KPSEDLL char *kpathsea_version_string;
+ #else
+ extern DllImport char *kpathsea_version_string;
+ #endif
++#endif
+ #elif defined(HAVE_EMTEXDIR)
+ char emtex_version_string[] = "emTeXdir";
+ #elif !defined(HAVE_MIKTEX)