Use system libs instead of bundled ones, bug #487512; thanks Nikoli for the patch; update live ebuild to new repo location, bug #544862

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

9 files changed, 300 insertions, 77 deletions

diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index 7e952e394f7b..a7e51424d8eb 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-geosciences/merkaartor
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.30 2015/02/28 17:39:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.31 2015/03/31 13:15:04 jlec Exp $
+
+*merkaartor-0.18.1-r1 (31 Mar 2015)
+
+  31 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/merkaartor-0.18.1-system-libs.patch,
+  +files/merkaartor-9999-system-libs.patch, +merkaartor-0.18.1-r1.ebuild,
+  merkaartor-0.17.2.ebuild, merkaartor-0.18.1.ebuild, merkaartor-9999.ebuild,
+  metadata.xml:
+  Use system libs instead of bundled ones, bug #487512; thanks Nikoli for the
+  patch; update live ebuild to new repo location, bug #544862
 
   28 Feb 2015; Agostino Sarubbo <ago@gentoo.org> merkaartor-9999.ebuild:
   Move KEYWORDS to another line to avoid bug #399061
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 25dfec6c909e..194c8a6a32b0 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,29 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.17.2-includes.patch 452 SHA256 69e257bc8eca02c18313502d4fdf9729e2eaa51e5bd04da8f2115e28d9b675cb SHA512 a920fbd3c7fb54a70ce33e57c188ee1ca775767e78f2d2f5f576a6081c6c351a41276be588d763a2e340ee74cbd30c1b3eb3fcc12f0dc994edc3f43228a739c7 WHIRLPOOL 343abb61b50835ecefd8c0d3212ba30bab971ef0fc9cb63a818a385bc363318729097ee9731e3bf055089c7401f6f33688f4bf6183336eae7743e861697b009b
 AUX 0.17.2-libproxy.patch 483 SHA256 94c6eca2403ac89d9454837e547651d3158f94ab4abb2e1e9a5f586159990513 SHA512 b958d6d463076530c1105b7bddb7b1fabfc59a22a3a552878b79c52f80d4ae1abf2d21af74a854b22ef7d2070632bdddec2836006ceee4c63b41cc29853c0088 WHIRLPOOL 0372d1e5a8595c314a88cd7fb9d292c2a733768eb9d883569595bc67728c8abd0294a2f861639c10eb697edb34e3b4c6d859490c41ea5467050d93dd3013643b
+AUX merkaartor-0.18.1-system-libs.patch 1375 SHA256 c2b03cb87e739425234cf233fd32763f0ec52e55ef69596c65b4da78d74ef711 SHA512 b6ba4532a1cd4a7766c97824304f8b4573358fba7fba43e2078e8aa2c22207fc286680b582cb36ef7a2c6304f232a6ca352c988e9b1f72541c710ddc529b6d13 WHIRLPOOL cd35a64088ee291dcd77db64546cc0e9d97ba3720ec7ce19003ea4b1a8e91da712f0c03c0a8906c091ba8f7e644b896d2a51fec1a99fa1de8ed179d4cfb8e4e4
+AUX merkaartor-9999-system-libs.patch 1656 SHA256 c43f28f56d5f171c472384f4c1d40b33547bbe8acfb8e57626577173d495e820 SHA512 64365c293ab8b7bc5d225a18333bbe4aef910f0ff272ec68ffde409e91905cf8833ade0b96295d2faf1855f5a228355ada8b6ea256f97d9ad8369f06ff7e6220 WHIRLPOOL a76c3d23fff4e27fa36e9ccc079190941265ae667ea9138e9fc3988db2a0aff0e82ba0d70b3ae3e0c6b4a353634adfe17365c1d10b33cab7627107aa82a75e24
 DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a SHA512 3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed WHIRLPOOL 22a07736e7da44d3799831352d0e9d323143f228dcf7693b6f90fe101a8a04c74c2c5186db15723902b7dd8aadd93a78547e4622b5238ceb7074027e987b8487
 DIST merkaartor-0.18.1.tar.bz2 5579080 SHA256 3d6a96599815d5f1c8558acd255a413ea47b93ddad8414147d11775a6f21139f SHA512 d45b25ad5a7f19b32ca3e91ad514ef1a8450024bdab9e8c215f60a5ec3fc6332a5cadfcec586a32805c7727d224588b504b01d3023120d55476660a8a394cd45 WHIRLPOOL 23327a7eaa91531a95665fe9ff647712606babf96e3843ef33b94a37f6f7ca6d1cb09576b0b31197badc32e87cfc7ca275a9e3792e57f57dd58fe0509ec1b46d
