diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-12-16 15:24:57 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-12-16 15:24:57 +0000 |
| commit | 590f8766a09c870f3e3331d3ce96e2732a82fe83 (patch) | |
| tree | 58a5a38eb254fb99ce428551a97357e0de21d0de /sci-geosciences/merkaartor | |
| parent | Stable for AMD64, fixed repoman warnings and replaced make with emake in src_... (diff) | |
| download | gentoo-2-590f8766a09c870f3e3331d3ce96e2732a82fe83.tar.gz gentoo-2-590f8766a09c870f3e3331d3ce96e2732a82fe83.tar.bz2 gentoo-2-590f8766a09c870f3e3331d3ce96e2732a82fe83.zip | |
Fix problems with localization search dirs wrt #385671 by Nikoli and René Kraneis
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences/merkaartor')
| -rw-r--r-- | sci-geosciences/merkaartor/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild | 3 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-9999.ebuild | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog index 29f655c25757..436b1f55dc69 100644 --- a/sci-geosciences/merkaartor/ChangeLog +++ b/sci-geosciences/merkaartor/ChangeLog @@ -1,6 +1,11 @@ # 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.20 2011/06/10 15:31:33 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.21 2011/12/16 15:24:57 ssuominen Exp $ + + 16 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> merkaartor-0.17.2.ebuild, + merkaartor-9999.ebuild: + Fix problems with localization search dirs wrt #385671 by Nikoli and René + Kraneis 10 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> +files/0.17.2-libproxy.patch, merkaartor-0.17.2.ebuild: diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild index cec83168b06c..236098f0a9ce 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.3 2011/06/10 15:31:33 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.4 2011/12/16 15:24:57 ssuominen Exp $ EAPI=4 @@ -57,6 +57,7 @@ src_configure() { myconf+=" LIBPROXY=$(${PN}_use libproxy)" myconf+=" NODEBUG=$(use debug && echo "0" || echo "1")" # inverse logic myconf+=" NOUSEWEBKIT=0" # fails to link if disabled, upstream needs to fix + myconf+=" TRANSDIR_MERKAARTOR=/usr/share/${PN}/translations TRANSDIR_SYSTEM=/usr/share/qt4/translations" #385671 if use nls; then lrelease src/src.pro || die "lrelease failed" diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild index 2ed4a97d8817..38b7d474c358 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.9 2011/06/09 20:30:38 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.10 2011/12/16 15:24:57 ssuominen Exp $ EAPI=4 @@ -54,6 +54,7 @@ src_configure() { myconf+=" LIBPROXY=$(${PN}_use libproxy)" myconf+=" NODEBUG=$(use debug && echo "0" || echo "1")" # inverse logic myconf+=" NOUSEWEBKIT=$(use webkit && echo "0" || echo "1")" # inverse logic + myconf+=" TRANSDIR_MERKAARTOR=/usr/share/${PN}/translations TRANSDIR_SYSTEM=/usr/share/qt4/translations" #385671 if use nls; then lrelease src/src.pro || die "lrelease failed" |