gentoo resync : 15.12.2019

16 files changed, 189 insertions, 99 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index e5bfdca9e899..5da167e06f5f 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index b02003b7d9e3..8f7fdf452052 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-maps-3.30.3.1.tar.xz 2175840 BLAKE2B 0c2f44ec3262715d98e1a0412ca305e15916cdb92df5fc5b04df34b65a7b9c55d4f5dd9c54f9f9dc34f8e6dd889f60d7993b59ca0cd92e4e60b22b506877b24c SHA512 02d3b1b305c1011a60a34566847962ec3c32ee3563ce2c327b810fae24c2df08354d8420f1986645d861cfef7a35f336d67d4576a3e2f61eabdd972b8d070a8e
+DIST gnome-maps-3.34.2.tar.xz 3973480 BLAKE2B b2a4ff993ccecb27c79599485278fdffcd64b22d5cdf011a73106e883c75b72e4a5160a1d5c05a1e9324ecd458371a5e512855dc1d59f14e06e711b00e4128f8 SHA512 8f7f88343bee22aff9d9e821d2059c4428788d9a43ada7415387721664a58fa1bc7ff36865fc7d12702e77fa794d87d3e3fb80aab694fb6c014fd4dbc1db0f0c
 EBUILD gnome-maps-3.30.3.1.ebuild 1370 BLAKE2B 5434f28013128cc139a5f4b9cff7c5d80a627bb29fed3444fd2637d1d8ebd50412e377207e4ec1f1bf018829c0892a0c97daf54ff82a6031fdfa1a1ea8bcf1d3 SHA512 d803255db05419c8c8ec3fa2ae50787c53b81fee53fa8483898958e27514ff3379a546145caa0e79d5d20b68462082d5e3a6d09fd04a70d8e02e445bd35adff4
