fix build with kpathsea from texlive 2015

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

3 files changed, 16 insertions, 9 deletions

diff --git a/app-text/ps2pkm/ChangeLog b/app-text/ps2pkm/ChangeLog
index eecc0b821adb..698fd5c30c2e 100644
--- a/app-text/ps2pkm/ChangeLog
+++ b/app-text/ps2pkm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/ps2pkm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ps2pkm/ChangeLog,v 1.43 2015/07/12 17:16:52 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ps2pkm/ChangeLog,v 1.44 2015/07/15 09:28:35 aballier Exp $
+
+  15 Jul 2015; Alexis Ballier <aballier@gentoo.org>
+  ps2pkm-1.5_p20140525.ebuild:
+  fix build with kpathsea from texlive 2015
 
   12 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> ps2pkm-1.5_p20140525.ebuild:
   x86 stable wrt bug #550840
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index 37acccdd6533..edb4727ec1be 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -6,15 +6,13 @@ DIST texlive-20130530-source.tar.xz 179963948 SHA256 a905832e4c04dd1cb16db4bb7ba
 DIST texlive-20140525-source.tar.xz 41657688 SHA256 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be SHA512 09169af15d806abd721e55ffc20ed684c0a7ad60783272d49fabfe9c88857c4abd15b60f30e3f5511ceda1982fdc1d33db8265f97e374bfa5b250dbb5612f8ad WHIRLPOOL fd7fffeeaf319bca5333f6d5d8d9cc6517f76ffe5b2793a73604d844cb7474d83c23826f98d4d11ea5e1a35c0f273e12b2fe6f5945f9880a9577fedad6625014
 EBUILD ps2pkm-1.5_p20120701.ebuild 940 SHA256 1569d7e194cef80c5fc161de68accf8d0ac6af6007d7d32315e41404042e7c5f SHA512 e957a7377c7d0cd4b7091571df6b9237fad8938db2bd3655809936353658e562623302143bf1c4531a43ea2266df86e9cee9f9a3c10d292b3ab0bf2e4c0d6161 WHIRLPOOL 41a49d0e8f61d710421d5060ce4d3f87c3b90562bfda495713cbc7a39be8c11f0c7db47b6edfa5551923e9332a0700c091857c3e303621f475cf02ffc23a7c20
 EBUILD ps2pkm-1.5_p20130530.ebuild 955 SHA256 c8b1f50cdc1d57eb5bfd84e3ae1f77b99b201450c05aface93a5bed6e92f6717 SHA512 813b8b96f23ca9798fe92aa2081deaa4b2ef025fb0e71cd2e06b6189cbd39c00cba9184f33848454561126f121a33627d6338ad17f6796fae859a8ccaa55bb98 WHIRLPOOL 6a5e4c3073ed390868f2c70eaefc76d8985870eb9cc700b00af523ab8a5a330cd0438e69a0c2d23305bce5f90dd217bf60fa09368fb9311c51b8cb15e51da7d2
