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

(Portage version: 2.2_rc91/cvs/Linux x86_64)

3 files changed, 49 insertions, 5 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/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)