gentoo resync : 22.12.2021

25 files changed, 119 insertions, 364 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index a81b9c2f581a..f3979c0163fa 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 4d8cdf3f617c..2b72cfe23f54 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-maps-40.5.tar.xz 3542648 BLAKE2B bbc45882e314667def29b8d7491afba2e1649ef62a6898a58b4afd93bd26537af73588d9cecd0ed06fc53c8083ade6d33f468b4a51481886d30abdc13558be80 SHA512 1d53dda1b96fb5a6db4152380f9136f2e66cbc0062434254cc0b47e999c19dfcbde6bc1d6bc787474eab83b29293a1e207cf41b177f7cd01b29ccb15a6628d15
 DIST gnome-maps-41.1.tar.xz 2187384 BLAKE2B 792ada987c513118411233b477373db015e55b5c4da2405d40f69833fbce3d0fdfec4c194fdfa762d5642039c4965db9a606d6206e8c52b16a4f7c26ae9b54ab SHA512 ff750c009c0409bdf87a08b2a89296f5f214f8fa294c7470e99841fc6f155ae14cf9bfd388a65231e03c4c4fdbe5606c90b2bf5897e756a1699a19782f89a5db
+DIST gnome-maps-41.2.tar.xz 2187460 BLAKE2B 83f93f9cf371e4275cb73e9a847be6400a4f736fe605266a1f371bc03af13b37af3bae04d5d0a7dbddd8605c099af92030ed8dec555f1f1b59339c9f907b3b21 SHA512 b0f167797986224d5b51df4be44731409241935513f6863ef844121b8b29829ed6ba1e37a2478b93e79dab5f9825e1632ef74f576f37990c9f9779b8de24cddc
 EBUILD gnome-maps-40.5.ebuild 1500 BLAKE2B c4ada54156ab4d3faf9f6991df7cca4677f6e50165b742545e38d2b3997ba2670b4d08ea4e503f710a2468e365829a225801586edb12a61a00f124a83f119612 SHA512 150c00848281da75a4cabd680686901bc9d4d547e15c26aa44c30fb7c647760d201f28dd754e6dcbfd0176c989b6fdcabbfd035b98c4ecc99dbe869e0cddfdf6
 EBUILD gnome-maps-41.1.ebuild 1502 BLAKE2B 5e9fc6c4e38b790fcf7cbc206d1f0c1b7da5fe36182f4f3bf516ccb823df956b3615b0d062b19a6290008cafb56afedf59bd26c03e58f7c6f062a5ad2d5bc892 SHA512 801383b53bc33c4a8461d879bfffd6fb521caac0d84fabae2824c8c1f8c4bb0d070afa07a156893cdb0ee638ffaf5361dfad6e30654577c34ad6b5975f7a853c
+EBUILD gnome-maps-41.2.ebuild 1502 BLAKE2B 5e9fc6c4e38b790fcf7cbc206d1f0c1b7da5fe36182f4f3bf516ccb823df956b3615b0d062b19a6290008cafb56afedf59bd26c03e58f7c6f062a5ad2d5bc892 SHA512 801383b53bc33c4a8461d879bfffd6fb521caac0d84fabae2824c8c1f8c4bb0d070afa07a156893cdb0ee638ffaf5361dfad6e30654577c34ad6b5975f7a853c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
new file mode 100644
index 000000000000..5ec15782805f
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 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 ~arm ~arm64 ~x86"
+
+# Pure introspection dependencies found by grepping imports.gi in ${S}
+RDEPEND="
+	>=dev-libs/glib-2.66.0:2
+	x11-libs/pango[introspection]
+	>=dev-libs/gjs-1.66.0
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=gui-libs/libhandy-0.84:1=
+	>=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="
+	${PYTHON_DEPS}
+	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/gpsprune-bin/Manifest b/sci-geosciences/gpsprune-bin/Manifest
index bd68039bea7c..973d438461b4 100644
--- a/sci-geosciences/gpsprune-bin/Manifest
+++ b/sci-geosciences/gpsprune-bin/Manifest
@@ -1,3 +1,3 @@
 DIST gpsprune_20.4.jar 1269002 BLAKE2B 616e19f69ce81d26c68714240beae154d66e181067385fa35e0c790c7614d9ec6a1a672d67494c96c443d4c30b20fc7122d2a88f8608ca407f5f5b22fa0cf8e6 SHA512 78347793982e8e39f9747a20d1f366376bed93099c84f2e168dc3ffdee041ff7c3e90e48d3f076637d83f8f5f1e84bd18dbe2a35bef68ce972a4f541315a2f64
