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

9 files changed, 86 insertions, 56 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 6e71bcf36f46..6a1b8b49393a 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 56493970a81a..d3b941c93a91 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -2,8 +2,8 @@ AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf
 DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0
 DIST grass-8.4.0.tar.gz 70245687 BLAKE2B 0f8283d215cc5412abcf4bc984aa94b5ca3de6de0d3d240fb533a4a0d2b335438269524462f3c4ede5ebec5cfc0348246571216dbc16f8658d88db28159bf360 SHA512 c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4
 DIST grass-8.4.1RC1.tar.gz 70287232 BLAKE2B 9fa54d30524372d520fdb9fd99c4e7daff1607d9e3f32ffa1fd3ce6ca37f42d257747b4be5c96a419ac247bf0a7684d6ca0b117e968b1136c47714e1b6c30325 SHA512 71088bbc47d7bc798db7fdf9ab3f25ff9ad04ac2e108cbd3d3d6db77c36f85821579a78a40bdfe1c9ab75b0c6c8f3e2f23b5dcbb233aed4c60526f1d3db79349
-EBUILD grass-8.3.2-r1.ebuild 7233 BLAKE2B 52b85ff828a941e9effc6cf2edc76691fe3612aa0715efbab0d9dc98c95e26f013a74ad02309d1125a9c9e899dcf214915267f77a7d413693abbb85acd35b34f SHA512 8474276591fd3107288f35b78bc1fea841c60c048e51c88331185d4ff059de3a4404aa5d6b85a3ba34881021b8d7cedabd4036590bb1ff7a390bf1240d55a84f
-EBUILD grass-8.4.0.ebuild 7255 BLAKE2B c075fea780c7c0003ec2593390c11629bebba7444e9cc8cb56fd7ad0253b7abfd11e8f754265f0df77d643f4e31ef80cce8bc915dc62917b0d575f7bba274cc3 SHA512 6f42e91ad5bb8a35dffeb5255d5e024e8c13f89d5e143c3300d21009c2eb8d282de69cdc7cf0cb6946402c40e204576314d51e8f67693785462d679b2d911f61
-EBUILD grass-8.4.1_rc1.ebuild 7256 BLAKE2B 698b120edb34819277f13ea86b32268579c911444f51b9d1e9fbdf1f6cf3b9bd0ed786c4b08cb196c0d6ad3a5dfd3d5e3dab7682d4cba940f2f4e17b40a94e8d SHA512 acf62047c6aab9eda40c5b6493b0df11ad3c1d123388c17394a3c903d55186e6f1f827fa396709d8a0e560667862dcdd4225f597d6780cb61e3307ffc92f06f6
-EBUILD grass-9999.ebuild 7196 BLAKE2B 539144500b15275e94831c062e89bc1fbe496ef3e8b733e6ed3e0e166da8016fc2129b36ccbbbec827fe15c77f873bb9f635635171bda204caa078241ffe5122 SHA512 0094e59498c5479df22a0ffe52b9db49313daeb3f3361e84d4af64ab602b6a22894db0cf337e47bae37741bd9d4cf32af3662152ba03336d72d50c5d124c8e23
+EBUILD grass-8.3.2-r1.ebuild 7422 BLAKE2B eba1966576bcf66b9a5eefa4d81289e51c663e9355acc758e77bf9321d693bf487b6ceb73b0577abffeb5aeb3e1eb97fb0300c2b83f481e7ee5a48c923d7fffc SHA512 c494e127f54565d50d3075e4a36011979140be1be862449f43551d075d3bd51427db95de5718831176f760494cc875fef902e510164903fd11f547b049f64c5e
+EBUILD grass-8.4.0.ebuild 7444 BLAKE2B dbfde2546911f45ac1ebe35179a6d39f347473a9fbcfa82671e8ee6c833dcb960323b6e1caa80f73156b91d669acd3230870e2e153b5bae38cfbfb26e3f5c11f SHA512 633a75b5310bd0934a20f0e0c882c551aa7999c9095eaf9529ed0b33a9946d1de5c5836cbf1a3b693e02b7d69e4046afe30071118b7f885dc1e72ea4e37b7eea
+EBUILD grass-8.4.1_rc1.ebuild 7445 BLAKE2B db0bab7b03f1e0be18302d92293fde8b916bcef8f06ea67f708b12c4fdedd6644f96da2955a42f7a01dfb4b6b64cebd0563c1b39070bd9afea2287037c343ec1 SHA512 6b50405c6bbe0df922d30847245f8289b953a2fcd76749bb43adf61cb5b9c70549acdd1a1895fb00b71943650a65018ad2aa6e8058337dcfb6ab58e2a56a59a4
+EBUILD grass-9999.ebuild 7385 BLAKE2B 821aa3dab4de51c367fe890161e444b430c12740231c093c1919e9d68b1ae3f23da5bcd906d6d279caabf43681bc9996e15c1312403fc15ee2bbcd4adbaaaf96 SHA512 69a093172a6cf14376574825dde20fbd4a236f3bbf528f8c0a9b3fc5e4e93ac43d4b0d9a5aef755661032f0bb95f7506ec42ae379161ea0aaca871774f78385d
 MISC metadata.xml 1316 BLAKE2B 508c5fdf769d6563bb585ccd0a7072675f2725fa0702ca9e3f9b3963bd5379312dda36e37ba2fc58c7a85e03c035484abbe95a2e6651d51ea7fa97e013897355 SHA512 1f58db0827750b585c64c8321d47b4277a8472b1073f0216f06cf211aeea6ad53065634b4003269560282b22679b90d34b077d447f8ae07c16a4dbe905cf9b79
