gentoo resync : 25.11.2020

8 files changed, 200 insertions, 103 deletions

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 85558ee0e426..5a3e569f77f6 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,10 +1,13 @@
-AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81bef294b79705589f537a9a7a2054806df06550a54525e307cc1eec2ecb81340faaf595a706d3d504190d720efe638ef3e2fb SHA512 a21ff313e4d1768dc15ac7dae8901d7245efb30f3caf7f9c0dbd667647e96b282f3451e7f52c8168df23ba2e953832995d975805a8f8bc176d20bd0862d9a51d
+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
+AUX qgis-3.16.1-find-qt5linguisttools.patch 923 BLAKE2B 2753e58338432736be05e6ac64a46638d417db2145f084a97b8c3371752ecb8d639df6ec0dd519533ec39444f098cf43716a8f1b4c516681fe2be34f73affef3 SHA512 b42de8f7c23fb0010e77ae873fb88304b3f70506317203d0aee170a7340ef9244ea0c4e39cd850ef57f2324e0c125a7c6c77f84e3835e5f59f2bdcb3f6a78612
 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.10.7.tar.bz2 102154692 BLAKE2B 9b54d542770f149eb3c413ef867a012e28e4121ff38114ef954131f55dea54cc8c0d4e65a5e8eac9098fb596af7b8d2f77ddfb2f8d0170d2e1a5b59569952151 SHA512 b10d81d24c7cfb8b285b6d9884dfe19ba33b032cd843d29b879159d203454fd359a669047b677baf515d92ce331ba66f59dc2466beae2048920b2c0da0c3d666
-DIST qgis-3.10.9.tar.bz2 102418680 BLAKE2B 53599dab784fc42b7a4505e13b1fd97cdb7c696bf1a004425ea0e7b88659b9af40f74b7107ef6103a138f4bc8886eda0a99a07a1c1466fb73c94d55ea39d8ea8 SHA512 91bba01db04094a194d1437a00276f076cd88d9ebcfe4792f20da8fb4339c984262e2bf79f666cf23af13081da358bbfb69bdff086e4988701c4431f53732275
+DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
+DIST qgis-3.16.1.tar.bz2 113943328 BLAKE2B 0c0f9c0a038e87d7f16e66a00cd6844db27b9238ef4f42cf2504a5e498843d4f93bde42542cf7bedcc7f58303daa4fdc7d9cb9e1954958a0de29e294e502a461 SHA512 2df53731468b734c95ad32cd8ecc930dd113b1084c4d3971aba2aaf58b473dc8e0dd204d979b74ee79d443cd95e4f91c51d071eb645254142a76d7a4d0bc3dc8
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-EBUILD qgis-3.10.7.ebuild 5445 BLAKE2B f706ee24d324b05712d761b4bf2cf363bb0678d900b114f6b879908386eeda6da458df6c86d668f13bfb4208432b40b14e952fdae4d61df0a1de00e63fa8f3e4 SHA512 98d6a84452b8dcb44d35e2c87f0b9a00b29cae9630437b8320ecee06de8e14e0ad59008dfeb3f6b65c86bae0a461c157070a7a439cb8e44d0f0938a3e36de7e1
-EBUILD qgis-3.10.9.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180
-EBUILD qgis-9999.ebuild 5447 BLAKE2B 63ac17c1c6e2ef62207d2674c38bde5ef0f89cecdd9acd745d5c3efe46291d38925e5d92141c051fab3080cd479b4cd13bcee052895c6b0f6bc58501b987d375 SHA512 479a56d2904d296df36f0b9b171a9127b89d677e6f87b761bd85b0872eb7ae585b4277be58d6e841c6d9b0ed4841b5d1da7f7a528924a027419380e588a83180
+EBUILD qgis-3.16.0-r1.ebuild 5355 BLAKE2B b6a9239578ab1f6363dfdd78ac5141a0890a70902bd4ac76f58311a8f57fed841bee5f85368ec620902e17e88cd46dc734d49b722db9522c81de46329c81ccf0 SHA512 c11682d7c7555ba9078344aa3d9cf0624f173dcc151395ae2ae9c765d4baebedbe90d15bcecde01bd48a80d74a4e3609f33dd28bf572b097e5f317ad220cc2de
+EBUILD qgis-3.16.1.ebuild 5399 BLAKE2B 1a5e4ce95087ac6642dce7a90820485aa3c70339a63b3630c7bb6c9d90afff7f2d2637cfb5e5af32c99d95c7fc7c193b9d6c5cd672f91f7349c1ecca0fc7c5f0 SHA512 1da717908534b7cf47c04f4fbbdd848731b35ee1320d7a5419f3597bd0169b4f7d03155917bb77d5c69868cb1d0024b45baa0b0657fcfff269ee33de90f2315c
+EBUILD qgis-9999.ebuild 5291 BLAKE2B 8efe5c7bef0d5136907571d17737b8a721fc12c7cbcd6328fe44d9232b0f25c3cc89670f0fd55e9b620803bb82692466d9e2b230bdcdf0a0dd1d6cce6c1638c1 SHA512 c721f235aeabb56cb4b5c03d5a35f269cd949665443ac0633f59fac7c29f44acb744cbc37855a700c857c7e1dcc62876283d2c2c23bb1f19cb4f959cbec9f675
 MISC metadata.xml 1386 BLAKE2B f5e9142fe248a2482ca29fe1b03aa585fb5b2eb4f0e1a1f0bf8d4a643034fffb9d37c3595170c9fea7b3b2dc0dcbec0e94dcc0bef2af6ea2da29a48d6880a7c3 SHA512 0ef09ee19b881d9ecc04884bc568e17013cb6794c666e75993031f798dca5f80b60b3c9ecded1183e0ac004a65ab0cf4f5af973132991e0b5a51674a6daab0ce