-EBUILD gpsprune-bin-20.4.ebuild 1561 BLAKE2B a88e3f7e2c65593cd48f3bd0cc22041dbcd1d37f275c302dfabc9002a7bff6c80c0391086de3f85eed4e60ec636df7fe2e9761cafc9e44dbd62f4cf716be9729 SHA512 548a972c3995249d694f460b93ba8837e182e60b7b2a47acaeef9eac2446ffed44f0d97f72b34031e09dacec2d2b5d58eb0a2f3885b5cccf43538dfff8546ee2
+EBUILD gpsprune-bin-20.4.ebuild 1546 BLAKE2B d9538c01dd22f7848929871b04cc2ec88d6b8302a03bb5ad3ac74662bbe60ec45a406f9d9ec154cb0ab01aeca14e9a5c8544388709df0868b5e2652a7655ca59 SHA512 9d7f06bed0312e722f29c64494e07077c422c451ad9c29793c335ad9b29155b60c97816211799f64694b67a7154444e056cd5d7699a0c03d161458504198f1ae
 MISC metadata.xml 261 BLAKE2B 36ef7307b8c913ceda7118a783c7f0c263e94e804f7c75e34007573f82dcddf62cfd202716bf5fb6e0adcad28a5a453d516f4caf4d2ca2eed6d076c6f7824afb SHA512 c24567fd3f715c867c52662d520fbf423d407a2a364d4ea9e5e66610cabb3728b494610106110abfac2b36554c4ad4b63f640e92f8d1b22bdea512037e461602
diff --git a/sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild b/sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild
index 68975bc30884..64683646638f 100644
--- a/sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild
+++ b/sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit desktop
+
 DESCRIPTION="An application for viewing, editing and converting GPS data."
 HOMEPAGE="http://activityworkshop.net/software/gpsprune/index.html"
 SRC_URI="http://activityworkshop.net/software/gpsprune/gpsprune_${PV}.jar"
@@ -61,6 +63,5 @@ src_install()
 		doins "icons/${size}/gpsprune.png"
 	done
 
-	insinto /usr/share/applications
-	doins gpsprune.desktop
+	domenu gpsprune.desktop
 }
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 4f1ed9cd393e..226372390b1c 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,10 +1,8 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
-DIST gpxsee-9.0.tar.gz 8538085 BLAKE2B 4c8cdabba6082689e98561eccb399bd2e8c4fdce6f229dae2c4a5576e0adbd05380538c906654d7400f5537d370d368193efdb380100cdb79a3805fa9e80f12c SHA512 3eeaaadd48e838dfa56a499ff44cee681f02c6e3e34ec500c70024926af854966f0ddb81b5b88c3f1741350eed3207d864a83daff93009f3f6a72b9fb69357d8
+DIST gpxsee-10.0.tar.gz 4994900 BLAKE2B 5f0e59655da285461de39bcac51b65ae4965723a5a438b88eb55b22f0e9398db94edce283f0bd1218d0b78375edf9e9d3e2148079cf12c9927819a0235df7f08 SHA512 bc081fdc9000be6f605b137fe5de282d11508b994b34d1e515913e33829516893c7748d9c5a5ec2639e36e665db8dc99656364498abd0e21069a7fc34b251f9f
 DIST gpxsee-9.10.tar.gz 4837219 BLAKE2B 529a47cafc02d563abf3cc8b80a06ec2b850c935a0e4e0e6933028c6e7d630e25b78db453130efe7e062b6d8bfa288bb22f58aff3f27b7d51025132894a6db27 SHA512 ab7c47e6ba583ca008867d9586320204a2d862ad1d6c91ad0b6e8dfde5854c0c6956be597938aa9077183a48d9c00ce1b232ff87f36b9a4cd58ad096b1fd1342
-DIST gpxsee-9.11.tar.gz 4835356 BLAKE2B a1306471e5fe71db76f67a80a22fc7dc8b52b3fb72f108cd3bb7babfb144228be469c0612d320aabbc39dc559c055eae5d0c54912df1d4798ebfc300505ed7cb SHA512 f6cc924b448932aa17c817d909320355f0f8b4b97c86b2ecafc3854f7d2d11541885e3b1402efe473f99b7d5da1909c9c26b3238a4815c325acd57059b100d3e
 DIST gpxsee-9.12.tar.gz 4977257 BLAKE2B 30060478cef417f8d9fe87878ecc1338336e48906eaa3eb7735d086b47fa8a7cc2154e8719e0f92109d4e4f881d90f6ebe1f6088a9684fdde42672c4eef9d664 SHA512 47c414f5a6fd61b93119820b24f49a73575a260c986e3403776322f15ff514de82a23444369ef4803fa82c512f9af49f5acc28e719633173c7961f2d34b7cd4b
