Fix building with GCC 4.4 wrt #277770.

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

4 files changed, 31 insertions, 12 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/Manifest b/media-gfx/monica/Manifest
index f29272e17e17..c1d5d4808858 100644
--- a/media-gfx/monica/Manifest
+++ b/media-gfx/monica/Manifest
@@ -1,7 +1,8 @@
 AUX monica-3.6-makefile-cleanup.patch 907 RMD160 16c86b04e867e013378e4ab97ad68d64fad30e8f SHA1 e4fe19abdcf80ca1399cb1f9dfd2bfbb522e50f7 SHA256 cb4ac6b098360ffc8a4f926b2b8624d69257d074e5115fbb62e8a1207d9a309b
+AUX monica-3.7-gcc44.patch 341 RMD160 4b189456b4f4a37a98c7292d057624c6dd1255ec SHA1 095729e09b4499fa8efe1d175c04b6ace0aa6b11 SHA256 b689f66cf8fffa88ccc8bcc40b3e758a40575258f98fc4097286239f65836ceb
 DIST monica-3.6.tar.bz2 17212 RMD160 1a3b7e2e67e053f9685d79930914f18f85b4901e SHA1 173cdedd9896c844fc20e96884bb2d129ac88fd8 SHA256 2a15c13a0b431a524038e6403ae215cd500d4b17647e828c116273060f06517e
 DIST monica-3.7.tar.bz2 18330 RMD160 a10b15563b6e35bf1d3aa36cb21c6d3a601bce34 SHA1 ff99dcaa1da0c2945ee8d91558f8739b296b2b8b SHA256 da0d7762f5a2eed482e8e2f87762d3ac1f013d5c99bd99b34083b69f03492036
 EBUILD monica-3.6.ebuild 768 RMD160 a6c9ace73443cf92f4178186394dea9250c0c4ca SHA1 66899d38882c7219504445a4de30b4e8b7f65f77 SHA256 8683283065e36356c4eadfea9409ecb1de23e1237e7ec38e2339327349f4453a
-EBUILD monica-3.7.ebuild 800 RMD160 1ddeabb16488bfaab49f257283b1f62a26b2a015 SHA1 d2a66a9ceb3f197a921fb0abd7b15a3780a06b48 SHA256 ab80d2cb5e8a3fcf4c74bed829d8f0ea3306af058607f7aac11effd60713cc6e
-MISC ChangeLog 742 RMD160 0a614b1823806bb9ee42272f11878c97ad26fd68 SHA1 c6a32f0b2db0d13def504fbf8ae781a5ab00ba70 SHA256 61d29ea217913aa4604f36432651c505224f49bb7e6bea3f9167eec8ebea3d56
+EBUILD monica-3.7.ebuild 887 RMD160 7230ee84952de9c6470ee669c32f578bb6c1cc65 SHA1 9c1c9f961e5111862505df5c48d4ceeecfb05bde SHA256 ac0a76dfacfb2bc018d10ce3cdb3e5f007a1d02faec9319b669a3c1781d94d31
+MISC ChangeLog 892 RMD160 ed2a63fee79beda75800bc47abd3460adfdc5458 SHA1 64d8f309708e12124117f3350433b8def0ba421d SHA256 b56f0e653f58af12636721399743d7a1ad8c1a711b03fa00fce1dad65429de65
 MISC metadata.xml 564 RMD160 c8630285b83ffe9b491e4d9c1ffbce1cfd894a3c SHA1 88f799567e1e90aff693b0c7c4b4dc1a1c5e22d5 SHA256 4af92ba2a39099129b66238de03d66f29ac91429f3dcde353d1e1a6827cf8200
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
 }