fix build with kpathsea from tl2015 and add explicit dep on it, bug #529388

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 17 insertions, 10 deletions

diff --git a/dev-tex/tex4ht/ChangeLog b/dev-tex/tex4ht/ChangeLog
index 16db77a99d15..c3ab1dbdd4d5 100644
--- a/dev-tex/tex4ht/ChangeLog
+++ b/dev-tex/tex4ht/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/tex4ht
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/ChangeLog,v 1.93 2015/07/12 18:15:04 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/ChangeLog,v 1.94 2015/07/22 12:22:17 aballier Exp $
+
+  22 Jul 2015; Alexis Ballier <aballier@gentoo.org>
+  tex4ht-20090611_p1038-r3.ebuild:
+  fix build with kpathsea from tl2015 and add explicit dep on it, bug #529388
 
   12 Jul 2015; Mikle Kolyada <zlogene@gentoo.org>
   tex4ht-20090611_p1038-r3.ebuild:
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index c95051f95e1f..a5ae6cecfe5e 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -6,15 +6,13 @@ AUX tex4ht-texlive-updates.patch 16596 SHA256 34b803f68ebe65c8de910c513106401e21
 DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 SHA256 9f3e259641bb7d5f32b8efaa85cb7c1a9f1a17f5fc6a859c81449d9984ec91a3 SHA512 868961c16da63ef20a8af3ec3e56a2b6c518a291cdbc3974f701773dbb55b844f0df06aae4c7b481c96b9e2ba29cb0f1ed1279b6f32340e4708e31bb67170963 WHIRLPOOL 3fd49876e0cc19432c0ba5142848dd034a528441586550c49d04187a301ceb44a7d4374ef57a5b658a19e32b039ce1cdaa742331baf0008d51098567556e46cd
 EBUILD tex4ht-20090611_p1038-r1.ebuild 3426 SHA256 cf54f63b37c816ee0a6763710da2d4c434b8aa608eddb184529717dfe20c28bd SHA512 c8292ee0c63ee1b7d5904521ebecb2784c06df84a5727771595b11881a86d02df6c5b754c85ad05127bed9d4bb7ce49f5790a1da6543441c011fa9b33e50e1d2 WHIRLPOOL fe3d79b719b1cd178fb504c45d1b320069341b4ed15dea213730b50b34f5630cc1f2d841f1ce424abccd0d0715c6b1a69a23999bfbcaeab3c297602d6a1d7406
 EBUILD tex4ht-20090611_p1038-r2.ebuild 3473 SHA256 f9eb77547eb07af3bb71046f75bb1890722873dc95126c021ef9b473154c807c SHA512 a30aaf9be4520f61b4437c13057484a814d9c0b0f5a5b93deab66b2e2cba82782745a938bfeb25d6871c662dfb746d76003ccc08dea1bcf3b1cea1470c221828 WHIRLPOOL e7fa0cb1cf346aeca4cd827400c57222c74ca55bc63575c079eb4a49220df786427b35562dd65d8067d37e2078fef5ce273783e630d74c26f5bc3d2ee224f4b3
