gentoo resync : 18.08.2019

13 files changed, 19 insertions, 297 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 82e7f20c21ef..faa7023eb4e8 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index f7263e858a40..69096cbc21c3 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,11 +1,5 @@
-DIST gpxsee-6.3.tar.gz 3861093 BLAKE2B bd6cd81b1f2c4fdd3b4b6c0bae72be1a48ad0f0d22203f653e325228974eaf0043eca41efd42e085bd5811a8d2a9cd2f51fe04c03d9e9d064e01cfc24d7a12e4 SHA512 7a4f23444517a0481490f8f1a0520634e63e0416dd5fd5bdb01942df138839595dffd4bced21e264552915c38e5653e927244ea5ca185ff3f93df56fad3e9c73
-DIST gpxsee-7.1.tar.gz 3868798 BLAKE2B 08bc30d77508429bec94bbdb255b76b79c21bd2e251b216743f49fa45f59ded5a02e730c4766fd9f15e2357d74a66750e3e7515a9d8bdd21a1f97dee77cbec02 SHA512 bb7dc14a3cf7ca87a4335383d6c4c380fcf1a0009161ec988b1b5cf964cf757bbe05ae2e51d726edcb97966918afe4d872172087988321222a65e3c27c276a5d
-DIST gpxsee-7.5.tar.gz 4302319 BLAKE2B f31aba249b87a85b7d5e4b2e3bb6c300b682a0f0e77d82b8151ffbd621664840782a1894277249e5f858a6837cf0580bb32748a04684157999edc64295f4192d SHA512 ff55267abeda8970282bbbadc9fdf0c72120aa25cf6f3ce95de77ea330087e36a0c64332ff9cd1c569bac24bed891dc265ded57587e7fb258b30e382fa31b093
-DIST gpxsee-7.8.tar.gz 4330785 BLAKE2B 360e7bb21870256b0480653687e2323e262d84db511acecd3a45228bab87b25b6eac5ae96e670d50bb5e9f8090907c9876685df5a4badba9d12572efbb30afe7 SHA512 07c6a67f574abc1f916a1d25424ab4e277617ac4b698c99307a144a07d2d08634e9c3353bfd2f3fddf0b45c27adbd1ba8499c46a35608aa66a9a851118ce2af5
+DIST gpxsee-7.12.tar.gz 4688060 BLAKE2B 5700bfd8ec4d6702df417297b0c5ce7d5df5f099ee435b4e322b78b65441adb0fcb00d4cbcddd825c75879cc35d2e7f67900525bc515a64813ab8148fc025fe8 SHA512 1630e34e5a367e88f55b690434be6f3ba73d9a55c0d351944939cca8a1994b0ac9ccc4a52ec30562d64179326f7be514549a83a0027a4b0189306fc47840d0bc
 DIST gpxsee-7.9.tar.gz 4347609 BLAKE2B 1555576b72ada6d6302fede1ba0d043b4656afeabaa390e5c32289a0b5e57fdf5a5a880516a6960ea2d00844cdf9a88a894a36e3a82bde6f6fb3c30ddb166bc7 SHA512 24522506894e9ea88ab7b79b34082a1c8c563c8e0c73672ba247a5d013f0c802752665a62686259981f2b49494982d3ad0f06de83f37874e87110bee42964659
