gentoo resync : 12.01.2019

14 files changed, 140 insertions, 207 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 4b6691a0be58..53f4de94142d 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index 5804e99badb9..619075954746 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,3 +1,6 @@
+AUX disable-installed-tests.patch 1245 BLAKE2B e66fe773ad51475247306ea3b2459bf062e5b26cf8e85c52ce99dd05bfdcd32dd40c5d3d591737f6c3ce7c2688f31526b39af852a92a40c06657fc3e9149035c SHA512 7ab8113b1468c9291838def18b57e4dc3cc1a5bcbc22208ac2920b1199121a2055dcd31346551cbcafc1101945f242afdbabd8738d32fdc254a5b7474aeaa038
 DIST geocode-glib-3.24.0.tar.xz 413536 BLAKE2B 37eebd39bb64d614af338e323b7c37c9bcf554d82b761c135326a9b2c0ab405901739ffe89f50c35932d162e4d2743a21caf4f446924c5d9f47bcf50eb11f4e8 SHA512 0e3910e99d164fdf5afd6befbcb7139a56779834fb1f2a318951c03e5196a31c4dafd7f88c37c7014377f15cd4d4b81e7080a440881e2c50aadaadf621abe3b6
-EBUILD geocode-glib-3.24.0.ebuild 1126 BLAKE2B a32f466ba0e92ce4f07cb8c4c3de71f45cf9d309e16aecdb3b976cca8644de0feff9d50ec69a5c30104e4b64cdf8ece6a97430d7cc7cb4a328db121ac55c3e63 SHA512 92bc4d7b61f6eb6c38268fa6ac2852a2aeb126bab0953e3280b6750cd9a4c74d024f8205d30bce000ca990ae0cf979773cd726834880f167eb76cda28e2b863e
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+DIST geocode-glib-3.26.0.tar.xz 75984 BLAKE2B 72d7655e1066c276663ce90082d40c353a3c11ca13e51cb1568180d39e6058df5e7729b2206b44539ed70bd7fb8afeb7d4c264f7a541ab9b9c80223bcab0a457 SHA512 d0924673b669a29d04ad5f1d70797e98b67af3bc85edd8870d21d22d18ec8f2b93a13f94226e295ccb3c6e83d1545bdd2361ebacdbb1928c06b8beed36759838
+EBUILD geocode-glib-3.24.0.ebuild 1102 BLAKE2B 57374e9c55d69bf88a15daba5a16288141d601fb63db5aef322bc6ae0e9293a36cccd32a45fa4e8b582e904239d091dd85159a52d3c0d71f405faf9a20eb092d SHA512 1f22d917ed56b2cc8e0707586131fb0c5c94a7322d444b06a3a31a06e445b0bd35eab970b747538b889066700600a03e4acd909f723f2682d888d6bd8d715b31
+EBUILD geocode-glib-3.26.0.ebuild 1108 BLAKE2B b98945fed4ce215f78ac578bd82722478c9abf0943429798fcb47327f0845eb9f88d3cad669a6e5827879f87ab353eb63654ac1b420fd321a0a7cf9eb8b8fcc4 SHA512 edebca99a3efbea33218ac027cf5a80e3dbab5f7fa27d2825d4b31924a021743f02b43fe58bb2badd0c517d08f5af9e69487db23c86306e879b8fc1308c5c209
+MISC metadata.xml 416 BLAKE2B dfe7b0b1aa8cd6c4664d3cbc0d9bda64b4452e8bf606f105a24829f19a9151b36406c676ffd66e81150e0cfd813d1f7b33ada08b71be9e93ac3547815ba9721c SHA512 d3c5f22341ffa6a9a63d788f9cdb801b496142336bed66318d780ad7cb16d75cbc964d11b472e0cb268d431542b4d2b2a2ccc87fff20fd77777bae0418009cb8
diff --git a/sci-geosciences/geocode-glib/files/disable-installed-tests.patch b/sci-geosciences/geocode-glib/files/disable-installed-tests.patch
new file mode 100644
index 000000000000..9358e4896526
--- /dev/null
+++ b/sci-geosciences/geocode-glib/files/disable-installed-tests.patch
@@ -0,0 +1,38 @@
+--- a/geocode-glib/tests/meson.build	2019-01-11 14:10:47.797376871 +0200
++++ b/geocode-glib/tests/meson.build	2019-01-11 14:13:09.409159050 +0200
+@@ -3,7 +3,7 @@
+ e = executable('geo-uri',
+                'geo-uri.c',
+                dependencies: geocode_glib_dep,
+-               install: true,
++               install: false,
+                install_dir: install_dir)
+ test('Geo URI', e)
+ 
+@@ -12,7 +12,7 @@
+                'geocode-nominatim-test.c',
+                'geocode-glib.c',
+                dependencies: geocode_glib_dep,
+-               install: true,
++               install: false,
+                install_dir: install_dir)
+ env = ['G_TEST_SRCDIR=' + meson.current_source_dir()]
+ test('API test', e, env: env)
+@@ -20,10 +20,11 @@
+ e = executable('mock-backend',
+                'mock-backend.c',
+                dependencies: geocode_glib_dep,
+-               install: true,
++               install: false,
+                install_dir: install_dir)
+ test('Test mock backend', e)
+ 
++if false
+ install_data('locale_format.json',
+              'locale_name.json',
+              'nominatim-area.json',
+@@ -39,3 +40,4 @@
+              'search_lat_long.json',
+              'xep.json',
+              install_dir: install_dir)
++endif
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
index 792fefb398a0..73ffc54fc348 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit gnome2
 
