Fix building with libpng16 from which we don't get <cstring> within <png.h> anymore wrt #467918 by Antoine Lemoine

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 42 insertions, 21 deletions

diff --git a/media-gfx/png2ico/ChangeLog b/media-gfx/png2ico/ChangeLog
index 857c48a286db..29da7b72ed70 100644
--- a/media-gfx/png2ico/ChangeLog
+++ b/media-gfx/png2ico/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/png2ico
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/png2ico/ChangeLog,v 1.1 2011/10/09 09:04:00 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/png2ico/ChangeLog,v 1.2 2013/04/30 06:47:27 ssuominen Exp $
+
+  30 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+  png2ico-2002.12.08.ebuild, +files/png2ico-2002.12.08-memset_and_strcmp.patch:
+  Fix building with libpng16 from which we don't get <cstring> within <png.h>
+  anymore wrt #467918 by Antoine Lemoine
 
 *png2ico-2002.12.08 (09 Oct 2011)
 
diff --git a/media-gfx/png2ico/Manifest b/media-gfx/png2ico/Manifest
index 744b0f9b6aeb..0664f0fb0c8f 100644
--- a/media-gfx/png2ico/Manifest
+++ b/media-gfx/png2ico/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST png2ico-src-2002-12.08.tar.gz 26527 RMD160 d71f49992f152df580e0c264f723a2a4c20fac2c SHA1 955004bee9a20f12b225aa01895762cbbafaeb28 SHA256 d6bc2b8f9dacfb8010e5f5654aaba56476df18d88e344ea1a32523bb5843b68e
-EBUILD png2ico-2002.12.08.ebuild 869 RMD160 2d215eecc0266314a95f88a6c68e5cc8a1bb2fa4 SHA1 5fbc17c9c60ebb26f2fe2b18f90be29039213ba4 SHA256 a758ecffe8aa28f2cc51df2d092fbc04ad4a03fbd9dda6da301055d9262f7efa
-MISC ChangeLog 372 RMD160 bb6e0d09144ccbfb8d6bb1969f70e2545c2be4b6 SHA1 8cff33e24bf538ef04985ee4339fdc34fcafe944 SHA256 1f790176c9f273b6eacf8eb0e45f0281f2567867f67efe4b6c6569796e1e934f
-MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
+AUX png2ico-2002.12.08-memset_and_strcmp.patch 277 SHA256 643170b93549022d357ab5892f7f702f4ad0c0ad001ffbb784a1ad17d26a2390 SHA512 a89d8dc1b65e6cfc3c1201a255a1b16ef22ae0fbc02e3b8a0ac097f1d62c472960f42132d84fc9fada900138a6d49af60455999cd28d2565035a69a5244994c9 WHIRLPOOL 5c042c5fb824e85076e6e0a23a0020048ad48da434cb50a360224657994e06267051701fb8513bb9614e20be60ad23659d00b0b5bac0be960cb68c56f59421a3
+DIST png2ico-src-2002-12.08.tar.gz 26527 SHA256 d6bc2b8f9dacfb8010e5f5654aaba56476df18d88e344ea1a32523bb5843b68e SHA512 f9410d2d15a14b5350cab7bf93f91b80f9e1d0b6a1fdae8b8850d11f29c9f4000bc8c3778fe24acec75f1f182d5ea383cff38e22b8ac5da6432c0a7a2d0e3208 WHIRLPOOL 66e73ec1ec91761552a832812b30862488a2fa305f22e2ed37d44533350c44bbec8bf3015ad75fe85ef76a083c1f9e82c722a2a1ab4160cf87b2ce9a7d1c3ead
+EBUILD png2ico-2002.12.08.ebuild 933 SHA256 119e4f8cb821c0a295d404c610883d56c97a2c1506597d9769a025f4aac1ffa5 SHA512 7ebbb8ab9824a9b0961cb7fa4337c30fa2dbb46a3b7af2f9bf663bc838322f3e984c9b61878078890acdb45b3005246d8a4caa980b6e7854c5a724a9c52b08a1 WHIRLPOOL 989aa15871098e244aa66dcc6b6b692bd0e5b69e7a51b9e85267f4f5cf570e89d48297c0c1841dda7f81caaa3e633c0b5dcd0100dfe7315bd975cd827ab6fdb4
+MISC ChangeLog 626 SHA256 df10a571cc99c9051d374e2d6d19adace4467b0bf9752a53367192ce025bdebf SHA512 b57561f93d5e74540851aacd96c6b66baaae296b14bc2139115b841bf8325ab65f7e0996179e44bf0a9f2db603cd82ac837b93d4b0b1e3b3daca4808ee061109 WHIRLPOOL 00513fb7914d54015ebdd8ac01916c90c89ff601658d8a22d174f1152c5aebde769c844b47b7095ee9dc0899c5f3e053d9ee39900de5cfa29283b544ab6d880b
+MISC metadata.xml 161 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 SHA512 425caf0160f1410ce7bf1d4639020be7f6335152c339edbce80676bff4166f1cab3ae9e13161c47b98dc00741dab3bfa45e9572a3314844476e480f5c2b58d7d WHIRLPOOL ad7cdd3352dbc12cb4181fb5d63b5aee5ce3a151b975c12a96c4a5c91f751736d27282ad22633c7e768230266bce5d17947735d33ef5c5c2341c3f9435b9ebb0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOkWOaAAoJEEdUh39IaPFNSqYH+gN+prCSwiGoZRvC407y74pP
-SuCinIWMGpnfXhUeoR7rT4Xza+H9w8FuDIy/Ho0oLj0ry2+1HF21PYlK0wdldKP1
-NRpIySyBcyJNM9Ce2J+BWHI3QoPbggLstgJB5wSfDeBL1R/4At1gmc47u50yiYEp
-rUkp1zif79bXmbCVPz4sqPu2ULWW/btqPaJKdpIUiqECgRzYzN3G2CHscT0ZRUW0
-Z7TfeUd9kSXrvEFUF9qs+xrPwThzysf+fTIsGFxJox4YE8dQKtT9Ubg2cBRXd1GF
-MFD2w0QIFmyYd526XdVMwv25VWEacqmxuwI+pws0klwhPBdUc5Nt4g7DIzMipqE=
-=USX5
+iQEcBAEBCAAGBQJRf2iYAAoJEEdUh39IaPFNpUUIAJXSlzWgdWkbgb6B6kc6Ndk1
+X6kW0I7ssSmYBkyrnDFbebJFGvk7QF002MryUJ0jcTDY/2Ew0tUnSSyaaXsr6Wyn
+qySA+YQFiwXHq+hWv5bPjPoX4JZBbQ36aqxJkoDFN73LAYiMU9GsSoMGOdRUo/U9
+R2f6NME6VWWOIT0u96oEMUabc7HHt3I5QWpVkgG3GTfE/NICg/b0IM8mZC07AMje
+AuyB6sloQejEUsSoPJqlOUVGMSDpvh+v7gQiP5asiFYXN7fK8BrDPJIyBSHWrMj2
+8BygcqW8TD5pLKU7NcfXRnYV6Q6lc7oQwhh0di4xtYmNycaqDDrq+UuOUdeCI88=
+=SyeW
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/png2ico/files/png2ico-2002.12.08-memset_and_strcmp.patch b/media-gfx/png2ico/files/png2ico-2002.12.08-memset_and_strcmp.patch
new file mode 100644
index 000000000000..96720bebd18f
--- /dev/null
+++ b/media-gfx/png2ico/files/png2ico-2002.12.08-memset_and_strcmp.patch
@@ -0,0 +1,13 @@
+png2ico.cpp:133:31: error: ‘memset’ was not declared in this scope
+png2ico.cpp:443:34: error: ‘strcmp’ was not declared in this scope
+
+--- png2ico.cpp
++++ png2ico.cpp
+@@ -33,6 +33,7 @@
+ 
+ 
+ #include <cstdio>
++#include <cstring>
+ #include <vector>
+ #include <climits>
+ 
diff --git a/media-gfx/png2ico/png2ico-2002.12.08.ebuild b/media-gfx/png2ico/png2ico-2002.12.08.ebuild
index dda9667905a6..2805a4d8774c 100644
--- a/media-gfx/png2ico/png2ico-2002.12.08.ebuild
+++ b/media-gfx/png2ico/png2ico-2002.12.08.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/png2ico/png2ico-2002.12.08.ebuild,v 1.1 2011/10/09 09:04:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/png2ico/png2ico-2002.12.08.ebuild,v 1.2 2013/04/30 06:47:27 ssuominen Exp $
 
-EAPI=4
-inherit toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs
 
 DESCRIPTION="PNG to icon converter"
 HOMEPAGE="http://winterdrache.de/freeware/png2ico/index.html"
@@ -14,13 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/libpng
-	sys-libs/zlib"
+RDEPEND="media-libs/libpng:0=
+	sys-libs/zlib:="
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-memset_and_strcmp.patch
+
 	sed -i \
 		-e 's:CPPFLAGS=-W -Wall -O2:CXXFLAGS+=-W -Wall:' \
 		-e 's:g++ $(CPPFLAGS):$(CXX) $(LDFLAGS) $(CXXFLAGS):' \