diff --git a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
index 472b8aa466ce..1edba1f0e747 100644
--- a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
+++ b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
@@ -4,7 +4,7 @@ diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
 @@ -36,7 +36,7 @@
    ELSE(CMAKE_HOST_WIN32)
      # TODO osx
-     SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
+     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)
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
new file mode 100644
index 000000000000..9a57d45984e2
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..b1098175647c
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
@@ -0,0 +1,32 @@
+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/files/qgis-3.16.1-find-qt5linguisttools.patch b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
new file mode 100644
index 000000000000..01f602694395
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
@@ -0,0 +1,27 @@
+From db2fee6c199a34507e5742b2360d594a5bf67b18 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 23 Nov 2020 22:04:50 +0100
+Subject: [PATCH] Fix Qt5LinguistTools detection/lrelease binary location
+
+Correctly find the Qt5 module that provides the path to Qt5-based lrelease.
+Available since >= Qt-5.3.1 which is well below the current minimum for QGIS.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ i18n/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
+index a836e5cae5..7d7f79da89 100644
+--- a/i18n/CMakeLists.txt
++++ b/i18n/CMakeLists.txt
+@@ -1,4 +1,5 @@
+-find_program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease)
++find_package(Qt5LinguistTools REQUIRED)
++set(QT_LRELEASE_EXECUTABLE Qt5::lrelease)
+ 
+ macro(ADD_TRANSLATION_FILES _sources )
+     foreach (_current_FILE ${ARGN})
+-- 
+2.29.2
+
diff --git a/sci-geosciences/qgis/qgis-3.10.7.ebuild b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
index 65bdc947394e..d952288f81f8 100644
--- a/sci-geosciences/qgis/qgis-3.10.7.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
-QTMIN="5.9.4"
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -18,46 +17,48 @@ fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
 DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
+HOMEPAGE="https://www.qgis.org/en/site/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
 BDEPEND="${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QTMIN}:5