-DESCRIPTION="GLib geocoding library that uses the Yahoo! Place Finder service"
+DESCRIPTION="GLib helper library for geocoding services"
 HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection test"
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild
new file mode 100644
index 000000000000..018bb7e4086a
--- /dev/null
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org meson xdg
+
+DESCRIPTION="GLib helper library for geocoding services"
+HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection test"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-0.99.2[introspection?]
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.13
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/disable-installed-tests.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test enable-installed-tests) # Actual installation to live system is sedded out, but we need this for running them in src_test
+		$(meson_use introspection enable-introspection)
+		$(meson_use gtk-doc enable-gtk-doc)
+	)
+	meson_src_configure
+}
diff --git a/sci-geosciences/geocode-glib/metadata.xml b/sci-geosciences/geocode-glib/metadata.xml
index 39980802b1da..f4c3acdf586c 100644
--- a/sci-geosciences/geocode-glib/metadata.xml
+++ b/sci-geosciences/geocode-glib/metadata.xml
@@ -5,4 +5,8 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<longdescription lang="en">
+	geocode-glib is a helper library for geocoding and reverse-geocoding
+	services offered by OpenStreetMap and Nominatim.
+</longdescription>
 </pkgmetadata>
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index a5f2f1a2ab9e..680ca17f9442 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,7 +1,5 @@
-DIST gpxsee-5.14.tar.gz 3155455 BLAKE2B 6180efa345532c99a655b80b6052e6646d4b8bcf5b7feda1eec6f0c73ca63a21cf6ab7efd29e297d35e2cd5ab8cd73204864f1db0e9417107b59bc29f8982d3e SHA512 0fa666b999bb6990a3e78087053f9647c023a21b2bbec870fffc4fe1df3982e06beb294231340c4a0a006d06a1c136f94a09724ffa76758c1246d79f3077b075
-DIST gpxsee-5.17.tar.gz 3831253 BLAKE2B 297dc940a373a302e93b647b386813d1d0d96ac3d01937f84d8bb79239be492b358351b498743981c046a86349b5036d4448288e7cb113eae42383b1f3ed64ed SHA512 260af8d80df5d4239a4ad6c32154871f663c167f6dc697a4cbc7127d29e8752c401720697ba463647852d4179cd484e871645385baad277f3512e74159a2016e
 DIST gpxsee-6.3.tar.gz 3861093 BLAKE2B bd6cd81b1f2c4fdd3b4b6c0bae72be1a48ad0f0d22203f653e325228974eaf0043eca41efd42e085bd5811a8d2a9cd2f51fe04c03d9e9d064e01cfc24d7a12e4 SHA512 7a4f23444517a0481490f8f1a0520634e63e0416dd5fd5bdb01942df138839595dffd4bced21e264552915c38e5653e927244ea5ca185ff3f93df56fad3e9c73
