gentoo resync : 03.11.2019

15 files changed, 52 insertions, 268 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 871fb4e931ec..2e563b3cbd54 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index b64d1a5c7ce6..dd5e3dcc0fad 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,9 +1,5 @@
-DIST gpxsee-7.12.tar.gz 4688060 BLAKE2B 5700bfd8ec4d6702df417297b0c5ce7d5df5f099ee435b4e322b78b65441adb0fcb00d4cbcddd825c75879cc35d2e7f67900525bc515a64813ab8148fc025fe8 SHA512 1630e34e5a367e88f55b690434be6f3ba73d9a55c0d351944939cca8a1994b0ac9ccc4a52ec30562d64179326f7be514549a83a0027a4b0189306fc47840d0bc
-DIST gpxsee-7.13.tar.gz 4687849 BLAKE2B 1963533450c8721b9ef9323080efc885ead692f683f1f3e5458938be3599481f4dc79b569ed01324939b3a67a344983f03d8bff48d7dbb867cf6a96e01b93aef SHA512 679d78169ed272239e1f474a9c25654f3230ed30cddc22e7f19ba8b5726e8a8f6b41aae34b3017beb14ca80ad553572ac0c53f504489fbb70fd32ea9e5969702
-DIST gpxsee-7.14.tar.gz 4696636 BLAKE2B 6ce00165cd6e14242d8aab5d809e0758015683be3cc3dcf8b012163e0114605c2f9cf31a49b950790dd09f8ee8c3d8edaca4660df36845379ccc6b74a3981759 SHA512 ecde2a2dc6b001239c9827698b27d08e1909fad3798fe04612378889fb6c9368663a6032bc823f2da82ec72fe0fe2647cf86aba87cd31c1467dbefbde985e613
-DIST gpxsee-7.9.tar.gz 4347609 BLAKE2B 1555576b72ada6d6302fede1ba0d043b4656afeabaa390e5c32289a0b5e57fdf5a5a880516a6960ea2d00844cdf9a88a894a36e3a82bde6f6fb3c30ddb166bc7 SHA512 24522506894e9ea88ab7b79b34082a1c8c563c8e0c73672ba247a5d013f0c802752665a62686259981f2b49494982d3ad0f06de83f37874e87110bee42964659
-EBUILD gpxsee-7.12.ebuild 1594 BLAKE2B 8d3b72434f4880eda221cc748bd3cb2e4ca913cc99051048562f0191d8dc246920f052c79b37aa2979deb14216d8f1f4ecc6990cf4f66f7c3b2ee072e9b54438 SHA512 84ba5507e36b527b62435cd12183fe3ef956aa187e346d555545e8d7b66ac3ff583618860239ae308249b72651ac66daef5b4208d12f397fec0149d99c1bc44c
-EBUILD gpxsee-7.13.ebuild 1377 BLAKE2B 98419dbae65600b2ba5a621407587ebf55a8f8587ad73a9975f0bacb9ee8728d75d87715a41458e0b6865a430a7661d205948058eb3f0790b9b0e821b6cf3302 SHA512 00edbbf249b1df6b98e421f6dc620324ee1fd8b563cc122ba30b6ee5cb95f162fde12392dfcdec9132f3eae4b5bfc9bb09516fb1d3aa2b33ef3dc219a56a791a
-EBUILD gpxsee-7.14.ebuild 1383 BLAKE2B 66f291c8833ec14210cc81295557cd0694f4aa42f8473cb587bc93255f0a7fddab00daf4e263ee98d7dd73292e185dd13efceb54f9927bd6a512a74a32d477dc SHA512 f606c24b11b61f69325a5c76c6c4489856f9d3cd210292302bc9445fb398b7ecbbd7fffa75ca56a12d6ca0aa8f384c2fa4ccba3e7cba90cb9741b629827088c2
-EBUILD gpxsee-7.9.ebuild 1594 BLAKE2B 8d3b72434f4880eda221cc748bd3cb2e4ca913cc99051048562f0191d8dc246920f052c79b37aa2979deb14216d8f1f4ecc6990cf4f66f7c3b2ee072e9b54438 SHA512 84ba5507e36b527b62435cd12183fe3ef956aa187e346d555545e8d7b66ac3ff583618860239ae308249b72651ac66daef5b4208d12f397fec0149d99c1bc44c
+DIST gpxsee-7.15.tar.gz 4696645 BLAKE2B 92b88c95f83cc769b54204451fd6b0ed03144e2db3711672062e586ef3b97ca5cec9bdcdf6ed2b764d14e76d4efa387ffd6ad9d8f2c588f972c8cf5ee50e06a6 SHA512 9a9c1f577cdb1d2b4008f2e3ff00da801373bd8bac89d1aef3198e0a640191d4c9dd64f4e2483e3c536ad1a51b6389d10a8b1cb8224ec5baab79a8f92a1c2bf1
+DIST gpxsee-7.17.tar.gz 4996230 BLAKE2B e6f267466837ad16793b99b14c535d005154e10dc5ebe35a242ce766eff6f63c4476add36f67c4e4b3ad7604272d5b283b898b35bfdc09bb51be2e66e017331a SHA512 93be78863c96b82a49ae4eab742ab5e075b5fee9372bb016cfbb9b74941217c348a4d7834934e72641a2e474f16bc0d5e51927420e171e454b7bebffea5fcecb
+EBUILD gpxsee-7.15.ebuild 1383 BLAKE2B 66f291c8833ec14210cc81295557cd0694f4aa42f8473cb587bc93255f0a7fddab00daf4e263ee98d7dd73292e185dd13efceb54f9927bd6a512a74a32d477dc SHA512 f606c24b11b61f69325a5c76c6c4489856f9d3cd210292302bc9445fb398b7ecbbd7fffa75ca56a12d6ca0aa8f384c2fa4ccba3e7cba90cb9741b629827088c2
+EBUILD gpxsee-7.17.ebuild 1383 BLAKE2B 66f291c8833ec14210cc81295557cd0694f4aa42f8473cb587bc93255f0a7fddab00daf4e263ee98d7dd73292e185dd13efceb54f9927bd6a512a74a32d477dc SHA512 f606c24b11b61f69325a5c76c6c4489856f9d3cd210292302bc9445fb398b7ecbbd7fffa75ca56a12d6ca0aa8f384c2fa4ccba3e7cba90cb9741b629827088c2
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-7.12.ebuild b/sci-geosciences/gpxsee/gpxsee-7.12.ebuild
deleted file mode 100644
index 6b28d5dd63ab..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-7.12.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/gpxsee/gpxsee-7.14.ebuild b/sci-geosciences/gpxsee/gpxsee-7.15.ebuild
index 3b81f7fe5b94..3b81f7fe5b94 100644
--- a/sci-geosciences/gpxsee/gpxsee-7.14.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-7.15.ebuild
diff --git a/sci-geosciences/gpxsee/gpxsee-7.13.ebuild b/sci-geosciences/gpxsee/gpxsee-7.17.ebuild
index 0f57099d7bd7..3b81f7fe5b94 100644
--- a/sci-geosciences/gpxsee/gpxsee-7.13.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-7.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PLOCALES="cs da de en es fi fr nb pl pt_BR ru sv tr"
+PLOCALES="cs da de en es fi fr nb pl pt_BR pt_PT ru sv tr"
 inherit qmake-utils l10n xdg
 
 MY_PN="GPXSee"
