From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 11 Mar 2015 19:57:45 +0000 (+0000)
Subject: Respect CPPFLAGS and relax libpng requirement.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4e5792f72a32d112a2285f38b1f7a755bd582d74;p=gentoo.git

Respect CPPFLAGS and relax libpng requirement.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200
---

diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog
index 463ba445a55a..81ea05ee4825 100644
--- a/media-gfx/pngcrush/ChangeLog
+++ b/media-gfx/pngcrush/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/pngcrush
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.134 2015/02/15 02:58:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.135 2015/03/11 19:57:44 vapier Exp $
+
+  11 Mar 2015; Mike Frysinger <vapier@gentoo.org> pngcrush-1.7.83.ebuild:
+  Respect CPPFLAGS and relax libpng requirement.
 
 *pngcrush-1.7.83 (15 Feb 2015)
 
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index 4acabcced247..537316f6037a 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -9,17 +9,23 @@ DIST pngcrush-1.7.83-nolib.tar.xz 59624 SHA256 b2963793b02e205fb011667a03912337c
 DIST pngcrush-1.7.83.tar.xz 359980 SHA256 c34fb4f8247d07ab05878d5d0f3de5cebbd999c2f5193a9d768b6382ab01e57b SHA512 ff0f1c6c81ea28df89223128dd1b215855a4c55ea44efcf68146067adecb05816a63d22397e534dc954d04f9d5d849d2ab2fc6072b18af6d323a21e648998256 WHIRLPOOL 07e4501e57840d6dd23dbef90cd81a577fe37a38ebf74a940d68bf38de2ad8cafcee3dd803707c0deaab5c88b61762dbadc24bb5a6c2a454fae20ff83e5a484d
 EBUILD pngcrush-1.7.81.ebuild 969 SHA256 554c8d51c7d033ce3c195e042d19b604617b00bbcfcb865b78efb451f0e577c2 SHA512 375985276f876ca8270ab996e6a20435a1e0265a43df3d8b8c972b0c16d1e55928652e2b0d3d66daea75b3e1f11dde7a197ce9ac7463520a2d4d1dcbcc25a858 WHIRLPOOL 8e7d1272b0da270bcacf1aff6aa01da4b5447e338a034fe54fd756a9722e570c32e7c5b821e02ea9c88c2c52d941585aeae1e60b76cbe3b795332d878be5f19a
 EBUILD pngcrush-1.7.82.ebuild 971 SHA256 b36625d6e257ba866aca89f306f409cfbca47d05512b61a0b2b165785c9e60f2 SHA512 2a10656cbce2798797c0a5d1342a20ecb5e15e316bae0b978bc04a4f44a8d477eb6f0859209e51cc2dfa9d697171254e03e5f988ef49698ecf8aafd816101560 WHIRLPOOL 06a5ec41d9cb36e1708116ba144398ac6eb5461132123e3851bbba4cbdad1765ab8d417b686b250c1562e06b4f02fd5761865a2300db46d151856c1de3ac5ed3
-EBUILD pngcrush-1.7.83.ebuild 971 SHA256 e847ec94f2f17e493f2e21870995f19f781e4c0766e2934c7c17fccc0b25c6f5 SHA512 e019d067ea37979b9c90df91761a67581b199500c5edd395982c2075280077beb6b1bd44ab933d80d3660a52b095c4133d698aaea32726e4422fcd33b5b44dc5 WHIRLPOOL d90b4f0bec058335f62c0c19491eed97ba840cdf79cda075c2938754f9378e71eaf55bd1aa7281a1e8ae4ab585da9b5a163ff42cfd92af8b2ffa392566203727
-MISC ChangeLog 17372 SHA256 16298305bd7a3ec5d9d5d8b55defc82ab906af386f71fb07061b075718d59628 SHA512 e209b4c6c18d42e719230e67ac17399776a1ef420b72b96233999989734d4e0753067c833a85652f25efa7502d2b83e1ddc016bbf4703b8f15bbc6a44177d13b WHIRLPOOL c2fdedafe5fb9941dba567f64481f6bf661f7588a09710071f768d6c86ae7e52154890da4561713aa1e5ddbb7cc5071612a0c9caa21330f2cac29ee71200f94f
+EBUILD pngcrush-1.7.83.ebuild 974 SHA256 58dc0124ee14da43f063cffb21b7e85efcb5fb35078628c846022f333ecd6a91 SHA512 16110384ee95d30fc218c90722a3947067e6fc39fb85e38bebc6da35e471368988b2f5d5414dea5d7ce2faabc4267f8a3eee1651e62b24645d8315065f8004ee WHIRLPOOL b405b7a80584e29dfac9e54531e72597377d425e03de69b4a485ec7b312c4bf05497e3371ceaf82190a45c51af06598882936ff385e3400f4d7c68725e7f5802
+MISC ChangeLog 17493 SHA256 06be4427c744e1987e016246d61d10535527ff744eae06fd1f2c6bf0d92a0a71 SHA512 4d1d8508c8861b4e0dea3009c48bcde61435f1981ec15e83f21bf90333f3b35530b57a916797f5c687b7c295df755aba0422a1cd00d9ccb4c6dd478bf66a5123 WHIRLPOOL 56ef38f166bbd364e37965d31756f502beef15a6a56108b1a1222bd2c5c069d81569a0cd2f42f39ab9201ccba80c96484bd97e7ef53cbd42d3319a0306c176d0
 MISC metadata.xml 482 SHA256 a90154b30ac16c421694ea7cb9a914d25cfab2470bc4561e22ffe61dc46339f8 SHA512 1e544bb03733397023506f520aeb45dacdd55fc2b98e9fa735aefd74d1507824ab8677e266bab538fea0423fca0880c186152d6a156e4789750ea38c43abdd91 WHIRLPOOL 4669ff66e12c24527676807d8677941561668613d34318f3a3ee51390deeb190c05bd4a357c763fcb69b3412cc261cdb01e45e42651950a19b2d698352653d7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJU4AtKAAoJEEqz6FtPBkyjZqoH/1MnA9NLjWm3Cg+yxxx56IXp