-EBUILD merkaartor-0.17.2.ebuild 2047 SHA256 0341c9ec8b5100e9d58e34d9b3466c71535cb4cec13cff6d5c9616741e33cc6c SHA512 926fbaadda785b85e65410443fe76a2ac2aca9e21c757ee929c86bcfa07c426a896c87df171f4abd070782f879930eed0b09f09542e1748ccfc0a3b6300bccd3 WHIRLPOOL 48eb0dd530440f8078a0b7e0eb6e316f01acaa498726d76c7f7d8dce755ab91a72fc0a7e9670494906b6b0cac00f3c49f8b676a0a91435f1a9d050a2aef4ec3f
-EBUILD merkaartor-0.18.1.ebuild 2052 SHA256 20e0813953849f572f244e4a959eaa93d5af6996e11373fe0939704fd43534e7 SHA512 e7809b83e1d58bf7279058638c893e8131c1231317bee25d785d88cad20f20841ff5fca5de9e388c68e8e7df58b924e89deba4db4f55228faa383ebfaaad1be9 WHIRLPOOL a33b943fd8d0de714802139efa2e5e35fe36334738d5a3da5fe05e0a9481759277ddc783b993f0150b52253c149303ef77e4d6796324d6622f4901e58e8cc8a1
-EBUILD merkaartor-9999.ebuild 1918 SHA256 25aacd4c806b94af5506b3152e7869ea4dda23daf9879cf42e3efd7f10542a4e SHA512 92ad2a32e3f738445fd8c40cf08d1f251013d6801671558093aeb496471e028cac9c5df9198039a7b6a791f93ab26df7aa2c792f8b839e7231df438f573202c3 WHIRLPOOL 7157feb2630b362583a2c1c125e3196fa2c46cda830f7e706b49e7733734c5ccda79fd2165142b7cb6e320d8623f6e0e69b6f9b529d28e6ae128ad5704b86cdc
-MISC ChangeLog 4782 SHA256 6774373f06844324b8e607c256bee4b665d1d09d9361833ced3cca888750013a SHA512 6fa659d03803fc4da7d4d8314c680e631aa8795b8759cfaa3eb068b1dd4633269370bef3941b138a29edf2d21a487c2db160ac287111757e59ed6885301e4963 WHIRLPOOL 2e5b47dc000981b25d138348b5dccac38bef46a89bc6a68175f82244f83ca3d837b0a44be66e2628979b571166481037d870efe1a9db18c9ff4a525e85513be0
-MISC metadata.xml 399 SHA256 4931a1fe900747778c950db3daee2b91c42af78d43830edcce65ce721d919944 SHA512 219e60c681822f4a4eab54e509bc35fc325dfeb1921d905779ee6a25f65468f21ac9372c8dbdf518ce50ea03536ed29dfd0c2b7a4e5546f36ec220a059842046 WHIRLPOOL 9f193970d0d33b3e36178466dcb9cb3a6821523f68e483bd5c437f7d7940e01e0b514243639163b9bc7494e23004e7cdf012c5b9f94b1f5d4bd8adfb73e5db61
+DIST merkaartor-0.18.1.tar.gz 6459640 SHA256 e9fa5e30e6392c9224f73e9bb7d17b66c4eb6c023633eb2af0cf58ba8acf684f SHA512 5ccb2aca7463cd3b31790b0f231cd18f4499b38ec3eb14c3600bdaae880194a71aaf63a2c2f814af6277b1b07fd618b4393309aa5ded375940bd464d1e77d71d WHIRLPOOL fde10a93510c123f2e1065ad745c3abc7860892c55ed615e75214dd172bfbec1da6f254377cc2d6e0f1df6f9d0680d0f7878ba3224651f5b09c590c335211d9c
+EBUILD merkaartor-0.17.2.ebuild 1881 SHA256 202ab26c21a8ce9ab5951e807e74cb73079ab1ce4008f3700b801e6361e25d2c SHA512 0c0a8d937c6ede8bff2c109aafcb042b49c2e6ae5948e1e851387004b373e9dc07b67cc01dc440c1d675bea510c2f3258cd8300707c45838afaa381a1adb8aa9 WHIRLPOOL 436db5305757901757fca6b120e414fd43aabe59bbca76553db9f4deb5f0b01e47fa81e7ad1d3684befc255b5e9df4258423394a9f2a5414b5f861e88abc2902
+EBUILD merkaartor-0.18.1-r1.ebuild 2216 SHA256 573407111fbbcb273eeb55fb2406ba87a5d622f11e132434de57a8e75cc0e733 SHA512 90a9bb4cb0aaefd75ad65eba0f655e7eb587b84d49a679eef6bd9509699aed932ab4db98c8355d726218ce9dc5f2935f05324fca33d12d236a9f8cbe664d8606 WHIRLPOOL d7475e82ae567ca5abbdf2c3205c9df115fec4bb033d22ae7afd3f2d3864386831d39977e42cdce6b274b08c2b36c5d45706c14d6676ef6ddc2c7358f570f999
+EBUILD merkaartor-0.18.1.ebuild 1885 SHA256 345c7fd79fd2137e8dd7b7954c1668faa92faa6c8801285ed6f0cd55ecf216dd SHA512 a830f310068e4be0207c221fe3d014d9d5f8ce62badf2dd6fb0c912b4a161df16e27c64dd346511a2dea3216ad4ccdf3c4921c48f45d6247766db711d5a05ab1 WHIRLPOOL 9f8ac41570ef8040a756c4377f9ae49651d764b7d1b3ce6e9382c6fd2b18245df53ee260340eb66220bc3674d2f631257bc0c730a6732412be08200c4f560c7f
+EBUILD merkaartor-9999.ebuild 2272 SHA256 968d56873492b0e232327218bcf263978b269849fe24f4b4745319e3b6093fef SHA512 ad6da632dea7517c701e5a16e317fd44de3c70136c477e423c6c49a1fb895bbc905d26dee26a924b826680bc2a4d118ef6bd799614f028c4ffee19b6383f811a WHIRLPOOL ce849841605c85237c44dd4893e25004929ea39f6660c28dba1917ae2091dfa0244f0a5c30a837844b75255daef03f9db599213c1edacc03a9acfc767baa98eb
+MISC ChangeLog 5222 SHA256 ae2146a2c11796e6f36332958aa13e8ecf9ea7f3be5232af33cbc23897e012eb SHA512 d196826ebd8baeb0308bdfe2ad880380e61041f208c7f5d5d073428fceeb417e91018fdbaa993a0faa7f595f70b89b3faf51c799429a79f2a358b1e7e653f9ea WHIRLPOOL e6ba84cffda8f13d675d349fa57e010ad9a79e5f702e597e79e37a49298cd47bdf1b98608f26e654a59c236b208ce294433bcf6cafa294d7742dfe73f58266d6
+MISC metadata.xml 414 SHA256 c2a4c6ae349e9b1e05de3ef95ed79e0e3f9d70d6161836b05ff8b49d7fa1cafb SHA512 1c7b4d75ccec2deb4c034512fab6da5f4deadceb55bcda1caf9ecf7a91128dd7f31eedf4ce71e9676c343cde5df0d2fe836daeed1781098a9e3af433d8d17fa2 WHIRLPOOL 2ea3a0509ecb1d72b138e225a9e98775f628ecbc0e1aabb2af3413df28ef42d368ef901d5071ee7e062f8abbd1faed9875ea5d830766aaf9bf7465cc72a081aa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU8f1mAAoJELp701BxlEWfr9oQAJdnv8sT7H6q6ku1S+Mu/6Tk
-+I9PqsIDNRL8SrWFzdbFsjlhi4bAxp2i6W7vYcz3xPmYlQLIYlBuYSnany+ERN5F
-ll5x6dNQhmhIzX7Qg134Ruhqc8Mk/4dOoRznDImF681dZcKRW9gB5U2nowuO2vPQ
-h2xxcSduwf2DKEO29KR8mIeqY6E6aicWqPipXD+gVOrDjKMPQXBe5jYeApZRE78/
-JkdRItgZRNltyNYufPsJ3n62LZGCmx7DqP/Qqu/xsmrBu8cLF/fL3GyH2ZzTAVDe
-ypWMnQx1ywlfXHjbTiT2NLxRVVacOLKAlVsBRl63CaPJCxHwv1SbW81/o6n1jBfS
-T3dkWM0ZR3FIOFgGU/8QJhXRiHUspSJ+yOnf3Iqq+JbR7y5nUU4U+fVdDk84rPPA
-b3b760VjKkuvmh2yuQHY6ou9OsnFdnLiVhho7mvQ3IXisN/7hEevuqWgefefetF6
-WMW/cJEZIYfUdBZ9a6hbxr+vypCGO3WyW0QvcBKFkOW8N6cMQpdxTc6GxStX6o4A
-8HWq/izy7gE3xTlfM4gMwjPyOhYyDDMbGDUxXm6R7Jzf6oF4Y6s8bg+kYnyj83Ml
-a9Lm9NFMA1WMqXhjgfEn5sbKkxaxlVHq/Xx8yV/NJUUlJy7GvYQKEJKgjxbd6a9i
-1QFW18x2W9RizFAqxpsl
-=7k+j
+iQJ8BAEBCgBmBQJVGp3ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirjZUP/iXyiw+NLN6XxFssIquVdaQH
+LbB0HF4bjZCbhwXzCXB6ZQ5Af8EBTTJ13XDLh+q60RReJbnmPi2w62maYCnX5/fj
+BZ/2GMChEZez9MWEKxCPF1qLAkr3sFWk+IB5D3jVbGyLG9Awb0tTHeMXmcSkGVt4
+GaZ/FOHFHy8WyEi/4Z5tZEbZv7wsHeEKcWSYgNlr3cMy4m443oaF3jgHjIagdWaD
+PI5P+0RtrFdyfuSDLImFJ7N/z4RqxKrB60BKWmThVeg6NGFkRqa4NmgKT6/GoOxm
+cFHilsA3fe3vy11URXouOSMr5s/pjo2yeisNOz3bBtAgc/XzY7X+0EZk+vTMGIMm
+fl0P5R2MoJPyXCfxaFs73p6aVSIzZndfqw+cUd0UPg5VhGWyd+YqDrxjY+nAydLy
+j71NR9EPIOXvGPSq/jd9XIE2ypDKjrXLNaufwQe6fbESngxGAmIAV0TYhSSMWwTY
+EdC1YSbMCD1Suc3qRkxEqbBE56P1P+2+1UmcT3HY6LXzIsYm2mWQLuciGlmVewrm
+V3y6ZFYAlJMDQez/gy53ulcspoH6p84bNltfj2qwtrSFeC2QvcO2OE/PdUAADTKe
+jFicjMjNArY+qvmL0R3K7Bu3ZGJljLzris+8g+6RkjK76fdAdCzVoF1h5t/yL/on
+GO6LiuUrQMvcf57PW1H2
+=66lR
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch
new file mode 100644
index 000000000000..52955735e20a
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch
@@ -0,0 +1,43 @@
+From e4cda9c42c049577caf126e8849c4b9eba62b31b Mon Sep 17 00:00:00 2001
+From: Nikoli <nikoli@gmx.us>
+Date: Thu, 10 Oct 2013 16:28:02 +0400
+Subject: [PATCH] Support for building with system qtsingleapplication and
+ quazip
+
+---
+ INSTALL     | 1 +
+ src/src.pro | 6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/INSTALL b/INSTALL
+index a828c17..022e8d0 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -33,6 +33,7 @@ TRANSDIR_MERKAARTOR=<path>	- where will the Merkaartor translations be installed
+ TRANSDIR_SYSTEM=<path>		- where your global Qt translation directory is
+ NODEBUG=1			- release target
+ NOUSEWEBKIT                 	- disable use of WebKit (Yahoo adapter)
++SYSTEM_QTSA			- use system copy of qtsingleapplication instead of internal
+ 
+ see http://wiki.openstreetmap.org/wiki/Merkaartor/Compiling for the complete list
+ 
+diff --git a/src/src.pro b/src/src.pro
+index f23e05e..ff228b6 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -6,7 +6,11 @@ include (Config.pri)
+ #Custom config
+ include(Custom.pri)
+ 
+-include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
++isEmpty(SYSTEM_QTSA) {
++  include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
++} else {
++  CONFIG += qtsingleapplication
++}
+ include(../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri)
+ 
+ #Qt Version
+-- 
+2.0.5
+
diff --git a/sci-geosciences/merkaartor/files/merkaartor-9999-system-libs.patch b/sci-geosciences/merkaartor/files/merkaartor-9999-system-libs.patch
new file mode 100644
index 000000000000..2ea136523be7
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-9999-system-libs.patch
@@ -0,0 +1,54 @@
+From 1fc139ff9958039c7836ac043a7f9a91aa7785a6 Mon Sep 17 00:00:00 2001
+From: Nikoli <nikoli@gmx.us>
+Date: Thu, 10 Oct 2013 16:28:02 +0400
+Subject: [PATCH] Support for building with system qtsingleapplication and
+ quazip
+
+---
+ INSTALL     |  2 ++
+ src/src.pro | 16 +++++++++++-----
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/INSTALL b/INSTALL
+index 79ec63b..447876c 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -51,6 +51,8 @@ TRANSDIR_MERKAARTOR=<path>  - where will the Merkaartor translations be installe
+ TRANSDIR_SYSTEM=<path>      - where your global Qt translation directory is
+ NODEBUG=1                   - release target
+ NOUSEWEBKIT                 - disable use of WebKit (Yahoo adapter)
++SYSTEM_QTSA                 - use system copy of qtsingleapplication instead of internal
++SYSTEM_QUAZIP               - use system copy of quazip instead of internal
+ 
+ 
+ 3. Run your build tool, make for posix like systems, nmake for
+diff --git a/src/src.pro b/src/src.pro
+index a8a4730..c332b18 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -6,11 +6,17 @@ include (Config.pri)
+ #Custom config
+ include(Custom.pri)
+ 
+-include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
+-DEFINES += QUAZIP_STATIC
+-include(../3rdparty/quazip-0.7/quazip.pri)
+-
+-#LIBS += -lquazip
++isEmpty(SYSTEM_QTSA) {
++  include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
++} else {
++  CONFIG += qtsingleapplication
++}
++isEmpty(SYSTEM_QUAZIP) {
++  DEFINES += QUAZIP_STATIC
++  include(../3rdparty/quazip-0.7/quazip.pri)
++} else {
++  LIBS += -lquazip
++}
+ 
+ #Qt Version
+ QT_VERSION = $$[QT_VERSION]
+-- 
+2.0.5
+
diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
index 505d2d28c0cb..7d13e0629879 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.8 2013/03/02 23:21:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v 1.9 2015/03/31 13:15:04 jlec Exp $
 
 EAPI=4
 
 REDMINE_HASH="253"