-EBUILD gpxsee-9.0.ebuild 1120 BLAKE2B a08d58f04255fd34faa739551b640756018ca8ad9f9036192d373c64b34020790a441550142d13fbc4bd682eaa8ec24098c82dfe6c8c8fd6a9f826f519038e71 SHA512 1b9f155067f8d47fdd6d450147f1ae760146ee0aa65acd12a37e86958ff8c620ac5c0c226c24e3b9170a54c401e2ca47e87cd6b17de24e63da0c77afe274ffff
-EBUILD gpxsee-9.10.ebuild 1122 BLAKE2B 955e43ef2360e4b9e7beb5bb0a9fd2ba8b3f6d602b9f61bb9e25ccf321077012c4f202aa35980a3215015d3589846c89b1d0976c9100099fcea7fa59b8941f7c SHA512 d3f1381937115969adb6d1eede760b0bbc518da84b6b777a6aa57f66b5333d1dccbd7fd2bb5c2dba991286c5cbc95dd2dfd7a19bafa7361644bf55f74f5cebcf
-EBUILD gpxsee-9.11.ebuild 1122 BLAKE2B 955e43ef2360e4b9e7beb5bb0a9fd2ba8b3f6d602b9f61bb9e25ccf321077012c4f202aa35980a3215015d3589846c89b1d0976c9100099fcea7fa59b8941f7c SHA512 d3f1381937115969adb6d1eede760b0bbc518da84b6b777a6aa57f66b5333d1dccbd7fd2bb5c2dba991286c5cbc95dd2dfd7a19bafa7361644bf55f74f5cebcf
+EBUILD gpxsee-10.0.ebuild 1127 BLAKE2B 3933226f6889696d60554467117c4029ebc945c7251183f3b13f4c53982519420fc9eb0a15d2ad1a613dc766e2633031be233af7e3cf08c8842f1b57fb9d3245 SHA512 7dda94addff64c2342ca9791f3bc91af912fde65356fd402694cd68c0d0fa4ec58b55fd3899cfa235eb751f0ee728fd82bd643a5b1cb1a55d1c850a2457b5033
+EBUILD gpxsee-9.10.ebuild 1120 BLAKE2B a08d58f04255fd34faa739551b640756018ca8ad9f9036192d373c64b34020790a441550142d13fbc4bd682eaa8ec24098c82dfe6c8c8fd6a9f826f519038e71 SHA512 1b9f155067f8d47fdd6d450147f1ae760146ee0aa65acd12a37e86958ff8c620ac5c0c226c24e3b9170a54c401e2ca47e87cd6b17de24e63da0c77afe274ffff
 EBUILD gpxsee-9.12.ebuild 1122 BLAKE2B 955e43ef2360e4b9e7beb5bb0a9fd2ba8b3f6d602b9f61bb9e25ccf321077012c4f202aa35980a3215015d3589846c89b1d0976c9100099fcea7fa59b8941f7c SHA512 d3f1381937115969adb6d1eede760b0bbc518da84b6b777a6aa57f66b5333d1dccbd7fd2bb5c2dba991286c5cbc95dd2dfd7a19bafa7361644bf55f74f5cebcf
 MISC metadata.xml 453 BLAKE2B e7f32299798b2f8b3d91dcdf0c4c024e8296a3cfa0f0a35acfc52475b4b2df0f276b6a9e9718a2f3593dde7fd9ee11afc06c601235db7e272ec552b072bd139c SHA512 c66111588383b1363eb07d3f1d9efd2adad37ee6bac9d159847f642b2ed864e1bb26db8f67fc94e9a5ca4d28623e8dc8d15395132e46d1e4fca17cbf6986dc35
diff --git a/sci-geosciences/gpxsee/gpxsee-9.11.ebuild b/sci-geosciences/gpxsee/gpxsee-10.0.ebuild
index 01738be156d9..ddca8ed2552c 100644
--- a/sci-geosciences/gpxsee/gpxsee-9.11.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-10.0.ebuild
@@ -16,14 +16,14 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RDEPEND="dev-qt/qtwidgets:5
+RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
 	dev-qt/qtsql:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5"
+	dev-qt/qtpositioning:5"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
diff --git a/sci-geosciences/gpxsee/gpxsee-9.0.ebuild b/sci-geosciences/gpxsee/gpxsee-9.0.ebuild
deleted file mode 100644
index 7afc1386fcea..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-9.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk zh"
-inherit desktop plocale qmake-utils 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}"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
-
-src_prepare() {
-	default
-
-	plocale_find_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	plocale_for_each_disabled_locale rm_ts
-}
-
-src_compile() {
-	lrelease gpxsee.pro
-	eqmake5 gpxsee.pro
-	emake
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README.md
-}
diff --git a/sci-geosciences/gpxsee/gpxsee-9.10.ebuild b/sci-geosciences/gpxsee/gpxsee-9.10.ebuild
index 01738be156d9..7afc1386fcea 100644
--- a/sci-geosciences/gpxsee/gpxsee-9.10.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-9.10.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND="dev-qt/qtwidgets:5
 	dev-qt/qtgui:5
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 3213fdf1e8bf..0911ccf0c0d8 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -3,6 +3,6 @@ AUX grass-7.8.5-bool.patch 4472 BLAKE2B b48a2138b9299e91eb15ebe62f29f0a677dfc690
 DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
 EBUILD grass-7.8.5.ebuild 6993 BLAKE2B a772460a6bc1ce8c2b50bd68dafb4b98c0771bab4ed72e99f685064081f7f9e1edb3abfc9fb308579e864f12beb282383029e89455ab73e4c235ebdc5ec81117 SHA512 cf69543c0883fe7d93bedb72280d04ca8055c6659bc84a6016a86c58c273487aba68948c84b6bc5ff3c84223c375d5ac4c32f7ca53dd175c2e19ded5c2a223b6
