Fix building with GCC 4.4 wrt #277770.

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

3 files changed, 28 insertions, 10 deletions

diff --git a/media-gfx/monica/ChangeLog b/media-gfx/monica/ChangeLog
index 92a6cd05d14a..5d6ccb325ba9 100644
--- a/media-gfx/monica/ChangeLog
+++ b/media-gfx/monica/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/monica
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/ChangeLog,v 1.3 2008/11/14 20:59:15 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/ChangeLog,v 1.4 2009/07/24 17:44:52 ssuominen Exp $
+
+  24 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> monica-3.7.ebuild,
+  +files/monica-3.7-gcc44.patch:
+  Fix building with GCC 4.4 wrt #277770.
 
   14 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> monica-3.6.ebuild,
   monica-3.7.ebuild:
diff --git a/media-gfx/monica/files/monica-3.7-gcc44.patch b/media-gfx/monica/files/monica-3.7-gcc44.patch
new file mode 100644
index 000000000000..6fad87c6f86b
--- /dev/null
+++ b/media-gfx/monica/files/monica-3.7-gcc44.patch
@@ -0,0 +1,11 @@
+diff -ur monica-3.7.orig/monica.cpp monica-3.7/monica.cpp
+--- monica-3.7.orig/monica.cpp	2008-06-02 06:45:50.000000000 +0300
++++ monica-3.7/monica.cpp	2009-07-24 20:42:12.000000000 +0300
+@@ -14,6 +14,7 @@
+ #include <FL/Fl_Tooltip.H>
+ #include <FL/Fl_Pixmap.H>
+ 
++#include <cstdio>
+ #include <cstdlib>
+ #include <string>
+ #include <iostream>
diff --git a/media-gfx/monica/monica-3.7.ebuild b/media-gfx/monica/monica-3.7.ebuild
index 99282b43b192..8a796f2987f2 100644
--- a/media-gfx/monica/monica-3.7.ebuild
+++ b/media-gfx/monica/monica-3.7.ebuild
@@ -1,32 +1,35 @@
-# 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/monica/monica-3.7.ebuild,v 1.2 2008/11/14 20:59:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/monica-3.7.ebuild,v 1.3 2009/07/24 17:44:52 ssuominen Exp $
 
 inherit eutils
 
 DESCRIPTION="Monica is a Monitor Calibration Tool"
 HOMEPAGE="http://www.pcbypaul.com/software/monica.html"
 SRC_URI="http://www.pcbypaul.com/software/dl/${P}.tar.bz2"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
+
 DEPEND="<x11-libs/fltk-2"
-RDEPEND="x11-apps/xgamma
-		 ${DEPEND}"
+RDEPEND="${DEPEND}
+	x11-apps/xgamma"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-3.6-makefile-cleanup.patch
-	make clean
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+	emake clean || die "emake clean failed"
 }
 
 src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dobin monica || die "installing failed"
+	dobin monica || die "dobin failed"
 	dodoc authors ChangeLog news readme
 }