Include string.h for memcpy(), memset(), strlen() and strcpy() wrt #465780 (revealed by the libpng upgrade from 1.5 to 1.6) by Richard Grenville

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

4 files changed, 45 insertions, 19 deletions

diff --git a/media-gfx/apngasm/ChangeLog b/media-gfx/apngasm/ChangeLog
index d09d06c692e2..86174e41c502 100644
--- a/media-gfx/apngasm/ChangeLog
+++ b/media-gfx/apngasm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/apngasm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/apngasm/ChangeLog,v 1.8 2012/10/03 09:52:37 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/apngasm/ChangeLog,v 1.9 2013/04/13 14:30:07 ssuominen Exp $
+
+  13 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> apngasm-2.7.ebuild,
+  +files/apngasm-2.7-string_h.patch:
+  Include string.h for memcpy(), memset(), strlen() and strcpy() wrt #465780
+  (revealed by the libpng upgrade from 1.5 to 1.6) by Richard Grenville
 
 *apngasm-2.7 (03 Oct 2012)
 
diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index ac34e6815f0c..ae374076216d 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX apngasm-2.7-string_h.patch 411 SHA256 fa86aadb490f26752fead9781cc88a7b461e91dd3019d6c2e002f5b59265943d SHA512 00605660094af0c8f7bbd96a94e02b0ed505f0e2d8bf6643fc6d6d5f92e40411f409630c1d0c538bf874dfd31ccfea2363fea7640edadde5fe2c4d9e15e3e524 WHIRLPOOL 206de9b93e7ad2dc22b72e5447703aaacee9cfb2fadb62dcb44e5d2790523d2f7d5f29b84cdd0e47d91314be23b2fc9e63830360d56d0d535bf00d63e1dcc3f0
 DIST apngasm-2.5-src.zip 11333 SHA256 e5346948f2a51328161b3ef0d2c8111cd7289c7b4ac48e72db3a617cfb4f24c5
 DIST apngasm-2.6-src.zip 11350 SHA256 1d4b63e55c241c0db4a812e6cddea48586e4275b041a1e600154c2840f4ebb06 SHA512 b603bb91ad2c803abd18894ff95212f9cbed37a61fdefec60f06284e03bf274721b291f63ac8cf7d6c0cad516cb05f2ae7382f4aeb42ec87ebb07eaf29b27050 WHIRLPOOL 0e1c2684e3b36a062fb832077b29395a2198dca94c784c80d9e9c7de7542db3208a9e80e7529d6e28b2e46b32ff98534b96b62e683eba3a1b2d4515898446b95
 DIST apngasm-2.7-src.zip 11448 SHA256 af42569666cab268a20a0754191396c9d48f4e01d6e8f93c3ae1164c3c821cc3 SHA512 28ec70a4ac02021ff85390ad6863aaca5451937209345128ecd5baf76bef9495168c3c4ee5d823afbeb569ca673328673a81b807e7985c3d5d1843c056af7810 WHIRLPOOL e2cd3c937af8010672cb3866903df084c52e37e7c05c0933f0e7bf2be69ee74a78c5367c463a07d2314e5d416c3616e6e218060298f349be0eab944d4e6af2eb
 EBUILD apngasm-2.5.ebuild 751 SHA256 c2174ca1b1697e710844cbf0477e4bb7963568cc430fdbb26ea86790558ad46f SHA512 59a69b7ea8f4ca2c7709b5bf60c4b05988e483a7da714839928a82d648e9b308a343b22f395079cd87dd89205a398df73be111e94d684e506732d2da757ff5d3 WHIRLPOOL b3c58fbcf1df24bee18aa6b708735b77d0cd279e7f9abb09d2441732290f8ae3580caa17423768d3f8f2cf48ecde77e86da47c6f66984c706a269a4a5c2f953b
 EBUILD apngasm-2.6.ebuild 751 SHA256 d5767d7d967bcf9237573aaef029a504c8e89d6b7936f66101787d8f16e78505 SHA512 1734237a57a714e46d4b04c3538f5d9682e86cc27452bae99051a2782d2f9d045dd0bcf407d363b786a18cda3ba2a7304ead4f2b8401b57ff7b56ddae11d8ed2 WHIRLPOOL 64c34a8a46c828819bf4039a99d3550cb8c9a21518746037a207ac424717771700849553fad7312cf35e327db03f2500b74ee52e3a0a7e9ea18e727021a9ab8b