diff --git a/sci-geosciences/gpxsee/gpxsee-7.9.ebuild b/sci-geosciences/gpxsee/gpxsee-7.9.ebuild
deleted file mode 100644
index 6b28d5dd63ab..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-7.9.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/gtk-g-rays2/Manifest b/sci-geosciences/gtk-g-rays2/Manifest
index 3e08b46462d0..1f728175e789 100644
--- a/sci-geosciences/gtk-g-rays2/Manifest
+++ b/sci-geosciences/gtk-g-rays2/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-g-rays2-2.05.tar.xz 898216 BLAKE2B aeba28398ba4be7dcbbfdae48dbf87ab4f6e9e9401981e4626187ccccc352793e39fee5518ece2197207c260b50b76cbfd59cad716fecb12e789a7577b4f1db7 SHA512 673d6e756f1a827e1c0de5384f3228e69a00a56588b81528202e80f5d2067213fd9fdb5af22028fcce0c4ea9e4d1b708accdd5777628ded351e3f2b6f2f57e41
-EBUILD gtk-g-rays2-2.05.ebuild 864 BLAKE2B af2d814e755863c740ae6e93ad5bd6d6c1ccbe2cd3a022e4eac103909296876035c8511cd48e8d5d7497458f846929a32a85b4c50d48c99e4b518f0e887e2c88 SHA512 8740f2d0b71e7021a1b1a9325c5a15531a187cf007bd76963e2cf3babc35a69b5cad33ce0c4212ef8903368933913dc97a35d3de340491e8db124c6bccf399f4
+EBUILD gtk-g-rays2-2.05.ebuild 862 BLAKE2B f3990575eb57b8f50b08497fd711ea29077abea1a2e0f782a0e60fd24f0daa9d27e45287dafef7bf8b3c6ea4ed1eb0b2cbb5a6adca286f1141a4f60125726d83 SHA512 888ffb41b55babc4af9463d1a9da9686548a90af75728361c3463e5657fd23d5a62abd8b02f0c173827621d0ccba29017c04775fac79f674a473bb2300fed877
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
index b1cae729d35b..cae8a6436b4f 100644
--- a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
+++ b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="
 	dev-libs/glib:2
 	dev-libs/dbus-glib