-EBUILD grass-7.8.6.ebuild 7051 BLAKE2B 6ec47fc0cd471ceafcfb36a20ec8838d404ee4afc4e4bd6ae128e75f1b0da1664904f66d444d98a8ffd5cc3f56c156bb85f31366ccc6ede3c5d17fbd0f7b22f0 SHA512 45ec6d127211da1f4759a3b27569da68c49c6c26b41e43a9ecd585ca06078cfd163e2a1b13a8e6b2dd6e503209281462e22f7792a9dbeae6de3bc27ad05420c3
+EBUILD grass-7.8.6.ebuild 7049 BLAKE2B ee0747641286d7437da3c3f547f63e0ad93c70ae8f0edd7f25d11d94e6e95fa37d364dfa513bdf107f282191394379c1312a9963951fbc6a287f791a73e8042c SHA512 df96f673860271084a2840e9006f608edf0d85e491295544d56b22cd8e3cbbe30d001b24507cbc6ec0ca75df69760415a42b7bfdf9998c14083b364d05095f5c
 EBUILD grass-9999.ebuild 6892 BLAKE2B 1396540d588329e56f3b9eef76efcdcae283aad5904bf633d8931312fba180c6d498fb967fc4a9f4b459f269fbbaa11ddb166f4ad55a24fc522817c8cde68ff1 SHA512 cf7162d2b39b396d4b701ba0bfd13a01003a98f857756dc62bd55ee5ecea472603f36e7589c2989f0ee066bb644402df74e4303b1e90311f5ce09f045f04497d
 MISC metadata.xml 1165 BLAKE2B 5cfa38c94f3855681ac0f61ae88c58de766eab048601d8c45324f192de975287088ab424030857f4a84ae6eea01fc0e9033ab36c00e679645545cd857722d060 SHA512 58a86942daa71543093c95015366a08f75fa88075330ffda2431e47d93d79f60c8f60b90c05e2a068283045f54db8f8f45dcb36664268a1207e90fa90bd6d63b