-EBUILD apngasm-2.7.ebuild 754 SHA256 e7b485f626f636b389da6842c60e6058f2e5e533cc408e1a8b716b40a33296b9 SHA512 3b55680a9324fb4c1b665fd2561f655fdf5d13de33ba6bea0e3fa3a3ca59f67f43cef09bbe5cb2bd1d6a5dbb52f56bfc391a1b079648ecf614043a731e78bea5 WHIRLPOOL fcf4e7a032131a9933d762022d5ef36e8b31607203e9e83563b2b427696698a2af1b361ed0b80b03f2635233a57e8b7d5f885efe7947607d3f98bbb606955c31
-MISC ChangeLog 1170 SHA256 9c213afb9629aa252dd21d53a2ecce0e94529488e7b3121be0897a4ec214d05e SHA512 d7e76cc44582d861ea65bf163f4c39e314da235f65d8f9ddabbf110229a22dc6ccb4715a9c4cffb3cf56bb39e05a4441d48b827fc919964e8b85d43eec0b524c WHIRLPOOL ff68013230e86262458fa8769745657a71cbf9f324daaff1355dd3c839254132f0e0b99ce19b41e0888ec2746319efe3c9b68a0630cadd88cba6e9e339deb483
+EBUILD apngasm-2.7.ebuild 835 SHA256 612e833b6465372c565c17e8684fea0438bb7a443a8f8037fe9309b65c56cf1b SHA512 16f3b8d8545d01f571f79a66a3b839b0932070d2e046ab11edc9cf80169a3a702141714987b2a0d411e1494bafe4703fe492151fbe8ffd841d33e4bfa433af7d WHIRLPOOL d4e5ec665c4974c97517b45732c0ac656dbe8692ad00535a4162d6a355bef2bf929bef002af61de6fca741398fc04d3643e504b282471e251b60893ba8ff6a84
+MISC ChangeLog 1431 SHA256 904c2d60ed54b20321d70d0e92238db1608020ae9b51e1e12f392e7a51d20f30 SHA512 b2196729c7eb8da872c33948836832a3d6954204f0dc4a58a071bb2a24b6814cbb20e2644822da216f17fda3539a55af9145f10ba1a0ab4d7a12ec60bd581550 WHIRLPOOL 3cde3183605954b917757e2935b47b48f2664575593059e3d40f512a1c0f1c65f498c930688a8fd8e9d380182600aca1c8074e14ea3d9027c5374870bb240ee8
 MISC metadata.xml 161 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 SHA512 425caf0160f1410ce7bf1d4639020be7f6335152c339edbce80676bff4166f1cab3ae9e13161c47b98dc00741dab3bfa45e9572a3314844476e480f5c2b58d7d WHIRLPOOL ad7cdd3352dbc12cb4181fb5d63b5aee5ce3a151b975c12a96c4a5c91f751736d27282ad22633c7e768230266bce5d17947735d33ef5c5c2341c3f9435b9ebb0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQbArmAAoJEEqz6FtPBkyjfIcH/1PfBGPTslShr4Y+gR2NyCS2
-hIJS4ro8smhtL8PWEJRy2VAyw5jz8Yt8P/xHi3H+Mg+vxB8AdNI1eSYDvMAkF1h0
-eAByFs1/KE9xHSS7D3TaFOt6rc/CSZ8JOX5Lzhk2zUYfeoNBdO5aTDjt63dHtBBp
-Bgfklb0QXTtBTk0n2quRzTFLTzWzBlgwFupOMn1dKMhXyHWGzKQOngj3gw8bT7Nf
-ld+o+tzuNRrg2vz6YnADypr17El7fWagUyCkl9dyn+lCfs7Va2NH5wLqW1bTMhKm
-pIydXFCePfdX912CaCtG49hX+ONyoISOOSTfAX7cIS6ktta3m6Kvw70gA51Yu6s=
-=kgHJ
+iQEcBAEBCAAGBQJRaWvbAAoJEEdUh39IaPFNF7IIAKAAMgMWy8pX5BOGckHEr8Sx
+GytzbgZhr/uE8d44QEdEVzlaU3vF+1Lk3jtScaINblXKD6y7Vt7DhbHRPeaEyTHR
+emGn4TZmDe20disRGpalkmQUlkbncqEd54daXSJu8Gv3+ixsiyTDtHxWwxamgFN0
+b/E2ZMM5zZ2UW7e9DqQSC75WhDh2ZDkS/K8bbp2k04KKiLW+y5K/Z8NdcZxyHS+K
+D8Hm+1U1lrQgZrrFIIXQ9q8fToDdZwmb0e2J3Sxos3422LeP5v5GMyEee3jBx9gf
+nZCw/t0LJsihegYpMevx46//WFQzukG65en0ClDWFZx4Gy1hREQUvYbTaCuK/Cw=
+=OTSK
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/apngasm/apngasm-2.7.ebuild b/media-gfx/apngasm/apngasm-2.7.ebuild
index d0b11ee0abb4..8468dd62a59a 100644
--- a/media-gfx/apngasm/apngasm-2.7.ebuild
+++ b/media-gfx/apngasm/apngasm-2.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 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/apngasm/apngasm-2.7.ebuild,v 1.1 2012/10/03 09:52:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/apngasm/apngasm-2.7.ebuild,v 1.2 2013/04/13 14:30:07 ssuominen Exp $
 
-EAPI="4"
+EAPI="5"
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="create an APNG from multiple PNG files"
 HOMEPAGE="http://sourceforge.net/projects/apngasm/"
@@ -15,14 +15,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/libpng[apng]
-	sys-libs/zlib"
+RDEPEND="media-libs/libpng:0=[apng]
+	sys-libs/zlib:="
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/unzip"
+	app-arch/unzip
+	virtual/pkgconfig"
 
 S=${WORKDIR}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-string_h.patch #465780
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) --libs libpng --libs zlib)" ${PN}
 }
diff --git a/media-gfx/apngasm/files/apngasm-2.7-string_h.patch b/media-gfx/apngasm/files/apngasm-2.7-string_h.patch
new file mode 100644
index 000000000000..303e832b37c5
--- /dev/null
+++ b/media-gfx/apngasm/files/apngasm-2.7-string_h.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/465780
+
+Same for all of memcpy(), memset(), strlen() and strcpy():
+
+apngasm.c:141:11: warning: incompatible implicit declaration of built-in function ‘memcpy’ [enabled by default]
+
+--- apngasm.c
++++ apngasm.c
+@@ -29,6 +29,7 @@
+  */

+ #include <stdio.h>

+ #include <stdlib.h>

++#include <string.h>

+ #include "png.h"     /* original (unpatched) libpng is ok */

+ #include "zlib.h"

+