-EBUILD gpxsee-6.3.ebuild 1537 BLAKE2B 5868cebe01d8b5095eb92c5fbf43b87961b2b08a3d9afb1fed7d7f0e7dda58bb68aa1a7953f52f5d569c4722cfeaa7350f30391ba6b6738a92f6284782444660 SHA512 f25ad58786a05cbdf28e99aff7054281d0fcc199cae3e090a4db11ac42f4f5a802e9247a309396e25db884f58ce5e654ec5c590d80fd8d9429c444c6c5bab0b1
-EBUILD gpxsee-7.1-r1.ebuild 1595 BLAKE2B 56ee4fc1ae26a1b7df8d20ac9c5a6b05416693ff90b9c25d99c19d1573024e5e84eaad1bf0118d376646152608584311f6afb18925e3899a80e781414ff3bd35 SHA512 b3d634a0888de422e0b912913323142b9c02673d610d17036854102c6213cd599635a61f30937a0d9255d8f8ae669eef64ab02b5a9935af922251ca9a953c0a4
-EBUILD gpxsee-7.5.ebuild 1594 BLAKE2B 8d3b72434f4880eda221cc748bd3cb2e4ca913cc99051048562f0191d8dc246920f052c79b37aa2979deb14216d8f1f4ecc6990cf4f66f7c3b2ee072e9b54438 SHA512 84ba5507e36b527b62435cd12183fe3ef956aa187e346d555545e8d7b66ac3ff583618860239ae308249b72651ac66daef5b4208d12f397fec0149d99c1bc44c
-EBUILD gpxsee-7.8.ebuild 1594 BLAKE2B 8d3b72434f4880eda221cc748bd3cb2e4ca913cc99051048562f0191d8dc246920f052c79b37aa2979deb14216d8f1f4ecc6990cf4f66f7c3b2ee072e9b54438 SHA512 84ba5507e36b527b62435cd12183fe3ef956aa187e346d555545e8d7b66ac3ff583618860239ae308249b72651ac66daef5b4208d12f397fec0149d99c1bc44c
+EBUILD gpxsee-7.12.ebuild 1594 BLAKE2B 8d3b72434f4880eda221cc748bd3cb2e4ca913cc99051048562f0191d8dc246920f052c79b37aa2979deb14216d8f1f4ecc6990cf4f66f7c3b2ee072e9b54438 SHA512 84ba5507e36b527b62435cd12183fe3ef956aa187e346d555545e8d7b66ac3ff583618860239ae308249b72651ac66daef5b4208d12f397fec0149d99c1bc44c
 EBUILD gpxsee-7.9.ebuild 1594 BLAKE2B 8d3b72434f4880eda221cc748bd3cb2e4ca913cc99051048562f0191d8dc246920f052c79b37aa2979deb14216d8f1f4ecc6990cf4f66f7c3b2ee072e9b54438 SHA512 84ba5507e36b527b62435cd12183fe3ef956aa187e346d555545e8d7b66ac3ff583618860239ae308249b72651ac66daef5b4208d12f397fec0149d99c1bc44c
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-6.3.ebuild b/sci-geosciences/gpxsee/gpxsee-6.3.ebuild
deleted file mode 100644
index 845d03f7b4f1..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-6.3.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 da de en fi fr nb 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-7.1-r1.ebuild b/sci-geosciences/gpxsee/gpxsee-7.1-r1.ebuild
deleted file mode 100644
index f37e65f5536a..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-7.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs da de en fi fr nb pl ru sv tr"
-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/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtconcurrent: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-7.5.ebuild b/sci-geosciences/gpxsee/gpxsee-7.12.ebuild
index 6b28d5dd63ab..6b28d5dd63ab 100644
--- a/sci-geosciences/gpxsee/gpxsee-7.5.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-7.12.ebuild
diff --git a/sci-geosciences/gpxsee/gpxsee-7.8.ebuild b/sci-geosciences/gpxsee/gpxsee-7.8.ebuild
deleted file mode 100644
index 6b28d5dd63ab..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-7.8.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs da de en es fi fr nb pl pt_BR ru sv tr"
-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/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtconcurrent: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
-	dobin ${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/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 3fed11748db4..6b90c211fcb3 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -6,7 +6,7 @@ AUX mapserver-7.0.7-missing-macro.patch 353 BLAKE2B 0443e605f7b2f59bfce38a200704
 DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753
 DIST mapserver-7.0.7.tar.gz 2634698 BLAKE2B fadde68803d7f74b116aa23c05c25f9c52c67e0a8ea69eace2c865843d7f223c24d8c42cbed54578f2eb631cb58bae3652075872f76e9b88238d76e044d4314b SHA512 94225dbe64edf6623bb5e92649d505809f70f86c24ca06675f6277ac4a161c40c369fd1973db649e6c864fa5e2e4a8a93cbd36d1524297a0e47b96ab59c0941c
 DIST mapserver-7.2.2.tar.gz 2677800 BLAKE2B 3f26517f634098fd7f005aa5a1f71fc8ba9b831b9bd0385a64272db6705ad3bd7563848bea1532c08f28177c51b104b1185fe6aa319de8c4ed95ec649a1bf7f4 SHA512 8c66a52ec04741495e0cf2bf5ec28f8e3cafac9834ab314ef998d6cf8d50b893dcc66a05d4b30f29694c357cd175a1cb28712c94bf15da4c8bcb9bfd98f0d2af
-EBUILD mapserver-7.0.5.ebuild 4509 BLAKE2B a595b08ad87b62ee2239ac4b911a8c762adc22190c9f29679ae37eeff0e0f694943c824ece901c7e46098f32abb7134c4c8083a08da97ff2c3c086005a48eaca SHA512 7b6f3701f6cb18a1423fa73d41b797672c15a81f899897340c26efa91331551d0c5261f517ce67f5813c66c786e75835816eeef8312b7f73197f2956003ac888
-EBUILD mapserver-7.0.7.ebuild 4946 BLAKE2B 2f3b53e1189ac689f7f8c6d13f82c7476f0291a4506c14ed71f18b6558cc47a884cd35666d0ec48d5f7c7b0e42bfe953a81fde843772933b627205cc3f98a1db SHA512 c352de91cc36f3143636d707a7531d65fcb21a87d561369d0965aee104621c417ad9325f7eefcd0dbd428e9df0ca0618da5e979784893ad5e4e60ef2a88c7ffe
-EBUILD mapserver-7.2.2.ebuild 4937 BLAKE2B 757901fefce7a1d297a18f409b17c3764a959eca9158860c37a9bad9ce37123fb2d243e5118e45199b9fecf1b5ca199638361d9021170915bd90ceff783a7fd2 SHA512 cd299942207e6f2c66af7a2376f140896f801e1b1a23f4c54ce4fe862159dbde814fb36db5514a1da1759be85994788f8baa3e3cb55a9f48dc286c0e5706f932
+EBUILD mapserver-7.0.5.ebuild 4515 BLAKE2B fd190f6f28e7474992e713feb9e31acce66e6c7e52c5e13a7d47fb1c5b0c16d3109cac025d4900738c5c0c716829a8e090d19a9ae675c91aacce7c502e77b684 SHA512 0b0a8fe0f507cedad19354beab48f8209119e1cc6c27d1a29372a4e2131694ae7174d416c099835ccb403f87b5d6c5e1033e1d82efd6ab7ae1a49651dfd1f360
+EBUILD mapserver-7.0.7.ebuild 4952 BLAKE2B 434e0d38aed21a5751a7fe9cf0535da6aba6b108afac4aa9e83afaecfefc550192213899be612f96579cff6d7073de8025082e8761cd201cc7168374be95d183 SHA512 ca8d7ceb46f139e7177fa4b4ffed026d566439c9931155d6cfdfb6906bf3e5c8467dde3d36df9c3d5d7ba90ee30587925276a3073e3432f98a5d1f1fd4149f0f
+EBUILD mapserver-7.2.2.ebuild 4943 BLAKE2B 3e39d474fceeff3ba1486070c6ebf735fcbab8c66b3a6e5dc1e42dc720fa9ebba13300eb3428c7a83d87c8131f5b328cfb7b6a8c609e6ce59564d001a4618508 SHA512 908d6b5f8a544909c63637b01bbd604636461d5ca1ea9d92b10a3ce6c195fce2985dd114094ef2ef85f5873058ecce7f2b7e74c91676e8e8cd7264696e14a135
 MISC metadata.xml 748 BLAKE2B d0cdfaae91bf8b692dd90eb8842c5c5bc78c421e729b713d1091de482e23475aedd1c987de14da5e438228bcbbf15bb488515d7253d635aac6148599fae58c3c SHA512 c0ed4810c5d7eff6fc409ae17f25ece71a89d99ba33fe2c27c04d37859798997a8e29964514fd95d1639688e29044309666e0684befcc598c4ea9ce9c82fd2b6
diff --git a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
index 262043174b9f..e0d969774e18 100644
--- a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
@@ -50,7 +50,7 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 	opengl? (
 		media-libs/ftgl
-		media-libs/mesa
+		media-libs/mesa[X(+)]
 	)
 	perl? ( dev-lang/perl:= )
 	postgis? ( dev-db/postgis )
diff --git a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
index 3d9b414957ef..27ff52df21b1 100644
--- a/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.0.7.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 	opengl? (
 		media-libs/ftgl
-		media-libs/mesa
+		media-libs/mesa[X(+)]
 	)
 	oracle? (
 		dev-db/oracle-instantclient:=
diff --git a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
index 643020ee7545..7d9720fe06c7 100644
--- a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 	opengl? (
 		media-libs/ftgl
-		media-libs/mesa
+		media-libs/mesa[X(+)]
 	)
 	oracle? (
 		dev-db/oracle-instantclient:=
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 5036088eca1c..a585f294a113 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,11 +1,9 @@
 AUX FindPROJ4.cmake 5695 BLAKE2B 916e3cb12a6dfb8428bfa97d74dc34b4b357935cc6be1e07444cbed86ace926348c0b94a0061cde1edd1ab0dfd330b57dabd7cc9be5317c761c307f61fce3c9a SHA512 d110ae4081ba75cdcee0feac9967a8f59218f12cd497a48434e6289a2fa1b04116a84582191ff45b8eda4af2dd4b6611b5035422af392653e3548e1829f2acd6
 AUX qmapshack-positioning.patch 482 BLAKE2B cb7d7b8f74a23828503c76e0cf3c7120af1aa412512461ae0e3e4a051ed7d8b89f9254a2397767b6ff56f1cbeefb1a6347f546222e991946dae3235da194d774 SHA512 245524903ec5db0da9d1874f0b5c0e2a318f6b955970da2645cff6dc1b21adb0565728021feca2cd236af9d2e60325e0bce1bb8084390d073200c5bad65d7175
 DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5
-DIST qmapshack-1.12.1.tar.gz 12033026 BLAKE2B e898507bad42a141f02cf8fd0338cdf9f39344b249318be29d1e6eb500a9e810496c6a790745cf50aec0025b5547be8382ef0c9eab2d780cbf63f9d29eb064a9 SHA512 c9b6ad0c7372cc4d992cee07d20ee0ad5779014ce6336644e13be705ec0bbed22d5f83e27473c2813c5bf13e49558686546c50fd597eb9ef2692c64933f94713
-DIST qmapshack-1.12.3.tar.gz 12029443 BLAKE2B 8d7f117c8379f7181ce68f79f460f59342cf654179c8b85839fe003e06167765e3e2292e14b4bc71c3ba1aeb388fcbb77faccdd57748335c1df8500f9e52ba41 SHA512 01a2b73f2f432a24b614c4a325e0b0a2aaf5b6ef75c5a7fbeb2be341adc7c46faa71cf7e9f4fdeb769d546b7a760be553a38ac6cc1c5c2c2d044edd37f550a85
 DIST qmapshack-1.13.0.tar.gz 12323773 BLAKE2B ea9cc15376546af442c6874e9321dfda268f523edb9908418baa4b3286339b4274f3c4694bebe036fb24ea3af82da1195d323c5e7484ca49039b9a526c29fa12 SHA512 cdc876a73d855573854691e3ef1d685499c9da381eb028e4a6e80dcd243df68caa66c92057fc1b896fce2be20e6d2ca43499b0e6827f804f27a0e8cc3749a100
+DIST qmapshack-1.13.1.tar.gz 12615121 BLAKE2B d1de6ec299c539da451f800565ea9e1e44edfbe0c1c0fa6ea8d6b1922cffbc94082ae12557050608d21f1d84fb3c5ce37dea1d2b676cd2d15edfaa8da8cbe4c7 SHA512 998366a1aff3568e9d0484c54aa18ee7621e9ed676f1f011cfc0566a7bc32379bb525168987f1a6c7332e4791aad6590398dc82d5af14a044ec5eb341b4597b3
 EBUILD qmapshack-1.12.0.ebuild 917 BLAKE2B ccad73881751fd4798d592def9b28fbbd3459045015bdd1a19f322d5a9bac452b370fe6d629eb5f894b7512d38481c0804de1819a429bca782e7cafba6eb5595 SHA512 e856b78e8fe4320e2134c7b0438ad467f609c2ad622b5bd4b8af41afa729c9323b1f5bab07ebe98b652d0fa133a338fe3e1d81f355257152f11ea0b43e25918d
-EBUILD qmapshack-1.12.1.ebuild 922 BLAKE2B 0648b29870c6882bb3e3e2e3f3b85e4e39788e517e93d16e52fe7a50822d7f57f4e07cd7146fc4f3960622cbb789848e603a12ddc4d16fab2a08c1f335befd38 SHA512 fdc7e4dd5c41f28a8b7186096435b817c03c2b5440733820981e2e167d2e13d9dbd034dce59dd8f4b1c85bbdb6f857641d5326e179771872bc4be2924a091f8b
-EBUILD qmapshack-1.12.3.ebuild 919 BLAKE2B 328f37d614983ffa610d602b14a897ff7a5f85042e23fe011afcfb63ac7e2ccf37cd577ca705701c7ad25d1e29fb7e364044313b3fc4d9e38dc035fbc3e35160 SHA512 8c58ee8a428ccd501c51431365cbdc31d974d0d6fe34e18809b5e999b2fcb1558ade2a7e0275f98f53818ac7ff97538d16d38dd2a0fffc9bb10e2928330530d6
 EBUILD qmapshack-1.13.0.ebuild 1086 BLAKE2B 83e222af391edb4bbfa51d04f8180ecaf76756653da973f5c13133b5e854e7041fd482bca52569ac0c17eabc9dcdaa88c00cec87f4140f20964cb4cd7fd347fa SHA512 802ba95584a69c7cc31919d4523d156f4406c3bc9a1537c0607be9dd0e93ebcd6c958030bae46a3f9b90d73dbd01e0700b3305bb9c5b2a5d17b62d303a315c1a
+EBUILD qmapshack-1.13.1.ebuild 1086 BLAKE2B 83e222af391edb4bbfa51d04f8180ecaf76756653da973f5c13133b5e854e7041fd482bca52569ac0c17eabc9dcdaa88c00cec87f4140f20964cb4cd7fd347fa SHA512 802ba95584a69c7cc31919d4523d156f4406c3bc9a1537c0607be9dd0e93ebcd6c958030bae46a3f9b90d73dbd01e0700b3305bb9c5b2a5d17b62d303a315c1a
 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
deleted file mode 100644
index d7cc3ab65fff..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.12.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.12.3.ebuild b/sci-geosciences/qmapshack/qmapshack-1.13.1.ebuild
index 6dfd76c879ad..a1e08508c620 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.12.3.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.13.1.ebuild
@@ -15,6 +15,7 @@ IUSE=""
 RDEPEND="dev-qt/qtwebengine:5[widgets]
 	dev-qt/qtdeclarative:5[widgets]
 	dev-qt/qtprintsupport:5
+	dev-qt/qtpositioning:5
 	dev-qt/qtdbus:5
 	dev-qt/qttest:5
 	dev-qt/designer:5
@@ -23,11 +24,18 @@ RDEPEND="dev-qt/qtwebengine:5[widgets]
 	dev-libs/quazip
 	>=sci-geosciences/routino-3.1.1
 	sci-libs/gdal
-	sci-libs/proj
+	>=sci-libs/proj-5.0.0
 	sci-libs/alglib"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
 
+PATCHES=( "${FILESDIR}"/${PN}-positioning.patch )
+
+src_prepare() {
+	default
+	cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die
+}
+
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update