diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2008-11-24 17:59:25 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2008-11-24 17:59:25 +0000 |
| commit | 72448b104caa3e3ab96bb3ce29e264389036aaec (patch) | |
| tree | 36816f465599dafb24a85f2f671952124da88fc5 | |
| parent | Rename my old e-mail drac at gentoo.org to ssuominen at gentoo.org. (diff) | |
| download | gentoo-2-72448b104caa3e3ab96bb3ce29e264389036aaec.tar.gz gentoo-2-72448b104caa3e3ab96bb3ce29e264389036aaec.tar.bz2 gentoo-2-72448b104caa3e3ab96bb3ce29e264389036aaec.zip | |
merkaartor: fix building with USE=-nls
(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64)
| -rw-r--r-- | sci-geosciences/merkaartor/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-0.11.ebuild | 6 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-9999.ebuild | 12 |
3 files changed, 17 insertions, 7 deletions
diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog index 6781194d9ee6..cae529792ee7 100644 --- a/sci-geosciences/merkaartor/ChangeLog +++ b/sci-geosciences/merkaartor/ChangeLog @@ -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. diff --git a/sci-geosciences/merkaartor/merkaartor-0.11.ebuild b/sci-geosciences/merkaartor/merkaartor-0.11.ebuild index 541ab1a047ec..d19c8ae260c1 100644 --- a/sci-geosciences/merkaartor/merkaartor-0.11.ebuild +++ b/sci-geosciences/merkaartor/merkaartor-0.11.ebuild @@ -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 @@ DEPEND="x11-libs/qt-webkit:4 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" } diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild index 63f9a8c0facb..8e4e472a2d62 100644 --- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild +++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild @@ -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 @@ LICENSE="GPL-2" 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" } |