fix build with kpathsea from texlive 2015

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

3 files changed, 14 insertions, 8 deletions

diff --git a/app-text/dvipsk/ChangeLog b/app-text/dvipsk/ChangeLog
index 016082c08352..4d445b91a529 100644
--- a/app-text/dvipsk/ChangeLog
+++ b/app-text/dvipsk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/dvipsk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipsk/ChangeLog,v 1.45 2015/07/15 09:18:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipsk/ChangeLog,v 1.46 2015/07/15 09:21:55 aballier Exp $
+
+  15 Jul 2015; Alexis Ballier <aballier@gentoo.org>
+  dvipsk-5.994_p20140525.ebuild:
+  fix build with kpathsea from texlive 2015
 
   15 Jul 2015; Alexis Ballier <aballier@gentoo.org>
   -dvipsk-5.991_p20110705-r1.ebuild:
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index 4bc5ad67d17b..71802382955a 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -12,13 +12,13 @@ DIST texlive-module-dvips.doc-2013.tar.xz 484492 SHA256 76dfb96428aee66f6cac7ba1
 DIST texlive-module-dvips.doc-2014.tar.xz 482740 SHA256 a9cc6c6ec9f0ed97bc12bb8a3d8d6626419eb9956f4e1f1bd62893c2372d72e2 SHA512 d66ec3e70d57777363fc00f9789fda515cfea87968c9161870c695742935f696e830fc6b35da991cda6c78a1ef544cb36836c04411e6c7fa9b829b16365f5677 WHIRLPOOL fbfd2a7b61ffab4ef657d065b07fc2da6e99db069f4b672291830319795520bbf65ad8ae851c59c2361a850dd8dc5ecb3b1ebf08cf58596c3361715366642ac4
 EBUILD dvipsk-5.992_p20120701.ebuild 2131 SHA256 d88a712e78648c52825a24b0eff56dfe69d39f3472691321abe0f44e32ddeed0 SHA512 4dd10f06d81eedbe400a3429be9a56905b859fac3a67afaa037009b719efecc2f37e0c6d3d95808b5179b2d7970b87fb4668ca3c760d5936adc49d81c5d97bd8 WHIRLPOOL 976ff83d6cbba98e18e038533f2a46781f99b1b314b847b2409f9681e2cf8065fd14bd3ccdb474432f8867507c08ecb263a325e35530c97e24910163893e4bfb
 EBUILD dvipsk-5.993_p20130530.ebuild 2066 SHA256 62bfcb9b9dc1384afeb062dc887520dbfb6096364ec7b4a0e88daa34be4e6352 SHA512 2f721881b4fa5fb028a33c1552ed6b1f434841482ac5bc9ef9b0f4be40538cbedab90cf332ebdbb4697db0aa5eb411a9b188d11cdb2b6ae2581e142181047893 WHIRLPOOL 69ebdb0019f4e1cf5c71a453344ba6b8cc0184e3240a7df82f7b5e3e86e25604dc127e944ae41b5c98ec507f6243be1fac99f82c603e2433afdb4a556e500220