diff --git a/sci-geosciences/grass/grass-8.3.2-r1.ebuild b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
index 9e070e7012a6..0f5c4b57489c 100644
--- a/sci-geosciences/grass/grass-8.3.2-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
@@ -156,16 +156,24 @@ src_prepare() {
 	eend $?
 
 	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
 	shopt -s nullglob
-	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
+	ati_cards=$(echo -n /dev/ati/card*)
+	for card in "${ati_cards[@]}"; do
+		addpredict "${card}"
+	done
+	mesa_cards=$(echo -n /dev/dri/card*)
+	for card in "${mesa_cards[@]}"; do
+		addpredict "${card}"
+	done
+	nvidia_cards=$(echo -n /dev/nvidia*)
+	for card in "${nvidia_cards[@]}"; do
+		addpredict "${card}"
+	done
+	render_cards=$(echo -n /dev/dri/renderD128*)
+	for card in "${render_cards[@]}"; do
+		addpredict "${card}"
+	done
 	addpredict /dev/nvidiactl
 }
 
diff --git a/sci-geosciences/grass/grass-8.4.0.ebuild b/sci-geosciences/grass/grass-8.4.0.ebuild
index de06e287f11f..1d490f0bf7d4 100644
--- a/sci-geosciences/grass/grass-8.4.0.ebuild
+++ b/sci-geosciences/grass/grass-8.4.0.ebuild
@@ -156,16 +156,24 @@ src_prepare() {
 	eend $?
 
 	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
 	shopt -s nullglob
-	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
+	ati_cards=$(echo -n /dev/ati/card*)
+	for card in "${ati_cards[@]}"; do
+		addpredict "${card}"
+	done
+	mesa_cards=$(echo -n /dev/dri/card*)
+	for card in "${mesa_cards[@]}"; do
+		addpredict "${card}"
+	done
+	nvidia_cards=$(echo -n /dev/nvidia*)
+	for card in "${nvidia_cards[@]}"; do
+		addpredict "${card}"
+	done
+	render_cards=$(echo -n /dev/dri/renderD128*)
+	for card in "${render_cards[@]}"; do
+		addpredict "${card}"
+	done
 	addpredict /dev/nvidiactl
 }
 
diff --git a/sci-geosciences/grass/grass-8.4.1_rc1.ebuild b/sci-geosciences/grass/grass-8.4.1_rc1.ebuild
index d1df30016725..462a01ac5c57 100644
--- a/sci-geosciences/grass/grass-8.4.1_rc1.ebuild
+++ b/sci-geosciences/grass/grass-8.4.1_rc1.ebuild
@@ -156,16 +156,24 @@ src_prepare() {
 	eend $?
 
 	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
 	shopt -s nullglob
-	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
+	ati_cards=$(echo -n /dev/ati/card*)
+	for card in "${ati_cards[@]}"; do
+		addpredict "${card}"
+	done
+	mesa_cards=$(echo -n /dev/dri/card*)
+	for card in "${mesa_cards[@]}"; do
+		addpredict "${card}"
+	done
+	nvidia_cards=$(echo -n /dev/nvidia*)
+	for card in "${nvidia_cards[@]}"; do
+		addpredict "${card}"
+	done
+	render_cards=$(echo -n /dev/dri/renderD128*)
+	for card in "${render_cards[@]}"; do
+		addpredict "${card}"
+	done
 	addpredict /dev/nvidiactl
 }
 
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index b35f6c4b8ae1..10a22120331e 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -151,16 +151,24 @@ src_prepare() {
 	eend $?
 
 	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
 	shopt -s nullglob
-	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
+	ati_cards=$(echo -n /dev/ati/card*)
+	for card in "${ati_cards[@]}"; do
+		addpredict "${card}"
+	done
+	mesa_cards=$(echo -n /dev/dri/card*)
+	for card in "${mesa_cards[@]}"; do
+		addpredict "${card}"
+	done
+	nvidia_cards=$(echo -n /dev/nvidia*)
+	for card in "${nvidia_cards[@]}"; do
+		addpredict "${card}"
+	done
+	render_cards=$(echo -n /dev/dri/renderD128*)
+	for card in "${render_cards[@]}"; do
+		addpredict "${card}"
+	done
 	addpredict /dev/nvidiactl
 }
 
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"
 )