commit: 06ea3fdebe4845e10d05bc29aae3f3d6ab810021
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 15:12:47 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 20:16:27 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06ea3fde
sci-geosciences/qgis: Prepare for all kinds of deps to drop IUSE qt6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qgis/{qgis-3.38.3.ebuild => qgis-3.38.3-r1.ebuild} | 12 ++++++------
sci-geosciences/qgis/qgis-9999.ebuild | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sci-geosciences/qgis/qgis-3.38.3.ebuild
b/sci-geosciences/qgis/qgis-3.38.3-r1.ebuild
similarity index 97%
rename from sci-geosciences/qgis/qgis-3.38.3.ebuild
rename to 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..2e3c265b3261 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 )
