* [gentoo-commits] gentoo-x86 commit in sci-geosciences/merkaartor: ChangeLog merkaartor-9999.ebuild merkaartor-0.11.ebuild
@ 2008-11-24 17:59 Hanno Boeck (hanno)
0 siblings, 0 replies; only message in thread
From: Hanno Boeck (hanno) @ 2008-11-24 17:59 UTC (permalink / raw
To: gentoo-commits
hanno 08/11/24 17:59:25
Modified: ChangeLog merkaartor-9999.ebuild
merkaartor-0.11.ebuild
Log:
merkaartor: fix building with USE=-nls
(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64)
Revision Changes Path
1.9 sci-geosciences/merkaartor/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?r1=1.8&r2=1.9
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog 16 Sep 2008 22:23:16 -0000 1.8
+++ ChangeLog 24 Nov 2008 17:59:25 -0000 1.9
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/merkaartor
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.8 2008/09/16 22:23:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.9 2008/11/24 17:59:25 hanno Exp $
+
+ 24 Nov 2008; Hanno Boeck <hanno@gentoo.org> merkaartor-0.11.ebuild,
+ merkaartor-9999.ebuild:
+ Fix building with USE=-nls.
16 Sep 2008; Hanno Boeck <hanno@gentoo.org> merkaartor-9999.ebuild:
Add geoimage support to live ebuild.
1.4 sci-geosciences/merkaartor/merkaartor-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?r1=1.3&r2=1.4
Index: merkaartor-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- merkaartor-9999.ebuild 16 Sep 2008 22:23:16 -0000 1.3
+++ merkaartor-9999.ebuild 24 Nov 2008 17:59:25 -0000 1.4
@@ -1,6 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.3 2008/09/16 22:23:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.4 2008/11/24 17:59:25 hanno Exp $
+
+EAPI="1"
inherit qt4 subversion
@@ -13,14 +15,16 @@
SLOT="0"
KEYWORDS=""
IUSE="nls"
-DEPEND="x11-libs/qt-webkit
- x11-libs/qt-gui
+DEPEND="x11-libs/qt-webkit:4
+ x11-libs/qt-gui:4
media-gfx/exiv2"
S="${WORKDIR}/${PN}"
src_compile() {
- use nls && lrelease Merkaartor.pro || die "lrelease failed"
+ if use nls; then
+ lrelease Merkaartor.pro || die "lrelease failed"
+ fi
eqmake4 Merkaartor.pro PREFIX=/usr GEOIMAGE=1 || die "qmake failed"
emake || die "make failed"
}
1.3 sci-geosciences/merkaartor/merkaartor-0.11.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild?r1=1.2&r2=1.3
Index: merkaartor-0.11.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merkaartor-0.11.ebuild 16 Sep 2008 20:59:45 -0000 1.2
+++ merkaartor-0.11.ebuild 24 Nov 2008 17:59:25 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild,v 1.2 2008/09/16 20:59:45 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.11.ebuild,v 1.3 2008/11/24 17:59:25 hanno Exp $
EAPI="1"
@@ -18,7 +18,9 @@
S="${WORKDIR}/${PN}"
src_compile() {
- use nls && lrelease Merkaartor.pro || die "lrelease failed"
+ if use nls; then
+ lrelease Merkaartor.pro || die "lrelease failed"
+ fi
eqmake4 Merkaartor.pro PREFIX=/usr || die "qmake failed"
emake || die "make failed"
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-11-24 17:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-24 17:59 [gentoo-commits] gentoo-x86 commit in sci-geosciences/merkaartor: ChangeLog merkaartor-9999.ebuild merkaartor-0.11.ebuild Hanno Boeck (hanno)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox