Include string.h where required for memcpy() or memset() since it's no longer implicitly pulled in by libpng since 1.6.0 wrt #464972 by Kacper Kowalik

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

4 files changed, 47 insertions, 23 deletions

diff --git a/media-gfx/mandelbulber/ChangeLog b/media-gfx/mandelbulber/ChangeLog
index 963ff83cf4c6..b504aa5ba224 100644
--- a/media-gfx/mandelbulber/ChangeLog
+++ b/media-gfx/mandelbulber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/mandelbulber
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.10 2012/12/22 19:07:18 xarthisius Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.11 2013/04/08 15:05:56 ssuominen Exp $
+
+  08 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+  mandelbulber-1.12.1.ebuild,
+  +files/mandelbulber-1.12.1-memcpy_and_memset.patch:
+  Include string.h where required for memcpy() or memset() since it's no longer
+  implicitly pulled in by libpng since 1.6.0 wrt #464972 by Kacper Kowalik
 
   22 Dec 2012; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml:
   Drop myself from metadata.xml
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index a1bddb4041c5..bcbc3a7b79f2 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -2,26 +2,21 @@
 Hash: SHA256
 
 AUX mandelbulber-1.11-qa.patch 1313 SHA256 ab6cd3852408b7e3e8034f194562e3cd82742749cff120c3cc2ead79c70998d7 SHA512 d4ec5a1e6f475a518414a402942240b5679b0eae15d1ac83cb73148759ade31e69cb5bf61081ec9a9e9349697ed4eccd61f180b67588937d84cc990202393770 WHIRLPOOL a4dec86e4e3038ecfadb561e07c5720d1f45e9ffe44847d50880dcd0c071d2118fc7fbf7473129537beac9584ac6f02f30d05f3d072cea51362f2748daaea594
+AUX mandelbulber-1.12.1-memcpy_and_memset.patch 358 SHA256 953ab6d6a3074d5808daaaeb8ee5fb5397b6030260d79c7b6c97e05c94bdebd4 SHA512 3ace39be67fc5ee66c66a7d6ff6b81f8939c2d1c598effe676f6b8f750fa904c294197aea5f4a62519f1c129580ed8f037a55af0d88da0e02cbe993b2630082c WHIRLPOOL 187240e58b462fcca7ebcad0b931128396e54e5d113abc9eae9bb8fea8e2454e290fd175dd4755a20a4340b7ec4d42276c01f36b085f78a03ca2413718a65226
 DIST mandelbulber1.11.tar.gz 1176248 SHA256 3f57a23f91c3d88f1e28cba29e4f076e03c9bcb97ce7ecdd0cd713687cab714e
 DIST mandelbulber1.12-1.tar.gz 1179684 SHA256 75376616b52cb8dac7c7f358f4eb26f9d2fb171b9b0a54dbb25eeb57e494d382 SHA512 c198c71648ad4d674dac980c77fe2573617e122bdddb7775fccf74e1a929900691a421561f8717e4df741db65421cbdb8e464fd031ff5c38a56f63f5259b5512 WHIRLPOOL 7b5113bc81913607a544d19e9d16f53ec8888f97584110d0b8ad545b4603582f88fdfab4260d9fc74feaaae815739ac14f4b42e045fa1d6ae86d0e72e52f77fa
 EBUILD mandelbulber-1.11.ebuild 974 SHA256 693e9915b32438390dfb4775fadf7bd3dcd5886fb44e5614358e8f7cbb602be1 SHA512 4c8e83001fce6d4f1918e5205b36c92385049dc38a7fed1ece72d60a9d70c7945049f12eeb2444f38a4935408b4840ba6a9382d6b19c5290ed51c5795c7adafc WHIRLPOOL f7426d5654e6c7d7d6277e143eff1c873c724a7642ccd84fec3d276c38576e6684e1a352120ac3efd735f335b835d0c70579c276c4619e8b4220798428aa94e8
-EBUILD mandelbulber-1.12.1.ebuild 1028 SHA256 34cf2cb673ab30dc8cd6c1baf4ea7627575d3e6efa5cf051265a645df9207662 SHA512 7efe21583ad253393121ce31f719a037da1e511227fd3d0b85616b9182f03ea7753810da9eab3efe81c7dfea307aeeef4ea5fe5ebc42bad803ff5fafb92c43f6 WHIRLPOOL a4d59268dc1a884a81d0f7b07b97c0a274506671f41b51f2124ecc22f2af29855cc5090e3d6e0f3c9bb76df627469afafe6309420563dc4f4249d5c278465907
-MISC ChangeLog 2587 SHA256 c25249c887c0c454e1e30d1a911a0f79b137370d34d4b70e8080bb565c510fec SHA512 cab256455991eab5b06efc0169f6b00921b40e96ecb2c941726773fbc9d0f080db664e2f5342e8e1d5a22e6afafb3ec0b105a8f691a42ebf78f430b45efba8c8 WHIRLPOOL 4199fcf374504eba8647412f94f0e0b8ce6d05dc73c49cac19616924ad37084e2fca89e718f538883e3870dff11bcbfcf447c6f0f52d41abbfd834bedbc6d5b7
+EBUILD mandelbulber-1.12.1.ebuild 1080 SHA256 2fce93ecb9886b4fcc3760de837f2dd18b1a364d08457cc0e527f766bf1018d6 SHA512 2dd04c65135bac857349943b028ecd2d2aa26d81e38c41eafd1186d25a8120248b2d45409c858eceb60f0c932279d5a2cc86efd6614b496c0c07c0385bd4da5e WHIRLPOOL abf791187c2eba2861a235aa9e1e3a209b78b486e30ea533d7a1b311a7ce04ccda025ae3ff98af0cf087fbb89b2dcb889550eefd035dd1b0e02906c5ac21b37d
+MISC ChangeLog 2880 SHA256 7276ebe1c8fc73d568df0f03e7ba4a5f02b6c2372769054da901bfa4e7fa99c5 SHA512 399c79c09444c75e12ec8b8f97893d6dd6060aff30a96e07295dfb45f0191f89f913a6ddc59d78eebfe20a33d00f022ebfe1dea3165a0e0946ba1ee06d1445af WHIRLPOOL fc421f515fb69afa4916a2c1a44708ff23613eede37afc09f99e42cf0fc777ec2967b0fe20752e6c68b9a5eedde1fc9d873e80b3223e816240c7edda08d07e4e
 MISC metadata.xml 434 SHA256 495c048b131523b62f8ac1992eb2aafb4af67e7f8ef09262de8dff6edd086505 SHA512 6c7eeac970dc1840cfa78e178c734a642d363e0e78e57378f71095e49c24ebb301dc16a0410a68358394f8b87a052983e1837078545b863edf88c92182c52782 WHIRLPOOL 7d7a15ca2f34558710e689c01d9ab7caf2916bfda23c88adb9f7d3838d4888b7ca5646d412065ca72bbbd627032e88058ca904c62c802597a12ce8df1e4231e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ1gTtAAoJEF0huFKJUZL5bp8P/2LvPZjDYLrBWcm88j698kKa