diff --git a/sci-geosciences/grass/grass-7.8.6.ebuild b/sci-geosciences/grass/grass-7.8.6.ebuild
index 3cb671b723e1..5f6717ab03ef 100644
--- a/sci-geosciences/grass/grass-7.8.6.ebuild
+++ b/sci-geosciences/grass/grass-7.8.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7.8.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
deleted file mode 100644
index ccb2cc07d692..000000000000
--- a/sci-geosciences/josm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST josm-10966.tar.gz 61397663 BLAKE2B 31fce57126f0a311c1e7d815c1a26406c7d29429c737fc2405c3fed4240787f1e25b08ad7ca1d9b476bbf2d722a4f03db4dc6cf4a2911edd73f77165d253ef82 SHA512 a710e8c8b696955140a858dcb53184515a5c0d7b8cde71099258690b26cc980b903cfea2e4ef9b7fbf524e3b8a153f71d4464260294b0fdcf8941812ffe6b5ee
-EBUILD josm-10966.ebuild 2088 BLAKE2B 631c89036da2c3e582a671b6450b2020b85bc9b55e1f26b51a5666223d9bfc5134e77bb0fddcb6896e8d328027b59afa1b4204430ea3ff4be223f68ec3210f0b SHA512 b6c542427427ea97e7002baa91e40b82051a00e399d183b630ba52620ccba9fe91a8d0816b9cd685182c58304d81bc2b49a3ce0d42e6a1256dd86325d1b67c6a
-EBUILD josm-99999.ebuild 1445 BLAKE2B b862ebc9400f78a6338410fa35ed578f90aa600182c393e007e8c35c09ba68108b77aec66ed92cb10914c6cbc24cfd85b433e117fe4accc27fb10e318d3dc8e1 SHA512 b4337460b8904e36dd30319dc5171c14c36f6f68845c3d4f09c2f7413201e6e142c6f82064e33a92e80de42ca4f2b17a94bacd4a7c24db2a0a4f5567745f1a54
-MISC metadata.xml 276 BLAKE2B 51ed91dbe57f48aa4af2c9fa6fc16fa70996a95e31096505ec3e9288f04182aaf09feb0cd3e2e1c45e37dcffc528c788995ee4c89ea73b3c736dd9ec6172788c SHA512 b0a243998a4962647e6e5bbf04f9d92837c969c5a2f44d1c752a032cf3f0308d0ad82dcab968781b8edb88aa49748e27da617e7c3587647d4637db0912a4cb95
diff --git a/sci-geosciences/josm/josm-10966.ebuild b/sci-geosciences/josm/josm-10966.ebuild
deleted file mode 100644
index a357e498979b..000000000000
--- a/sci-geosciences/josm/josm-10966.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_ANT_ENCODING=UTF-8
-
-[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
-ESVN_REPO_URI="https://josm.openstreetmap.de/svn/trunk"
-inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
-unset SUBVERSION_ECLASS
-
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="https://josm.openstreetmap.de/"
-# Upstream doesn't provide versioned tarballs, so we'll have to create one on our own:
-# REVISION=${PV}
-# mkdir -p josm-${REVISION}
-# svn co -r ${REVISION} https://josm.openstreetmap.de/svn/trunk/ josm-${REVISION}
-# cd josm-${REVISION} && ant init-svn-revision-xml && cd -
-# tar -cz  --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION}
-[[ ${PV} == "9999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == "9999" ]] || \
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-IUSE=""
-
-src_prepare() {
-
-	if [[ ${PV} == "9999" ]]; then
-
-		# create-revision needs the compile directory to be a svn directory
-		# see also https://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
-		sed -i \
-			-e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
-			build.xml || die "sed failed"
-
-	else
-
-		# Remove dependency on git and svn just for generating a
-		# revision - the tarball should already have REVISION.XML
-		sed -i -e 's:, *init-git-revision-xml::g' \
-			-e '/<exec[ \t].*"svn"[ \t].*/,+5{d;n;}' \
-			-e 's:${svn.info.result}:1:' \
-			build.xml || die "sed failed"
-
-	fi
-
-}
-
-src_compile() {
-	eant dist-optimized
-}
-
-src_install() {
-	java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
-
-	newicon images/logo.png josm.png || die "newicon failed"
-	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
-}
diff --git a/sci-geosciences/josm/josm-99999.ebuild b/sci-geosciences/josm/josm-99999.ebuild
deleted file mode 100644
index 58def9eb19e5..000000000000
--- a/sci-geosciences/josm/josm-99999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_ANT_ENCODING=UTF-8
-
-[[ ${PV} == "99999" ]] && SUBVERSION_ECLASS="subversion"
-ESVN_REPO_URI="https://josm.openstreetmap.de/svn/trunk"
-inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
-unset SUBVERSION_ECLASS
-
-DESCRIPTION="Java-based editor for the OpenStreetMap project"
-HOMEPAGE="https://josm.openstreetmap.de/"
-[[ ${PV} == "99999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == "99999" ]] || \
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-IUSE=""
-
-src_prepare() {
-	if [[ ${PV} == "99999" ]]; then
-
-		# create-revision needs the compile directory to be a svn directory
-		# see also https://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
-		sed -i \
-			-e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
-			build.xml || die "Sed failed"
-	fi
-}
-
-src_compile() {
-	eant dist-optimized
-}
-
-src_install() {
-	java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
-	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
-
-	newicon images/logo.svg josm.svg || die "newicon failed"
-	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
-}
diff --git a/sci-geosciences/josm/metadata.xml b/sci-geosciences/josm/metadata.xml
deleted file mode 100644
index d3369ac77939..000000000000
--- a/sci-geosciences/josm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-geosciences@gentoo.org</email>
-    <name>Gentoo Geosciences Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7cf70cf38357..2e14525d8cda 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,14 +1,11 @@
-AUX qgis-3.16.0-cmake-lib-suffix.patch 507 BLAKE2B 0a8943fe06f4065d5c0b1cf7797ecedb9fed40616121cbfd9f0c97568dd7da0b7c3e6a526b9408b6268b20988fe7a216d94cc394c01a693fcac6b321f7c7ca01 SHA512 5014fb01e7caa56f5fcb8a7f6b81e1f99acac50e7edff524071808f2b145f87dd440ce8c4897b7c781cb8e30c5ee3a873a6d977c6ecd65a54dc3157de8b0bfd1
-AUX qgis-3.16.1-default-qmldir.patch 899 BLAKE2B b5f573445c80cf991864320d80644aacdfc28095f3657839dec0c084544d44405857a2cf1f644c8a47ac271cf51953f861cde285f37e30c490623fbbf96f7470 SHA512 4d794cdc730c55d59163bce7d1c23cab7ab3c384e09dccfe3b541d12ef365a180035fd51d998128c59c493b6039fff13dafe392c5935bbdedb39c22c05748a5c
-AUX qgis-3.16.1-featuresummary.patch 905 BLAKE2B 318239edfc14562cccf0a0c79e330fc24c03f8468d4df3a3ece0286f2448df275d117afc0ed63f8d7c682cebef84a62fda3a992a9e4746f37fe1e8b52e82ecf7 SHA512 c3b563fcfac199756f4f8212cf1f0ceb301c7d4cc751d2b9b1b6f3f8d69d88ae1d6cab33c952a2ff15bdbe33a4151f93eaf9308a486ca330fd45c533f9fa3b36
-DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826 SHA512 b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
+DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30 SHA512 6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-EBUILD qgis-3.18.3.ebuild 5334 BLAKE2B d913ed8bc2ebb13f0d3dc61a6a50d1e8895efc557eb4951649591c9e9428f4121136826ea24a017d6c40e154fb21a61de32526309e51a765ddf46774272c7ed0 SHA512 9ab03ed7a1cd3c83392016c0f61ab7f7d38f661a9fbbd3673153dd7ec15e3335b3b0eca98708df3d21bd93a7a7a5602ad12cb8e1901efca0b2c32ce9ac7202f6
 EBUILD qgis-3.20.3-r1.ebuild 5383 BLAKE2B 8cadb34d9c5701998ba2552b1e53c9a5bb03b56d65004b400964425cd30f81e886e66ad985b2afcff93af40b69e97895a03f5fb0f69cb1f92f0a83093ec97852 SHA512 cc7b8e34986dd40cc8b111edff2547c88743cc6263ef4139e604c49c38482fb6ad5c3f14d2d739b2949548257b407f837f621e2084a3bc62830735dae4b0e9de
-EBUILD qgis-3.22.0-r4.ebuild 5421 BLAKE2B 6f5602d442d9835a423f4be625e0bfcf326697dee5cca65f52ed4b9608e68bdbdc14e1cc041a9d4f4210f42bc26d79e202359c0a4c429b9bc4fa7a051bfcfef8 SHA512 2a97cd87be7107af9ff9dcd33ba4b8186895d976eaaaff0e1ba86dc1f77b1827e96d8d3f84dec339e07f329fc1c65c1b6f5543cb9664667a4399ea12f91f9ac4
+EBUILD qgis-3.22.0-r4.ebuild 5420 BLAKE2B dc36fe6b812a086e27fb2d64704116820f2e69985c7a85ffa8369589fe965f0b49bf039776f01435d6f7af06f8e0766cd3ec5be168924686a16b81087c8eb863 SHA512 bb9cf572439f8f4993898b62047bea605cb1c6b5315aaeb319597f831dd62b9aee4eb8112749eec7177e738e54a5b363dc86f3ab70a8839a994996d0f5ab78b5
 EBUILD qgis-3.22.1.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930aba1116c813c8598c317af059280e4d8f2357b684b759501c4c6665957f1f8830acf3f130ce7688081759c3f6 SHA512 ec6eb7592c0b51d3e3e48d9ccb2ad2c25ef6e07c30d571a4efdc867be0105c721a82a7998d3d16405e174430d323010bcc56a784f50a5d6da8a47ae47e088fcb
+EBUILD qgis-3.22.2.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930aba1116c813c8598c317af059280e4d8f2357b684b759501c4c6665957f1f8830acf3f130ce7688081759c3f6 SHA512 ec6eb7592c0b51d3e3e48d9ccb2ad2c25ef6e07c30d571a4efdc867be0105c721a82a7998d3d16405e174430d323010bcc56a784f50a5d6da8a47ae47e088fcb
 EBUILD qgis-9999.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930aba1116c813c8598c317af059280e4d8f2357b684b759501c4c6665957f1f8830acf3f130ce7688081759c3f6 SHA512 ec6eb7592c0b51d3e3e48d9ccb2ad2c25ef6e07c30d571a4efdc867be0105c721a82a7998d3d16405e174430d323010bcc56a784f50a5d6da8a47ae47e088fcb
 MISC metadata.xml 1483 BLAKE2B 7e376bf280c7004be4e1122616586c105c0eef696e787586736f19565e8df31d994d3b4fddde3344432adf1ffb99afaac2acfe1f70cd5cd8ee5344fe1f65dc48 SHA512 cbc63fa480c07625e1e6317fcc98dababb209ee65a9aa461ab1897aab861df7d5db0cad9f4a20e8787c11ea6300f90f73706bf7ca7dc65965681731ac23cff1c
diff --git a/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
deleted file mode 100644
index 1edba1f0e747..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.16.1-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
deleted file mode 100644
index 9a57d45984e2..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ad432e066fcc3d985fb5a451ad128cdf35c1dad9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 20 Nov 2020 20:41:36 +0100
-Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 61b4c863d0..e7d0bdc8d3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -750,7 +750,7 @@ if (WITH_CORE)
-       set (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
-       set (DEFAULT_PLUGIN_SUBDIR  lib${LIB_SUFFIX}/qgis/plugins)
-       set (DEFAULT_INCLUDE_SUBDIR include/qgis)
--      set (DEFAULT_QML_SUBDIR     qml)
-+      set (DEFAULT_QML_SUBDIR     ${DEFAULT_DATA_SUBDIR}/qml)
- 
-       set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
-     endif()
--- 
-2.29.2
-
diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
deleted file mode 100644
index b1098175647c..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f0fd6e80ad034cf7c49f4ba3708819424b6857b2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 20 Nov 2020 20:41:06 +0100
-Subject: [PATCH] cmake: Use FeatureSummary
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f581b2c889..61b4c863d0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -111,6 +111,8 @@ if (FORCE_STATIC_PROVIDERS)
-   set (HAVE_STATIC_PROVIDERS TRUE)
- endif()
- 
-+include(FeatureSummary)
-+
- # in generated makefiles use relative paths so the project dir is moveable
- # Note commented out since it cause problems but it would be nice to resolve these and enable
- #
-@@ -1035,3 +1037,5 @@ endif()
- if (UNIX AND NOT APPLE)
-   add_subdirectory(linux)
- endif()
-+
-+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.29.2
-
diff --git a/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
index c8150cce4fe3..19fa8cd32b85 100644
--- a/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
@@ -12,7 +12,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 desktop python-single-r1 qmake-utils xdg
 
diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.22.2.ebuild
index 9f48c0bfa4e3..af65e82db8df 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.2.ebuild
@@ -3,21 +3,21 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="sqlite"
 
-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"
+	KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
+inherit cmake python-single-r1 xdg
 
 DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/"
+HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
@@ -25,19 +25,17 @@ 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:5
-	sys-devel/bison
-	sys-devel/flex
-"
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
 COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[ssl]
+	app-crypt/qca:2[qt5(+),ssl]
 	>=dev-db/spatialite-4.2.0
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/protobuf:=
-	dev-libs/qtkeychain:=
+	dev-libs/qtkeychain[qt5(+)]
 	dev-qt/designer:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -45,18 +43,18 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
+	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos]
 	sci-libs/geos
 	sci-libs/libspatialindex:=
-	>=sci-libs/proj-6.3.1:=
 	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.3:=
-	>=x11-libs/qwt-6.1.3-r2:6=[svg]
+	>=sci-libs/proj-4.9.3:=
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
 	3d? ( dev-qt/qt3d:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
@@ -68,21 +66,23 @@ COMMON_DEPEND="
 		dev-db/oracle-instantclient:=
 		sci-libs/gdal:=[oracle]
 	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
 			dev-python/httplib2[${PYTHON_USEDEP}]
 			dev-python/jinja[${PYTHON_USEDEP}]
 			dev-python/markupsafe[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 			dev-python/owslib[${PYTHON_USEDEP}]
 			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_USEDEP}]
 			dev-python/pytz[${PYTHON_USEDEP}]
 			dev-python/pyyaml[${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.3[${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 			<dev-python/sip-5:=[${PYTHON_USEDEP}]
 			dev-python/six[${PYTHON_USEDEP}]
@@ -95,21 +95,17 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qttest:5
+	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
 "
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
-)
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -117,8 +113,6 @@ pkg_setup() {
 
 src_prepare() {
 	cmake_src_prepare
-	sed -e "/QtWebKit.*.py/d" \
-		-i python/PyQt/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -128,6 +122,7 @@ src_configure() {
 		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
 		-DQWT_INCLUDE_DIR=/usr/include/qwt6
 		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+		-DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
 		-DPEDANTIC=OFF
 		-DUSE_CCACHE=OFF
 		-DWITH_ANALYSIS=ON
@@ -137,7 +132,7 @@ src_configure() {
 		-DWITH_QSPATIALITE=ON
 		-DENABLE_TESTS=OFF
 		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GSL=$(usex georeferencer)
 		-DWITH_GRASS7=$(usex grass)
 		$(cmake_use_find_package hdf5 HDF5)
 		-DWITH_SERVER=$(usex mapserver)
@@ -154,9 +149,12 @@ src_configure() {
 	)
 
 	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass78
-		)
+		readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
+		readarray -d'.' -t v <<<"${f[2]}"
+		grassdir="grass${v[0]}${v[1]}"
+
+		GRASSDIR=/usr/$(get_libdir)/${grassdir}
+		mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
 	fi
 
 	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index a8b73dc8b49c..53ee68929cb0 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,6 +1,5 @@
-AUX qmapshack-1.15.2-no-hacks-kthxbye.patch 1369 BLAKE2B 01a896d00a15553dbf027d957ebb813f8f211f00e885e80f0cebf34f314fbfab5de0bd601a6a82297ac3ef746d5f2a91903b26cae692c00156409deff6df13cd SHA512 86319948c6f3c7f9e32a19ab88c2de9cd8acc858a7c8c7f02f612d5fb343cae5dbf36f27266e09481cfe5024c91b8e6985b84d83828cb275d0ac27e6deebecee
-DIST qmapshack-1.15.2.tar.gz 46899954 BLAKE2B b7121331039d8fedf6c44ef591e5f7a637787201bed1763bad026f866060d60a756f18858e76d95ea2420a3183f36147f2c72d151f377e8f2bc9108832266ff4 SHA512 536ba1c2fb3516560307c18eb76ef2b86fecaa1bc0fa4bcef25c8eb2e6c6dee5c3a9a81d6a9d05a147234df7c703937fd9e841696316c350694b0494705f885c
 DIST qmapshack-1.16.0.tar.gz 54233332 BLAKE2B 8507018e65072856455e500aae59db146f68b7a1cf5eb2311ee3526044f8fafcec0034ac4f7a473c95ac71bcad8eb057bfc6724f3c80caff51aadba9e16fc412 SHA512 768fe7331d2bc2f2bbadd8c9296012e718f52863c4dfc29f000a5417ccf83297791333be9a20b9d49dcc7b92a779184503e8315b1f7ca258efc9f539ef7262f4
-EBUILD qmapshack-1.15.2-r2.ebuild 1282 BLAKE2B c149bdc91387d706c25c341088ac5663a7a536247a9d7662c2b29b5a621e4bfe3fa331ee045b7397a6c45a66a72f4a02225fd91c5d07eb05fb7f4d2265c2d293 SHA512 b4161a42a97ae5c6c285d4c381462753cd17cd79fe6b72e023a871405531de4964a9c1aedf985d08839f4637b61720bbb88c148881c3056318c434904a170ba3
-EBUILD qmapshack-1.16.0.ebuild 969 BLAKE2B 86f3517a30da1b086b587ad304d628c00351e18d3ecdc9b3fe12b9d8aeab9e24350fa4f2dd10033917609a4e311811c9c617817a0d11c10b1e74fd4befda6218 SHA512 43c58531b9b231ba9392dd53d18df0afc4454a8cfc336a9f6e905015597651abb228c789318c375840cbc715e0d22d0e32100275f0276fecf82b7a2165f4d1a6
+DIST qmapshack-1.16.1.tar.gz 54433326 BLAKE2B 58d3fff752187418552cba1d89b3ebd0082af379204b3c0b79cb8f8096cd422d3a9d347f7b91379868b37092469c5ef6187e67bfb7d0c3c07e18a65df0b488f1 SHA512 cd6c1818c2468a4654222d165bfa7278dea01890d4065a359942ce16ee1c643b54f86a94a30632bc414a1ec22e04ea340109fc89ca6c340eb717f8e86468e281
+EBUILD qmapshack-1.16.0.ebuild 967 BLAKE2B 86b7bf4ab46ca6c1a5d4fd923c09574464dea8c6a3d8ed4e45d660b295e93af3ab34274da97570ba622b63e541c5a732042ec9096f8e86462af9a83ca5b9fab5 SHA512 ad24da0b305c408af1bc7b3feade6b31db7088bbb54fd04d88c15b171cece3b18320cad2c3d4ada436d00b0ed63b18f92d0cdcb2045f95b85272ce034e863ee6
+EBUILD qmapshack-1.16.1.ebuild 969 BLAKE2B 86f3517a30da1b086b587ad304d628c00351e18d3ecdc9b3fe12b9d8aeab9e24350fa4f2dd10033917609a4e311811c9c617817a0d11c10b1e74fd4befda6218 SHA512 43c58531b9b231ba9392dd53d18df0afc4454a8cfc336a9f6e905015597651abb228c789318c375840cbc715e0d22d0e32100275f0276fecf82b7a2165f4d1a6
 MISC metadata.xml 832 BLAKE2B d5194f18fd470325a3c98e268794bc01c4adc951a88f7548a52291cafbf010ded0e71beec3b902021e4b318eb5d21b35d2397475df948acec8f5683d003c576a SHA512 d5c8cc820bba367ace5ac27c714b735c22b456d71248cce2a4ed5c67eb80033c3690127887cb3a181628a836dc42c322508058363ec57b06ae823b43aaf63f2f
diff --git a/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch b/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch
deleted file mode 100644
index 99a55d694fb5..000000000000
--- a/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/CMakeLists.txt	2020-12-07 17:13:38.000000000 +0100
-+++ b/CMakeLists.txt	2021-02-20 20:01:41.706789439 +0100
-@@ -18,25 +18,6 @@
- endif()
- 
- ###############################################################################################
--# Do distribution dependent stuff
--###############################################################################################
--string(TIMESTAMP YEAR "%Y")
--set(EXPIRE_YEAR "2021")
--set(DEBIAN_RELEASE_INFO "/etc/debian_version")
--
--if(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR APPLE)
--    message( STATUS "Apply patches to fix build system on Debian")
--    execute_process(COMMAND bash "-c" "patch --quiet -p1 < FindPROJ4.patch"
--                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
--                    OUTPUT_QUIET)
--    execute_process(COMMAND bash "-c" "patch --quiet -p1 < FindQuaZip5.patch"
--                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
--                    OUTPUT_QUIET)
--endif(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR APPLE)
--
--
--
--###############################################################################################
- # Define project name and version tags
- ###############################################################################################
- # this is not only the QMS version it will be the package version, too.
diff --git a/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
index 6c1736186d87..a9b713177f55 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild b/sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild
index 233c124fc27e..6c1736186d87 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -26,30 +26,17 @@ RDEPEND="
 	dev-qt/qtwebengine:5[widgets]
 	>=sci-geosciences/routino-3.1.1
 	sci-libs/alglib
-	sci-libs/gdal
-	<sci-libs/proj-8:=
+	sci-libs/gdal:=
+	>=sci-libs/proj-8:=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
 S="${WORKDIR}"/${PN}-V_${PV}
 
-PATCHES=(
-	"${S}"/FindPROJ4.patch
-	"${FILESDIR}"/${P}-no-hacks-kthxbye.patch
-)
-
 src_prepare() {
 	cmake_src_prepare
-
-	# TODO: upstream
-	if has_version ">=dev-libs/quazip-1.0"; then
-		sed -e "/^find_package(QuaZip5/s/5          /-Qt5 CONFIG/" \
-			-i CMakeLists.txt || die
-
-		sed -e "s/\${QUAZIP_LIBRARIES}/QuaZip::QuaZip/" \
-			-i src/qmapshack/CMakeLists.txt || die
-	fi
+	xdg_src_prepare
 }
 
 src_install() {