gentoo resync : 22.12.2021

6 files changed, 38 insertions, 113 deletions

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 ) ||