commit: 21035cc535fb3513a8d9126daf0c3f49a0e7d715 Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com> AuthorDate: Wed Feb 21 06:56:59 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Thu Apr 11 12:42:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21035cc5
sci-geosciences/qgis: add missing rdep sci-libs/gdal[spatialite,sqlite], add 3.36.1 Co-authored-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com> Closes: https://bugs.gentoo.org/893950 Closes: https://bugs.gentoo.org/918437 Closes: https://bugs.gentoo.org/925126 Closes: https://github.com/gentoo/gentoo/pull/35458 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sci-geosciences/qgis/Manifest | 1 + .../qgis/{qgis-9999.ebuild => qgis-3.36.1.ebuild} | 18 +++++++++++------- sci-geosciences/qgis/qgis-9999.ebuild | 16 +++++++++------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 67d8a7fa6983..e2761b3b0e7a 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,2 +1,3 @@ DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56 +DIST qgis-3.36.1.tar.bz2 171472398 BLAKE2B 1bcd657d1bb715566975ec5aa5bff5a6f282b025c578370d1112a53d00865e18828343ec644f7bb9cff24922e50070c361cae93246f067df4566a4cbd629349b SHA512 e6c6cd458bf9ead5ff42dd51a7c80c6fff66fe04e1618265fccff706a5e60189d8819dc61479a2f2b23f00664c91304d9891ddbaedc4cadf2b9cfd0a6af4e273 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.36.1.ebuild similarity index 95% copy from sci-geosciences/qgis/qgis-9999.ebuild copy to sci-geosciences/qgis/qgis-3.36.1.ebuild index c1a65d6983fa..76add61ac820 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-3.36.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="sqlite" # We only package the LTS releases right now @@ -25,7 +25,7 @@ HOMEPAGE="https://www.qgis.org/"; LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python ) @@ -50,15 +50,17 @@ COMMON_DEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= - >=sci-libs/gdal-3.0.4:=[geos] + >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= @@ -89,7 +91,7 @@ COMMON_DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/owslib[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}] + dev-python/PyQt5[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}] @@ -100,7 +102,6 @@ COMMON_DEPEND=" ') ) qml? ( dev-qt/qtdeclarative:5 ) - serial? ( dev-qt/qtserialport:5 ) " DEPEND="${COMMON_DEPEND} dev-qt/qttest:5 @@ -112,6 +113,7 @@ BDEPEND="${PYTHON_DEPS} dev-qt/linguist-tools:5 app-alternatives/yacc app-alternatives/lex + doc? ( app-text/doxygen ) test? ( $(python_gen_cond_dep ' dev-python/PyQt5[${PYTHON_USEDEP},testlib] @@ -154,7 +156,7 @@ src_configure() { -DPEDANTIC=OFF -DUSE_CCACHE=OFF -DWITH_ANALYSIS=ON - -DWITH_APIDOC=OFF + -DWITH_APIDOC=$(usex doc) -DWITH_GUI=ON -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 -DWITH_QSPATIALITE=ON @@ -172,8 +174,8 @@ src_configure() { -DWITH_BINDINGS=$(usex python) -DWITH_CUSTOM_WIDGETS=$(usex python) -DWITH_QUICK=$(usex qml) - -DWITH_QT5SERIALPORT=$(usex serial) -DWITH_QTWEBKIT=OFF + -DWITH_DRACO=OFF ) # We list all supported versions *by upstream for this version* @@ -225,6 +227,8 @@ src_configure() { use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) + CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging + # bugs 612956, 648726 addpredict /dev/dri/renderD128 addpredict /dev/dri/renderD129 diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index c1a65d6983fa..1318c361a34f 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="sqlite" # We only package the LTS releases right now @@ -25,7 +25,7 @@ HOMEPAGE="https://www.qgis.org/"; LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python ) @@ -50,15 +50,17 @@ COMMON_DEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= - >=sci-libs/gdal-3.0.4:=[geos] + >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= @@ -89,7 +91,7 @@ COMMON_DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/owslib[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}] + dev-python/PyQt5[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}] @@ -100,7 +102,6 @@ COMMON_DEPEND=" ') ) qml? ( dev-qt/qtdeclarative:5 ) - serial? ( dev-qt/qtserialport:5 ) " DEPEND="${COMMON_DEPEND} dev-qt/qttest:5 @@ -112,6 +113,7 @@ BDEPEND="${PYTHON_DEPS} dev-qt/linguist-tools:5 app-alternatives/yacc app-alternatives/lex + doc? ( app-text/doxygen ) test? ( $(python_gen_cond_dep ' dev-python/PyQt5[${PYTHON_USEDEP},testlib] @@ -154,7 +156,7 @@ src_configure() { -DPEDANTIC=OFF -DUSE_CCACHE=OFF -DWITH_ANALYSIS=ON - -DWITH_APIDOC=OFF + -DWITH_APIDOC=$(usex doc) -DWITH_GUI=ON -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 -DWITH_QSPATIALITE=ON @@ -172,8 +174,8 @@ src_configure() { -DWITH_BINDINGS=$(usex python) -DWITH_CUSTOM_WIDGETS=$(usex python) -DWITH_QUICK=$(usex qml) - -DWITH_QT5SERIALPORT=$(usex serial) -DWITH_QTWEBKIT=OFF + -DWITH_DRACO=OFF ) # We list all supported versions *by upstream for this version*