+	dev-qt/linguist-tools:5
 	sys-devel/bison
 	sys-devel/flex
 "
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+),ssl]
+	>=app-crypt/qca-2.3.0:2[ssl]
 	>=dev-db/spatialite-4.2.0
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
-	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtpositioning-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtserialport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain:=
+	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/qtserialport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg: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:=
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.3:=
+	>=x11-libs/qwt-6.1.3-r2:6=[svg]
+	3d? ( dev-qt/qt3d:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -68,7 +69,7 @@ COMMON_DEPEND="
 		dev-db/oracle-instantclient:=
 		sci-libs/gdal:=[oracle]
 	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
@@ -78,11 +79,11 @@ COMMON_DEPEND="
 			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
 			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
 			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
 			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
 			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests[${PYTHON_MULTI_USEDEP}]
 			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
 			dev-python/six[${PYTHON_MULTI_USEDEP}]
@@ -90,11 +91,10 @@ COMMON_DEPEND="
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
 		')
 	)
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+	qml? ( dev-qt/qtdeclarative:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QTMIN}:5
+	dev-qt/qttest:5
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
@@ -105,7 +105,7 @@ RESTRICT="test"
 
 PATCHES=(
 	# git master
-	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+	"${FILESDIR}/${P}-cmake-lib-suffix.patch"
 	# TODO upstream
 	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
 	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
@@ -117,6 +117,8 @@ pkg_setup() {
 
 src_prepare() {
 	cmake_src_prepare
+	sed -e "/QtWebKit.*.py/d" \
+		-i python/PyQt/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -147,7 +149,7 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
+		-DWITH_QTWEBKIT=OFF
 	)
 
 	if use grass; then
@@ -156,7 +158,8 @@ src_configure() {
 		)
 	fi
 
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
 
 	# bugs 612956, 648726
 	addpredict /dev/dri/renderD128
diff --git a/sci-geosciences/qgis/qgis-3.10.9.ebuild b/sci-geosciences/qgis/qgis-3.16.1.ebuild
index 5009332eb58e..2bc3ef993a96 100644
--- a/sci-geosciences/qgis/qgis-3.10.9.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
-QTMIN="5.9.4"
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -18,46 +17,48 @@ fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
 DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
+HOMEPAGE="https://www.qgis.org/en/site/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
 BDEPEND="${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QTMIN}:5
+	dev-qt/linguist-tools:5
 	sys-devel/bison
 	sys-devel/flex
 "
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+),ssl]
+	>=app-crypt/qca-2.3.0:2[ssl]
 	>=dev-db/spatialite-4.2.0
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
-	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtpositioning-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtserialport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain:=
+	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/qtserialport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg: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:=
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.3:=
+	>=x11-libs/qwt-6.1.3-r2:6=[svg]
+	3d? ( dev-qt/qt3d:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -68,7 +69,7 @@ COMMON_DEPEND="
 		dev-db/oracle-instantclient:=
 		sci-libs/gdal:=[oracle]
 	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
@@ -78,11 +79,11 @@ COMMON_DEPEND="
 			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
 			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
 			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
 			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
 			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests[${PYTHON_MULTI_USEDEP}]
 			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
 			dev-python/six[${PYTHON_MULTI_USEDEP}]
@@ -90,11 +91,10 @@ COMMON_DEPEND="
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
 		')
 	)
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+	qml? ( dev-qt/qtdeclarative:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QTMIN}:5
+	dev-qt/qttest:5
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
@@ -105,10 +105,11 @@ RESTRICT="test"
 
 PATCHES=(
 	# git master
-	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
 	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+	"${FILESDIR}/${P}-featuresummary.patch"
+	"${FILESDIR}/${P}-default-qmldir.patch"
+	"${FILESDIR}/${P}-find-qt5linguisttools.patch"
 )
 
 pkg_setup() {
@@ -117,6 +118,8 @@ pkg_setup() {
 
 src_prepare() {
 	cmake_src_prepare
+	sed -e "/QtWebKit.*.py/d" \
+		-i python/PyQt/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -147,7 +150,7 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
+		-DWITH_QTWEBKIT=OFF
 	)
 
 	if use grass; then
@@ -156,7 +159,8 @@ src_configure() {
 		)
 	fi
 
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
 
 	# bugs 612956, 648726
 	addpredict /dev/dri/renderD128
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 5009332eb58e..e895dc655819 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
-QTMIN="5.9.4"
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -18,46 +17,48 @@ fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
 DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
+HOMEPAGE="https://www.qgis.org/en/site/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
 BDEPEND="${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QTMIN}:5
+	dev-qt/linguist-tools:5
 	sys-devel/bison
 	sys-devel/flex
 "
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+),ssl]
+	>=app-crypt/qca-2.3.0:2[ssl]
 	>=dev-db/spatialite-4.2.0
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
-	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtpositioning-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtserialport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/protobuf:=
+	dev-libs/qtkeychain:=
+	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/qtserialport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg: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:=
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
+	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.3:=
+	>=x11-libs/qwt-6.1.3-r2:6=[svg]
+	3d? ( dev-qt/qt3d:5 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( =sci-geosciences/grass-7*:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -68,7 +69,7 @@ COMMON_DEPEND="
 		dev-db/oracle-instantclient:=
 		sci-libs/gdal:=[oracle]
 	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
@@ -78,11 +79,11 @@ COMMON_DEPEND="
 			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
 			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
 			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
 			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
 			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
 			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests[${PYTHON_MULTI_USEDEP}]
 			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
 			dev-python/six[${PYTHON_MULTI_USEDEP}]
@@ -90,11 +91,10 @@ COMMON_DEPEND="
 			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
 		')
 	)
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+	qml? ( dev-qt/qtdeclarative:5 )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QTMIN}:5
+	dev-qt/qttest:5
 "
 RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
@@ -105,10 +105,10 @@ RESTRICT="test"
 
 PATCHES=(
 	# git master
-	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
 	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
 )
 
 pkg_setup() {
@@ -117,6 +117,8 @@ pkg_setup() {
 
 src_prepare() {
 	cmake_src_prepare
+	sed -e "/QtWebKit.*.py/d" \
+		-i python/PyQt/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -147,7 +149,7 @@ src_configure() {
 		-DWITH_BINDINGS=$(usex python)
 		-DWITH_CUSTOM_WIDGETS=$(usex python)
 		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
+		-DWITH_QTWEBKIT=OFF
 	)
 
 	if use grass; then