[gentoo-commits] gentoo-x86 commit in media-gfx/monica: ChangeLog monica-3.7.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    09/07/24 17:44:53

  Modified:             ChangeLog monica-3.7.ebuild
  Log:
  Fix building with GCC 4.4 wrt #277770.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  media-gfx/monica/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/monica/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/monica/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/monica/ChangeLog?r1=1.3&r2=1.4

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/monica/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	14 Nov 2008 20:59:15 -0000	1.3
+++ ChangeLog	24 Jul 2009 17:44:52 -0000	1.4
@@ -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@g.o> 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@g.o> monica-3.6.ebuild,
   monica-3.7.ebuild:



1.3                  media-gfx/monica/monica-3.7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/monica/monica-3.7.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/monica/monica-3.7.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/monica/monica-3.7.ebuild?r1=1.2&r2=1.3

Index: monica-3.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/monica/monica-3.7.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monica-3.7.ebuild	14 Nov 2008 20:59:15 -0000	1.2
+++ monica-3.7.ebuild	24 Jul 2009 17:44:52 -0000	1.3
@@ -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
 }