Fix problems with localization search dirs wrt #385671 by Nikoli and René Kraneis

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 21 insertions, 10 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/Manifest b/sci-geosciences/merkaartor/Manifest
index 8956172cba27..9e7680dd75d6 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -4,14 +4,18 @@ Hash: SHA1
 AUX 0.17.2-includes.patch 452 RMD160 9a6dbda2ff06503945221f732fd568f269ed37e8 SHA1 2d2cdc05704933df08bebfe3b90dc709aa895dac SHA256 69e257bc8eca02c18313502d4fdf9729e2eaa51e5bd04da8f2115e28d9b675cb
 AUX 0.17.2-libproxy.patch 483 RMD160 38f13275474936ce4eeae2f30b4db51a251e432d SHA1 a15742ecab65eec3483df99d9ded71fb3dae952c SHA256 94c6eca2403ac89d9454837e547651d3158f94ab4abb2e1e9a5f586159990513
 DIST merkaartor-0.17.2.tar.bz2 7138991 RMD160 c5c8944872828ba5ada6003cd5821f33899da3cb SHA1 f789141db427bf25bb3b61801fefc98ab0430012 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a
-EBUILD merkaartor-0.17.2.ebuild 1836 RMD160 bdb358472d957a0006bc2e7ceafad120a7089539 SHA1 c4b24a389f45c780c40b41c2bf16bf43ebe82b59 SHA256 ce745826138f160216a9a40cbebca447232d19b4b3414db6aaa0c2b1c53baa9d
-EBUILD merkaartor-9999.ebuild 1787 RMD160 1dd5712960c8698fb2c8ab84018745ce5b5f8616 SHA1 9f618213fe03ce873b9b0760d7d3d51b6495bfa3 SHA256 1697c0fc5b82378ce6713e500625092f1f1c80ce7e2eddb43ec308341bd105b7
-MISC ChangeLog 3238 RMD160 2cd0d851d34bede5d3ff94e4d39fb67e466bad23 SHA1 0ca2c8450ee1751fbc7bfd6a1bd53d859ec4a6d7 SHA256 a8c32c709686d699e26f5b2c37ef01c78f10d718a34667aabed96be4efebc7d1
+EBUILD merkaartor-0.17.2.ebuild 1950 RMD160 ca936c3f8e921c3522a7913bcf0fb1399229b60b SHA1 aa00f833f165ddb37358359c9b0ee76c4a861fe8 SHA256 3983732e2ab72bf08824e8da6c855397eb51f2c7b609cada8ef7b9b53f1a01c0
+EBUILD merkaartor-9999.ebuild 1902 RMD160 080ade56c2c7383edc0cec93aa446664f10bcab4 SHA1 9c9cb398fec05a8fe58b5d20cc40ca1359ed4b5a SHA256 42fa396d4a332aa58f825a9ed8a5e088a864dd87909ed812ef6407694fc44637
+MISC ChangeLog 3432 RMD160 01cc3d942218cdbd86ee68bf0c7d39b5edde64e3 SHA1 e02fcf9ada8ca2077708f99af408291408e094f4 SHA256 d2044354bb6e385e34e2eb5dd026fcc2a38e77abef4aa36934bcd68e3d4ce9a6
 MISC metadata.xml 467 RMD160 35303c7ae1f239e15845d3b01417f0f2d04ebf3a SHA1 1361600e4014ce1cc840cbc1d3adec1640903a7b SHA256 b107951b4352a6a1c5ce816735d5dc45306cbf8da2e80adc6d63d8b04bb3d838
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3yONkACgkQHB6c3gNBRYd9kwCeJAvCbalQHeUgPUuwc67TJE0a
-YfgAn3vaKsi65LKK08cNdvFpfQja8PMB
-=+T0I
+iQEcBAEBAgAGBQJO62KyAAoJEEdUh39IaPFN8FMH/RDdRTNqnqjAmMknVfCybSV1
+DYPfLPYZvq80ViVCJSnDLjcuPTyiHYi5Isn7GaRHaULpaH9AGOeyP2KarOTjR5pw
+2RBaiX6N7Ac1vilKT8QMSFLV259NvV6h0ngVOV4LOQvEZQTBDtwMnMN3fmjWFElM
+MiXf9JFG3oBGwXTNNfFuCl43G0w/y5I0VedK9jCia3VCKivdgUEJWJSC+IbxeRNA
+V1T5RhUyK2RJ1AYzZpcZG/OBY/Li6BHdMNh1vG3xnAEtU89Pp3qMunbddVa1ctVz
+U3GCv3c6Zg4MAIPDtYCUrydPhDk+nw2wDfG6PUOtUeYQQJmGIp0dmq8jHkwSCV8=
+=TQVG
 -----END PGP SIGNATURE-----
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"