gentoo auto-resync : 20:02:2025 - 00:15:26

3 files changed, 14 insertions, 16 deletions

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index e48c4edca347..b25c4850dc58 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -3,6 +3,6 @@ AUX qgis-3.36.3-qt6.patch 1523 BLAKE2B 2a79e10ea3cbccb75e2af8b59c717668c37915989
 AUX qgis-3.36.3-testReportDir.patch 651 BLAKE2B 04dcbad99cfd7156f284284cd165b39231de5ee29d45cd132d5afef7ceaa6197920385ffaf2f339c0ab943e2af2ceb5d5a232d3c5f9f753df7621d4d9ef9e18b SHA512 faf701cd2f83c966826933fbb9f8abbfdd3cce4278a6c9ace55641ce31fc7e8d282872aff7e7ea5a8e31f7590d94b53b608b0344daff3107f095914ebbcb0fe8
 DIST qgis-3.38.3.tar.bz2 175959255 BLAKE2B 7fdc310cb8464bcc1b2168b14b661a41941c2ec22b5075f5c40796b15feeb8becec44e38905c6c970c94584b71e6d6798d0c072870f0f10555441db9399fa597 SHA512 ebf3899c9d80499f48cde713f31372fd46066c40aaeb1dacdf0778a86d6321cf73d5b68a9f03aa2423df8508142776e26878f3d845e773d4e44a86793ab92484
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-EBUILD qgis-3.38.3.ebuild 12317 BLAKE2B aa2c2e6d1ebd39e14bd1415ed09b24a6b151cce3bedf5719cd1701802d09026a313d781cf22b44256375252025064d79cc5da6416723dc6fe30581a3279b55f6 SHA512 f588b6326df4021a94d617d925def0efb44f7346de0cf600acbc0b2fd63a37296bee492a26f7e6c0265faa2e95f1418efb58493c252d19997d4a968d66950bff
-EBUILD qgis-9999.ebuild 12318 BLAKE2B f78c62bf8ed100087a1e09eef915f732d0ad02f3210ce8f4ea4e2b9040820913bab64eec3319474e0e7b118beeeb6f22aabb017b606e1f865a170ee4f950760f SHA512 f342616d80ce20a179ebe6f53027df78a063d0895e5534ae84c3d95e647e0246f6f84877a4836e8862cd65d4c589fdb6f71d89e3d09f703014420eef1fa0ca0b
+EBUILD qgis-3.38.3-r1.ebuild 12360 BLAKE2B 12f17949630ace7a3de2363f03c6fa73890e4451414f3013641319b36fc6a2fcb9992efa5130511ed72d5be6264b68d5935c5fd21d1c364884b86a3efd5d6187 SHA512 ab66a54f934815b0de165192fcbf6a9e3e195af2acd49ee5f523c6972a3b0cc34408156b72aa59f7eccca93d08995a1608b141c53f43f10e8f5af67fafed3fc1
+EBUILD qgis-9999.ebuild 12267 BLAKE2B 90d2270c6eb4efcb18dfc68690b3d0dbd0d1d60ffdf546f39566706bee35106622b73e8be848acd63919195cdab2330f670cd4ebf0cfcb7cde67ff36c21eb8e8 SHA512 534fd8b8e2ff47abfed44362ba59ed6331ee590d17e7a6169dd4011dc02bdaa6af05b324c85d4446f304163dab93972c7da2c226c9dd5025bfece6a17c234f46
 MISC metadata.xml 1492 BLAKE2B 7e9411a1d657f64f47f477386b8c78fde0404aea2d5387e1d7e5982a532b9daddf6b8881c35c6238e568c45dc071d2bcb852577ab6a00677a2370b8eac79eeea SHA512 ddf595ddc3ca7f33bbaa57936bc7a3162d11e85e7c07f6fe5b3ef9e57132cfe0686d1c8b3b22d5dba7ea0545cba653b6ecce49dc056049c931120174e27db1dd
diff --git a/sci-geosciences/qgis/qgis-3.38.3.ebuild b/sci-geosciences/qgis/qgis-3.38.3-r1.ebuild
index f882c81156e0..7a18bae8c6b9 100644
--- a/sci-geosciences/qgis/qgis-3.38.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.38.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,13 +36,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
-	app-crypt/qca:2[qt6,ssl]
+	>=app-crypt/qca-2.3.7:2[qt6(+),ssl]
 	>=dev-db/spatialite-4.2.0
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/protobuf:=
-	dev-libs/qtkeychain[qt6]
+	>=dev-libs/qtkeychain-0.14.1-r1:=[qt6(+)]
 	dev-qt/qttools:6[designer]
 	dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml]
 	dev-qt/qtmultimedia:6
@@ -56,8 +56,8 @@ COMMON_DEPEND="
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-4.9.3:=
 	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.1:=[qt6]
-	>=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)]
+	>=dev-python/qscintilla-2.14.1-r1[qt6(+)]
+	>=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6(+),svg(+)]
 	3d? ( dev-qt/qt3d:6 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( sci-geosciences/grass:= )
@@ -89,7 +89,7 @@ COMMON_DEPEND="
 			dev-python/sip:=[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 			dev-python/pyqt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-2.10.1[qt6]
+			>=dev-python/qscintilla-2.14.1-r1[qt6(+)]
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:6 )
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index e3db08636738..24c33583da29 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,13 +36,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
-	app-crypt/qca:2[qt6,ssl]
+	>=app-crypt/qca-2.3.7:2[qt6(+),ssl]
 	>=dev-db/spatialite-4.2.0
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/protobuf:=
-	dev-libs/qtkeychain[qt6]
+	>=dev-libs/qtkeychain-0.14.1-r1:=[qt6(+)]
 	dev-qt/qttools:6[designer]
 	dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml]
 	dev-qt/qtmultimedia:6
@@ -56,8 +56,8 @@ COMMON_DEPEND="
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-4.9.3:=
 	sys-libs/zlib
-	>=x11-libs/qscintilla-2.10.1:=[qt6]
-	>=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)]
+	>=dev-python/qscintilla-2.14.1-r1[qt6(+)]
+	>=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6(+),svg(+)]
 	3d? ( dev-qt/qt3d:6 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( sci-geosciences/grass:= )
@@ -89,7 +89,7 @@ COMMON_DEPEND="
 			dev-python/sip:=[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 			dev-python/pyqt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-			>=dev-python/qscintilla-2.10.1[qt6]
+			>=dev-python/qscintilla-2.14.1-r1[qt6(+)]
 		')
 	)
 	qml? ( dev-qt/qtdeclarative:6 )
@@ -123,8 +123,6 @@ BDEPEND="${PYTHON_DEPS}
 "
 
 PATCHES=(
-	# "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
-	"${FILESDIR}/${PN}-3.36.3-qt6.patch"
 	"${FILESDIR}/${PN}-3.36.3-testReportDir.patch"
 )