-[[ ${PV} == 9999 ]] && SCM_ECLASS=git-2
-EGIT_REPO_URI="git://gitorious.org/merkaartor/main.git"
-EGIT_PROJECT=${PN}
+
 inherit multilib qt4-r2 ${SCM_ECLASS}
 
 DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be"
-[[ ${PV} == 9999 ]] || SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
+SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~x86"
 
 IUSE="debug exif gps nls libproxy"
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild
new file mode 100644
index 000000000000..c7ee4dda9be7
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild,v 1.1 2015/03/31 13:15:04 jlec Exp $
+
+EAPI=5
+
+PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
+
+inherit eutils fdo-mime gnome2-utils l10n multilib qt4-r2
+
+DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug exif gps libproxy qrcode"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
+	>=dev-qt/qtsingleapplication-2.6.1[X,qt4(+)]
+	>=sci-libs/gdal-1.6.0
+	>=sci-libs/proj-4.6
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
+	libproxy? ( net-libs/libproxy )
+	qrcode? ( media-gfx/zbar )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CHANGELOG HACKING )
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+		rm "translations/${PN}_${1}.ts" || die
+	}
+
+	l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
+
+	if [[ -n "$(l10n_get_locales)" ]]; then
+		l10n_for_each_disabled_locale_do my_rm_loc
+		$(qt4_get_bindir)/lrelease src/src.pro || die
+	fi
+
+	epatch "${FILESDIR}"/${P}-system-libs.patch
+	epatch_user
+}
+
+src_configure() {
+	# TRANSDIR_SYSTEM is for bug #385671
+	eqmake4 \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations" \
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
+		SYSTEM_QTSA=1 \
+		RELEASE=1 \
+		NODEBUG="$(usex debug '0' '1')" \
+		GEOIMAGE="$(usex exif '1' '0')" \
+		GPSDLIB="$(usex gps '1' '0')" \
+		LIBPROXY="$(usex libproxy '1' '0')" \
+		ZBAR="$(usex qrcode '1' '0')" \
+		Merkaartor.pro
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
index 973edc7f9c86..b91fe4768f97 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
@@ -1,25 +1,21 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild,v 1.2 2013/03/02 23:21:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild,v 1.3 2015/03/31 13:15:04 jlec Exp $
 
 EAPI=4
 
 REDMINE_HASH="301"
-[[ ${PV} == 9999 ]] && SCM_ECLASS=git-2
-EGIT_REPO_URI="git://gitorious.org/merkaartor/main.git"
-EGIT_PROJECT=${PN}
 
 inherit multilib qt4-r2 ${SCM_ECLASS}
 
 DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be"
-[[ ${PV} == 9999 ]] || SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
+SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~x86"
 
 IUSE="debug exif gps nls libproxy"
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index a95d298c94bf..1bb882546ed9 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,67 +1,93 @@
 # Copyright 1999-2015 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.15 2015/02/28 17:39:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.16 2015/03/31 13:15:04 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-REDMINE_HASH="253"
-[[ ${PV} == 9999 ]] && SCM_ECLASS=git-2
-EGIT_REPO_URI="git://gitorious.org/merkaartor/main.git"
-EGIT_PROJECT=${PN}
-inherit multilib qt4-r2 ${SCM_ECLASS}
+PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
+
+inherit eutils fdo-mime gnome2-utils git-r3 l10n multilib qt4-r2
 
 DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be"
-[[ ${PV} == 9999 ]] || SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps nls libproxy webkit"
+KEYWORDS=""
+IUSE="debug exif gps libproxy qrcode"
 
-QT_MINIMAL="4.7.2"
 RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
+	>=dev-qt/qtsingleapplication-2.6.1[X,qt4(+)]
+	>=dev-libs/quazip-0.7[qt4(+)]
 	>=sci-libs/gdal-1.6.0
 	>=sci-libs/proj-4.6
-	>=dev-qt/qtgui-${QT_MINIMAL}:4
-	>=dev-qt/qtsvg-${QT_MINIMAL}:4
-	exif? ( media-gfx/exiv2 )
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
 	gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
 	libproxy? ( net-libs/libproxy )
-	webkit? ( >=dev-qt/qtwebkit-${QT_MINIMAL}:4 )
+	qrcode? ( media-gfx/zbar )
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.46
+	virtual/pkgconfig
 "
 
-DOCS="AUTHORS CHANGELOG HACKING"
+DOCS=( AUTHORS CHANGELOG HACKING )
+
+src_unpack() {
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+		rm "translations/${PN}_${1}.ts" || die
+	}
 
-MAKEOPTS+=" -j1"
+	l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
 
-merkaartor_use() {
-	local useflag=${1}
-	[[ -z ${useflag} ]] && die "No useflag specified"
-	if use ${useflag}; then
-		echo "1"
-	else
-		echo "0"
+	if [[ -n "$(l10n_get_locales)" ]]; then
+		l10n_for_each_disabled_locale_do my_rm_loc
+		$(qt4_get_bindir)/lrelease src/src.pro || die
 	fi
+
+	epatch "${FILESDIR}"/${P}-system-libs.patch
+	epatch_user
 }
 
 src_configure() {
-	local myconf
-	myconf+=" RELEASE=1 ZBAR=0" # deps not in main tree so hard-disable
-	myconf+=" GEOIMAGE=$(${PN}_use exif)"
-	myconf+=" GPSDLIB=$(${PN}_use gps)"
-	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"
-	fi
+	# TRANSDIR_SYSTEM is for bug #385671
+	eqmake4 \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations" \
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
+		SYSTEM_QTSA=1 \
+		SYSTEM_QUAZIP=1 \
+		NODEBUG="$(usex debug '0' '1')" \
+		GEOIMAGE="$(usex exif '1' '0')" \
+		GPSDLIB="$(usex gps '1' '0')" \
+		LIBPROXY="$(usex libproxy '1' '0')" \
+		ZBAR="$(usex qrcode '1' '0')" \
+		Merkaartor.pro
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
 
-	eqmake4 Merkaartor.pro LIBDIR=/usr/$(get_libdir) PREFIX=/usr/ ${myconf}
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index c619c41c0b94..54f195a373e9 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -3,7 +3,11 @@
 <pkgmetadata>
   <herd>sci-geosciences</herd>
   <use>
-    <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
-    <flag name="webkit">Enable Webkit browser plugin using <pkg>dev-qt/qtwebkit</pkg></flag>
+    <flag name="libproxy">
+    	Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration
+    	</flag>
+    <flag name="qrcode">
+    Enable QR code scanning with <pkg>media-gfx/zbar</pkg>
+    </flag>
   </use>
 </pkgmetadata>