-EBUILD dvipsk-5.994_p20140525.ebuild 2040 SHA256 efce0c7026ac04e56101a6b2cb5024d594fb1401d30c1cafddd64f01be9a44a1 SHA512 7166448a590f70325c73f9cee5e0eb9751777e7e815eec586552c3f5d4cf78853348f43e17585d8b75ae799b3113c520baa27747374a4148984387c15164e7c1 WHIRLPOOL 490cd12764d1873c8e58a2750f84fccf573b39914b9c5cf560a54d6e933d0924fd006703bba3872605553e836e3cda4f2972105bb3ee07f00b9ab1d76e538991
-MISC ChangeLog 5900 SHA256 3d172db33307ed2531dcbb15cab9500b05bc55145692a4ad1b72d5fef7c00115 SHA512 7cc6b66ca52034ca8b4945382b8160787d0db32114e9eabc20aaaffbf79d7d7f858d16908e623ffde31a66f3530f5d4aef43da4ff59b09bf5e558dd7b8029481 WHIRLPOOL 885d317a626d9bd937002ee01ee31bdc7e7d61f0befbf335ef7f97ba01b691a5eab38ea295383d17d435fd4aebe7af2bf50b93069bc66e12fdd8eed55bc747e5
+EBUILD dvipsk-5.994_p20140525.ebuild 2210 SHA256 82d6ccc403b0059b622fa6a7c1d290dae2f16b7408b5fd7cd09c86b6d8693333 SHA512 41fb8263c035d71b6daffe8aad186b7b160714e749c50db85ac80965cba3a0de356cc576c3db05e000321b3f751f1d6d043f87364a4e5c8588a1f679a651cc94 WHIRLPOOL b8294b57c8e598ab4e9f0bc6336b45e3e0bedc467f95d3c6c7833ed5189596b2880a443f4d48a6267451207c1581a527c666bd0ae338ba886b659fe12b592316
+MISC ChangeLog 6030 SHA256 a8e29be072f8b79d4c2f123bbbb7da601f0b6331fb011d66a999d8bf3f62a671 SHA512 d2db770e55019a2787ee991e31b0b4e17e92cacb038c6639501571e269cfb810c1847c4cfdf09761b1fb6812ccf6a68ec2294fb3d24556b93209549188dc7f48 WHIRLPOOL 0177fc3e0eeb200a7a18611a028e033d92e2bc271f9e9611a85c16ebd52c896d1594bcdc462408782c6547070e02c87d9cd65c835837b8b22a8d046ec38ce292
 MISC metadata.xml 254 SHA256 78294df0a1d0e815b05f968bb43c4272d420e3025a38ea2d4fe6193a918a8e10 SHA512 1d0e4d92def0b0187a09480fb289fecf98812c95736ef3772e0763a1572181f6f31ae558b1dd9bdcfad3bf3768440122ee774ec56f1a9d4b18103a8a8efcb6d0 WHIRLPOOL c033be17e138d0533bd36185df412dc39ed32269b8875e53417f9e320461e7dcf9133479f2497cbaa3ef579dd65b7ac25490976c7c9a3250fc606e5448415268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWmJXkACgkQvFcC4BYPU0oGuwCdFbI8rAo0aeuMD3hP/AGp3INA
-bxwAnjYLnuQsRkNlj9geVuGutH7Gf0dM
-=MwtG
+iEYEAREIAAYFAlWmJjQACgkQvFcC4BYPU0qAEACfWevV99UnEJAnoc4JqxdkbTPj
+8G4An3sNuLyjcgtszq/8Hc1wTfcMfNp1
+=rXnC
 -----END PGP SIGNATURE-----
diff --git a/app-text/dvipsk/dvipsk-5.994_p20140525.ebuild b/app-text/dvipsk/dvipsk-5.994_p20140525.ebuild
index bc58393fdae1..f7d2c01ac3fe 100644
--- a/app-text/dvipsk/dvipsk-5.994_p20140525.ebuild
+++ b/app-text/dvipsk/dvipsk-5.994_p20140525.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipsk/dvipsk-5.994_p20140525.ebuild,v 1.3 2015/07/12 17:16:08 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipsk/dvipsk-5.994_p20140525.ebuild,v 1.4 2015/07/15 09:21:55 aballier Exp $
 
 EAPI=4
 
 #TL_UPSTREAM_PATCHLEVEL="1"
 
-inherit texlive-common eutils
+inherit texlive-common eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="DVI-to-PostScript translator"
 HOMEPAGE="http://tug.org/texlive/"
@@ -38,6 +38,7 @@ RDEPEND="
 	!<dev-texlive/texlive-basic-2009
 	!app-text/ptex
 	${DEPEND}"
+DEPEND="${DEPEND} virtual/pkgconfig"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
 
@@ -47,6 +48,7 @@ S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
 #}
 
 src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
 	econf --with-system-kpathsea
 }