Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/monica: ChangeLog monica-3.7.ebuild monica-3.6.ebuild
Date: Thu, 05 Jan 2012 18:23:36
Message-Id: 20120105182321.A60B52004B@flycatcher.gentoo.org
1 ssuominen 12/01/05 18:23:21
2
3 Modified: ChangeLog monica-3.7.ebuild
4 Removed: monica-3.6.ebuild
5 Log:
6 old. clean up a bit...
7
8 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.8 media-gfx/monica/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/monica/ChangeLog?rev=1.8&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/monica/ChangeLog?rev=1.8&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/monica/ChangeLog?r1=1.7&r2=1.8
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-gfx/monica/ChangeLog,v
20 retrieving revision 1.7
21 retrieving revision 1.8
22 diff -u -r1.7 -r1.8
23 --- ChangeLog 20 Mar 2011 20:14:46 -0000 1.7
24 +++ ChangeLog 5 Jan 2012 18:23:21 -0000 1.8
25 @@ -1,6 +1,9 @@
26 # ChangeLog for media-gfx/monica
27 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/ChangeLog,v 1.7 2011/03/20 20:14:46 jlec Exp $
29 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/ChangeLog,v 1.8 2012/01/05 18:23:21 ssuominen Exp $
31 +
32 + 05 Jan 2012; Samuli Suominen <ssuominen@g.o> -monica-3.6.ebuild:
33 + old
34
35 20 Mar 2011; Justin Lecher <jlec@g.o> monica-3.6.ebuild,
36 monica-3.7.ebuild:
37
38
39
40 1.7 media-gfx/monica/monica-3.7.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/monica/monica-3.7.ebuild?rev=1.7&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/monica/monica-3.7.ebuild?rev=1.7&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/monica/monica-3.7.ebuild?r1=1.6&r2=1.7
45
46 Index: monica-3.7.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/media-gfx/monica/monica-3.7.ebuild,v
49 retrieving revision 1.6
50 retrieving revision 1.7
51 diff -u -r1.6 -r1.7
52 --- monica-3.7.ebuild 20 Mar 2011 20:14:46 -0000 1.6
53 +++ monica-3.7.ebuild 5 Jan 2012 18:23:21 -0000 1.7
54 @@ -1,9 +1,8 @@
55 # Copyright 1999-2011 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/monica-3.7.ebuild,v 1.6 2011/03/20 20:14:46 jlec Exp $
58 -
59 -EAPI="1"
60 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/monica/monica-3.7.ebuild,v 1.7 2012/01/05 18:23:21 ssuominen Exp $
61
62 +EAPI=4
63 inherit eutils toolchain-funcs
64
65 DESCRIPTION="Monica is a Monitor Calibration Tool"
66 @@ -15,23 +14,25 @@
67 KEYWORDS="amd64 ppc x86"
68 IUSE=""
69
70 -DEPEND="x11-libs/fltk:1"
71 +DEPEND=">=x11-libs/fltk-1.1:1"
72 RDEPEND="${DEPEND}
73 x11-apps/xgamma"
74
75 -src_unpack() {
76 - unpack ${A}
77 - cd "${S}"
78 +src_prepare() {
79 epatch "${FILESDIR}"/${PN}-3.6-makefile-cleanup.patch
80 epatch "${FILESDIR}"/${P}-gcc44.patch
81 - emake clean || die "emake clean failed"
82 + emake clean
83 }
84
85 src_compile() {
86 - emake CXX=$(tc-getCXX) LINK=$(tc-getCXX) CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
87 + emake \
88 + CXX="$(tc-getCXX)" \
89 + CXXFLAGS="${CXXFLAGS}" \
90 + LINK="$(tc-getCXX)" \
91 + LDFLAGS="${LDFLAGS}"
92 }
93
94 src_install() {
95 - dobin monica || die "dobin failed"
96 + dobin monica
97 dodoc authors ChangeLog news readme
98 }