commit: 00f77af5ca55b979e14e1466648e57e6ca67ea10 Author: José de Paula Rodrigues <espinafre <AT> gmail <DOT> com> AuthorDate: Fri May 28 20:54:12 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jun 19 00:03:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f77af5
sci-geosciences/qgis: fixes for paths, adds PDAL option Closes: https://bugs.gentoo.org/693074 Signed-off-by: José de Paula Rodrigues <espinafre <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> sci-geosciences/qgis/qgis-9999.ebuild | 87 +++++++++++++++++------------------ 1 file changed, 42 insertions(+), 45 deletions(-) diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index b1e1845009f..60ed73da843 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7,8,9,10} ) PYTHON_REQ_USE="sqlite" +QT_MIN_VER="5.9.4" if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"; @@ -17,48 +18,47 @@ fi inherit cmake desktop python-single-r1 qmake-utils xdg DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/en/site/"; +HOMEPAGE="https://www.qgis.org/"; LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml" +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" -BDEPEND="${PYTHON_DEPS} - dev-qt/linguist-tools:5 +BDEPEND=" + ${PYTHON_DEPS} + >=dev-qt/linguist-tools-${QT_MIN_VER}:5 sys-devel/bison sys-devel/flex " COMMON_DEPEND=" - >=app-crypt/qca-2.3.0:2[ssl] + app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= - dev-libs/protobuf:= - dev-libs/qtkeychain:= - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui: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 + dev-libs/qtkeychain[qt5(+)] + >=dev-qt/designer-${QT_MIN_VER}:5 + >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 + >=dev-qt/qtcore-${QT_MIN_VER}:5 + >=dev-qt/qtgui-${QT_MIN_VER}:5 + >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl] + >=dev-qt/qtpositioning-${QT_MIN_VER}:5 + >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 + >=dev-qt/qtserialport-${QT_MIN_VER}:5 + >=dev-qt/qtsvg-${QT_MIN_VER}:5 + >=dev-qt/qtsql-${QT_MIN_VER}:5 + >=dev-qt/qtwidgets-${QT_MIN_VER}:5 + >=dev-qt/qtxml-${QT_MIN_VER}:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= - >=sci-libs/proj-6.3.1:= - sys-libs/zlib - >=x11-libs/qscintilla-2.10.3:= - >=x11-libs/qwt-6.1.3-r2:6=[svg] - 3d? ( dev-qt/qt3d:5 ) + >=sci-libs/proj-4.9.3:= + >=x11-libs/qscintilla-2.10.1:=[qt5(+)] + >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] + 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) @@ -69,21 +69,23 @@ COMMON_DEPEND=" dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r2 ) + polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] dev-python/httplib2[${PYTHON_MULTI_USEDEP}] dev-python/jinja[${PYTHON_MULTI_USEDEP}] dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] dev-python/owslib[${PYTHON_MULTI_USEDEP}] dev-python/pygments[${PYTHON_MULTI_USEDEP}] - dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}] dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] dev-python/pytz[${PYTHON_MULTI_USEDEP}] dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] - >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}] dev-python/requests[${PYTHON_MULTI_USEDEP}] <dev-python/sip-5:=[${PYTHON_MULTI_USEDEP}] dev-python/six[${PYTHON_MULTI_USEDEP}] @@ -91,10 +93,12 @@ COMMON_DEPEND=" postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) ') ) - qml? ( dev-qt/qtdeclarative:5 ) + qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) + webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20200309-r1:5 ) " DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 + >=dev-qt/qttest-${QT_MIN_VER}:5 + python? ( ${PYTHON_DEPS} ) " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel @@ -103,22 +107,12 @@ RDEPEND="${COMMON_DEPEND} # Disabling test suite because upstream disallow running from install path RESTRICT="test" -PATCHES=( - # git master - "${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch" - # TODO upstream - "${FILESDIR}/${PN}-3.16.1-featuresummary.patch" - "${FILESDIR}/${PN}-3.16.1-default-qmldir.patch" -) - pkg_setup() { python-single-r1_pkg_setup } src_prepare() { cmake_src_prepare - sed -e "/QtWebKit.*.py/d" \ - -i python/PyQt/CMakeLists.txt || die } src_configure() { @@ -149,13 +143,16 @@ src_configure() { -DWITH_BINDINGS=$(usex python) -DWITH_CUSTOM_WIDGETS=$(usex python) -DWITH_QUICK=$(usex qml) - -DWITH_QTWEBKIT=OFF + -DWITH_QTWEBKIT=$(usex webkit) ) if use grass; then - mycmakeargs+=( - -DGRASS_PREFIX7=/usr/$(get_libdir)/grass78 - ) + readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)" + readarray -d'.' -t v <<<"${f[2]}" + grassdir="grass${v[0]}${v[1]}" + + GRASSDIR=/usr/$(get_libdir)/${grassdir} + mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} ) fi use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
