diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-09 20:30:38 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-09 20:30:38 +0000 |
| commit | 01659cd8c02c2eb6a6dbd4d970351ece8cfb58de (patch) | |
| tree | b90d66f1c83588b987163af52abae0e3c2718903 /sci-geosciences/merkaartor | |
| parent | Version bump to 0.17.2. Drop older. Fix live ebuild. (diff) | |
| download | gentoo-2-01659cd8c02c2eb6a6dbd4d970351ece8cfb58de.tar.gz gentoo-2-01659cd8c02c2eb6a6dbd4d970351ece8cfb58de.tar.bz2 gentoo-2-01659cd8c02c2eb6a6dbd4d970351ece8cfb58de.zip | |
Fix prefix and multilibness.
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences/merkaartor')
| -rw-r--r-- | sci-geosciences/merkaartor/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild | 6 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-9999.ebuild | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog index c41a2fc952ce..6da82b505e02 100644 --- a/sci-geosciences/merkaartor/ChangeLog +++ b/sci-geosciences/merkaartor/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/merkaartor # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.18 2011/06/09 20:25:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.19 2011/06/09 20:30:38 scarabeus Exp $ + + 09 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> + merkaartor-0.17.2.ebuild, merkaartor-9999.ebuild: + Fix prefix and multilibness. *merkaartor-0.17.2 (09 Jun 2011) diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild index 9351f88eac0f..0d19ba91fdf0 100644 --- a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild +++ b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.1 2011/06/09 20:25:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.2 2011/06/09 20:30:38 scarabeus Exp $ EAPI=4 @@ -8,7 +8,7 @@ REDMINE_HASH="253" [[ ${PV} == 9999 ]] && SCM_ECLASS=git-2 EGIT_REPO_URI="git://gitorious.org/merkaartor/main.git" EGIT_PROJECT=${PN} -inherit qt4-r2 ${SCM_ECLASS} +inherit multilib qt4-r2 ${SCM_ECLASS} DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project" HOMEPAGE="http://www.merkaartor.be" @@ -61,5 +61,5 @@ src_configure() { lrelease src/src.pro || die "lrelease failed" fi - eqmake4 Merkaartor.pro ${myconf} + eqmake4 Merkaartor.pro LIBDIR=/usr/$(get_libdir) PREFIX=/usr/ ${myconf} } diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild index d97b68dd4658..2ed4a97d8817 100644 --- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild +++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.8 2011/06/09 20:25:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.9 2011/06/09 20:30:38 scarabeus Exp $ EAPI=4 @@ -8,7 +8,7 @@ REDMINE_HASH="253" [[ ${PV} == 9999 ]] && SCM_ECLASS=git-2 EGIT_REPO_URI="git://gitorious.org/merkaartor/main.git" EGIT_PROJECT=${PN} -inherit qt4-r2 ${SCM_ECLASS} +inherit multilib qt4-r2 ${SCM_ECLASS} DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project" HOMEPAGE="http://www.merkaartor.be" @@ -59,5 +59,5 @@ src_configure() { lrelease src/src.pro || die "lrelease failed" fi - eqmake4 Merkaartor.pro ${myconf} + eqmake4 Merkaartor.pro LIBDIR=/usr/$(get_libdir) PREFIX=/usr/ ${myconf} } |