From 0614f8b12644432ea92ae29b74dd52c61036ba27 Mon Sep 17 00:00:00 2001
From: Hanno Boeck <hanno@gentoo.org>
Date: Sat, 22 Oct 2005 22:57:43 +0000
Subject: [PATCH] openexr gcc4 fix Package-Manager: portage-2.0.53_rc6

---
 media-libs/openexr/ChangeLog                  |  6 ++++-
 media-libs/openexr/Manifest                   | 25 +++++++++++++------
 .../openexr/files/openexr-1.2.2-gcc4.patch    | 11 ++++++++
 media-libs/openexr/openexr-1.2.2-r1.ebuild    |  4 ++-
 4 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 media-libs/openexr/files/openexr-1.2.2-gcc4.patch

diff --git a/media-libs/openexr/ChangeLog b/media-libs/openexr/ChangeLog
index 3172092fe489..05d900b02e39 100644
--- a/media-libs/openexr/ChangeLog
+++ b/media-libs/openexr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openexr
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/ChangeLog,v 1.27 2005/09/12 12:18:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/ChangeLog,v 1.28 2005/10/22 22:57:43 hanno Exp $
+
+  22 Oct 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/openexr-1.2.2-gcc4.patch, openexr-1.2.2-r1.ebuild:
+  Fix for gcc4.
 
   12 Sep 2005; Aron Griffis <agriffis@gentoo.org> openexr-1.2.2.ebuild:
   Mark 1.2.2 stable on alpha
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 2a194c1a8cfa..5ff6f15a9f22 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,9 +1,20 @@
-MD5 c9c0d28408bc3c035ac3d1de86ea72ac openexr-1.2.2.ebuild 1005
-MD5 ecbccc321ed77269259d02d45e9af467 openexr-1.2.2-r1.ebuild 1619
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 a31350247591f598c5dc499c814b7c10 ChangeLog 3663
-MD5 6f69b195aab90aaa3d98f058bc0f584d openexr-1.0.7.ebuild 1006
-MD5 ae16061f11f8add38c447314c0f8724c files/digest-openexr-1.2.2 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 42bc823bb4d3bb80a755861bedc0902c ChangeLog 3783
 MD5 21ea9ea0c3fabd1e25cd34b7de57dc62 files/digest-openexr-1.0.7 66
-MD5 dd45e17d712e65d12cb5a8cb704fc11c files/openexr-1.0.7-gentoo.patch 993
+MD5 ae16061f11f8add38c447314c0f8724c files/digest-openexr-1.2.2 66
 MD5 ae16061f11f8add38c447314c0f8724c files/digest-openexr-1.2.2-r1 66
+MD5 dd45e17d712e65d12cb5a8cb704fc11c files/openexr-1.0.7-gentoo.patch 993
+MD5 bc17a0faf5bb747f36271992bc598a15 files/openexr-1.2.2-gcc4.patch 311
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 6f69b195aab90aaa3d98f058bc0f584d openexr-1.0.7.ebuild 1006
+MD5 cf302ab9e9b6094b081093ae2a12aa51 openexr-1.2.2-r1.ebuild 1661
+MD5 c9c0d28408bc3c035ac3d1de86ea72ac openexr-1.2.2.ebuild 1005
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDWsQ5r2QksT29OyARAnzcAJ0YM+zPde7QU/WbCC0w0l0AXXKVlgCfc8ci
+OMAnWc/9yIHoztGzqHPwU+g=
+=E2o8
+-----END PGP SIGNATURE-----
diff --git a/media-libs/openexr/files/openexr-1.2.2-gcc4.patch b/media-libs/openexr/files/openexr-1.2.2-gcc4.patch
new file mode 100644
index 000000000000..5395cffd7245
--- /dev/null
+++ b/media-libs/openexr/files/openexr-1.2.2-gcc4.patch
@@ -0,0 +1,11 @@
+diff -u -r /tmp/OpenEXR-1.2.2/exrmaketiled/Image.h ./exrmaketiled/Image.h
+--- /tmp/OpenEXR-1.2.2/exrmaketiled/Image.h	2004-06-04 06:11:23.000000000 +0200
++++ ./exrmaketiled/Image.h	2005-08-08 20:29:50.000000000 +0200
+@@ -49,6 +49,7 @@
+ #include <string>
+ #include <map>
+ 
++class Image;
+ 
+ class ImageChannel
+ {
diff --git a/media-libs/openexr/openexr-1.2.2-r1.ebuild b/media-libs/openexr/openexr-1.2.2-r1.ebuild
index d97e31b701c7..f6e6138cfc5d 100644
--- a/media-libs/openexr/openexr-1.2.2-r1.ebuild
+++ b/media-libs/openexr/openexr-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/openexr-1.2.2-r1.ebuild,v 1.3 2005/09/10 13:04:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/openexr-1.2.2-r1.ebuild,v 1.4 2005/10/22 22:57:43 hanno Exp $
 
 inherit eutils
 
@@ -35,6 +35,8 @@ src_unpack() {
 	unpack ${A}
 	sed -i -e "s:OpenEXR-@OPENEXR_VERSION@:\$\(P\):" ${S}/IlmImfExamples/Makefile.in
 	sed -i -e "s:NVSDK_CXXFLAGS=\"\":NVSDK_CXXFLAGS=\"-DUNIX\":" ${S}/acinclude.m4
+
+	epatch ${FILESDIR}/openexr-1.2.2-gcc4.patch
 }
 
 src_compile() {
-- 
2.26.2