-	virtual/libgudev
+	dev-libs/libgudev
 	x11-libs/cairo
 	x11-libs/gtk+:3
 	virtual/freedesktop-icon-theme
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index ad46cd4dec0c..9b8bbe61e3e2 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,11 +1,12 @@
 AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7
 AUX qgis-3.2.1-qtwebkit-optional.patch 978 BLAKE2B 31ed74dfc390bd132547a3934d5bfb906134efc5b1d56c885a1446a4bf828474a8262414c3cdd446286a7e266d09a0f775ba2087c1741053154ca55b7773274f SHA512 dc71b850f73a11781d89bc1f08c830fd13d2d5d912d746133d7748724933143dbaf7957fbcdd8f8009ad8648d4f528661cf62ebf2aff5d04cd5856ba1429e3d8
+AUX qgis-3.4.12-qt-5.13.patch 707 BLAKE2B 3a6e14a77403980df16008345c1f8a6edeba6d7bc027e6c2844501af2d902277360d0ef3955bdc9845da3c2b8a688f4d98fd3d4062c388476c20900e08827be7 SHA512 66af7639e1ab475ae1f6d89d44bef75b5904024b04209fddb6b855f3f08e823a1224233a39f595412de196f6739d026e2c0a9384694ca308d8a5bea0ab4942e5
 AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716eda662437a4d8469c055483b0e8c0014d0bc35e071b50a6e1a23138e8b6822df226d4d80b18f789976ff922a35311200 SHA512 59fee5497129856a15bf573d2682a4c837df044ccb44bc914fb64ad6e27d321251723131ae3ab5ffffdce876be954f2fd4db52931cd3fb6fbeb2f38a41419133
 AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f
 DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22
-DIST qgis-3.4.7.tar.bz2 74373862 BLAKE2B 9b3a9987df406c703b0cdac36bc5267cca23b77e1c9f142e74b5170018c7c1ccdca738908412803a6703b0d2e64ef7733f2f4e986188cf90ce79a65e72113a55 SHA512 3977a49378ecaa27556ce76c6755281e477cea4a29a6a2ab496ef8e7b9b488cb31f9a124eece6f8a4974c98f0ae5396061e8c14fd577655bb4d428b818d1e1db
+DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.2.3.ebuild 6195 BLAKE2B 92beb6aef1915030ae047a9216d2593f2c9a5f0cace785b4ac95aaa38472b1cef8012474eac3f5a59cf2dadb1f93383e6fe0d9016af447404573ad285e40ee1a SHA512 a322aa327c5c2e6512e74597216edb6fef931cb5c2e0a85f28614bda0c5a96b4ba561e1ba2613dc875921a291f4d4dee33cb35ae51ee618b91b7969b777a0a9b
-EBUILD qgis-3.4.7.ebuild 6148 BLAKE2B a172b10767c6b4b090f4dce7523886e4cb328c34b263a28702982999c6468a4d0e8bd2f55db6373c79bce77187315b55a8f0bcaf5ab19cea0c6b8b6f984c383b SHA512 93dfd0d7e4fcb926e5c136dffa2c296f27c08e586eca0c7e3f6397a056d1de8e2d1055f9ea18fcabc55bf475d6a4e272fb8af56af854330c4f00efdd1308967c
-EBUILD qgis-9999.ebuild 6060 BLAKE2B a3de4e10e3bbb1b403a8aabf9ca3fb7c08ab883438946677edd77f82090823aa2b4d7e2f95e290e0cb46ba221298384bad387e7f1ca49a122019b3e8d1a855ef SHA512 49083b5cacb71c640f9319659c614f21c0dda8503624f0b6437514cbb0addc1f494ca2d00cafcc27e86a18dbd39ecc4a1a672292a5477839aceed5527ed4da1e
+EBUILD qgis-3.4.12.ebuild 6075 BLAKE2B 64e2aa5661165efcbdfc3ce28c85c44cc9b9dfcc03a28883848d09b45401c450af0f50a27c219cc8db7498fdcd76302e77d70d386e1416eb7e2eef64f22c85fd SHA512 ac1f98028a53e363a2f7ac0ac334f6a7ea45a29aa7cee142b02c587b5c5700a65cefe2f9f6388567734cd21e553f3ff5227e534e167ba608481080007b58cade
+EBUILD qgis-9999.ebuild 5491 BLAKE2B ea69d54d0bf622ccad598a2465eaa22d1c88e596a726bde79da7ca5e88a5847f18942035247d2413e3230d5d82a9e882cd2750455f70adf85461250aa5ce0e79 SHA512 6ace42006d5d504bc6cccd5467f919e11dfadeec66eb2ee72341a6df95837b3683cf6ebbf2d41a904cfad395ff020d7e1574deae0b8eeede3f3b70d30700d6d5
 MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99