-q65yF+A5VtzphjGyODNJAdOmcON4k7d8/jEmfuACE7EIIHnI7Q2iR8nv2bc+TJgS
-WIeLrQTDpjHf5O4NIN0lI6lD1VWi3Y609nro8CIxjBGFXvQGcTliCS3fF0FY11np
-djSYBmdfm2rmn6JaTYM4Xzg1xW6J8vRWpI+1ixuWJZaQ1HukmG6s1mppvzltEH5h
-Bz47fIL9ZNcw4zfvQGA8mBStqpqNV8RzKLgEssOp2/UTzKM9fn/0jwDIJhAr3MuP
-FgP7s95WTzITw5/5IsJloOqmUAKq1HYv2yEjbKbihnSegy/QcBDH9bN0xjv9ZTxE
-a+gjEoqtWCURLuNbsykDGHxeJIQX5eave8AjZ64/Gq4qvmzHSpu23oqR00UFtmG0
-0ohBMSfljGSxGCe8ZyRR7GDiRLC5+Lt5j5nzJTu7pIb+UyS5QOBleVqdLat6IwYC
-72GZKIsg4l5S92G2qV1hGviVwVfiWG0NZly7+Drq2zlyKLa0fvhf9ojvfgSX8+fP
-PSIYh2yfqYWhnsObcF/JwpRX2XPGH1vargEyvrWxYMF4n+5VEaOFOoAv2VFAsFvX
-I8eX0frn+l/kIRNj1MbA73QrCxz39sTEj8lUrdlEAFBsesKRTUDEh6JdcUgJXAkE
-WA2Ru7eCRIkt25uBCOLW
-=ZX/R
+iQEcBAEBCAAGBQJRYtyrAAoJEEdUh39IaPFN/+UIAKOgnpS8gOAntq00+3S00+z0
+QlqEZyup1SLJNLI+qzN1hs4oCeXhcRyiOGMvoRa8fKBHfBZeKTz0PUH8areFaGTq
+O3DduPyVVzSAJf6AlqoqFah58vdWHtLUY0APXY+/3gTepfb5U6nSiQPAQpmlfozy
+k8ApQEEGp7eVwEvI7bTNgFj6CMY4C8BMLS6B/39Dzwk16fk2M6iuEZiz3pU2f/zE
+5F4sDWIcOhJREnAcU29Ply6T5SGmtGvY5xovNniMbTco653atuA5bf5kZQX+fuD1
+90X59K81CGz2irthDJyG43OdSygidC9El++e4pfK0T2qJE/6U2oQu8EY84dcQcM=
+=Axvq
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch b/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch
new file mode 100644
index 000000000000..43fb0b982dbd
--- /dev/null
+++ b/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/464972
+
+--- src/texture.cpp
++++ src/texture.cpp
+@@ -5,6 +5,7 @@
+  *      Author: krzysztof
+  */
+ #include <stdio.h>
++#include <string.h>
+ #include "texture.hpp"
+ #include "files.h"
+ 
+--- src/timeline.cpp
++++ src/timeline.cpp
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <cstdlib>
++#include <cstring>
+ 
+ #include "timeline.hpp"
+ #include "files.h"
diff --git a/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild b/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild
index bd1fe357c33b..76d112a7c73d 100644
--- a/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild
+++ b/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild
@@ -1,9 +1,8 @@
-# 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/mandelbulber/mandelbulber-1.12.1.ebuild,v 1.1 2012/08/03 08:35:39 xarthisius Exp $
-
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild,v 1.2 2013/04/08 15:05:56 ssuominen Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs versionator
 
 MY_P=${PN}$(replace_version_separator 2 '-' )
@@ -19,7 +18,7 @@ IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
 	>=media-libs/libsndfile-1
-	>=media-libs/libpng-1.4
+	>=media-libs/libpng-1.4:0=
 	virtual/jpeg"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -27,7 +26,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.11-qa.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.11-qa.patch \
+		"${FILESDIR}"/${P}-memcpy_and_memset.patch
 }
 
 src_compile() {