-7k8rhwgyZKdur2QI2oLj5aUn/7TIeMG/NMXHySmTsfwtK5bx9Qr6rJRqZJQNVxRO
-ReOyWYleRxKqXVpwSflh7B6ry+e4W0zCLUNc0Gqercfji8CmNaVoMPhtS/vGk7qo
-1wm0xBI6RcUhk8WVoJ33hsjSdRbWighfN+SCNvMH15uu5kR/hoGeM1Vhay5OyPHn
-/t7xUbPiq17aEMIKBtjePKr+uycBK1Mnf68xqORDdgmEPmhoxZx1CA10SRCVLedF
-d59fQKwJ3qlcptj1rjhQHWocd1y63+XRZS5YZHRPQiat7D45U5h+nL9PF5cAV7Y=
-=8Hwg
+iQIcBAEBCAAGBQJVAJ45AAoJEPGu1DbS6WIAt+8P/19wihyrMErPVdK+jafjMU02
+XDhfKqJOvYMUiPWnowaGkHYCR1y9/a1kyk9fCNgLLCXvLA+4hjukTK2vvBsnouIj
+5ALIXgRTbfmiQNW+oMXQeTnlgGAyvbAG8M7/UG9ehbR0MvGpF67SLeq9p2XJHipw
+h0SPR5LxxwfAM0AAUf4Oy+Yb9Klm6omZfRJGbNFDTG86fQMacc1X4aU9Jmu7+whO
+mLrtZrevn5x0snBlsRJHwTrmTDKXBY5GfSBWW3Ul4kOTKDHn4TzgoGjhXh2eBLXt
+POZUFzBb3GqHQiBt+JXUwRRuJ6/zB9hl4/eBtPSq1JR8dtmDE19DQ5qVEydFdDtc
+dyFzh/2ukLRuu0P8J3esJS0+7f9z3g9FK9ODc+quh520rIWUoV2Bb+qoizootGKq
+bqxr8qRJpIxYivRM7iLUZ/Ds68pj7g4TrL7sQgCNHwABQCgTqqgGtHXqTIBpWkPz
+yZo2VcKDLbJQrUfVKS9zLnbPZ9CrA++dSj+MoSTywI5nTVE/mXrWsTZd3/6plTTL
+sMX6/WGSSA5+Hz9HaZn1ZOH7tZEhOUIs6KInA3QFEb1jkYrSsoVPfJQOGn7pZB59
+X38HhMlwKK5s9rh0GR1Ts35uhHTO/tZMYynB+9ctmGSneRAp61qrchDhKvrLzK6V
+vcpDEjelh+jI9inSA6YU
+=Dn6U
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pngcrush/pngcrush-1.7.83.ebuild b/media-gfx/pngcrush/pngcrush-1.7.83.ebuild
index 09ef388b746e..37a1649a5980 100644
--- a/media-gfx/pngcrush/pngcrush-1.7.83.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.7.83.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.7.83.ebuild,v 1.1 2015/02/15 02:58:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.7.83.ebuild,v 1.2 2015/03/11 19:57:44 vapier Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -17,7 +17,7 @@ IUSE="+system-libs"
 
 RDEPEND="
 	system-libs? (
-		>=media-libs/libpng-1.5:0=
+		media-libs/libpng:0=
 		sys-libs/zlib:=
 	)"
 DEPEND="${RDEPEND}
@@ -31,7 +31,7 @@ src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
 		LD="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -Wall" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS} -Wall" \
 		LDFLAGS="${LDFLAGS}"
 }