gentoo resync : 25.03.2022

9 files changed, 381 insertions, 40 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 6e4a9bb2f895..b9431b9dd917 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 76273fc71802..2b4fcdae031b 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,4 +1,5 @@
-AUX gnome-maps-meson-0.61.patch 916 BLAKE2B f2affee9ce30596872b806da7833ec5f9dcf21db26b3ff2f5b9688b45658f40388c7103bbb0dd03de314c5d5e556c91229b86afda7f2081b876d8dce9b4c6af8 SHA512 a201b6e631c8bf8dc6d15c864266414eb659740d34bdfcc3fa021ac03c6585012e921c77135acde6b4be06fc2f1e7828e30de4ca2e7595f72b4f082bc6b00092
 DIST gnome-maps-41.4.tar.xz 2187076 BLAKE2B bb35925d1b69d50c65e3ffe68386242b776c2089bea3b2bfe88383f1a8fba4045474a1c8fc1c5d07a5b207ad953396d3a76af77fbdf984d286b5e242f9eea78f SHA512 605de671f85ae38a8dc79e58594f2170215e8a070377b1d9ebded9891425898bb40613f6acee1c95f5ea2e0d95e6a8c25757665a5aa890831325701b1abbc8fa
-EBUILD gnome-maps-41.4.ebuild 1507 BLAKE2B dfeae112e815cfa9a3d7bdf021a988ac539366ffaba065fc901331b24a8a9f90fc3cb677f21bb26c5781b4b4e5920f02c9e1be6783a4d73cd0e5ec7bf51fd66f SHA512 cedd81bde40b79aa4889714186375d8796ffa78d1dd6480476b894a5f9da6700e03feac73c5d0e959ffc81e6ad73b29ef6fa2f52bbe64f929113eb924a843ab6
+DIST gnome-maps-42.0.tar.xz 2315828 BLAKE2B dca0f7845b257780701186adf3408cf41797b235969dadf1fe73003b9e52b3ab26d39f8190336616d697bf87eafb2e1abd05a4da9de4837153237fd08e382854 SHA512 888caa6418a8afea6d334b90f28eb865e3955c0534df25d458e6b3a063944d09c46a3775a3d4953a968980446f2be69bd0c5c4183b3fc8419ed1f7bbb812429c
+EBUILD gnome-maps-41.4-r1.ebuild 1510 BLAKE2B 3a928ead826d4e54969b224c9f59da2239b542bf2f6e9f364e3bfc185717473aec4a1563174852fbefaec37fa20e3f8cee42eaf88e3a5ef25d80d7b7461c0f04 SHA512 f29d8940faa247f70ac479bf6dd3c968a5552c7e7a1d57831e9765e0716fa180794fec79932a3d5d46caed3c32d8a999ceb368fd9d1aee281a6fa988266fffcf
+EBUILD gnome-maps-42.0.ebuild 1513 BLAKE2B efa10f438002651620d1bdbeb8660de33491e3b888ea7bc8a0c253e2ca1d7d63544f7f9514d0602e34b2cf74b9a7591ee1a54631caf76e7a3c95887a07de77c0 SHA512 f4d5a4a18964f4548f9337b6d7b1ea6f10db9766a7966b8473d3c266d7bdbe3764a7ce1f80273c1c022dced4d388b74c0240f09ce593e94aab1372a4d26f70b4
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch b/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch
deleted file mode 100644
index 1ef4d4555c93..000000000000
--- a/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/831655
-https://gitlab.gnome.org/GNOME/gnome-maps/-/commit/def20cbb26e59e5023fe157e691de48d7afe7210
-
-From e81cbf910755c0387677a43a7427da4ec073e1eb Mon Sep 17 00:00:00 2001
-From: Marcus Lundblad <ml@update.uu.se>
-Date: Fri, 14 Jan 2022 23:33:43 +0100
-Subject: [PATCH] meson: Remove unnesseray argument to i18n.merg_file
-
-This causes a build failure with meson 0.60 (or later).
-Remove it, as it's ignored also for earlier meson versions.
-
-Fixes #418
-
-(cherry picked from commit def20cbb26e59e5023fe157e691de48d7afe7210)
----
- data/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2be4ee73..4ef7eba0 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -33,7 +33,6 @@ install_data(
- appdata = app_id + '.appdata.xml'
- 
- appdata_file = i18n.merge_file(
--	appdata,
- 	input: appdata + '.in',
- 	output: appdata,
- 	po_dir: po_dir,
--- 
-2.34.1
-
diff --git a/sci-geosciences/gnome-maps/gnome-maps-41.4.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.4-r1.ebuild
index d8c1777a2930..85aac7b81b42 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-41.4.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-41.4-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=net-libs/rest-0.7.90:0.7[introspection]
 
 	app-crypt/libsecret[introspection]
-	dev-libs/libgweather[introspection]
+	dev-libs/libgweather:2=[introspection]
 	media-libs/clutter-gtk:1.0[introspection]
 	media-libs/clutter:1.0[introspection]
 	net-libs/gnome-online-accounts[introspection]
diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.0.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.0.ebuild
new file mode 100644
index 000000000000..918462359832
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-42.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..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 ~ppc64 ~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-1.5.0: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:2=[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/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 9898c49ac270..94c1ec84ad62 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,9 +1,11 @@
+AUX qgis-3.22.5-install-grass8-scripts.patch 786 BLAKE2B fbffb03339dddad1479c8a8de8733caf1757ce7f968f64f086c64eae37dff041faf8017f67642a5dc3e254350869d7192330c0c6324ab69a682c5a04d6a7dac2 SHA512 8f1ad248848f10b5d8ca207954bb8276991f625a8b8ba7d0fd7200ed83e1782998cf2659dfebb8a976530bb2120031aa4641b065efab8ae1934b7b6d075b9416
 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-3.22.3.tar.bz2 136876983 BLAKE2B 3b57af74829ca35802a09a8d83f4638ccd4d56674151d45e81f0d2af5544a6d59f20c3a68e5508f5bb5e32f5e98bf7f64f2c9f2d72e09a5137be63e4cbcaa1c0 SHA512 8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28
 DIST qgis-3.22.4.tar.bz2 137701974 BLAKE2B f1e7c35ace59b427a29c96eb6304c2e03ef6ad5304832d679f4a51fcca2c4868bd68058aa224be82e0cdef7b4f44fa310daa51e8c207c16de90b4e6536935f54 SHA512 423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5
+DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.20.3-r1.ebuild 5383 BLAKE2B 8cadb34d9c5701998ba2552b1e53c9a5bb03b56d65004b400964425cd30f81e886e66ad985b2afcff93af40b69e97895a03f5fb0f69cb1f92f0a83093ec97852 SHA512 cc7b8e34986dd40cc8b111edff2547c88743cc6263ef4139e604c49c38482fb6ad5c3f14d2d739b2949548257b407f837f621e2084a3bc62830735dae4b0e9de
 EBUILD qgis-3.22.0-r4.ebuild 5420 BLAKE2B dc36fe6b812a086e27fb2d64704116820f2e69985c7a85ffa8369589fe965f0b49bf039776f01435d6f7af06f8e0766cd3ec5be168924686a16b81087c8eb863 SHA512 bb9cf572439f8f4993898b62047bea605cb1c6b5315aaeb319597f831dd62b9aee4eb8112749eec7177e738e54a5b363dc86f3ab70a8839a994996d0f5ab78b5
@@ -11,5 +13,6 @@ EBUILD qgis-3.22.1.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930ab
 EBUILD qgis-3.22.2.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930aba1116c813c8598c317af059280e4d8f2357b684b759501c4c6665957f1f8830acf3f130ce7688081759c3f6 SHA512 ec6eb7592c0b51d3e3e48d9ccb2ad2c25ef6e07c30d571a4efdc867be0105c721a82a7998d3d16405e174430d323010bcc56a784f50a5d6da8a47ae47e088fcb
 EBUILD qgis-3.22.3.ebuild 5404 BLAKE2B 79dbf4f3e24aa2a7d67b43421d8e4d68eb80c76d5b476d189b57da09fbdac5d1a793899782ef75a8b9215b04b5daa02729069e1936c4861cf07bee9c385c6ec3 SHA512 7330c05dea46d8df5a494a13a014f120a12b66823d13d4ce3d196482d77cdae3a0d6e718de469e2459a5f446358f97399f7d4414fa3982ed420b80d2add540e1
 EBUILD qgis-3.22.4.ebuild 5463 BLAKE2B 5bf8da2206e5da429ed618a2df814eb940aa5b94c71192e30587b1660905f27218a9f225e00e86e4eb0327fb9d0f8aa83a9a6d3fa0a87863997cf57d454e3b2f SHA512 504457d393767a0a50252a661d424d6214c0b292e39f9931a6f500fc83bb14eb0a4152ef1109f56f5816ecdfa00250265f682f84522d502246b83fa6c94560b2
-EBUILD qgis-9999.ebuild 5463 BLAKE2B 5bf8da2206e5da429ed618a2df814eb940aa5b94c71192e30587b1660905f27218a9f225e00e86e4eb0327fb9d0f8aa83a9a6d3fa0a87863997cf57d454e3b2f SHA512 504457d393767a0a50252a661d424d6214c0b292e39f9931a6f500fc83bb14eb0a4152ef1109f56f5816ecdfa00250265f682f84522d502246b83fa6c94560b2
+EBUILD qgis-3.22.5.ebuild 7287 BLAKE2B ad70353e43052e10886881dd89dc7ea8f4f840e0cadc67596f7d778747b20e147cfa61c721d0dde99784c3d0d90630a25145ecb648bf3429a702c52dcab01d0c SHA512 d03e1f57afe052ede7fdc608f6d5ec743be9d1c57ab0fce066d96773899705fa0a5a5ef832f5ecfdc4572e8c1760cbf47ecb3f09970d55b62c6eba9a97a204b8
+EBUILD qgis-9999.ebuild 7225 BLAKE2B 7ece82b673d84e5311d0eb274611bcc212b2aa721f705c1a04e933a2e460658cb3d34e81c3d80a0c7c324503da670376148e3c2204e800b8c61aa4cbf63b4b85 SHA512 17cac6dee4bd971454df55ad0d59732d1ee105d47d6e49350e229310eaf638ca1ea503011b429bac29b6724a48e37071869101907701339f099209b89cdf1382
 MISC metadata.xml 1580 BLAKE2B 66cde139d4014d816207d9b85fceee3d5c630e9dce42b84472cd3a6f42f9d49247cae35a93f8590a44af411a9fceebc05c5a1d75d68ba6d5e5a0238fe85b22c4 SHA512 ff8aefd056cc28a21f9af93201ab71c880bd423289933c2a0588f915ebd60e62d62d5046fe404a2c5a4350816299c50349d151223ad9959f885adc310fc6615b
diff --git a/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch b/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch
new file mode 100644
index 000000000000..5c801f23fe8c
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.22.5-install-grass8-scripts.patch
@@ -0,0 +1,17 @@
+https://github.com/qgis/QGIS/pull/47881
+https://github.com/qgis/QGIS/pull/47456
+https://github.com/qgis/QGIS/pull/47456/commits/84e574dcc043e03bb1682d1dfc5bd3b9fbf87b3d
+
+From 84e574dcc043e03bb1682d1dfc5bd3b9fbf87b3d Mon Sep 17 00:00:00 2001
+From: Bas Couwenberg <sebastic@xs4all.nl>
+Date: Fri, 18 Mar 2022 18:04:01 +0100
+Subject: [PATCH] Also install scripts for GRASS 8.
+
+--- a/src/plugins/grass/scripts/CMakeLists.txt
++++ b/src/plugins/grass/scripts/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if (GRASS_NUM_VERSION6 GREATER 60300 OR GRASS_NUM_VERSION7 GREATER 60300)
++if (GRASS_NUM_VERSION6 GREATER 60300 OR GRASS_NUM_VERSION7 GREATER 60300 OR GRASS_NUM_VERSION8 GREATER 60300)
+ file (GLOB MODULE_FILES *.py )
+ install (FILES ${MODULE_FILES}
+          DESTINATION ${QGIS_DATA_DIR}/grass/scripts
diff --git a/sci-geosciences/qgis/qgis-3.22.5.ebuild b/sci-geosciences/qgis/qgis-3.22.5.ebuild
new file mode 100644
index 000000000000..7aca973d344b
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.5.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="sqlite"
+
+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"
+fi
+inherit cmake python-single-r1 xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
+# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
+# Keep an eye on that bug / a fixed GRASS release and readd support
+# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
+# (No need to change the supported GRASS versions in src_configure b/c
+# it won't find GRASS 8 with this dependency set.)
+COMMON_DEPEND="
+	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[qt5(+)]
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtpositioning:5
+	dev-qt/qtprintsupport: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:=
+	sys-libs/zlib
+	>=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*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	pdal? ( sci-libs/pdal:= )
+	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,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.1[qt5(+),${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			<dev-python/sip-5:=[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		')
+	)
+	qml? ( dev-qt/qtdeclarative:5 )
+	serial? ( dev-qt/qtserialport:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qttest:5
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	sys-devel/bison
+	sys-devel/flex
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-install-grass8-scripts.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-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
+		-DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
+		-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_GSL=$(usex georeferencer)
+		$(cmake_use_find_package hdf5 HDF5)
+		-DWITH_SERVER=$(usex mapserver)
+		$(cmake_use_find_package netcdf NetCDF)
+		-DUSE_OPENCL=$(usex opencl)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_PDAL=$(usex pdal)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QT5SERIALPORT=$(usex serial)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	# We list all supported versions *by upstream for this version*
+	# here, even if we're not allowing it (e.g. bugs for now), so
+	# we enable/disable all the right versions. This is so qgis doesn't
+	# try to automatically use a version the build system knows about.
+	local supported_grass_versions=( 7 8 )
+	if use grass; then
+		# We can do this because we have a := dep on grass &
+		# it changes subslot (ABI) when major versions change, so
+		# the logic here doesn't end up becoming stale.
+		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}
+
+		einfo "Supported versions: ${supported_grass_versions[@]}"
+		einfo "Found GRASS version: ${v[0]}*"
+
+		local known_grass_version
+		# GRASS isn't slotted (in Gentoo, anyway) so we pick
+		# the best version we can to build against, and disable the others.
+		for known_grass_version in "${supported_grass_versions[@]}" ; do
+			case "${known_grass_version}" in
+				"${v[0]}")
+					einfo "GRASS version ${known_grass_version} is supported. Enabling."
+					mycmakeargs+=(
+						"-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
+						"-DWITH_GRASS${known_grass_version}=ON"
+					)
+					;;
+				*)
+					einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
+					mycmakeargs+=(
+						"-DWITH_GRASS${known_grass_version}=OFF"
+					)
+					;;
+			esac
+		done
+	else
+		local known_grass_version
+		for known_grass_version in "${supported_grass_versions[@]}" ; do
+			mycmakeargs+=(
+				"-DWITH_GRASS${known_grass_version}=OFF"
+			)
+		done
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/mime/packages
+	doins debian/qgis.xml
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${WORKDIR}"/qgis_sample_data/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use python; then
+		python_optimize
+		python_optimize "${ED}"/usr/share/qgis/python
+	fi
+
+	if use grass; then
+		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_postinst() {
+	if use postgres; then
+		elog "If you don't intend to use an external PostGIS server"
+		elog "you should install:"
+		elog "   dev-db/postgis"
+	elif use python; then
+		elog "Support of PostgreSQL is disabled."
+		elog "But some installed python-plugins import the psycopg2 module."
+		elog "If you do not need these plugins just disable them"
+		elog "in the Plugins menu, else you need to set USE=\"postgres\""
+	fi
+
+	xdg_pkg_postinst
+}
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 12e8cd68f1e8..157d86c11aaf 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="sqlite"
@@ -28,6 +28,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="test"
 
+# 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of
+# https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies)
+# Keep an eye on that bug / a fixed GRASS release and readd support
+# by unrestricting the dep in ${COMMON_DEPEND} once it's fixed!
+# (No need to change the supported GRASS versions in src_configure b/c
+# it won't find GRASS 8 with this dependency set.)
 COMMON_DEPEND="
 	app-crypt/qca:2[qt5(+),ssl]
 	>=dev-db/spatialite-4.2.0
@@ -134,7 +140,6 @@ src_configure() {
 		-DENABLE_TESTS=OFF
 		-DWITH_3D=$(usex 3d)
 		-DWITH_GSL=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
 		$(cmake_use_find_package hdf5 HDF5)
 		-DWITH_SERVER=$(usex mapserver)
 		$(cmake_use_find_package netcdf NetCDF)
@@ -150,13 +155,51 @@ src_configure() {
 		-DWITH_QTWEBKIT=OFF
 	)
 
+	# We list all supported versions *by upstream for this version*
+	# here, even if we're not allowing it (e.g. bugs for now), so
+	# we enable/disable all the right versions. This is so qgis doesn't
+	# try to automatically use a version the build system knows about.
+	local supported_grass_versions=( 7 8 )
 	if use grass; then
+		# We can do this because we have a := dep on grass &
+		# it changes subslot (ABI) when major versions change, so
+		# the logic here doesn't end up becoming stale.
 		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} )
+
+		einfo "Supported versions: ${supported_grass_versions[@]}"
+		einfo "Found GRASS version: ${v[0]}*"
+
+		local known_grass_version
+		# GRASS isn't slotted (in Gentoo, anyway) so we pick
+		# the best version we can to build against, and disable the others.
+		for known_grass_version in "${supported_grass_versions[@]}" ; do
+			case "${known_grass_version}" in
+				"${v[0]}")
+					einfo "GRASS version ${known_grass_version} is supported. Enabling."
+					mycmakeargs+=(
+						"-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
+						"-DWITH_GRASS${known_grass_version}=ON"
+					)
+					;;
+				*)
+					einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
+					mycmakeargs+=(
+						"-DWITH_GRASS${known_grass_version}=OFF"
+					)
+					;;
+			esac
+		done
+	else
+		local known_grass_version
+		for known_grass_version in "${supported_grass_versions[@]}" ; do
+			mycmakeargs+=(
+				"-DWITH_GRASS${known_grass_version}=OFF"
+			)
+		done
 	fi
 
 	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||