Fix building with GCC 4.4+ wrt #282788.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 29 insertions, 25 deletions

diff --git a/media-gfx/openexr_viewers/ChangeLog b/media-gfx/openexr_viewers/ChangeLog
index 4fabde10a9d0..0df513a2c3dc 100644
--- a/media-gfx/openexr_viewers/ChangeLog
+++ b/media-gfx/openexr_viewers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/openexr_viewers
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/ChangeLog,v 1.16 2008/11/14 18:58:58 coldwind Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/ChangeLog,v 1.17 2009/08/26 10:21:50 ssuominen Exp $
+
+  26 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  openexr_viewers-1.0.1.ebuild, +files/openexr_viewers-1.0.1-gcc44.patch:
+  Fix building with GCC 4.4+ wrt #282788.
 
   14 Nov 2008; Santiago M. Mola <coldwind@gentoo.org>
   openexr_viewers-1.0.1.ebuild:
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch b/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch
new file mode 100644
index 000000000000..3623de39ecd6
--- /dev/null
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch
@@ -0,0 +1,11 @@
+diff -ur openexr_viewers-1.0.1.orig/exrdisplay/applyCtl.cpp openexr_viewers-1.0.1/exrdisplay/applyCtl.cpp
+--- openexr_viewers-1.0.1.orig/exrdisplay/applyCtl.cpp	2007-07-26 04:38:21.000000000 +0300
++++ openexr_viewers-1.0.1/exrdisplay/applyCtl.cpp	2009-08-26 13:17:37.000000000 +0300
+@@ -39,6 +39,7 @@
+ //-----------------------------------------------------------------------------
+ 
+ #include <applyCtl.h>
++#include <stdio.h>
+ 
+ #if HAVE_CTL_INTERPRETER
+ 
diff --git a/media-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild b/media-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild
index b0583f18fe8d..69a04b46ba5d 100644
--- a/media-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild
+++ b/media-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild
@@ -1,59 +1,48 @@
-# 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-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild,v 1.11 2008/11/14 18:58:58 coldwind Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild,v 1.12 2009/08/26 10:21:50 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils
 
 DESCRIPTION="OpenEXR Viewers"
 SRC_URI="http://download.savannah.nongnu.org/releases/openexr/${P}.tar.gz"
 HOMEPAGE="http://openexr.com/"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE_VIDEO_CARDS="video_cards_nvidia"
-IUSE="doc opengl ${IUSE_VIDEO_CARDS}"
+IUSE="doc opengl video_cards_nvidia"
 
 RDEPEND="media-libs/ilmbase
 	media-libs/openexr
 	media-libs/ctl
 	media-libs/openexr_ctl
 	opengl? ( virtual/opengl
-		>=x11-libs/fltk-1.1.0:1.1
+		>=x11-libs/fltk-1.1.0:1.1[opengl]
 		video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit ) )"
 DEPEND="${RDEPEND}
 	!<media-libs/openexr-1.5.0
 	dev-util/pkgconfig"
 
-pkg_setup() {
-	if use opengl && ! built_with_use x11-libs/fltk opengl ; then
-		die "You need OpenGL support in FLTK"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.0.0-nvidia-automagic.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.0-nvidia-automagic.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 	AT_M4DIR="m4" eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_with opengl fltk-config /usr/bin/fltk-config) \
 		$(use_enable video_cards_nvidia nvidia)
-	emake || die "emake failed"
 }
 
 src_install () {
 	emake DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS ChangeLog NEWS README
 
-	if use doc ; then
+	if use doc; then
 		insinto "/usr/share/doc/${PF}"
 		doins doc/*.pdf
 	fi