Do not include empty headers. They have been removed from TeX Live 2012 kpathsea, fixes build with that version. Patch from upstream.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 42 insertions, 11 deletions

diff --git a/dev-tex/luatex/ChangeLog b/dev-tex/luatex/ChangeLog
index 192b84164b45..5ded69a2f9be 100644
--- a/dev-tex/luatex/ChangeLog
+++ b/dev-tex/luatex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/luatex
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.101 2012/07/25 00:36:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/ChangeLog,v 1.102 2012/07/26 10:56:03 aballier Exp $
+
+  26 Jul 2012; Alexis Ballier <aballier@gentoo.org> +files/kpathsea2012.patch,
+  luatex-0.70.1.ebuild:
+  Do not include empty headers. They have been removed from TeX Live 2012
+  kpathsea, fixes build with that version. Patch from upstream.
 
   25 Jul 2012; Christoph Junghans <ottxor@gentoo.org> luatex-0.70.1.ebuild:
   added prefix support (bug #427834)
diff --git a/dev-tex/luatex/Manifest b/dev-tex/luatex/Manifest
index c00744247d96..cf76525d57be 100644
--- a/dev-tex/luatex/Manifest
+++ b/dev-tex/luatex/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kpathsea2012.patch 944 SHA256 afb87b3c1cb9317666a7f45b6ecd6ad1078896d56b91fca7bfe6aa1c75ada495 SHA512 d72bce55c2494622fd15703f483c058245c96c8b2aa03d6fa02b112be827ddfe8a0013ee0c3710bb3e1313b631bf436f70ce99d383f11f4d2b51915752c59960 WHIRLPOOL 39c93138b416d79a55d1e5a464afe8363c9902abff50397d88bad623ec298e970490fd93dd8ed4d4c1a8e9788da300f265da550bf2ab6149b41351027998b107
 AUX poppler018.patch 5041 SHA256 98317c41cab055cde67fd1eefa6c79fa8ec0ac2b36d93a094abe9eb8e834221c SHA512 e8b1660cb6674a8d2f68f29022d0ea33ca00795c8360a9656c5ad84776c86d3ab0a3c0895632957c5ed93fcab96e11e6bc7eb1a03df518122fcc3fa574b095ee WHIRLPOOL 0a14b110479acbe5d31a40642b53e0bcf03226acac19596f5dc885ff8a7a9c83895d8409044e96630bc66cf77ea915ce41f580a43dc48df423519dc0a9226335
 AUX poppler020.patch 2909 SHA256 ffec5fd2e311841ee355deabfe13b37fdaea781608e95a2a5ab037d1cdd04ea8 SHA512 9517efce4ede9b792f27647ec4ed95d447572a9cbb3ee58e089b658ccc55bbb6a7843768b5962a4535ed77ab364e73f4fd1248e92a5a480ce30429303664f385 WHIRLPOOL db89a3e07ace603aea4abf71a97cd26f0b16c60b939f0c361db77d8af22c03b0003440e38164a0052258a8fbaceb283bac401a8254fa0b42e71179b715151f06
 DIST luatex-beta-0.70.1-doc.tar.bz2 1048489 SHA256 4f1d24777725a606efbf5d7a59064245c46fb29b8066236c6b48fb423a595606 SHA512 eb4de91a80a6afccf5cca5cb05d5c1378a60ec35763e5ef5e9dbadaa2a276758a446e01d66e76a78e91442274778c10c73458b513af903e7221d90beb644afa9 WHIRLPOOL 97142a3a3c23d01f3b21963690f7362edf0c7f0de1ad77295361122a81c92459cb2ecd36baaea3588b7ad4f8b81c5dfa81d22df7a5529cb5b8b2b39fe6ce84be
 DIST luatex-beta-0.70.1.tar.bz2 8181155 SHA256 c641a4ba1535ede6ee8e2a958d8c4b436f5979c5be6f3f51d3dec5b4df6bb6ed SHA512 e04a9b96f349bf9036ef4c01746dee96ebf245cd4da6b719f546223e05cb98fb844e20878a64f80f42c77e220fac01ee2d97ad56939c1fb3af44faab53c603cb WHIRLPOOL 63dfdf182d3f1aadd6fc802e424b3791eda4df7eb8d707ad719d2ad0f97946b365316f6b9caed2362d5827280e9ddf2e750c8beeb61277dac72bffaed06a4fc9
-EBUILD luatex-0.70.1.ebuild 3893 SHA256 c62ee0303d36d15c0fd12268b74a68bf63577059e2e2b86fda39afe66867735e SHA512 8e6a6dd74f5f000710289e5c0d53d58525c9668f6029adb88657fd65ff447463efc4964bfd64abc1f520888953eb4ff39b331417b594d7dc766a76146b12cb88 WHIRLPOOL 0fb6fd116aed73a1e6e255cc64523c5f7fca35e07e6c7212dfab67b33dc34f2d314a7d3aaf2081415db53bb55a600b9682704191ff570aadfd43c227ca2463ed
-MISC ChangeLog 12590 SHA256 f322aebba4018bb264e4d46e172e0d49770aea2e3eb6e2520aa77945e8efbc11 SHA512 31e4a2ac3e63b5491f241ceeae3cc4320344d1181e807caf061b591862a0406ae288a39b0f7881fa7938bcdeb9c1a4d40d64f2f7ccc8feddb1f273f6000a4dc3 WHIRLPOOL 53ad3e35a1af8f5568389c53e5782b1d9938f56cd0645e001f925e51170648d5034a497702b16eba38a8a26c7bcdd5793d2c2bfc81cb277a5194dc349ab39e4b
+EBUILD luatex-0.70.1.ebuild 3936 SHA256 41d34bac949635fc65c23b6c6f58a7ccaf39115fd5bd0287596e73e494461de9 SHA512 a6321da552ef12c384f415152588f698e8b7a16e415b695be532ee226d370dbb829263edd058ba1b55bae12eb6f66d34532a2837f1c52f692d7747ddef32dd00 WHIRLPOOL d2400d3f34413ea51c2d84faa930620059f39a8d48dacb9b474593c94112094507bf9ac4077e769de284a9e7a6ead2333c678190585782cd5dfdfba14ae4b840
+MISC ChangeLog 12834 SHA256 c32c10a2cd05125c09ca85d6eb216ac774dd99a6ae4b42c48a45e8f9c1f60d1f SHA512 bac891d5ba77cc4ea9038c227807c247f043359c646ba1232170e391ba17cee083ffdbd4c66e83e05f44b9ee8098fc17248edcddc348488c74f0d7b227260d99 WHIRLPOOL 39cec3281f8f75b4c3b591dcea681eb792306222b83a93010b073ae7ece69c80bc2c93020987c409031903f073acd00a009faa4df3bf07700681c8710d40ffe2
 MISC metadata.xml 336 SHA256 126018a4822f911e52afe63656a10f2a7b0b938ea106f2a2caef00bdc18a845f SHA512 d998dbfe23cbb7f60db7b876e8ac3d039281ad9568aeb45a494774eb65468392523cdfc1b5cc8b621fc9a2f2f7f33dc3e351d1cf902f9ecf3f122534ef4767e0 WHIRLPOOL 3350c9964adc178cb58ee77019669fa51899cd71734ae1ff8f4646d1f9e141973c9f686f43e5995f1a7258d92bd173176dc0d9c3d8bcc09b96c37a0b7a0fb4a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQDz+dAAoJEOeBhlrCAAWGX/4IAK3cUqRAZPYVySgcNLh6Hn3X
-l7UVzZUu872ogOTKCfCRpYvWSze+9ngMDSUDLDSL+JsAXbewqY4SnxAAgd6OCg2J
-LyTbZFferzfKFvjxfV5j4dW+GHOofZ52P5Jwnv/5Iv6xuGHXIAUX3OOF6cm7FszE
-cLw4eiPWt15bZKQluMRiAeLSThohALTyXkzhq43ke/IecT4XrsXIF5pSreZoDe8E
-S/nNNcOA4mwgSiVc5uISxXYVZHstipfICYRuasW5hyXQjpcoXyymWxR5em6hEPih
-Q0daKUlhgcK5jnrybH5esNTI4/okJKbyp927+EqJqGTFmrC93pH4mr+g0yTFQaI=
-=9TGq
+iEYEAREIAAYFAlARIkgACgkQvFcC4BYPU0qlWgCfYJwkwbFvu5aLpZV2f4ROgmV2
+g48AnR8T8qvPU+4kiddxGGQwRMSt1qnW
+=Z8jp
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/luatex/files/kpathsea2012.patch b/dev-tex/luatex/files/kpathsea2012.patch
new file mode 100644
index 000000000000..80c356d9de80
--- /dev/null
+++ b/dev-tex/luatex/files/kpathsea2012.patch
@@ -0,0 +1,28 @@
+From TeX Live svn rev 23421.
+Remove unnecessary headers. Fixes build with kpathsea from TeX Live 2012.
+
+
+Index: source/texk/web2c/luatexdir/luatex.c
+===================================================================
+--- source/texk/web2c/luatexdir/luatex.c	(revision 23420)
++++ source/texk/web2c/luatexdir/luatex.c	(revision 23421)
+@@ -32,7 +32,6 @@
+ #include <kpathsea/readable.h>
+ #include <kpathsea/variable.h>
+ #include <kpathsea/absolute.h>
+-#include <kpathsea/recorder.h>
+ #ifdef WIN32
+ #include <kpathsea/concatn.h>
+ #endif
+Index: source/texk/web2c/lib/texmfmp.c
+===================================================================
+--- source/texk/web2c/lib/texmfmp.c	(revision 23420)
++++ source/texk/web2c/lib/texmfmp.c	(revision 23421)
+@@ -17,7 +17,6 @@
+ #include <kpathsea/readable.h>
+ #include <kpathsea/variable.h>
+ #include <kpathsea/absolute.h>
+-#include <kpathsea/recorder.h>
+ #ifdef WIN32
+ #include <kpathsea/concatn.h>
+ #endif
diff --git a/dev-tex/luatex/luatex-0.70.1.ebuild b/dev-tex/luatex/luatex-0.70.1.ebuild
index cb3a309c6094..6a4d9b79a572 100644
--- a/dev-tex/luatex/luatex-0.70.1.ebuild
+++ b/dev-tex/luatex/luatex-0.70.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1.ebuild,v 1.14 2012/07/25 00:36:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1.ebuild,v 1.15 2012/07/26 10:56:03 aballier Exp $
 
 EAPI=4
 
@@ -32,6 +32,7 @@ PRELIBS="libs/obsdcompat"
 src_prepare() {
 	has_version '>=app-text/poppler-0.18.0:0' && epatch "${FILESDIR}/poppler018.patch"
 	has_version '>=app-text/poppler-0.20.0:0' && epatch "${FILESDIR}/poppler020.patch"
+	epatch "${FILESDIR}/kpathsea2012.patch"
 	S="${S}/build-aux" elibtoolize --shallow
 }