-EBUILD tex4ht-20090611_p1038-r3.ebuild 3521 SHA256 345ea38e98ce5f0cdb253bfc71cf91e5794045c47beaca73c25ff319b0974ca2 SHA512 3e0b1c08929af494e8826564245a1ef8199f85444aa725ebe5f79e54d66e50681b1e69e388591184daa2408f1ab5c06b05539121c41487ca55155703edcd469f WHIRLPOOL cd82b660d0c260bb98684b0887f01430c07fc582e4d11b7554d45ad6c1b38a59df91deb2312e503eb20c93eaa5761c6b91503dc95f3e2644f574c3bf2e4952e4
-MISC ChangeLog 12702 SHA256 fac10162ddfa3aba6282cdf3137579280b55d83e3547a25237fcb311a522889c SHA512 e7e546d6b9dfad86ef08c97b673d9f91c28f49b5fea9a1a22a173179ee8d835b77af6947448b9338c2b14115814b7c418cf1df1e4b4aafc07d0cadc13bab3bde WHIRLPOOL 8a5bb6998aacb395dd068a9af646eb0110ecfc15a335e096f0d2f37717d50d83bb62dabaa0e0405f2bda5afde3f4af9be854503d956b383a2330108f27bb6866
+EBUILD tex4ht-20090611_p1038-r3.ebuild 3696 SHA256 80c9a8ddc9b0ad3f9013178b1f46568881f9904c424f436ee5c516562cfbfe5a SHA512 9c4b4a5a64b34fbd0ddfb56c33c6d31ce60aed72f4300c8697b77d490d2cd5bc8449c8c0cc6f91d55ea5756bad321eca72ff7acdbe62170c1c1dd9b6b979fcc8 WHIRLPOOL f0440b18fcbea5a75213a6699f290140aa1a2f86d67932cadc337fa4a420bfbae9c655a5b0903be836de153aca6d6aac7e73de63c60c4866ae3fb7e3dcee08e0
+MISC ChangeLog 12869 SHA256 d132cdca9359dc14ec6fa01f263aff41300b99d1279c9527461088c7752ae2d1 SHA512 253bc07d6395fae3ccecf67a128b015aa87916fd37d89f2f409391858bf915789326cd70b716dce466f203ea854d146ce4a7285d0e1796fbff9c98312bac4654 WHIRLPOOL 95cd2b54a55e0e26976e67a9fee6b3e220ac3a1b2d2fa7ad3fae0a676c9ab38fcef76157aacfd824388cbdf81732c180ab39cb294458f024aebbcf0517c3a18b
 MISC metadata.xml 156 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6 SHA512 cecee760dd314c182191a282255f2415e479a8cc6cab9cb664e5b82d52b700a3444aa0d33b30a721a756e432819decc8c92588c769ea6fd33dabe9adc16d75c0 WHIRLPOOL 88a15092b616df72dd0ae91d89c80d852ad49ab9fee8a9688f3a1be59c365cc3dc77e90be68b5c4ec9cc1dc9885e06e723abc96830df4d0628df8c97f8b2a332
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlWiriIACgkQG9wOWsQutdZdRAP/XYXLB+6tuEceVHp8u2B6BFGW
-Ef5jMwOb0ui1qf0IJNJo0y0DxpLLrj3/XtocL2qzHxXz6dK1KmLQAmcVs4h7E44M
-SQgiXvfA/NRNoLEJY0c3UTgfxqdrZmr574y0jGYzNHakgAErIPI5T88LQ+lzfRw4
-4f0IjNFtCwbkjCb2Iw8=
-=i1du
+iEYEAREIAAYFAlWvivoACgkQvFcC4BYPU0qzrgCgm4BB4op3/q6rb/2cFf46TfS2
+d50AniG+x84QoTphocjp0hqlHgabaABW
+=Hzr1
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild
index 12ae509e355d..d2f97a6caf6d 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild,v 1.3 2015/07/12 18:15:04 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild,v 1.4 2015/07/22 12:22:17 aballier Exp $
 
 EAPI=4
 
-inherit latex-package toolchain-funcs java-pkg-opt-2
+inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic
 
 IUSE=""
 
@@ -21,10 +21,13 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-
 SLOT="0"
 
 DEPEND=">=sys-apps/sed-4
+	virtual/pkgconfig
+	dev-libs/kpathsea
 	java? ( >=virtual/jdk-1.5 )"
 
 RDEPEND="app-text/ghostscript-gpl
 	media-gfx/imagemagick
+	dev-libs/kpathsea
 	java? ( >=virtual/jre-1.5 )"
 
 IUSE="java"
@@ -47,6 +50,8 @@ src_prepare() {
 }
 
 src_compile() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
 	cd "${S}/src/"
 	einfo "Compiling postprocessor sources..."
 	for f in tex4ht t4ht htcmd ; do