diff --git a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch b/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch
new file mode 100644
index 000000000000..9edb44276098
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch
@@ -0,0 +1,22 @@
+From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001
+From: Matthias Kuhn <matthias@opengis.ch>
+Date: Sat, 22 Jun 2019 10:11:31 +0200
+Subject: [PATCH] Add missing include
+
+Fix https://github.com/qgis/QGIS/issues/30316
+---
+ src/analysis/interpolation/qgsinterpolator.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h
+index 35343ccdf7f..5d694418299 100644
+--- a/src/analysis/interpolation/qgsinterpolator.h
++++ b/src/analysis/interpolation/qgsinterpolator.h
+@@ -19,6 +19,7 @@
+ #define QGSINTERPOLATOR_H
+ 
+ #include <QVector>
++#include <QList>
+ #include "qgis_sip.h"
+ #include "qgis_analysis.h"
+ 
diff --git a/sci-geosciences/qgis/qgis-3.4.7.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
index c4b4335cecb7..e0c6822fbdda 100644
--- a/sci-geosciences/qgis/qgis-3.4.7.ebuild
+++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild
@@ -53,7 +53,7 @@ COMMON_DEPEND="
 	>=sci-libs/gdal-2.2.3:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	sci-libs/proj
+	sci-libs/proj:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
@@ -106,9 +106,10 @@ RESTRICT="test"
 PATCHES=(
 	# git master
 	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+	"${FILESDIR}/${P}-qt-5.13.patch"
 	# TODO upstream
-	"${FILESDIR}/${P}-featuresummary.patch"
-	"${FILESDIR}/${P}-default-qmldir.patch"
+	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
 )
 
 pkg_setup() {
@@ -210,9 +211,6 @@ pkg_postinst() {
 		elog "If you do not need these plugins just disable them"
 		elog "in the Plugins menu, else you need to set USE=\"postgres\""
 	fi
-	if has_version "<sci-geosciences/qgis-3"; then
-		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
-	fi
 
 	xdg_pkg_postinst
 }
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index a541d6c46fd2..73aa5dd50222 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -27,6 +27,7 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
 BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
 	sys-devel/bison
 	sys-devel/flex
@@ -50,10 +51,11 @@ COMMON_DEPEND="
 	>=dev-qt/qtsql-${QT_MIN_VER}:5
 	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
 	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	media-gfx/exiv2:=
 	>=sci-libs/gdal-2.2.3:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	sci-libs/proj
+	sci-libs/proj:=
 	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
@@ -93,7 +95,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
 	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -128,7 +129,9 @@ src_configure() {
 		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
 		-DPEDANTIC=OFF
 		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
 		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
 		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
 		-DWITH_QSPATIALITE=ON
 		-DENABLE_TESTS=OFF
@@ -166,18 +169,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
 	insinto /usr/share/mime/packages
 	doins debian/qgis.xml
 
@@ -188,6 +179,7 @@ src_install() {
 	fi
 
 	if use python; then
+		python_optimize
 		python_optimize "${ED}"/usr/share/qgis/python
 	fi
 
@@ -207,9 +199,6 @@ pkg_postinst() {
 		elog "If you do not need these plugins just disable them"
 		elog "in the Plugins menu, else you need to set USE=\"postgres\""
 	fi
-	if has_version "<sci-geosciences/qgis-3"; then
-		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
-	fi
 
 	xdg_pkg_postinst
 }
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index dae38d8bdbd2..274aa634ceae 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.13.0.tar.gz 12323773 BLAKE2B ea9cc15376546af442c6874e9321dfda268f523edb9908418baa4b3286339b4274f3c4694bebe036fb24ea3af82da1195d323c5e7484ca49039b9a526c29fa12 SHA512 cdc876a73d855573854691e3ef1d685499c9da381eb028e4a6e80dcd243df68caa66c92057fc1b896fce2be20e6d2ca43499b0e6827f804f27a0e8cc3749a100
-DIST qmapshack-1.13.1.tar.gz 12615121 BLAKE2B d1de6ec299c539da451f800565ea9e1e44edfbe0c1c0fa6ea8d6b1922cffbc94082ae12557050608d21f1d84fb3c5ce37dea1d2b676cd2d15edfaa8da8cbe4c7 SHA512 998366a1aff3568e9d0484c54aa18ee7621e9ed676f1f011cfc0566a7bc32379bb525168987f1a6c7332e4791aad6590398dc82d5af14a044ec5eb341b4597b3
 DIST qmapshack-1.13.2.tar.gz 12725064 BLAKE2B fad8fdbb9fe1559823bcb835f64d88751c4f8593b8e1b213df17d5450c12eaf8c470241c1dde1299a555d698ddae1aee6cb66bee09baa6e3339513e65bacbb79 SHA512 0f2d260cb58e1cc995a05eda213d7c3ddd219cb5829164f406f928da5bbaf681d41743534f0354ba59786339ff193925d41ffddc5efa5dcf27fbbcbc070b98f3
+DIST qmapshack-1.14.0.tar.gz 12541988 BLAKE2B 146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55 SHA512 675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
 EBUILD qmapshack-1.12.0.ebuild 917 BLAKE2B ccad73881751fd4798d592def9b28fbbd3459045015bdd1a19f322d5a9bac452b370fe6d629eb5f894b7512d38481c0804de1819a429bca782e7cafba6eb5595 SHA512 e856b78e8fe4320e2134c7b0438ad467f609c2ad622b5bd4b8af41afa729c9323b1f5bab07ebe98b652d0fa133a338fe3e1d81f355257152f11ea0b43e25918d
-EBUILD qmapshack-1.13.0.ebuild 1086 BLAKE2B 83e222af391edb4bbfa51d04f8180ecaf76756653da973f5c13133b5e854e7041fd482bca52569ac0c17eabc9dcdaa88c00cec87f4140f20964cb4cd7fd347fa SHA512 802ba95584a69c7cc31919d4523d156f4406c3bc9a1537c0607be9dd0e93ebcd6c958030bae46a3f9b90d73dbd01e0700b3305bb9c5b2a5d17b62d303a315c1a
-EBUILD qmapshack-1.13.1.ebuild 1086 BLAKE2B 83e222af391edb4bbfa51d04f8180ecaf76756653da973f5c13133b5e854e7041fd482bca52569ac0c17eabc9dcdaa88c00cec87f4140f20964cb4cd7fd347fa SHA512 802ba95584a69c7cc31919d4523d156f4406c3bc9a1537c0607be9dd0e93ebcd6c958030bae46a3f9b90d73dbd01e0700b3305bb9c5b2a5d17b62d303a315c1a
 EBUILD qmapshack-1.13.2.ebuild 875 BLAKE2B 336d58ba60e3a0d30c68b3ba2579851c4aa19e13473fa9dd51686b0b4b2e084979347d2959feb6f78296a515349a991cdb290955b2332ff6c24d40337685b613 SHA512 6bbd42f14809b65b4a4c3ea902f8eba523ee450a32e533f1cf10a50c419cd10a348d1930271f524e21810a414564e9afdda05bfbeecfd58e3f7e0ac3740ad2c2
+EBUILD qmapshack-1.14.0.ebuild 910 BLAKE2B 7816ff6d1d6171d5ef25a1202bbd3ede2e090ed36b6d6b065c5f494904bd312e9ca798e833f7e6ce55aaacc1ce9dde6fb81d8ad01411051d8e0b307e97df34f6 SHA512 548d08ffe6811d87c92abe7f863fce09035ecf1e33ff71168346d26251d1195caa75cc356aba87a06c6e8410773ad91b63ba11225c9552e529d72e1fcc83237a
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.13.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.13.0.ebuild
deleted file mode 100644
index a1e08508c620..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.13.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/qtpositioning: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-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
-	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.13.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild
index a1e08508c620..3897457cafed 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.13.1.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils xdg-utils gnome2-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
-SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
+HOMEPAGE="https://github.com/Maproom/qmapshack/wiki"
+SRC_URI="https://github.com/Maproom/${PN}/archive/V_1.14.0.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -30,20 +30,9 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
 
 PATCHES=( "${FILESDIR}"/${PN}-positioning.patch )
+S="${WORKDIR}"/${PN}-V_${PV}
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 	cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die
 }
-
-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
-}