Fix the kpathsea_version_string problem in a way that doesn't break compilation with TeX Live 2008.

Package-Manager: portage-2.1.9.21/cvs/Linux x86_64

4 files changed, 64 insertions, 10 deletions

diff --git a/dev-tex/catdvi/ChangeLog b/dev-tex/catdvi/ChangeLog
index 1b00d0d74fe0..0405dc78b99c 100644
--- a/dev-tex/catdvi/ChangeLog
+++ b/dev-tex/catdvi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/catdvi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/catdvi/ChangeLog,v 1.6 2010/10/27 21:54:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/catdvi/ChangeLog,v 1.7 2010/10/28 16:40:39 ulm Exp $
+
+  28 Oct 2010; Ulrich Mueller <ulm@gentoo.org> catdvi-0.14-r1.ebuild,
+  files/catdvi-0.14-kpathsea.patch:
+  Fix the kpathsea_version_string problem in a way that doesn't break
+  compilation with TeX Live 2008. Thanks aballier.
 
 *catdvi-0.14-r1 (26 Oct 2010)
 
diff --git a/dev-tex/catdvi/Manifest b/dev-tex/catdvi/Manifest
index 0086b12e81e8..3457a0d0ba18 100644
--- a/dev-tex/catdvi/Manifest
+++ b/dev-tex/catdvi/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX catdvi-0.14-kpathsea.patch 234 RMD160 d8fd7c5cd50d28cb68fdafe7e54508d62cf2e5f8 SHA1 59cbb395a09b08bb9e6fde2d55ed87668974b04d SHA256 7ae96b89c3cb8b89a8707810fb9e90a4fcf8f61a02e42ffe04d7389f03f510f2
+AUX catdvi-0.14-kpathsea.patch 1592 RMD160 f086c1851b021dd9e00f6190c2dcb590414ddb40 SHA1 c414a6912ee054485178b6be927fa526e7f31d38 SHA256 c15b29d47990a3220f4465490d428286c81ceea66299a9351a128b892797f53c
 DIST catdvi-0.14.tar.gz 160661 RMD160 52342c1354a91749351f7971075ceb441ed04692 SHA1 9a2d15e310a148b0a722422d0c7d843afcaa57a6 SHA256 6bface4e8a86f861d8de8ba56483ed2ace69fc0eb12c2c6d0e51e869a46b30a8
-EBUILD catdvi-0.14-r1.ebuild 841 RMD160 c8b5843552e3e1089da641278cdf467e68f6ccb4 SHA1 2df487912dbb68cd8fddf938b73b1de13385bce5 SHA256 d2e04cbbb4e4d397a7021645f177810ead9cbb9f0c26100cae172771bd4fb5bb
+EBUILD catdvi-0.14-r1.ebuild 862 RMD160 c95d72891ddb9c5ab1549b790c07c46b6b4bd5e1 SHA1 5fc9dbdaadbd9e06d28466f7a7c40dc3ea9110a7 SHA256 8276d8052151a0045bc9576f1953b1beb69391c6f4272d040703c4572d5bad94
 EBUILD catdvi-0.14.ebuild 773 RMD160 c7753ba6d87cf10e789446bac1883d647e53e48d SHA1 d8e3368905e14ddc3fd06359b87940b8c86e287e SHA256 606a2180097315f7e3385596dffb59b7a3a3c15a99b89f28e647a1b857f102a7
-MISC ChangeLog 1038 RMD160 a013316e6492d292d63b6769f892c0f2d914c3aa SHA1 e8cba4570086811e075b9a076fc5c2e19e40644e SHA256 1b679cba47c6914b92a5062c03e87d799e5f24c02404dc1f359620f7f66e4544
+MISC ChangeLog 1266 RMD160 279e34e7c123305a3cddde7b890cd9d5b5266f01 SHA1 10a9c23bec6be5fbfcbb5edda355a9216649232e SHA256 179f241ee5c7adb4e8233a31ae7bc38cc77d6f6538d6aa3a15b020ef6eb4b48d
 MISC metadata.xml 215 RMD160 87ecb50596543867dc15790c6103a1e79f7c8653 SHA1 6aa175978b2fb203e3225a3319b34765cc4a9293 SHA256 9d28682395a91478579cfc26faad628a3170f15244b662e3e5051b2c44128f84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzIoCYACgkQOeoy/oIi7uwNwACgiBO/Dik6y2Ngj7HbJ8Ipsypv
