Use the kpathsea/version.h header when available. Fixes a build failure with TeX Live 2010.

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

4 files changed, 39 insertions, 4 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index 5eb5095a3b3d..b9ad6ced1fbf 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/xdvik
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.73 2010/10/02 13:13:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.74 2010/10/10 16:27:23 aballier Exp $
+
+  10 Oct 2010; Alexis Ballier <aballier@gentoo.org> xdvik-22.84.16.ebuild,
+  +files/xdvik-22.84.16-kpathsea_version.patch:
+  Use the kpathsea/version.h header when available. Fixes a build failure
+  with TeX Live 2010.
 
   02 Oct 2010; Fabian Groffen <grobian@gentoo.org> xdvik-22.84.16.ebuild:
   Marked ~x64-macos, bug #333981
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index d51fee30e4f4..3b9a166adc00 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xdvik-22.84.16-cvararg.patch 2454 RMD160 a77819156d692965ab62f91d278e0a84bde37247 SHA1 3d3e83a58034cdde9d3c5caac0b2569d3085c79d SHA256 7d2ebfa1abd871bf2bfb48a32c0c6df28fcfd3dfa6d21bc8cf77bd8d61639891
+AUX xdvik-22.84.16-kpathsea_version.patch 669 RMD160 2db5b4a97ea80e2a112e3d895f32d9f207bc3262 SHA1 881c39c53f1d295058fc2181d373a1cb723774aa SHA256 064ac9b1d935f7985c7ba11bb5570a2fcc6026a5396acf6f1ce97f38b6aebc90
 AUX xdvik-22.84.16-open-mode.patch 497 RMD160 0a996bc83a9101b7a89f4f47c762083604ffc07f SHA1 d7a8a26e5d46d4784564452c1b9879a2c3a81829 SHA256 f557f52d401a9a5ad7791593d08da619e824387b4aa32be608ae46700d71bdcd
 AUX xdvik-22.84.16-parallel_make.patch 1031 RMD160 5cf3278cbad496333889ad5fdabd04718aa6c3f1 SHA1 e17080a333b52064249e91811ca006bfeec189b4 SHA256 63f1f3ed5a0dcd270a3a5e2512d0a62cbfecd77f1c6aa2684cfcbbded3e1681c
 AUX xdvik.xpm 3125 RMD160 1be4b30e1cbc650c37748c4d7606f2cec43bf8c5 SHA1 74c1791e6d003ecedbafd51255d83210a5740fe9 SHA256 3f9dd32d1197dcbb5a414816eea45c2f4dced24ee7726ee196b8d8d2e2e44d26
 DIST xdvik-22.84.16.tar.gz 2185822 RMD160 39448303e8df19e4ee34e01861ff188c30416d32 SHA1 12d15e63cdc936dd2d3706ce27a96edffde6e131 SHA256 3e41620f1783bd8265620c93d2597b82a155833f93639add8e877f8eb5f47dbf
-EBUILD xdvik-22.84.16.ebuild 2913 RMD160 e281d4439f1ebddba27d30afd0f5dcef31485a9c SHA1 b1420fa4e9e55f68931a4b498780dbcb18d42565 SHA256 3daff39f3f14becd2e06ec0e368cfdfeec3aa138c84167771446bc3dc4ab5301
-MISC ChangeLog 9980 RMD160 649f87dd465346b9d84e6d81e3b42532a0848c72 SHA1 076f96d020c4908c6d381a313d2c0c81dd814632 SHA256 ea84190b48ce3f42a95ac6362b5efd209f3cf9d9465877b630df998775e0e826
+EBUILD xdvik-22.84.16.ebuild 3005 RMD160 03835f3f532d779bdf991a48a563df84c5c02091 SHA1 88f1bd269e1d7ddd4eba422b59ba75cee57d76b3 SHA256 7f187128ab6a1ddd26e3cd5d7f7c9a04409d79fe22bd49e2ae43619230f81cc1
+MISC ChangeLog 10201 RMD160 acb107dd0b4cdb0700a840d0f7ec2f81493f272e SHA1 972455197b4fb9a76977b8e5a488c7b64168f871 SHA256 81e117fae5dafa6fd3c82da68e7d8819299c577fca852289bb974093991c916f
 MISC metadata.xml 351 RMD160 e0236b45acbcf41ef7883fd7e6779730e7850912 SHA1 7265aefd4237e321a3b5ae216e9bd79a7f20f156 SHA256 1348cd17584c52004c3d87ad5f2af2a6f87d921ffdeb1675827d8cb978ebad55
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyx6XEACgkQvFcC4BYPU0o0fACfUUnlxxwAG955EFdpp41c0ncS
+Cn4AoMkWhSZk2RUgABbvTNqyN8WZ8Ppr
+=0vKu
+-----END PGP SIGNATURE-----
diff --git a/app-text/xdvik/files/xdvik-22.84.16-kpathsea_version.patch b/app-text/xdvik/files/xdvik-22.84.16-kpathsea_version.patch
new file mode 100644
index 000000000000..fb69d3d1294e
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.84.16-kpathsea_version.patch
@@ -0,0 +1,18 @@
+kpathsea from TeX Live 2009 and later provides a version.h header with this
+definition. Use it because it causes definition conflicts with kpathsea from TeX
+Live 2010.
+
+Index: xdvik-22.84.16/texk/xdvik/xdvi.h
+===================================================================
+--- xdvik-22.84.16.orig/texk/xdvik/xdvi.h
++++ xdvik-22.84.16/texk/xdvik/xdvi.h
+@@ -242,8 +242,7 @@ typedef unsigned long xuint32;
+ #define LENGTH_OF_ULONG ((sizeof(unsigned long) * CHAR_BIT + 2) / 3 + 1 + 1)
+ 
+ #include "kpathsea/c-dir.h" /* dirent.h, NAMLEN */
+-
+-extern KPSEDLL char *kpathsea_version_string;
++#include "kpathsea/version.h"
+ 
+ #ifndef	NeedFunctionPrototypes
+ #  if	__STDC__
diff --git a/app-text/xdvik/xdvik-22.84.16.ebuild b/app-text/xdvik/xdvik-22.84.16.ebuild
index e9ac2c04d297..d36a04fae5ae 100644
--- a/app-text/xdvik/xdvik-22.84.16.ebuild
+++ b/app-text/xdvik/xdvik-22.84.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v 1.10 2010/10/02 13:13:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v 1.11 2010/10/10 16:27:23 aballier Exp $
 
 EAPI=3
 inherit eutils flag-o-matic elisp-common toolchain-funcs
@@ -31,6 +31,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-open-mode.patch \
 		"${FILESDIR}"/${P}-cvararg.patch \
 		"${FILESDIR}"/${P}-parallel_make.patch
+	has_version '>=app-text/texlive-2009' && epatch "${FILESDIR}"/${P}-kpathsea_version.patch
 	# Make sure system kpathsea headers are used
 	cd "${WORKDIR}/${P}/texk/kpathsea"
 	for i in *.h ; do echo "#include_next \"$i\"" > $i; done