Add patch by Stuart Longland for libpng-1.5 build failure #355025 by Lars Wendler.

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

3 files changed, 18 insertions, 11 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index b4224913aac9..ecb2a5bf32d4 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/netpbm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.246 2010/09/22 22:09:05 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.247 2011/08/15 03:39:29 vapier Exp $
+
+  15 Aug 2011; Mike Frysinger <vapier@gentoo.org> netpbm-10.51.00-r1.ebuild:
+  Add patch by Stuart Longland for libpng-1.5 build failure #355025 by Lars
+  Wendler.
 
 *netpbm-10.51.00-r1 (22 Sep 2010)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 3a1cabd16ba7..28a1f24319cf 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -13,15 +13,16 @@ AUX netpbm-10.51.00-pnmconvol-nooffset.patch 3930 RMD160 c54357f13fc1147b8020b52
 AUX netpbm-10.51.00-ppmtompeg-free.patch 1199 RMD160 3e3594fc27166423904ec56c0d17e427811614cd SHA1 ebe9561fd836c930ebd417cb81f507e502b36d57 SHA256 45c0229b035e8b50f759a5aae646a60ef07f4c0fb156b4aee1dc52aa0c1cbc75
 DIST netpbm-10.33-manpages.tar.bz2 236722 RMD160 5e43836a5f4d16f1ba5ece21e9996dbe60b252ae SHA1 6c0372f540ad040771beae15a8c2015252679e5f SHA256 aa18adee4a187ad5df243cb1a7c51097dc6a7d6a8072cf6da09972b74ac5454a
 DIST netpbm-10.49.00.tar.lzma 1917909 RMD160 26ce43d25a1e7319627d82bfa9a8e73d3c87d1fa SHA1 72db0cff9f805a3f84766dd8add82eaa30685ed3 SHA256 4414fe9b64c695e5d750670aa6e2b03828877d653bc8806e778c1352553c7c8e
+DIST netpbm-10.51.00-libpng-1.5.patch.bz2 8120 RMD160 49ee4fe57f170ffc1fb5470440dc840f0fb5387e SHA1 a6f0c2e37a5cb051e3c9275918c7e5b34c396aa9 SHA256 260a5f0e9834e7e1aa5c2dcc292695aa43b5aa198af1cb33e5705f7cac10da7b
 DIST netpbm-10.51.00.tar.xz 1834148 RMD160 71593d33e102de72230fbc306165ecc67bbb4c4f SHA1 ae5f9393ebcc75b0914f40c93a837de98a0a71c8 SHA256 6d7bb30d1d0e7f6a23b55c6f03bbb20b539909ad84281dc944b1072656dc1d0e
 EBUILD netpbm-10.49.00.ebuild 4308 RMD160 f92fac1b63e0d4c066d57e1085669b5196dfa58f SHA1 637e36390084ecd4bee85497f9628dcff7d7ccec SHA256 41bcaa9810b8f815876b8d00ee115ab0b7b9432f4c6f44309c0330d8973b85f0
-EBUILD netpbm-10.51.00-r1.ebuild 4728 RMD160 5d5b695f926f3623ca6c5ce6996f360c20b19280 SHA1 c4e9eee909d32783c6495dd32e10e9ab81c06bd5 SHA256 e69ffcd47a2e72e8d2e2d580d6d324d228c208879cabdc010bb9c2f6f75da341
-MISC ChangeLog 33925 RMD160 56905228a4dd049916c20bc017d65f52f28ca16e SHA1 22c5af1f9d2c0b2496a2415e10d1d7e29357e838 SHA256 377965bc744915a8971bc8717ea0340f1efa8fb114356a1f94d3a6be4595ab66
+EBUILD netpbm-10.51.00-r1.ebuild 4822 RMD160 ccb8754eee064b1d801454d5955c405a59cabfe3 SHA1 af7ef91aabb48381a1a22348dd7e9a7ac4b33695 SHA256 8a01c643570062bcf1cda814465faa5050ab489d259b3b50a0d29f51ccdff898
+MISC ChangeLog 34090 RMD160 b60836b7c7ba481770763a8aff4dac0cc9d6874b SHA1 fd865d14fe93112cab5aa59b82411f08228fcf6b SHA256 c5dcff6995324a494f3e270f336519635232860cd270e3fd20de382165943a83
 MISC metadata.xml 266 RMD160 de6149ba44458a170c3f6f6d5c015a3b4e5fe3bd SHA1 bb0d212119622779ede27328c6df989b362deac3 SHA256 4db3c087a1641cf4b8ae3750db0fb27bf8ff9a4dcbe496d1c173a9f9c04df75d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAkyafuYACgkQTwhj9JtAlp6eAgD/eW6keg4O4HqT2QJzagaFr3LE
-g4i4cSKjRbUcuYkTJ8sBAMKZbSbCK/k1rdRQRZMB1Qm8M1Cun2pG6Ct0KK6xl740
-=s/Kq
+iF4EAREIAAYFAk5IlQAACgkQaC/OocHi7JZpCgD/cE0nAXfrbBLoUxCkK06Xc4pM
+z/SDN0diRr78eZD1AJ0A/3EGWcIwthbCSHRVygeTguaXBlQq4EiWS1Dx7iahsPoT
+=hTIU
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/netpbm-10.51.00-r1.ebuild b/media-libs/netpbm/netpbm-10.51.00-r1.ebuild
index e031e0a98401..7943b9b05294 100644
--- a/media-libs/netpbm/netpbm-10.51.00-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.51.00-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.51.00-r1.ebuild,v 1.1 2010/09/22 22:09:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.51.00-r1.ebuild,v 1.2 2011/08/15 03:39:29 vapier Exp $
 
 EAPI="3"
 
@@ -8,7 +8,8 @@ inherit toolchain-funcs eutils multilib
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	mirror://gentoo/${P}-libpng-1.5.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -81,6 +82,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/netpbm-10.31-build.patch
 	epatch "${FILESDIR}"/${P}-ppmtompeg-free.patch
 	epatch "${FILESDIR}"/${P}-pnmconvol-nooffset.patch #338230
+	epatch "${WORKDIR}"/${P}-libpng-1.5.patch #355025
 
 	# make sure we use system urt
 	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die