-EBUILD gpxsee-5.14.ebuild 1528 BLAKE2B 3a497c29783eddebffec8cf3d9a6220680ba6763462f9b508b26c4cd6750af21982768eeac0086e03befd819fcdd159981457cc75c4d946ac2ab8b43c23e78a2 SHA512 e7eb13dd2c1577283f9e7fd75594436dff2cd35c0f5d9a2d987e2f02638d0fbd3346ab6808e85b50a202e630fa3de2852cdbeb3546ab73a07ce389392de576fe
-EBUILD gpxsee-5.17.ebuild 1528 BLAKE2B 3a497c29783eddebffec8cf3d9a6220680ba6763462f9b508b26c4cd6750af21982768eeac0086e03befd819fcdd159981457cc75c4d946ac2ab8b43c23e78a2 SHA512 e7eb13dd2c1577283f9e7fd75594436dff2cd35c0f5d9a2d987e2f02638d0fbd3346ab6808e85b50a202e630fa3de2852cdbeb3546ab73a07ce389392de576fe
+DIST gpxsee-7.1.tar.gz 3868798 BLAKE2B 08bc30d77508429bec94bbdb255b76b79c21bd2e251b216743f49fa45f59ded5a02e730c4766fd9f15e2357d74a66750e3e7515a9d8bdd21a1f97dee77cbec02 SHA512 bb7dc14a3cf7ca87a4335383d6c4c380fcf1a0009161ec988b1b5cf964cf757bbe05ae2e51d726edcb97966918afe4d872172087988321222a65e3c27c276a5d
 EBUILD gpxsee-6.3.ebuild 1537 BLAKE2B 5868cebe01d8b5095eb92c5fbf43b87961b2b08a3d9afb1fed7d7f0e7dda58bb68aa1a7953f52f5d569c4722cfeaa7350f30391ba6b6738a92f6284782444660 SHA512 f25ad58786a05cbdf28e99aff7054281d0fcc199cae3e090a4db11ac42f4f5a802e9247a309396e25db884f58ce5e654ec5c590d80fd8d9429c444c6c5bab0b1