-qDkAoINl0DDbi2BnHChRL/465vTyd+jr
-=lCds
+iEYEARECAAYFAkzJqCEACgkQOeoy/oIi7uwh3wCeJZlX9XV3MzMWJtqJUihoYQnM
+zJoAn0F/7S4/C6RL+ytI3ubTtNXIHH/m
+=i2Or
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/catdvi/catdvi-0.14-r1.ebuild b/dev-tex/catdvi/catdvi-0.14-r1.ebuild
index d0ef3d05a63c..4b6cfc0fed01 100644
--- a/dev-tex/catdvi/catdvi-0.14-r1.ebuild
+++ b/dev-tex/catdvi/catdvi-0.14-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/catdvi/catdvi-0.14-r1.ebuild,v 1.1 2010/10/27 21:54:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/catdvi/catdvi-0.14-r1.ebuild,v 1.2 2010/10/28 16:40:39 ulm Exp $
 
 EAPI=2
 
-inherit eutils toolchain-funcs
+inherit eutils autotools toolchain-funcs
 
 DESCRIPTION="DVI to plain text translator"
 HOMEPAGE="http://catdvi.sourceforge.net"
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-kpathsea.patch"
+	eautoconf
 }
 
 src_compile() {
diff --git a/dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch b/dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch
index c94e6d4aef95..799cd1512018 100644
--- a/dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch
+++ b/dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch
@@ -1,8 +1,56 @@
 http://bugs.gentoo.org/342817
 
+--- catdvi-0.14-orig/config.mk.in
++++ catdvi-0.14/config.mk.in
+@@ -23,6 +23,7 @@
+ 
+ CFG_HAS_GETOPT_LONG = @CFG_HAS_GETOPT_LONG@
+ CFG_HAS_KPATHSEA = @CFG_HAS_KPATHSEA@
++CFG_HAS_KPATHSEA_VERSION_H = @CFG_HAS_KPATHSEA_VERSION_H@
+ CFG_KPATHSEA_HAS_GETOPT_LONG = @CFG_KPATHSEA_HAS_GETOPT_LONG@
+ CFG_SHOW_PSE2UNIC_WARNINGS = @CFG_SHOW_PSETOUNIC_WARNINGS@
+ 
+--- catdvi-0.14-orig/configure.in
++++ catdvi-0.14/configure.in
+@@ -48,6 +48,9 @@
+     AC_MSG_ERROR([*** kpathsea library (required) not found; try to use the --with-kpathsea-prefix option ***])
+ fi
+ 
++AC_CHECK_HEADERS([kpathsea/version.h], CFG_HAS_KPATHSEA_VERSION_H=yes, CFG_HAS_KPATHSEA_VERSION_H=no)
++AC_SUBST(CFG_HAS_KPATHSEA_VERSION_H)
++
+ dnl It seem libkpathsea provides a getopt_long() implementation
+ dnl if and only if the C library does not.
+ dnl
+--- catdvi-0.14-orig/GNUmakefile
++++ catdvi-0.14/GNUmakefile
+@@ -36,6 +36,10 @@
+ endif
+ endif
+ 
++ifeq ($(CFG_HAS_KPATHSEA_VERSION_H),yes)
++CPPFLAGS += -DCFG_HAS_KPATHSEA_VERSION_H
++endif
++
+ ifeq ($(CFG_HAS_KPATHSEA),yes)
+ FINDTFM = kpathsea.o
+ LDLIBS = -lkpathsea
 --- catdvi-0.14-orig/kpathsea.c
 +++ catdvi-0.14/kpathsea.c
-@@ -36,7 +36,6 @@
+@@ -21,6 +21,12 @@
+ #include "findtfm.h"
+ #include "version.h"
+ 
++#ifdef CFG_HAS_KPATHSEA_VERSION_H
++#include <kpathsea/version.h>
++#else 
++extern char * kpathsea_version_string;
++#endif
++
+ void setup_findtfm(char const * progname)
+ {
+         kpse_set_program_name(progname, PACKAGE);
+@@ -36,7 +42,6 @@
  
  void version_findtfm(void)
  {