+EBUILD gnome-maps-3.34.2.ebuild 1364 BLAKE2B 3343ef412804ac7d7a22d69d9b1849cf746c73a1e4ca7d58a391e4e88f99a666cff5b19d54ba759aa7cf8a7eae7fdcb858fe506613075a0533eb000be345afd7 SHA512 eebcaf101663a1e19dcca6fb6b3ddf03d96d74fa0857f4744d08d8b184cb67e74bd4a3ac772d2eb0f53eb4ef006ce6f9ca157e6a27af214cd16b1187885a2729
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.34.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.34.2.ebuild
new file mode 100644
index 000000000000..ae5809e033e4
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.34.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Pure introspection dependencies found by grepping imports.gi in ${S}
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/gjs-1.50.0
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=dev-libs/libgee-0.16:0.8[introspection]
+	>=dev-libs/folks-0.10
+	>=sci-geosciences/geocode-glib-3.15.2[introspection]
+	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
+	dev-libs/libxml2:2
+	>=net-libs/rest-0.7.90:0.7[introspection]
+
+	app-crypt/libsecret[introspection]
+	dev-libs/libgweather[introspection]
+	media-libs/clutter-gtk:1.0[introspection]
+	media-libs/clutter:1.0[introspection]
+	net-libs/gnome-online-accounts[introspection]
+	net-libs/libgfbgraph[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-libs/webkit-gtk:4[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 2d4147ca7ecd..3ed5aae96744 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -9,8 +9,8 @@ AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee5
 DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
 DIST gpsd-3.18.1.tar.gz 9031595 BLAKE2B 170863740c7281ea111c3f4db2dfeb67f4366da7e9e8d2f7f3bbddacbc9d2083558379b1fe60c9293c31a6428288d205aba565694fedde6f1dfe67999a6782c6 SHA512 b381b177fcd29089a61aa11f5df2c67473720a6bbc5590ca1c4fda627331c407de01c62caceeddae780626b9a02392e9a770d52a143357e1babdcc2fbff0ed38
 DIST gpsd-3.19.tar.gz 10581777 BLAKE2B 0801919c968b8027c357047dabdc8587e1d5950cb0d80f89d6d62678a11b3dfc76a6a89ae59123680dac3188a695d0c37618d3f83280f5e584e10c1fa9a5dc03 SHA512 c9f9a9ff65759f852771ec4cf97ab15343c9176a149dd5ea6c2e2dc18b47aa7c7bf9ff1f2e8523121564d33a34ae6aa08169c5454847b4fe7848e616fd20a814
-EBUILD gpsd-3.17-r3.ebuild 4686 BLAKE2B e3ac61cb94c78890fc482d1deebb80892bc6c894d103a543f25966cf91bf759271b981ab03f2e08391635cd2f551aa513a7ce69f4d74702d46c80ac55015fec7 SHA512 f9262d5ccef23c8220b754d65555577d954c1f6690f6554c1a88522a341c26cc4fb2efe7709a1fd57e83d17bb647cdb77fb77f0b4e0456109683f546749517f9
-EBUILD gpsd-3.17-r4.ebuild 4867 BLAKE2B 2b0f2114ec71247b3c6a4043a71376639f1714d950ceb71c27b86829346f07d7535a2ec5d148fb5560730d7892e668ce7feeb42931a855d920da00ba5fc0265e SHA512 3fc494a8074710a28748b1f2d0482a1e98bd246e15c63fc544ab7867ee1320f4a2e12426af67ea3d8322a56718f3e4f410f3673646783a655ea94faf04249334
+EBUILD gpsd-3.17-r3.ebuild 4707 BLAKE2B 856de5c3f6f684e1777ade59ad372d8fdf2e0c43824f3a9303f1f6be2cbbdf74cbb01f7348d9fe77511b979d97ef7e2cdad0b8b9bb84863e80d5ed225aade9ff SHA512 f55bdf4ed92208d488e71b94e2edd562427ae495d07f609be88a6c5c172a89cdedf76199eb4d136d4f81917ba874bbec0caf5f4abf1b5732d8ab7520932864ec
+EBUILD gpsd-3.17-r4.ebuild 4888 BLAKE2B 0e9f549feb461ef812e823c310604967f12482bcd03f569f7146a254bcc8e422ec2d3dcb444af4f989b42caaca8fc027504287b26564e0551e055f7bb1fac349 SHA512 18746122b46198d686a1a19d78b51ea489b9a20e3838438c383a96eec1b351080e03d38f6cd647781915818ee5270c9cfb1bb255dc4f246b57ac5aae9a52a19f
 EBUILD gpsd-3.18.1.ebuild 5469 BLAKE2B a39b2da934d227ec77d8ce4276f94d5784f57208b53c8945450baabfd575b73aa7fca1671b5f3df07a3d3eacf0b63394d8b18ce1dae60ce5e1baba3e14eea1f8 SHA512 d3a5eb23450a37319cfee292edfa3caa86f8f9971ef9e761f833939302019d8778fd171031a5ed4e2fbb844f7e8002d5e5ed3dc946c8ee12f2dab5df188aa984
 EBUILD gpsd-3.19.ebuild 5469 BLAKE2B a39b2da934d227ec77d8ce4276f94d5784f57208b53c8945450baabfd575b73aa7fca1671b5f3df07a3d3eacf0b63394d8b18ce1dae60ce5e1baba3e14eea1f8 SHA512 d3a5eb23450a37319cfee292edfa3caa86f8f9971ef9e761f833939302019d8778fd171031a5ed4e2fbb844f7e8002d5e5ed3dc946c8ee12f2dab5df188aa984
 EBUILD gpsd-9999.ebuild 5433 BLAKE2B d8217a7e4212ebd2c7893a6f3cda00ed420e48695464b5c9da0429a39ba0d9b5f17ef9ebd90933a9425448fa03cfdc991d924a3b5f6328ad6bf036bd75e029af SHA512 e43bbf10fe64a252f04cd032db802118a0f6355f03c639e08c2d352b5bc74631964658a410f4ca3cd000ffe57e61971842e85b8d3721c807949658a34ba60460
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
index 8999e495cd4d..98c43cc1ab7f 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
@@ -31,6 +31,7 @@ GPSD_PROTOCOLS=(
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
 IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -89,7 +90,7 @@ src_prepare() {
 }
 
 python_prepare_all() {
-	python_export_best
+	python_setup
 	# Extract python info out of SConstruct so we can use saner distribute
 	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
 	local pybins=$(pyvar python_progs | tail -1)
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
index 78e26cfd7985..814c85acb356 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
@@ -31,6 +31,7 @@ GPSD_PROTOCOLS=(
 )
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
 IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="X? ( python )
 	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -91,7 +92,7 @@ src_prepare() {
 }
 
 python_prepare_all() {
-	python_export_best
+	python_setup
 	# Extract python info out of SConstruct so we can use saner distribute
 	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
 	local pybins=$(pyvar python_progs | tail -1)
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 90a56b2becf3..812b28145ebe 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,5 +1,7 @@
 DIST gpxsee-7.15.tar.gz 4696645 BLAKE2B 92b88c95f83cc769b54204451fd6b0ed03144e2db3711672062e586ef3b97ca5cec9bdcdf6ed2b764d14e76d4efa387ffd6ad9d8f2c588f972c8cf5ee50e06a6 SHA512 9a9c1f577cdb1d2b4008f2e3ff00da801373bd8bac89d1aef3198e0a640191d4c9dd64f4e2483e3c536ad1a51b6389d10a8b1cb8224ec5baab79a8f92a1c2bf1
 DIST gpxsee-7.17.tar.gz 4996230 BLAKE2B e6f267466837ad16793b99b14c535d005154e10dc5ebe35a242ce766eff6f63c4476add36f67c4e4b3ad7604272d5b283b898b35bfdc09bb51be2e66e017331a SHA512 93be78863c96b82a49ae4eab742ab5e075b5fee9372bb016cfbb9b74941217c348a4d7834934e72641a2e474f16bc0d5e51927420e171e454b7bebffea5fcecb
+DIST gpxsee-7.18.tar.gz 5006604 BLAKE2B b7568a677e3cff08903d862921ace01374a594e216b1bd9eda457a92f700ef232b5804dff24696ee0574bcbe1d4e8a103dac6b5db33482cb0139f73b21852883 SHA512 562944a14ac2af4ec6837e77a6610b8ad7d254ffada4202e589c05a4306c0410e815212d7a7847708c50de72fa21a02d41bf5152f5d5f313c96da5b2516138fd
 EBUILD gpxsee-7.15.ebuild 1383 BLAKE2B 66f291c8833ec14210cc81295557cd0694f4aa42f8473cb587bc93255f0a7fddab00daf4e263ee98d7dd73292e185dd13efceb54f9927bd6a512a74a32d477dc SHA512 f606c24b11b61f69325a5c76c6c4489856f9d3cd210292302bc9445fb398b7ecbbd7fffa75ca56a12d6ca0aa8f384c2fa4ccba3e7cba90cb9741b629827088c2
 EBUILD gpxsee-7.17.ebuild 1332 BLAKE2B d81beb7c3324c754a348375791307dc8fd0fe97a43d7df280e6e2c49889248a40709f865129df067821cd63429852419f7396536df2514e8d4c3ccb2e9c8b639 SHA512 67cc7da60184ee62d7b7050c3e9fb11c754ff616fa064d86db2316adfe792f89213a44a3fac26b3db60a62c918aad89f56f20667c39fb5540297b85d7775c9c7
+EBUILD gpxsee-7.18.ebuild 1332 BLAKE2B d81beb7c3324c754a348375791307dc8fd0fe97a43d7df280e6e2c49889248a40709f865129df067821cd63429852419f7396536df2514e8d4c3ccb2e9c8b639 SHA512 67cc7da60184ee62d7b7050c3e9fb11c754ff616fa064d86db2316adfe792f89213a44a3fac26b3db60a62c918aad89f56f20667c39fb5540297b85d7775c9c7
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-7.18.ebuild b/sci-geosciences/gpxsee/gpxsee-7.18.ebuild
new file mode 100644
index 000000000000..b7ebc18f0f55
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.18.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en es fi fr nb pl pt_BR pt_PT ru sv tr"
+inherit desktop qmake-utils l10n xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://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}"
+BDEPEND="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
+
+	domenu pkg/${PN}.desktop
+	insinto /usr/share/mime/packages
+	doins pkg/${PN}.xml
+	doicon icons/${PN}.png
+}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7efad702126a..96f597d5523b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,12 +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.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81bef294b79705589f537a9a7a2054806df06550a54525e307cc1eec2ecb81340faaf595a706d3d504190d720efe638ef3e2fb SHA512 a21ff313e4d1768dc15ac7dae8901d7245efb30f3caf7f9c0dbd667647e96b282f3451e7f52c8168df23ba2e953832995d975805a8f8bc176d20bd0862d9a51d
 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.10.0.tar.bz2 101075584 BLAKE2B ec2bb34a0e49c6291f02b3bd92e44999042c7f7ea77047f9ad61066503ffbe9678be91964b7300b4f0d22fe7bc51d7df53fb370a402157c3ce93949ace70c3af SHA512 0666e93998b7022b83f0321ba8848d8d0a182e3ced55a91f8d5119d4bfa971949a07b82668f7e6a4801bb9ca5a6e0c551ff4c346920feaed2ece24e61c4f2b4c
 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.12.ebuild 6074 BLAKE2B f3472d5e8f4c5538fe5e87bb58628ccbb643844ff7ed22bcb0ede2e25349c7d0e5a186f3a7de8d6820d47ce2ff4ef3227289c4d5ad18e9343d5ea0099877c920 SHA512 037ca4d081d4e99f0c617ab0b3874b7f3cd13a39d5344f4fbcbfae5041f6a12365801b4362aabf195f97c35a7636c516509b1725d9e112cffa0304ebc5a1e78f
-EBUILD qgis-9999.ebuild 5491 BLAKE2B ea69d54d0bf622ccad598a2465eaa22d1c88e596a726bde79da7ca5e88a5847f18942035247d2413e3230d5d82a9e882cd2750455f70adf85461250aa5ce0e79 SHA512 6ace42006d5d504bc6cccd5467f919e11dfadeec66eb2ee72341a6df95837b3683cf6ebbf2d41a904cfad395ff020d7e1574deae0b8eeede3f3b70d30700d6d5
+EBUILD qgis-3.10.0.ebuild 5492 BLAKE2B c80a9774aae4a055711d6cf61f9407173bf7fe2eba09fcea01563166378b01d4af903d347fd6556d33a9bf9f4de8aea35882ed41203b22d1aa833abaade1d5c6 SHA512 3ec865d805c4829ab01246583d725066878af3984831df95cab852d79d4abba26af358ef88d423948481a151d50414365507f1a7770ad1f8799d557245856da9
+EBUILD qgis-3.4.12.ebuild 6073 BLAKE2B 50be207fe2ab5581b0eff3bd44a513f46b96002bfa00b80a820543b141f8c418320344e655ba519654c021de6f122198a07f2f0ffc07479f7150a10fc46c27d3 SHA512 d2a520ab4f7e492a54f5a0780627b089ce48f5b58377cfb5f44436ef8303d43601652b20f257dfb4e4901f9fd7e07f1013a206ccad507b2b082d8b95c8f1f8e1
+EBUILD qgis-9999.ebuild 5493 BLAKE2B f5ba71539f41e02cbab1cf2f6e39cab371d5af9167b318f671f55d3167d6fd125392b6ac02a6799bf0321ea428e2f3d5cddc8779d0672222bde21cb160e1f41c SHA512 df8c87b10bbb48c92904fef7690b35c557d04f7c432322302bb92dd14edd66aafd93b79f21fff505b5aee4c4864bc4d425cdb7b5eafafc9abd474f3df87b16fc
 MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99
diff --git a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
new file mode 100644
index 000000000000..472b8aa466ce
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
@@ -0,0 +1,12 @@
+diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
+--- a/cmake/PyQtMacros.cmake	2019-10-28 08:23:18.776024266 +0100
++++ b/cmake/PyQtMacros.cmake	2019-10-28 08:24:17.316024213 +0100
+@@ -36,7 +36,7 @@
+   ELSE(CMAKE_HOST_WIN32)
+     # TODO osx
+     SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
+-    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
++    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
+   ENDIF(CMAKE_HOST_WIN32)
+ 
+   FOREACH(it ${ARGN})
diff --git a/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch b/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch
deleted file mode 100644
index 9e56bf5ae959..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 55473e7e21a068dec904fd4146642c33a44ce22a Mon Sep 17 00:00:00 2001
-From: Denis Rouzaud <denis.rouzaud@gmail.com>
-Date: Wed, 8 Aug 2018 13:40:04 +0200
-Subject: [PATCH] fix build without webkit
-
----
- src/gui/qgsmaptip.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gui/qgsmaptip.cpp b/src/gui/qgsmaptip.cpp
-index d9fe4a32607..7af6f97672c 100644
---- a/src/gui/qgsmaptip.cpp
-+++ b/src/gui/qgsmaptip.cpp
-@@ -155,12 +155,16 @@ void QgsMapTip::showMapTip( QgsMapLayer *pLayer,
- 
- void QgsMapTip::resizeContent()
- {
-+#if WITH_QTWEBKIT
-   // Get the content size
-   QWebElement container = mWebView->page()->mainFrame()->findFirstElement(
-                             QStringLiteral( "#QgsWebViewContainer" ) );
-   int width = container.geometry().width() + MARGIN_VALUE * 2;
-   int height = container.geometry().height() + MARGIN_VALUE * 2;
-   mWidget->resize( width, height );
-+#else
-+  mWebView->adjustSize();
-+#endif
- }
- 
- void QgsMapTip::clear( QgsMapCanvas * )
\ No newline at end of file
diff --git a/sci-geosciences/qgis/qgis-3.2.3.ebuild b/sci-geosciences/qgis/qgis-3.10.0.ebuild
index 7c4de2ebd699..365b9209d058 100644
--- a/sci-geosciences/qgis/qgis-3.2.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.0.ebuild
@@ -1,32 +1,37 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 
-if [[ ${PV} != *9999 ]]; then
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+	inherit git-r3
+else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="amd64 x86"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+	KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
+inherit cmake-utils desktop python-single-r1 qmake-utils xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python +webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+"
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+),ssl]
 	>=dev-db/spatialite-4.2.0
@@ -41,20 +46,25 @@ COMMON_DEPEND="
 	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
 	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
 	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtserialport-${QT_MIN_VER}:5
 	>=dev-qt/qtsvg-${QT_MIN_VER}:5
 	>=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 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
 	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
 	oracle? (
 		dev-db/oracle-instantclient:=
 		sci-libs/gdal:=[oracle]
@@ -80,14 +90,11 @@ COMMON_DEPEND="
 		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	)
+	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
 	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
 	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -99,8 +106,10 @@ RESTRICT="test"
 
 PATCHES=(
 	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	"${FILESDIR}/${PN}-3.2.1-qtwebkit-optional.patch" # bug 663394
+	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
 )
 
 pkg_setup() {
@@ -109,39 +118,36 @@ pkg_setup() {
 
 src_prepare() {
 	cmake-utils_src_prepare
-
-	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
-		-i CMakeLists.txt || die "Failed to fix lrelease path"
-
-	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
-		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
-		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
-		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
-	cd src/plugins || die
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
+		-DQGIS_MANUAL_SUBDIR=share/man/
 		-DQGIS_LIB_SUBDIR=$(get_libdir)
 		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
 		-DQWT_INCLUDE_DIR=/usr/include/qwt6
 		-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
 		-DWITH_3D=$(usex 3d)
 		-DWITH_GEOREFERENCER=$(usex georeferencer)
 		-DWITH_GRASS7=$(usex grass)
+		$(cmake-utils_use_find_package hdf5 HDF5)
 		-DWITH_SERVER=$(usex mapserver)
+		$(cmake-utils_use_find_package netcdf NetCDF)
+		-DUSE_OPENCL=$(usex opencl)
 		-DWITH_ORACLE=$(usex oracle)
 		-DWITH_QWTPOLAR=$(usex polar)
 		-DWITH_POSTGRESQL=$(usex postgres)
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
 		-DWITH_QTWEBKIT=$(usex webkit)
 	)
 
@@ -163,18 +169,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/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
 
@@ -185,11 +179,12 @@ src_install() {
 	fi
 
 	if use python; then
-		python_optimize "${ED%/}"/usr/share/qgis/python
+		python_optimize
+		python_optimize "${ED}"/usr/share/qgis/python
 	fi
 
 	if use grass; then
-		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
 	fi
 }
 
@@ -204,17 +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
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
 
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
index e3210886844b..e26eca9f9a28 100644
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild
+++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake-utils desktop python-single-r1 qmake-utils xdg
 
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 73aa5dd50222..9813d2056fe6 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.4"
 
diff --git a/sci-geosciences/seawater/Manifest b/sci-geosciences/seawater/Manifest
index b4f7620ee075..b3bb98f0cacb 100644
--- a/sci-geosciences/seawater/Manifest
+++ b/sci-geosciences/seawater/Manifest
@@ -1,5 +1,5 @@
 DIST seawater-2.0.1.tar.gz 2680741 BLAKE2B 5c1e8f5bd3cdc7a093732657d8d774f13d9a00785ea736617b8837076e740eab384caa61ae11b6f429db7bcf57f0ee1af8fd0c6dc917f3c3b50b25ee93a88920 SHA512 9d59d5c41f46311240934e18b8727514babc4e714553ba595017a17b95edf040c10ac7161f607c7e262c751e238a909d55a639a94fab4d4ce004a4c297af1e79
 DIST seawater-3.3.4.tar.gz 22899 BLAKE2B 1f3af9e1d592b2c7075711f0431dc9198c41047e46cefcbc2466eaad92bad1e9894e63e6d3846d08df00ad21df8dc773cd1822915896658fe06e298ed36b83ef SHA512 1e448c0473809ae5022eda6b695d67db85a22767d068d7a025bdb1ad49a09f0f336e5f43b6a2fd869d39082895e45e7fa4ae2af98c1f2d613d28393f88ef27af
 EBUILD seawater-2.0.1.ebuild 520 BLAKE2B b87325fd786d4e96daf1d6eb719c42819131be62214453bfb1b85baf6a94542eaaeb21f70f0b9ec00782343aad93c262955a3b6c453056e210d241940dd6f53f SHA512 db55bd174ef4eb586674c53abdeef1b2bdbb339a9cd190c0de1fda345438b9c8f72e5b8c8a3274690a2fe92662c2312dbeec01bbd24a6e6ace6994fccc2dbcc9
-EBUILD seawater-3.3.4.ebuild 715 BLAKE2B 95f04306c4d1a4d6a478302f778a67c85a5a130058f39fea44877d5f549bbddb1a624033c29a77cd8d91d739f5d284dc14da67f13122ff92f00cb19752bbe9a9 SHA512 44e381d5c8bdd4a264dbe5d3575126c29573aa8a6ce71d2b617bddd5269f86b68ec69d36838c06a5872642c4b8bb346d4b5991c9346e076daf328dcbc685f787
+EBUILD seawater-3.3.4.ebuild 711 BLAKE2B 0bf70e8881efac30c77539902a590ca11f5728934fc260e6d25284e578266a8154d38e15ddcb95a88806c5dfb9c6ba3fafa561692c7a977ff98d0213d21e0c37 SHA512 5c849ae8c90c473130987db73c6d605bf8202c2f1f3366c4a77105432d8d79c305b5e2732b719add661c6a94d58f1ff593bf2a7613033283aecda300c7713ab2
 MISC metadata.xml 243 BLAKE2B 511a8c3d7ae43c1e12c29835e6e64860728fa8446694b8e48b9c817e7efdb1fcd732ef7bfb231f86ae975836d402a9aece805234cba7c65efbe2f24d29558e53 SHA512 8dd5436eaded32c4c5bbf8bd6026ec0089cdf1ed92d43acbf535a8a711d1ce07a4d9650efe4bbdb9c5fa355b2aca45b4e40cbf94c34e14213adb2cbfbc9ec140
diff --git a/sci-geosciences/seawater/seawater-3.3.4.ebuild b/sci-geosciences/seawater/seawater-3.3.4.ebuild
index 87c3c03d00c0..40fd1739c478 100644
--- a/sci-geosciences/seawater/seawater-3.3.4.ebuild
+++ b/sci-geosciences/seawater/seawater-3.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Calculate properties of sea water. Similar to SEAWATER 3.2 for MATLAB"