commit: 342f19d05dbea37cfde0fb0da2bcc257664b3a49 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Fri Oct 21 15:03:47 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Fri Oct 21 15:04:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342f19d0
sci-geosciences/qgis: add 3.26.3, sync live Closes: https://bugs.gentoo.org/844754 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sci-geosciences/qgis/Manifest | 1 + .../qgis/{qgis-9999.ebuild => qgis-3.26.3.ebuild} | 25 +++++++++++++++++----- sci-geosciences/qgis/qgis-9999.ebuild | 23 ++++++++++++++++---- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 2b7cdae32bd0..5a04f79ee961 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,3 +1,4 @@ DIST qgis-3.22.11.tar.bz2 142155708 BLAKE2B 71b3e0a772fbea1e26d01dff6f65c35981a5ff091b5ea6bee76608f9812c569226f99789333fe39fdd772ee72af02746458c93117d21fb0352851871217a82f6 SHA512 0c41fa8e74b3cf54926aedc7a221ac440eabf9d27071bb79a17c5d7826624a8e6010521000f6b55afbc71f079ff18235d8fa5d407fe6b31b1bb705b6eb431424 DIST qgis-3.22.9.tar.bz2 138141096 BLAKE2B d59d6fd974333371397150e594acda1c6072948cc010b4bf4d34c33a642fabdc78a580bd76418785892114aa4997e88cf700f178a9243079ff800c76cb3c25cf SHA512 c33cfe18c542a3be42fa6a08b62f71511a71a7e72ae704177846b66444d90a28df2f1c42d98c53c2c0e43f13bce24224499c52db5d2cbcac5d8a53782f7c124c +DIST qgis-3.26.3.tar.bz2 151276080 BLAKE2B c15c0767edc1680d40bda62187368c4a3b56992ee117633b2299d26d3cae3b42cdad77b8e7b1b49a3706c16f0c3ea6048b8c4cdcf20a889b49c493b81fbece39 SHA512 4e239143dc63c773f8c0fd0445a5b18c59832ef978fbc2b132ef13da2f78c7f8aa439956dd88d4eaf1d980f602fd85f842d5e670707cc6e46779e7e5a3c14d76 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.26.3.ebuild similarity index 93% copy from sci-geosciences/qgis/qgis-9999.ebuild copy to sci-geosciences/qgis/qgis-3.26.3.ebuild index 0003264601b5..d5f9a8600ee7 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-3.26.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="sqlite" # We only package the LTS releases right now @@ -25,14 +25,19 @@ 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 examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test" -REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + mapserver? ( python ) + test? ( postgres ) +" # Disabling test suite because upstream disallow running from install path RESTRICT="!test? ( test )" -# See bug #850787 re sip-6.6. +# At some point the dependency on qwtpolar should be +# replaced with a dependency on qwt[polar]. Currently +# it does not build with qwt-6.2[polar] though. COMMON_DEPEND=" app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 @@ -91,7 +96,7 @@ COMMON_DEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] - <dev-python/sip-6.6:=[${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) ') @@ -122,6 +127,16 @@ BDEPEND=" src_prepare() { cmake_src_prepare + # Tests want to be run inside a git repo + if [[ ${PV} != *9999* ]]; then + if use test; then + git init -q || die + git config user.email "[email protected]" || die + git config user.name "Larry the Cow" || die + git add . || die + git commit -m "init" || die + fi + fi } src_configure() { diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 0003264601b5..abb712bc7c43 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="sqlite" # We only package the LTS releases right now @@ -27,12 +27,17 @@ LICENSE="GPL-2+ GPL-3+" SLOT="0" IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test" -REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + mapserver? ( python ) + test? ( postgres ) +" # Disabling test suite because upstream disallow running from install path RESTRICT="!test? ( test )" -# See bug #850787 re sip-6.6. +# At some point the dependency on qwtpolar should be +# replaced with a dependency on qwt[polar]. Currently +# it does not build with qwt-6.2[polar] though. COMMON_DEPEND=" app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 @@ -91,7 +96,7 @@ COMMON_DEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] - <dev-python/sip-6.6:=[${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) ') @@ -122,6 +127,16 @@ BDEPEND=" src_prepare() { cmake_src_prepare + # Tests want to be run inside a git repo + if [[ ${PV} != *9999* ]]; then + if use test; then + git init -q || die + git config user.email "[email protected]" || die + git config user.name "Larry the Cow" || die + git add . || die + git commit -m "init" || die + fi + fi } src_configure() {
