Make sure system kpathsea headers are used

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

4 files changed, 92 insertions, 10 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index c8736d15a251..2a57e2061203 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xdvik
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.64 2009/10/03 09:32:30 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.65 2010/01/09 13:22:12 aballier Exp $
+
+  09 Jan 2010; Alexis Ballier <aballier@gentoo.org> xdvik-22.84.16.ebuild,
+  +files/xdvik-22.84.16-cvararg.patch:
+  Make sure system kpathsea headers are used
 
 *xdvik-22.84.16 (03 Oct 2009)
 
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 28a061f10320..585e90a05288 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,6 +1,7 @@
 -----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-open-mode.patch 497 RMD160 0a996bc83a9101b7a89f4f47c762083604ffc07f SHA1 d7a8a26e5d46d4784564452c1b9879a2c3a81829 SHA256 f557f52d401a9a5ad7791593d08da619e824387b4aa32be608ae46700d71bdcd
 AUX xdvik.png 798 RMD160 b037217ce158c280019eac65aee6fe699f4c111b SHA1 e60a01c232b3b13bcf52e8118295bbc292bd6ae2 SHA256 87fc7b3f9623f613617b6f9157773029508714a56d1fd806805741ab93b2d3c9
 DIST xdvik-22.84.14-j1.40.patch.gz 128380 RMD160 2ca532aa61f98485b71b49f2875df8be340b79a4 SHA1 dad05ea6e4c527b30d7f60a78e2197f9e9dbaafc SHA256 d5f18effe55bc920983728af225e53759167538db78757b811b8ed3e08ddf07a
@@ -8,13 +9,13 @@ DIST xdvik-22.84.14.tar.gz 2016256 RMD160 a19920fcc9e4e5d2878b16e65fa95bab5f034b
 DIST xdvik-22.84.16.tar.gz 2185822 RMD160 39448303e8df19e4ee34e01861ff188c30416d32 SHA1 12d15e63cdc936dd2d3706ce27a96edffde6e131 SHA256 3e41620f1783bd8265620c93d2597b82a155833f93639add8e877f8eb5f47dbf
 EBUILD xdvik-22.84.14-r1.ebuild 4008 RMD160 70629a0ae66701fd922c1b7abc48e50ce8b50c1b SHA1 6c041abb138b204f26b912c64c67b4cb436eab22 SHA256 3d9b80f863ecb25d9c548caa4dca89a7bdedd9257054839dd8e3bbc338a0b82d
 EBUILD xdvik-22.84.14.ebuild 3818 RMD160 0f1d4feca064d32c88a2c90b1e882c0b7233a6fb SHA1 4e4b387cde3b10b27b94245b5c12ec8c7b3410af SHA256 6ddced84087eac18982ed8ae6df0c8bb5e0f7bb03c0e76e13ddb33f767c522ca
-EBUILD xdvik-22.84.16.ebuild 2552 RMD160 b4c51587b7d9eb334308c1ebc1e341c206057dc8 SHA1 f31ef05f719a218c610e1ad6bfb7cc4f188266ac SHA256 2fda9e13401e5b7d933b9203f96cc62a928ee854d9f00c4492c105e4a99e726f
-MISC ChangeLog 8785 RMD160 ae9649127efe85a832b2af5e7193d38e34abfd42 SHA1 bce2994907a9f27b12e56e8c76869abac6cca206 SHA256 d3fcb75cac93fad3330ca6ce4bf1a7c36e9190c0ce244e3e749fcf33734aa30f
+EBUILD xdvik-22.84.16.ebuild 2733 RMD160 71529a5fb2a07ab7eb03da2104d6be0bfe0b2042 SHA1 b72e611e08c4384ddf4fd659caed784aec893752 SHA256 1b4f8ad2323e4137ad6b544fb3fd2acd201ca15347c1e5e4e35e067a8a0fd198
+MISC ChangeLog 8945 RMD160 44b2194c31f06a1777347d35c1839b7562513885 SHA1 4f7d6358004c4122526cb106255e059521c396ce SHA256 88cfe339469cca9ad516d325925800400edebb8166cf986ecdbc66fd425dfc7c
 MISC metadata.xml 351 RMD160 e0236b45acbcf41ef7883fd7e6779730e7850912 SHA1 7265aefd4237e321a3b5ae216e9bd79a7f20f156 SHA256 1348cd17584c52004c3d87ad5f2af2a6f87d921ffdeb1675827d8cb978ebad55
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkrHGjQACgkQvFcC4BYPU0rs4gCfR8K2CDTZMfeqAOQOE831Fb+R
-pKsAnAoD85pisjSAa+NWZWuV1QTiqphR
-=pkVu
+iEYEARECAAYFAktIgwkACgkQvFcC4BYPU0pzfgCgz02xCslbcRtevq9lT9QDW5Vy
++WgAoI5py9ubCPEnzS85AY5n50kZQ+x3
+=J2eV
 -----END PGP SIGNATURE-----
