commit: d6aa94361bbeef3c9ea7153682c8e694f32303f1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 18 19:56:39 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 18 20:10:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6aa9436
sci-geosciences/qgis: Drop virtualx, set QT_QPA_PLATFORM=offscreen
Sort deps, cleanup dupes
Drop comment obsolete since commit 2f275a47a864b0c18984da0b02d968ff1361920e
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/qgis-9999.ebuild | 56 ++++++++++++++++-------------------
1 file changed, 26 insertions(+), 30 deletions(-)
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild
b/sci-geosciences/qgis/qgis-9999.ebuild
index 46c14396ec45..18b5d64047bb 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,9 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
+CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging
+
+PYTHON_COMPAT=( python3_{11..13} )
PYTHON_REQ_USE="sqlite"
# We only package the LTS releases right now
@@ -18,7 +20,7 @@ else
examples? (
https://qgis.org/downloads/data/qgis_sample_data.tar.gz ->
qgis_sample_data-2.8.14.tar.gz )"
KEYWORDS="~amd64"
fi
-inherit cmake flag-o-matic python-single-r1 virtualx xdg
+inherit cmake flag-o-matic python-single-r1 xdg
DESCRIPTION="User friendly Geographic Information System"
HOMEPAGE="https://www.qgis.org/";
@@ -32,7 +34,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
"
# test? ( postgres )
-# Disabling test suite because upstream disallow running from install path
RESTRICT="!test? ( test )"
COMMON_DEPEND="
@@ -44,12 +45,12 @@ COMMON_DEPEND="
dev-libs/libzip:=
dev-libs/protobuf:=
>=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
dev-qt/qtpositioning:6
dev-qt/qtserialport:6
dev-qt/qtsvg:6
+ dev-qt/qttools:6[designer]
dev-vcs/git
media-gfx/exiv2:=
>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
@@ -82,46 +83,41 @@ COMMON_DEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
+
dev-python/pyqt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-2.10.1[${PYTHON_USEDEP}]
+ dev-python/qscintilla[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
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.14.1-r1[qt6(+)]
')
)
qml? ( dev-qt/qtdeclarative:6 )
webengine? ( dev-qt/qtwebengine:6 )
"
DEPEND="${COMMON_DEPEND}
- test? (
- python? (
- app-text/qpdf
- app-text/poppler[cairo,utils]
- )
- )
+ test? ( python? (
+ app-text/poppler[cairo,utils]
+ app-text/qpdf
+ ) )
"
RDEPEND="${COMMON_DEPEND}
sci-geosciences/gpsbabel
"
BDEPEND="${PYTHON_DEPS}
- dev-qt/qttools:6[linguist]
- app-alternatives/yacc
app-alternatives/lex
+ app-alternatives/yacc
+ dev-qt/qttools:6[linguist]
doc? ( app-text/doxygen )
- test? (
- python? (
- $(python_gen_cond_dep '
- dev-python/pyqt6[${PYTHON_USEDEP},testlib]
- dev-python/nose2[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/psycopg:2[${PYTHON_USEDEP}]
- ')
- )
- )
+ test? ( python? (
+ $(python_gen_cond_dep '
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose2[${PYTHON_USEDEP}]
+ dev-python/psycopg:2[${PYTHON_USEDEP}]
+ dev-python/pyqt6[${PYTHON_USEDEP},testlib]
+ ')
+ ) )
"
PATCHES=( "${FILESDIR}/${PN}-3.42.2-testReportDir.patch" )
@@ -183,13 +179,13 @@ src_configure() {
$(cmake_use_find_package netcdf NetCDF)
-DUSE_OPENCL=$(usex opencl)
-DWITH_ORACLE=$(usex oracle)
- -DWITH_QTWEBENGINE=$(usex webengine)
-DWITH_PDAL=$(usex pdal)
-DWITH_POSTGRESQL=$(usex postgres)
-DWITH_BINDINGS=$(usex python)
-DWITH_PYTHON=$(usex python)
-DWITH_CUSTOM_WIDGETS=$(usex python)
-DWITH_QUICK=$(usex qml)
+ -DWITH_QTWEBENGINE=$(usex webengine)
)
# We list all supported versions *by upstream for this version*
@@ -241,8 +237,6 @@ src_configure() {
use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
- CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging
-
cmake_src_configure
}
@@ -421,8 +415,10 @@ src_test() {
xdg_environment_reset
- local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true"
- virtx cmake_src_test
+ local -x QGIS_CONTINUOUS_INTEGRATION_RUN=true
+ local -x QT_QPA_PLATFORM=offscreen
+
+ cmake_src_test
}
src_install() {
