Fix building with GCC 4.4 wrt #275903.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 30 insertions, 14 deletions

diff --git a/media-libs/openexr_ctl/ChangeLog b/media-libs/openexr_ctl/ChangeLog
index 801ce09db3df..d0f1895a103b 100644
--- a/media-libs/openexr_ctl/ChangeLog
+++ b/media-libs/openexr_ctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openexr_ctl
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr_ctl/ChangeLog,v 1.17 2008/12/17 07:50:00 ssuominen Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr_ctl/ChangeLog,v 1.18 2009/07/30 08:47:35 ssuominen Exp $
+
+  30 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  openexr_ctl-1.0.1-r1.ebuild, +files/openexr_ctl-1.0.1-gcc44.patch:
+  Fix building with GCC 4.4 wrt #275903.
 
   17 Dec 2008; <ssuominen@gentoo.org> openexr_ctl-1.0.1-r1.ebuild:
   x86 stable wrt #207663, Comment #14.
diff --git a/media-libs/openexr_ctl/Manifest b/media-libs/openexr_ctl/Manifest
index 038170d5bc68..b273e7a770a4 100644
--- a/media-libs/openexr_ctl/Manifest
+++ b/media-libs/openexr_ctl/Manifest
@@ -1,8 +1,9 @@
 AUX openexr_ctl-1.0.1-configure_gcc43.patch 858 RMD160 2caacf417d802da9e94b11ea5b34a6e41522af7f SHA1 ea3074a15ad2bf948e4cdea3f64e3a73ed138c8c SHA256 cd844d136c5e2e41aa89f5d7860dbc74aa0f8602d7307f7af30fbb1ccc7fcb28
 AUX openexr_ctl-1.0.1-gcc43.patch 1240 RMD160 a1d736312084e14609b09766491e255b853e68bc SHA1 70639d512eff974a20cf098e7daa791db8975a94 SHA256 f07d13959b92089c5eb54a0f08f33a46f314cdb1a6fa6600b132ace6fe167513
+AUX openexr_ctl-1.0.1-gcc44.patch 457 RMD160 dd5c4dbcae2f761797ed0bd4c4b334eafec611d4 SHA1 d25857fc776ba903c477a4eb1585c4a939f56b04 SHA256 4197d145431e8df1425c1d7ad7d6a378497df8229b474778026890c3d890953d
 AUX openexr_ctl-1.0.1-pkgconfig.patch 632 RMD160 3ac23b1a39ca7c5880cff955a4c14196881f7691 SHA1 d30ad48d5136800c87be07a8f19273839b362c39 SHA256 45162cf3c6e878d6beb5c86f84cf302978d2ef3fb3745ac50d8fbfd092c963d2
 DIST openexr_ctl-1.0.1.tar.gz 362864 RMD160 f95cb574ef8e47541d53c3919d7237de12c7cb7c SHA1 330839a3af4069d67292dd86cb9c2512d08bb8af SHA256 2d88d624e24fce64ee8494d4dd46e33684f93941e1ca46024554d1ab6ed5e9c9
-EBUILD openexr_ctl-1.0.1-r1.ebuild 908 RMD160 409b528f1ee2c48d84b6a33789674e3c4e956a95 SHA1 4fbefda149f1c7de80e0cb81f613ab56047488c7 SHA256 ef62c062cdf73a73f449198acdb3a6912d8bbf41898031f1ff7bbc821d88cc14
+EBUILD openexr_ctl-1.0.1-r1.ebuild 925 RMD160 b365aa667de1ebb6faf5e0074b4de156de4b0c94 SHA1 787beecaedef2178fbc1ebade58789505909c49a SHA256 8be76652c197de5741691ff3daa913f12a188599892b05901dccf4a21113eea4
 EBUILD openexr_ctl-1.0.1.ebuild 844 RMD160 99f047b260da0d47c687eb4b04990701907d3592 SHA1 0c7de9da58bd9a788c22ee7d5bd0e750f354a603 SHA256 e8e54b4da49b1e0e3c619d56f2e54661e6688f06af2d39992c290d959b478683
-MISC ChangeLog 2492 RMD160 b921e0eec7bb18d1d3fef5061d6622e4e4cdccca SHA1 49924e3536f6ce044c4a849081a303dbc79b93c2 SHA256 5a9492f334f540a2b5aca8e047447dbd52f24dd8bd12a56e8e43e27399c63652
+MISC ChangeLog 2657 RMD160 f705e9c713fb8d8ace9bc30be5c2bcac1648cbcd SHA1 b9ba3397ff0e08ea4976c55c9680a5870d77d456 SHA256 e92f4879cbf81f130ccf99ced519c9e6961ff2ee86019851ec339b62cc54d7be
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc44.patch b/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc44.patch
new file mode 100644
index 000000000000..08530bdeaad3
--- /dev/null
+++ b/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc44.patch
@@ -0,0 +1,11 @@
+diff -ur openexr_ctl-1.0.1.orig/exr_ctl_exr/applyCtl.cpp openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp
+--- openexr_ctl-1.0.1.orig/exr_ctl_exr/applyCtl.cpp	2007-07-13 06:24:37.000000000 +0300
++++ openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp	2009-07-30 11:46:29.000000000 +0300
+@@ -60,6 +60,7 @@
+ #include <ImfStandardAttributes.h>
+ #include <ImfHeader.h>
+ #include <ImfFrameBuffer.h>
++#include <cstdio>
+ #include <cassert>
+ #include <iostream>
+ #include <vector>
diff --git a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild
index 687145020dae..f24ab610a171 100644
--- a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild
+++ b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild,v 1.3 2008/12/17 07:50:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild,v 1.4 2009/07/30 08:47:35 ssuominen Exp $
 
-inherit eutils autotools
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="OpenEXR CTL libraries"
 HOMEPAGE="http://sourceforge.net/projects/ampasctl"
@@ -19,16 +20,15 @@ RDEPEND="media-libs/ilmbase
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-configure_gcc43.patch
-	epatch "${FILESDIR}"/${P}-pkgconfig.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-configure_gcc43.patch \
+		"${FILESDIR}"/${P}-pkgconfig.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README
 }