Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Hanno Boeck (hanno)" <hanno@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-geosciences/merkaartor: ChangeLog merkaartor-9999.ebuild merkaartor-0.11.ebuild
Date: Mon, 24 Nov 2008 17:59:27
Message-Id: E1L4fiX-0003OG-Q9@stork.gentoo.org
1 hanno 08/11/24 17:59:25
2
3 Modified: ChangeLog merkaartor-9999.ebuild
4 merkaartor-0.11.ebuild
5 Log:
6 merkaartor: fix building with USE=-nls
7 (Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64)
8
9 Revision Changes Path
10 1.9 sci-geosciences/merkaartor/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?rev=1.9&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?rev=1.9&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?r1=1.8&r2=1.9
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v
19 retrieving revision 1.8
20 retrieving revision 1.9
21 diff -u -r1.8 -r1.9
22 --- ChangeLog 16 Sep 2008 22:23:16 -0000 1.8
23 +++ ChangeLog 24 Nov 2008 17:59:25 -0000 1.9
24 @@ -1,6 +1,10 @@
25 # ChangeLog for sci-geosciences/merkaartor
26 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.8 2008/09/16 22:23:16 hanno Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.9 2008/11/24 17:59:25 hanno Exp $
29 +
30 + 24 Nov 2008; Hanno Boeck <hanno@g.o> merkaartor-0.11.ebuild,
31 + merkaartor-9999.ebuild:
32 + Fix building with USE=-nls.
33
34 16 Sep 2008; Hanno Boeck <hanno@g.o> merkaartor-9999.ebuild:
35 Add geoimage support to live ebuild.
36
37
38
39 1.4 sci-geosciences/merkaartor/merkaartor-9999.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?rev=1.4&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?rev=1.4&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?r1=1.3&r2=1.4
44
45 Index: merkaartor-9999.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v
48 retrieving revision 1.3
49 retrieving revision 1.4
50 diff -u -r1.3 -r1.4
51 --- merkaartor-9999.ebuild 16 Sep 2008 22:23:16 -0000 1.3
52 +++ merkaartor-9999.ebuild 24 Nov 2008 17:59:25 -0000 1.4
53 @@ -1,6 +1,8 @@
54 # Copyright 1999-2008 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.3 2008/09/16 22:23:16 hanno Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.4 2008/11/24 17:59:25 hanno Exp $
58 +
59 +EAPI="1"
60
61 inherit qt4 subversion
62
63 @@ -13,14 +15,16 @@
64 SLOT="0"
65 KEYWORDS=""
66 IUSE="nls"
67 -DEPEND="x11-libs/qt-webkit
68 - x11-libs/qt-gui
69 +DEPEND="x11-libs/qt-webkit:4
70 + x11-libs/qt-gui:4
71 media-gfx/exiv2"
72
73 S="${WORKDIR}/${PN}"
74
75 src_compile() {
76 - use nls && lrelease Merkaartor.pro || die "lrelease failed"
77 + if use nls; then
78 + lrelease Merkaartor.pro || die "lrelease failed"
79 + fi
80 eqmake4 Merkaartor.pro PREFIX=/usr GEOIMAGE=1 || die "qmake failed"
81 emake || die "make failed"
82 }
83
84
85
86 1.3 sci-geosciences/merkaartor/merkaartor-0.11.ebuild
87
88 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild?rev=1.3&view=markup
89 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild?rev=1.3&content-type=text/plain
90 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild?r1=1.2&r2=1.3
91
92 Index: merkaartor-0.11.ebuild
93 ===================================================================
94 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild,v
95 retrieving revision 1.2
96 retrieving revision 1.3
97 diff -u -r1.2 -r1.3
98 --- merkaartor-0.11.ebuild 16 Sep 2008 20:59:45 -0000 1.2
99 +++ merkaartor-0.11.ebuild 24 Nov 2008 17:59:25 -0000 1.3
100 @@ -1,6 +1,6 @@
101 # Copyright 1999-2008 Gentoo Foundation
102 # Distributed under the terms of the GNU General Public License v2
103 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild,v 1.2 2008/09/16 20:59:45 hanno Exp $
104 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild,v 1.3 2008/11/24 17:59:25 hanno Exp $
105
106 EAPI="1"
107
108 @@ -18,7 +18,9 @@
109 S="${WORKDIR}/${PN}"
110
111 src_compile() {
112 - use nls && lrelease Merkaartor.pro || die "lrelease failed"
113 + if use nls; then
114 + lrelease Merkaartor.pro || die "lrelease failed"
115 + fi
116 eqmake4 Merkaartor.pro PREFIX=/usr || die "qmake failed"
117 emake || die "make failed"
118 }
Report Message
Find on MARC Find on Google Groups