+EBUILD gpxsee-7.1.ebuild 1540 BLAKE2B 0ba94919b68048f8ffe4c898eb37053a648cbef4445c3eab1bb5c381b320e9e6d0c9c7ddec2e81f658ec262beecb892a20f46efc460e900b048aaa1dcda2ab47 SHA512 63c95ed59603f3b34c55d80a0ffcca9040d075b8952b388b6ad490c350d33956558dfafd97c66e4fd8735a63c2befddadb5f78266f2e2d022053345ba4c867d1
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-5.17.ebuild b/sci-geosciences/gpxsee/gpxsee-5.17.ebuild
deleted file mode 100644
index 50bccd2c2d46..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-5.17.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs de fi fr pl ru sv"
-inherit qmake-utils l10n xdg-utils gnome2-utils
-
-MY_PN="GPXSee"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
-HOMEPAGE="http://www.gpxsee.org/"
-SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtcore:5"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	l10n_find_plocales_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	l10n_for_each_disabled_locale_do rm_ts
-}
-
-src_compile() {
-	lrelease gpxsee.pro
-	eqmake5 gpxsee.pro
-	emake
-}
-
-src_install() {
-	local lang
-	newbin ${MY_PN} ${PN}
-	dodoc README.md
-	insinto /usr/share/${PN}
-	doins -r pkg/maps pkg/csv
-
-	insinto /usr/share/${PN}/translations
-	for lang in lang/*.qm; do
-		[ -f "${lang}" ] && doins "${lang}"
-	done
-
-	insinto /usr/share/applications
-	doins pkg/${PN}.desktop
-	insinto /usr/share/mime/packages
-	doins pkg/${PN}.xml
-	insinto /usr/share/pixmaps
-	doins icons/${PN}.png
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-geosciences/gpxsee/gpxsee-5.14.ebuild b/sci-geosciences/gpxsee/gpxsee-7.1.ebuild
index 50bccd2c2d46..f12eaf15a651 100644
--- a/sci-geosciences/gpxsee/gpxsee-5.14.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PLOCALES="cs de fi fr pl ru sv"
+PLOCALES="cs da de en fi fr nb pl ru sv tr"
 inherit qmake-utils l10n xdg-utils gnome2-utils
 
 MY_PN="GPXSee"
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 26a3cf2d5d46..8128edbcd07b 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -4,7 +4,6 @@ AUX merkaartor-0.18.3-webengine1.patch 6601 BLAKE2B efcb88f07abc23ff5221f42beb43
 AUX merkaartor-0.18.3-webengine2.patch 1647 BLAKE2B eb11ac314da643a6db425b8c0f520e315218420be2a438995a9f9deaaebf48c9f5e1bb65fa59bb20aab0c269f8730e299aedbaa40152eba44ae2b7a8c0139885 SHA512 faf8a4b22da050a88278672a77029c87a2b30658efc424a4c046a8fcecd491f763278076aad32cb88d8bd254d3f5837e272f178ca97c88a55831199aff0a138a
 AUX merkaartor-0.18.3-webengine3.patch 4895 BLAKE2B 38a9a6a87774094a8a6b1104dc2f5a4156bb908799ae6388b6d90ad41d9ef1a288368e7854dcdeddcd1db6a316c3488c90d7760c8757787be605a5e3de0c9afc SHA512 8b7478f5d3342f288f368b22ccfae113c0358d81ddce31eb211671202ac97ac314d73e0762ab66f0f708edfbeef3dfd5a4a6a2da7a37bf8f93b2151cfa56def2
 DIST merkaartor-0.18.3.tar.gz 7104234 BLAKE2B e7d84297452ad20daf2ab18c4aef3736758d98e6f839be1152651aa0196ccee2983d89935f121d4436245d7fdd1fa6b97cd99e6a154158cad4751eba02819a74 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
-EBUILD merkaartor-0.18.3-r3.ebuild 2257 BLAKE2B 54f02ae8d223a955d5e51f5675a25f0309e33cfa7e4118514ee2641b25c99eb60391a1e180c8e9f8cb9c0a9a191809c7f75cfcf804b85831cacb78844dc22d5f SHA512 b7dc364577288741999f114a5d8a1b39d57727b9ef062e27ad479fda9cf1e9393197ed785a3ad14f3117ba0708a8875cea714b1c64bff282d44e8695860313a7
 EBUILD merkaartor-0.18.3-r4.ebuild 2396 BLAKE2B 67cee765fa25b9ac7bf20ca89e10f51152ace48710eec72399c8b2d28b9521b4878655318caf90345c2d549af0346a73c70d1b81c6acc3f6ee3d8074bf5f102d SHA512 3a10b813895d1e5526e2bd718c4d17185ac5205c5e0d20f5952681776f409990aff108e2645a704595561858d562f3fb0c9db9adde0776e3b81f535a1217a926
 EBUILD merkaartor-9999.ebuild 2293 BLAKE2B 3dc5a0124e7a40bdcc2adf52e55ab2dc5368057e7d7e4fbd8990ef67e5d986f2497f7dde191e882cf2a26542dfa5bf8c6d213a1b6a79f095e56184dbc49856b4 SHA512 1366d4dd45c937b73c2125e549bf7fb0a4e97d38c3a76bc737966440735dbe451cecec9db5958ee9455abff00409deda507207f3b39cf8b00b7abc2ca5a31b9e
 MISC metadata.xml 575 BLAKE2B d9a30a01f5b6c55e9a4865f6f1aa92ea610ad2f1aa9ab1bcb129dfbf03f9579fe7f3d8bdf604da0564b4d53b65d54b8c32f3628f1e8e389f6368d14cfca9997b SHA512 d9e5293c9bf7a3bfc7fd691d5a61c7de6c284941da73883590e4956bb4a7b26215e003a9096b9fdaa1f7590765aad583bec04ad6ec8778bc4a26a422a3e2da38
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
deleted file mode 100644
index 19e627bdad45..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-
-inherit gnome2-utils l10n qmake-utils xdg-utils
-
-DESCRIPTION="Qt 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"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	>=sci-libs/gdal-1.6.0
-	>=sci-libs/proj-4.6
-	sys-libs/zlib
-	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
-	libproxy? ( net-libs/libproxy )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826
-DOCS=( AUTHORS CHANGELOG )
-
-src_prepare() {
-	default
-
-	my_rm_loc() {
-		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
-		rm "translations/${PN}_${1}.ts" || die
-	}
-
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
-		$(qt5_get_bindir)/lrelease src/src.pro || die
-	fi
-
-	# build system expects to be building from git
-	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
-}
-
-src_configure() {
-	# TRANSDIR_SYSTEM is for bug #385671
-	eqmake5 \
-		PREFIX="${ED%/}/usr" \
-		LIBDIR="${ED%/}/usr/$(get_libdir)" \
-		PLUGINS_DIR="/usr/$(get_libdir)/plugins" \
-		SHARE_DIR_PATH="/usr/share/${PN}" \
-		TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/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=0 \
-		Merkaartor.pro
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index f373246d955b..4db60b497bbd 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,8 +1,8 @@
 AUX qmapshack-1.11.1-qt-5.11.patch 738 BLAKE2B f67a505ae4c63f7aac616c6dab7c6b0d96ac63a15267c1be50d5f45b6cc0c7f0c8ca98d0f6c92f6970758ba0a5fa062d9f32615dca4eb7ed26878965fd068198 SHA512 7793e38cea40c692893934fbd33d7f60a1f456ca80612a2ec00fc0144717f34fd8eab01ef66b697b1cec52ec56e69d1197932f574d03dbed707c1dfc686fa36d
 DIST qmapshack-1.11.1.tar.gz 11446871 BLAKE2B fa92b93787306d23110112fd851f0ee02418ac7b27316f57b4045efc4ae726e36c4014682d1ee32879f8894bab7dcac70852384f8b158e01026d7782f67b5ede SHA512 43e1b587bd3f4901b155ea6d1d520cf303681640c1bd521b30ef7f23aaf49b2fffe9b764e5dd3fcaef360b0d32b360b76eb8d737ec5e186aa75362ff2507956e
 DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5
-DIST qmapshack-1.6.3.tar.gz 5181205 BLAKE2B 89e7a638f35e0e555b237a000992f48b1a126ed9de5c2892ee8e147060866656b87abbc46937cc5187e473681b71a2dfb250160d4847824df4989c352afd676b SHA512 6e9efdd35ebf3980011aea0cefdbcc433e4f0d333cbeff72e70880a41bff972cc27f4517e243f4990b5e04112a50af2651d99cb5c1c6e542341db30e5e000133
+DIST qmapshack-1.12.1.tar.gz 12033026 BLAKE2B e898507bad42a141f02cf8fd0338cdf9f39344b249318be29d1e6eb500a9e810496c6a790745cf50aec0025b5547be8382ef0c9eab2d780cbf63f9d29eb064a9 SHA512 c9b6ad0c7372cc4d992cee07d20ee0ad5779014ce6336644e13be705ec0bbed22d5f83e27473c2813c5bf13e49558686546c50fd597eb9ef2692c64933f94713
 EBUILD qmapshack-1.11.1-r1.ebuild 937 BLAKE2B e85730518ec6b863e90db2b77a24f2a4def775338a7683e80f7040e61806e3f2d6e0bc823afd1acdeb25641743261ea2a0cf2470795de1a20d2edcaefb3c5998 SHA512 148bab65d8f829d89e84f1df532701085d378fc9bda4f51fc68c8b05c9c48874e9acbc7ae721044db7a56b907ca9fe417094281c5460f571e7ebddad6cfcc57b
 EBUILD qmapshack-1.12.0.ebuild 922 BLAKE2B fc3b1c8317a13af3a85c85225df00470cc0ea4a2a0968cd843f827e23d0c4dd2f1c078df3c4dc3664b10e0f3e2165d1f92c1447175e2e53d60e78da68016948e SHA512 a146801935f9816c3e3abb09f88468cfd5e2d89881f6130325f17fa58d55705cbb6dfadd93340a531e4efe5b6eae7751bca741f1a20c153f45786385212fc623
-EBUILD qmapshack-1.6.3.ebuild 594 BLAKE2B 47fca8a961fe1e76d41cfee2ae99c4716bb3897a596e4ed29cc872e0296eee06fbc47188f84e423b28cf0c2d725f8e0fd5dc8e903761a1fafc4f2eedc481a4c3 SHA512 d6ba2f2fb68520668a89240021ab195477c94648b8fcf50040e671922a19f35d9107a8f0b56d33077bbb4b85f36787e995b26f54462ce8b62247d2fc4d118092
+EBUILD qmapshack-1.12.1.ebuild 922 BLAKE2B 0648b29870c6882bb3e3e2e3f3b85e4e39788e517e93d16e52fe7a50822d7f57f4e07cd7146fc4f3960622cbb789848e603a12ddc4d16fab2a08c1f335befd38 SHA512 fdc7e4dd5c41f28a8b7186096435b817c03c2b5440733820981e2e167d2e13d9dbd034dce59dd8f4b1c85bbdb6f857641d5326e179771872bc4be2924a091f8b
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.12.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.12.1.ebuild
new file mode 100644
index 000000000000..d7cc3ab65fff
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
+SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtdbus:5
+	dev-qt/qttest:5
+	dev-qt/designer:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-libs/quazip
+	>=sci-geosciences/routino-3.1.1
+	sci-libs/gdal
+	sci-libs/proj
+	sci-libs/alglib"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/qmapshack/qmapshack-1.6.3.ebuild b/sci-geosciences/qmapshack/qmapshack-1.6.3.ebuild
deleted file mode 100644
index b75a39d2f4d4..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.6.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
-SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="dev-qt/qtwebkit:5
-	dev-qt/qtscript:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtdbus:5
-	dev-qt/qttest:5
-	dev-qt/qtnetwork:5[ssl]
-	>=sci-geosciences/routino-3.1.1
-	sci-libs/gdal
-	sci-libs/proj"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"