-EBUILD ps2pkm-1.5_p20140525.ebuild 929 SHA256 56384dfa1fcccb7f312fcc707bc686bcf8d030da4e02f1a8a4aa4dc886db5aa6 SHA512 5cc8165fa941389d8ebb5ce630b0ebf2586fa661fd38677002a2b8a5d0638fd92b5b1090e754668768330a049ecf2eae7d7ed9352fbc37125716760d97168977 WHIRLPOOL 333b7f6b27fed3c6ec6d8982a9f3db16109cfc2f027e4167ec9e2190efbbd2acabf408dba4546d2012d767e236f343401ef03bb25682b4807a348e37ae633916
-MISC ChangeLog 5305 SHA256 057f0a0911580f973d6336dd3376f1e6b84c898fbb227302947658adef1ee63e SHA512 9c067b1cd95e2a5e6a21d474a505bd7abe6590c6696500db67d6171fa25f50bef0e401da4c47d916bc0cfc7328ef2e6c7579f4883015a313d595127b55617727 WHIRLPOOL 9daabd06c3cd5dab6919ddcce52f729aa00626c63c76f1e5067a0b380772b72db4ab9730f16f0d9fd043cf7eedbe395ee384d58613a3b418b4af22fd2459640e
+EBUILD ps2pkm-1.5_p20140525.ebuild 1109 SHA256 93aacc53413f1bd5e55cea1f7a6045b0bc31b7fdadffd98d6a61a6b86ee4842f SHA512 695c74612cc7e54fd4cfa5503437619b7cc02060ae806dfe5db456cea796bf57b2a45df413802b8dd98e522d3512c9ef485514547367deb200b07db93370c1d0 WHIRLPOOL 97411f3939b9e4029f7004ce74649e3d715f7ad91519016755564c1927a0727109b81bcaaaea8a85b341d2af35c259f8355143bf059b92bad712d36fa90df5a0
+MISC ChangeLog 5434 SHA256 349752ceb8203890b6e37f29dfd6916e20612ceed16d8533c650d44bb3bb575d SHA512 4b35c7351ae579c6cd2effd26b76cad6ed20ff20c9082c2f9f643b7e47fa48ebd56ac14e212fc0fd6939d75ebab1493d4a3e3f73ab52174e901229c0da52566a WHIRLPOOL 5da64a08f9d431d16d69ae516c0f87b9d95deca4ed653592b01336852c2fdabe828aeec93ec28b437fc888db72324e28f09c6288a3d96faf40773fef7f5b3378
 MISC metadata.xml 254 SHA256 78294df0a1d0e815b05f968bb43c4272d420e3025a38ea2d4fe6193a918a8e10 SHA512 1d0e4d92def0b0187a09480fb289fecf98812c95736ef3772e0763a1572181f6f31ae558b1dd9bdcfad3bf3768440122ee774ec56f1a9d4b18103a8a8efcb6d0 WHIRLPOOL c033be17e138d0533bd36185df412dc39ed32269b8875e53417f9e320461e7dcf9133479f2497cbaa3ef579dd65b7ac25490976c7c9a3250fc606e5448415268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlWioH0ACgkQG9wOWsQutdY2WgP/cH4M1XnFSpmR1cePr/E4v1ry
-uOMpH5VwDaw1jVZmIaZyp0xS5mh6Serxi++m+9ri6VvqZdRD7tTVsX6w73eMHJjB
-Zj1y1x2TGqpZpNujod4LUcFvkZoz7lK8Teq3C1m9w3HL5hNLWrB6FvbuJA7Pjuz9
-lIWoWEMT1cKh5XFYGgI=
-=tgdg
+iEYEAREIAAYFAlWmJ8QACgkQvFcC4BYPU0pO+ACcCQqwJTfXWxLpq4TR9MNtwjZA
+ODEAoI6bZBCvHtssAtJ4oMVJZ1TmBG0X
+=HJdi
 -----END PGP SIGNATURE-----
diff --git a/app-text/ps2pkm/ps2pkm-1.5_p20140525.ebuild b/app-text/ps2pkm/ps2pkm-1.5_p20140525.ebuild
index 67b37fdccd32..e3a65df5bd74 100644
--- a/app-text/ps2pkm/ps2pkm-1.5_p20140525.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.5_p20140525.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ps2pkm/ps2pkm-1.5_p20140525.ebuild,v 1.3 2015/07/12 17:16:52 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ps2pkm/ps2pkm-1.5_p20140525.ebuild,v 1.4 2015/07/15 09:28:35 aballier Exp $
 
 EAPI=4
 
+inherit flag-o-matic toolchain-funcs
+
 DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
 HOMEPAGE="http://tug.org/texlive/"
 SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
@@ -18,10 +20,13 @@ RDEPEND="
 	!<app-text/texlive-core-2010
 	!app-text/ptex
 	${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
 DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
 
 src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
 	econf --with-system-kpathsea
 }