diff --git a/app-text/xdvik/files/xdvik-22.84.16-cvararg.patch b/app-text/xdvik/files/xdvik-22.84.16-cvararg.patch
new file mode 100644
index 000000000000..25efb5d51382
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.84.16-cvararg.patch
@@ -0,0 +1,73 @@
+c-vararg is an internal header of kpathsea, not installed by the system version.
+
+Index: xdvik-22.84.16/texk/xdvik/dvi-draw.c
+===================================================================
+--- xdvik-22.84.16.orig/texk/xdvik/dvi-draw.c
++++ xdvik-22.84.16/texk/xdvik/dvi-draw.c
+@@ -43,7 +43,6 @@ in xdvi.c.
+ #include "kpathsea/c-stat.h"
+ #include "kpathsea/magstep.h"
+ #include "kpathsea/tex-file.h"
+-#include "kpathsea/c-vararg.h"
+ 
+ #include <string.h>
+ 
+Index: xdvik-22.84.16/texk/xdvik/gui/message-window.c
+===================================================================
+--- xdvik-22.84.16.orig/texk/xdvik/gui/message-window.c
++++ xdvik-22.84.16/texk/xdvik/gui/message-window.c
+@@ -78,7 +78,6 @@ by the user (as a rough guide: a delay o
+ # include <X11/Xaw/Dialog.h>
+ #endif
+ 
+-#include "kpathsea/c-vararg.h"
+ #include "xdvi.h"
+ #include "util.h"
+ #include "string-utils.h"
+Index: xdvik-22.84.16/texk/xdvik/gui/statusline.c
+===================================================================
+--- xdvik-22.84.16.orig/texk/xdvik/gui/statusline.c
++++ xdvik-22.84.16/texk/xdvik/gui/statusline.c
+@@ -32,7 +32,6 @@
+ #include "pagehist.h"
+ #include "util.h"
+ 
+-#include "kpathsea/c-vararg.h"
+ #include "my-vsnprintf.h"
+ 
+ #include <ctype.h>
+Index: xdvik-22.84.16/texk/xdvik/string-utils.h
+===================================================================
+--- xdvik-22.84.16.orig/texk/xdvik/string-utils.h
++++ xdvik-22.84.16/texk/xdvik/string-utils.h
+@@ -2,7 +2,6 @@
+ #define STRING_UTILS_H_
+ 
+ #include "xdvi-config.h"
+-#include "kpathsea/c-vararg.h"
+ #include "my-vsnprintf.h"
+ 
+ extern Boolean str_is_prefix(const char *, const char *, Boolean case_sensitive);
+Index: xdvik-22.84.16/texk/xdvik/tests/test_string_utils.c
+===================================================================
+--- xdvik-22.84.16.orig/texk/xdvik/tests/test_string_utils.c
++++ xdvik-22.84.16/texk/xdvik/tests/test_string_utils.c
+@@ -1,6 +1,5 @@
+ #include "xdvi-config.h"
+ #include "xdvi.h"
+-#include "kpathsea/c-vararg.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+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
+@@ -261,7 +261,6 @@ extern KPSEDLL char *kpathsea_version_st
+ #  define NeedVarargsPrototypes	NeedFunctionPrototypes
+ #endif
+ 
+-#include "kpathsea/c-vararg.h"
+ #include "kpathsea/c-fopen.h"
+ 
+ #ifndef	_XFUNCPROTOBEGIN
diff --git a/app-text/xdvik/xdvik-22.84.16.ebuild b/app-text/xdvik/xdvik-22.84.16.ebuild
index 13baef8fa38c..4ea2b6f7e5d4 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-2009 Gentoo Foundation
+# 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.1 2009/10/03 09:32:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v 1.2 2010/01/09 13:22:12 aballier Exp $
 
 inherit eutils flag-o-matic elisp-common toolchain-funcs
 
@@ -30,6 +30,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-open-mode.patch"
+	epatch "${FILESDIR}/${P}-cvararg.patch"
+	# Make sure system kpathsea headers are used
+	cd "${WORKDIR}/${P}/texk/kpathsea"
+	for i in *.h ; do echo "#include_next \"$i\"" > $i; done
 }
 
 src_compile() {