From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- sci-geosciences/qgis/Manifest | 8 +- sci-geosciences/qgis/qgis-3.22.1.ebuild | 205 -------------------------------- sci-geosciences/qgis/qgis-3.22.2.ebuild | 205 -------------------------------- sci-geosciences/qgis/qgis-3.22.3.ebuild | 205 -------------------------------- sci-geosciences/qgis/qgis-9999.ebuild | 30 ++++- 5 files changed, 25 insertions(+), 628 deletions(-) delete mode 100644 sci-geosciences/qgis/qgis-3.22.1.ebuild delete mode 100644 sci-geosciences/qgis/qgis-3.22.2.ebuild delete mode 100644 sci-geosciences/qgis/qgis-3.22.3.ebuild (limited to 'sci-geosciences/qgis') diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 94c1ec84ad62..9b7c253b898f 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,18 +1,12 @@ AUX qgis-3.22.5-install-grass8-scripts.patch 786 BLAKE2B fbffb03339dddad1479c8a8de8733caf1757ce7f968f64f086c64eae37dff041faf8017f67642a5dc3e254350869d7192330c0c6324ab69a682c5a04d6a7dac2 SHA512 8f1ad248848f10b5d8ca207954bb8276991f625a8b8ba7d0fd7200ed83e1782998cf2659dfebb8a976530bb2120031aa4641b065efab8ae1934b7b6d075b9416 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b -DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826 SHA512 b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9 -DIST qgis-3.22.2.tar.bz2 136903329 BLAKE2B b1991944c05a9035dc91ea3fcc252a43da435199cb37c8a03647666f15dfd2367f2990bdddb2a124559993405ff61b4a110e6fa31da10d33411e24b756b9eb30 SHA512 6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74 -DIST qgis-3.22.3.tar.bz2 136876983 BLAKE2B 3b57af74829ca35802a09a8d83f4638ccd4d56674151d45e81f0d2af5544a6d59f20c3a68e5508f5bb5e32f5e98bf7f64f2c9f2d72e09a5137be63e4cbcaa1c0 SHA512 8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28 DIST qgis-3.22.4.tar.bz2 137701974 BLAKE2B f1e7c35ace59b427a29c96eb6304c2e03ef6ad5304832d679f4a51fcca2c4868bd68058aa224be82e0cdef7b4f44fa310daa51e8c207c16de90b4e6536935f54 SHA512 423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5 DIST qgis-3.22.5.tar.bz2 137731586 BLAKE2B d5cad96ca7fadab58e2f680493469496d8c5e06141ac646a09cc1f5fa607b860a0e15e5b6257debb9e787d294d2183bd0b007e96e839aca7e9fb87d81001edd7 SHA512 d47bcd743a0c621b3a5a90923d98844056260f396e683b0874625e341cdf84d075505e909130cfc473fc550de37bc078fc5ebb54b437e582572d930e12411dcb DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d EBUILD qgis-3.20.3-r1.ebuild 5383 BLAKE2B 8cadb34d9c5701998ba2552b1e53c9a5bb03b56d65004b400964425cd30f81e886e66ad985b2afcff93af40b69e97895a03f5fb0f69cb1f92f0a83093ec97852 SHA512 cc7b8e34986dd40cc8b111edff2547c88743cc6263ef4139e604c49c38482fb6ad5c3f14d2d739b2949548257b407f837f621e2084a3bc62830735dae4b0e9de EBUILD qgis-3.22.0-r4.ebuild 5420 BLAKE2B dc36fe6b812a086e27fb2d64704116820f2e69985c7a85ffa8369589fe965f0b49bf039776f01435d6f7af06f8e0766cd3ec5be168924686a16b81087c8eb863 SHA512 bb9cf572439f8f4993898b62047bea605cb1c6b5315aaeb319597f831dd62b9aee4eb8112749eec7177e738e54a5b363dc86f3ab70a8839a994996d0f5ab78b5 -EBUILD qgis-3.22.1.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930aba1116c813c8598c317af059280e4d8f2357b684b759501c4c6665957f1f8830acf3f130ce7688081759c3f6 SHA512 ec6eb7592c0b51d3e3e48d9ccb2ad2c25ef6e07c30d571a4efdc867be0105c721a82a7998d3d16405e174430d323010bcc56a784f50a5d6da8a47ae47e088fcb -EBUILD qgis-3.22.2.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930aba1116c813c8598c317af059280e4d8f2357b684b759501c4c6665957f1f8830acf3f130ce7688081759c3f6 SHA512 ec6eb7592c0b51d3e3e48d9ccb2ad2c25ef6e07c30d571a4efdc867be0105c721a82a7998d3d16405e174430d323010bcc56a784f50a5d6da8a47ae47e088fcb -EBUILD qgis-3.22.3.ebuild 5404 BLAKE2B 79dbf4f3e24aa2a7d67b43421d8e4d68eb80c76d5b476d189b57da09fbdac5d1a793899782ef75a8b9215b04b5daa02729069e1936c4861cf07bee9c385c6ec3 SHA512 7330c05dea46d8df5a494a13a014f120a12b66823d13d4ce3d196482d77cdae3a0d6e718de469e2459a5f446358f97399f7d4414fa3982ed420b80d2add540e1 EBUILD qgis-3.22.4.ebuild 5463 BLAKE2B 5bf8da2206e5da429ed618a2df814eb940aa5b94c71192e30587b1660905f27218a9f225e00e86e4eb0327fb9d0f8aa83a9a6d3fa0a87863997cf57d454e3b2f SHA512 504457d393767a0a50252a661d424d6214c0b292e39f9931a6f500fc83bb14eb0a4152ef1109f56f5816ecdfa00250265f682f84522d502246b83fa6c94560b2 EBUILD qgis-3.22.5.ebuild 7287 BLAKE2B ad70353e43052e10886881dd89dc7ea8f4f840e0cadc67596f7d778747b20e147cfa61c721d0dde99784c3d0d90630a25145ecb648bf3429a702c52dcab01d0c SHA512 d03e1f57afe052ede7fdc608f6d5ec743be9d1c57ab0fce066d96773899705fa0a5a5ef832f5ecfdc4572e8c1760cbf47ecb3f09970d55b62c6eba9a97a204b8 -EBUILD qgis-9999.ebuild 7225 BLAKE2B 7ece82b673d84e5311d0eb274611bcc212b2aa721f705c1a04e933a2e460658cb3d34e81c3d80a0c7c324503da670376148e3c2204e800b8c61aa4cbf63b4b85 SHA512 17cac6dee4bd971454df55ad0d59732d1ee105d47d6e49350e229310eaf638ca1ea503011b429bac29b6724a48e37071869101907701339f099209b89cdf1382 +EBUILD qgis-9999.ebuild 11094 BLAKE2B 26af643627474796cc1dc06bc13806bc291d7a6e8c8485f33aecf1228af60a1e5f66b4f77d00e01e72861e000c16f382e2aae027d871de419763b632f1bee85e SHA512 427f3702c50e42faa0d69e22798d454b9820290c64fe62cb163c665d4337d311a1281d7d07817c40c3000ac7e2a521310ef7940c1c8653c5e5f602e4ed6c4057 MISC metadata.xml 1580 BLAKE2B 66cde139d4014d816207d9b85fceee3d5c630e9dce42b84472cd3a6f42f9d49247cae35a93f8590a44af411a9fceebc05c5a1d75d68ba6d5e5a0238fe85b22c4 SHA512 ff8aefd056cc28a21f9af93201ab71c880bd423289933c2a0588f915ebd60e62d62d5046fe404a2c5a4350816299c50349d151223ad9959f885adc310fc6615b diff --git a/sci-geosciences/qgis/qgis-3.22.1.ebuild b/sci-geosciences/qgis/qgis-3.22.1.ebuild deleted file mode 100644 index af65e82db8df..000000000000 --- a/sci-geosciences/qgis/qgis-3.22.1.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="sqlite" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" - inherit git-r3 -else - SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 - examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - KEYWORDS="~amd64 ~x86" -fi -inherit cmake python-single-r1 xdg - -DESCRIPTION="User friendly Geographic Information System" -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 serial" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" - -COMMON_DEPEND=" - 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[qt5(+)] - 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/qtsvg:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-gfx/exiv2:= - >=sci-libs/gdal-3.0.4:=[geos] - sci-libs/geos - sci-libs/libspatialindex:= - sys-libs/zlib - >=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:5 ) - georeferencer? ( sci-libs/gsl:= ) - grass? ( =sci-geosciences/grass-7*:= ) - hdf5? ( sci-libs/hdf5:= ) - mapserver? ( dev-libs/fcgi ) - netcdf? ( sci-libs/netcdf:= ) - opencl? ( virtual/opencl ) - oracle? ( - dev-db/oracle-instantclient:= - sci-libs/gdal:=[oracle] - ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - 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/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - =sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ') - ) - qml? ( dev-qt/qtdeclarative:5 ) - serial? ( dev-qt/qtserialport:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 - python? ( ${PYTHON_DEPS} ) -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" -BDEPEND=" - ${PYTHON_DEPS} - dev-qt/linguist-tools:5 - sys-devel/bison - sys-devel/flex -" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DQGIS_MANUAL_SUBDIR=share/man/ - -DQGIS_LIB_SUBDIR=$(get_libdir) - -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis - -DQWT_INCLUDE_DIR=/usr/include/qwt6 - -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so - -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml - -DPEDANTIC=OFF - -DUSE_CCACHE=OFF - -DWITH_ANALYSIS=ON - -DWITH_APIDOC=OFF - -DWITH_GUI=ON - -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF - -DWITH_3D=$(usex 3d) - -DWITH_GSL=$(usex georeferencer) - -DWITH_GRASS7=$(usex grass) - $(cmake_use_find_package hdf5 HDF5) - -DWITH_SERVER=$(usex mapserver) - $(cmake_use_find_package netcdf NetCDF) - -DUSE_OPENCL=$(usex opencl) - -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_CUSTOM_WIDGETS=$(usex python) - -DWITH_QUICK=$(usex qml) - -DWITH_QT5SERIALPORT=$(usex serial) - -DWITH_QTWEBKIT=OFF - ) - - if use grass; then - 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 ) || - mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 - - # bugs 612956, 648726 - addpredict /dev/dri/renderD128 - addpredict /dev/dri/renderD129 - - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /usr/share/mime/packages - doins debian/qgis.xml - - if use examples; then - docinto examples - dodoc -r "${WORKDIR}"/qgis_sample_data/. - docompress -x /usr/share/doc/${PF}/examples - fi - - if use python; then - python_optimize - python_optimize "${ED}"/usr/share/qgis/python - fi - - if use grass; then - python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts - fi -} - -pkg_postinst() { - if use postgres; then - elog "If you don't intend to use an external PostGIS server" - elog "you should install:" - elog " dev-db/postgis" - elif use python; then - elog "Support of PostgreSQL is disabled." - elog "But some installed python-plugins import the psycopg2 module." - elog "If you do not need these plugins just disable them" - elog "in the Plugins menu, else you need to set USE=\"postgres\"" - fi - - xdg_pkg_postinst -} diff --git a/sci-geosciences/qgis/qgis-3.22.2.ebuild b/sci-geosciences/qgis/qgis-3.22.2.ebuild deleted file mode 100644 index af65e82db8df..000000000000 --- a/sci-geosciences/qgis/qgis-3.22.2.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="sqlite" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" - inherit git-r3 -else - SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 - examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - KEYWORDS="~amd64 ~x86" -fi -inherit cmake python-single-r1 xdg - -DESCRIPTION="User friendly Geographic Information System" -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 serial" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" - -COMMON_DEPEND=" - 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[qt5(+)] - 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/qtsvg:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-gfx/exiv2:= - >=sci-libs/gdal-3.0.4:=[geos] - sci-libs/geos - sci-libs/libspatialindex:= - sys-libs/zlib - >=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:5 ) - georeferencer? ( sci-libs/gsl:= ) - grass? ( =sci-geosciences/grass-7*:= ) - hdf5? ( sci-libs/hdf5:= ) - mapserver? ( dev-libs/fcgi ) - netcdf? ( sci-libs/netcdf:= ) - opencl? ( virtual/opencl ) - oracle? ( - dev-db/oracle-instantclient:= - sci-libs/gdal:=[oracle] - ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - 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/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - =sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ') - ) - qml? ( dev-qt/qtdeclarative:5 ) - serial? ( dev-qt/qtserialport:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 - python? ( ${PYTHON_DEPS} ) -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" -BDEPEND=" - ${PYTHON_DEPS} - dev-qt/linguist-tools:5 - sys-devel/bison - sys-devel/flex -" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DQGIS_MANUAL_SUBDIR=share/man/ - -DQGIS_LIB_SUBDIR=$(get_libdir) - -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis - -DQWT_INCLUDE_DIR=/usr/include/qwt6 - -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so - -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml - -DPEDANTIC=OFF - -DUSE_CCACHE=OFF - -DWITH_ANALYSIS=ON - -DWITH_APIDOC=OFF - -DWITH_GUI=ON - -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF - -DWITH_3D=$(usex 3d) - -DWITH_GSL=$(usex georeferencer) - -DWITH_GRASS7=$(usex grass) - $(cmake_use_find_package hdf5 HDF5) - -DWITH_SERVER=$(usex mapserver) - $(cmake_use_find_package netcdf NetCDF) - -DUSE_OPENCL=$(usex opencl) - -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_CUSTOM_WIDGETS=$(usex python) - -DWITH_QUICK=$(usex qml) - -DWITH_QT5SERIALPORT=$(usex serial) - -DWITH_QTWEBKIT=OFF - ) - - if use grass; then - 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 ) || - mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 - - # bugs 612956, 648726 - addpredict /dev/dri/renderD128 - addpredict /dev/dri/renderD129 - - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /usr/share/mime/packages - doins debian/qgis.xml - - if use examples; then - docinto examples - dodoc -r "${WORKDIR}"/qgis_sample_data/. - docompress -x /usr/share/doc/${PF}/examples - fi - - if use python; then - python_optimize - python_optimize "${ED}"/usr/share/qgis/python - fi - - if use grass; then - python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts - fi -} - -pkg_postinst() { - if use postgres; then - elog "If you don't intend to use an external PostGIS server" - elog "you should install:" - elog " dev-db/postgis" - elif use python; then - elog "Support of PostgreSQL is disabled." - elog "But some installed python-plugins import the psycopg2 module." - elog "If you do not need these plugins just disable them" - elog "in the Plugins menu, else you need to set USE=\"postgres\"" - fi - - xdg_pkg_postinst -} diff --git a/sci-geosciences/qgis/qgis-3.22.3.ebuild b/sci-geosciences/qgis/qgis-3.22.3.ebuild deleted file mode 100644 index 424d7ec8847e..000000000000 --- a/sci-geosciences/qgis/qgis-3.22.3.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="sqlite" - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" - inherit git-r3 -else - SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 - examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" - KEYWORDS="~amd64 ~x86" -fi -inherit cmake python-single-r1 xdg - -DESCRIPTION="User friendly Geographic Information System" -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 serial" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" - -COMMON_DEPEND=" - 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[qt5(+)] - 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/qtsvg:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-gfx/exiv2:= - >=sci-libs/gdal-3.0.4:=[geos] - sci-libs/geos - sci-libs/libspatialindex:= - sys-libs/zlib - >=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:5 ) - georeferencer? ( sci-libs/gsl:= ) - grass? ( =sci-geosciences/grass-7*:= ) - hdf5? ( sci-libs/hdf5:= ) - mapserver? ( dev-libs/fcgi ) - netcdf? ( sci-libs/netcdf:= ) - opencl? ( virtual/opencl ) - oracle? ( - dev-db/oracle-instantclient:= - sci-libs/gdal:=[oracle] - ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - 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/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - =sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ') - ) - qml? ( dev-qt/qtdeclarative:5 ) - serial? ( dev-qt/qtserialport:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 - python? ( ${PYTHON_DEPS} ) -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" -BDEPEND=" - ${PYTHON_DEPS} - dev-qt/linguist-tools:5 - sys-devel/bison - sys-devel/flex -" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DQGIS_MANUAL_SUBDIR=share/man/ - -DQGIS_LIB_SUBDIR=$(get_libdir) - -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis - -DQWT_INCLUDE_DIR=/usr/include/qwt6 - -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so - -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml - -DPEDANTIC=OFF - -DUSE_CCACHE=OFF - -DWITH_ANALYSIS=ON - -DWITH_APIDOC=OFF - -DWITH_GUI=ON - -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF - -DWITH_3D=$(usex 3d) - -DWITH_GSL=$(usex georeferencer) - -DWITH_GRASS7=$(usex grass) - $(cmake_use_find_package hdf5 HDF5) - -DWITH_SERVER=$(usex mapserver) - $(cmake_use_find_package netcdf NetCDF) - -DUSE_OPENCL=$(usex opencl) - -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_CUSTOM_WIDGETS=$(usex python) - -DWITH_QUICK=$(usex qml) - -DWITH_QT5SERIALPORT=$(usex serial) - -DWITH_QTWEBKIT=OFF - ) - - if use grass; then - 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 ) || - mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 - - # bugs 612956, 648726 - addpredict /dev/dri/renderD128 - addpredict /dev/dri/renderD129 - - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /usr/share/mime/packages - doins debian/qgis.xml - - if use examples; then - docinto examples - dodoc -r "${WORKDIR}"/qgis_sample_data/. - docompress -x /usr/share/doc/${PF}/examples - fi - - if use python; then - python_optimize - python_optimize "${ED}"/usr/share/qgis/python - fi - - if use grass; then - python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts - fi -} - -pkg_postinst() { - if use postgres; then - elog "If you don't intend to use an external PostGIS server" - elog "you should install:" - elog " dev-db/postgis" - elif use python; then - elog "Support of PostgreSQL is disabled." - elog "But some installed python-plugins import the psycopg2 module." - elog "If you do not need these plugins just disable them" - elog "in the Plugins menu, else you need to set USE=\"postgres\"" - fi - - xdg_pkg_postinst -} diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 157d86c11aaf..52cef87319b2 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -14,19 +14,19 @@ else examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" KEYWORDS="~amd64 ~x86" fi -inherit cmake python-single-r1 xdg +inherit cmake python-single-r1 virtualx xdg DESCRIPTION="User friendly Geographic Information System" 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" +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" # Disabling test suite because upstream disallow running from install path -RESTRICT="test" +RESTRICT="!test? ( test )" # 3.22.5+ *does* support GRASS 8 but we can't enable it yet because of # https://github.com/OSGeo/grass/pull/2269 (=> unresolved SONAME dependencies) @@ -112,6 +112,13 @@ BDEPEND=" dev-qt/linguist-tools:5 sys-devel/bison sys-devel/flex + test? ( + $(python_gen_cond_dep ' + dev-python/PyQt5[${PYTHON_USEDEP},testlib] + dev-python/nose2[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ') + ) " pkg_setup() { @@ -137,7 +144,7 @@ src_configure() { -DWITH_GUI=ON -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF + -DENABLE_TESTS=$(usex test) -DWITH_3D=$(usex 3d) -DWITH_GSL=$(usex georeferencer) $(cmake_use_find_package hdf5 HDF5) @@ -202,8 +209,7 @@ src_configure() { done fi - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) || - mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 + use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) # bugs 612956, 648726 addpredict /dev/dri/renderD128 @@ -212,6 +218,18 @@ src_configure() { cmake_src_configure } +src_test() { + local myctestargs=( + # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887 + # test_core_offlineediting - see https://github.com/qgis/QGIS/pull/48059 + -E '(ProcessingGuiTest|ProcessingQgisAlgorithmsTestPt1|ProcessingQgisAlgorithmsTestPt2|ProcessingQgisAlgorithmsTestPt3|ProcessingQgisAlgorithmsTestPt4|ProcessingGdalAlgorithmsRasterTest|ProcessingGdalAlgorithmsVectorTest|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTestPt1|ProcessingGrass7AlgorithmsRasterTestPt2|ProcessingGrass7AlgorithmsVectorTest|ProcessingOtbAlgorithmsTest|test_core_callout|test_core_compositionconverter|test_core_expression|test_core_gdalprovider|test_core_gdalutils|test_core_geonodeconnection|test_core_imagecache|test_core_labelingengine|test_core_layout|test_core_layoutcontext|test_core_layouthtml|test_core_layoutlabel|test_core_layoutmanualtable|test_core_layoutmap|test_core_layoutmapgrid|test_core_layoutmapoverview|test_core_layoutmultiframe|test_core_layoutpicture|test_core_linefillsymbol|test_core_mapdevicepixelratio|test_core_maprendererjob|test_core_meshlayer|test_core_meshlayerrenderer|test_core_networkaccessmanager|test_core_offlineediting|test_core_pointpatternfillsymbol|test_core_rastercontourrenderer|test_core_rasterlayer|test_core_simplemarker|test_core_style|test_core_svgmarker|test_core_tiledownloadmanager|test_core_ziplayer|test_core_coordinatereferencesystem|test_core_geometry|test_gui_dualview|test_gui_htmlwidgetwrapper|test_gui_processinggui|test_gui_filedownloader|test_gui_ogrprovidergui|test_gui_meshlayerpropertiesdialog|test_gui_queryresultwidget|test_gui_listwidget|test_3d_3drendering|test_3d_tessellator|test_analysis_processingalgspt1|test_analysis_processingalgspt2|test_analysis_meshcontours|test_analysis_triangulation|test_analysis_processing|test_provider_wcsprovider|test_provider_postgresconn|test_provider_virtualrasterprovider|qgis_grassprovidertest8|test_app_qgisappclipboard|test_app_fieldcalculator|test_app_maptoolcircularstring|test_app_vertextool|PyQgsLocalServer|PyQgsAFSProvider|PyQgsPythonProvider|PyQgsAnnotation|PyQgsAuthenticationSystem|PyQgsAuthBasicMethod|PyQgsDataItem|PyQgsDelimitedTextProvider|PyQgsEmbeddedSymbolRenderer|PyQgsExpressionBuilderWidget|PyQgsExternalStorageWebDAV|PyQgsGeometryTest|PyQgsGoogleMapsGeocoder|PyQgsImageCache|PyQgsLayout|PyQgsLayoutHtml|PyQgsLayoutLegend|PyQgsLayoutMap|PyQgsLayoutMapGrid|PyQgsLayoutMapOverview|PyQgsMapClippingUtils|PyQgsMapLayerComboBox|PyQgsMapLayerProxyModel|PyQgsMemoryProvider|PyQgsOGRProviderGpkg|PyQgsPalLabelingCanvas|PyQgsPalLabelingLayout|PyQgsPalLabelingPlacement|PyQgsPointCloudAttributeByRampRenderer|PyQgsPointCloudClassifiedRenderer|PyQgsPointCloudExtentRenderer|PyQgsPointCloudRgbRenderer|PyQgsProcessExecutable|PyQgsProcessingInPlace|TestQgsRandomMarkerSymbolLayer|PyQgsRasterLayer|PyQgsRasterLayerRenderer|PyQgsRasterResampler|PyQgsRulebasedRenderer|PyQgsShapefileProvider|PyQgsSvgCache|PyQgsOGRProvider|PyQgsSpatialiteProvider|PyQgsTaskManager|PyQgsVectorFileWriter|PyQgsVectorLayer|PyQgsVectorLayerCache|PyQgsVectorLayerEditBuffer|PyQgsVectorLayerSelectedFeatureSource|PyQgsVectorLayerShapefile|PyQgsVirtualLayerProvider|PyQgsWFSProvider|PyQgsOapifProvider|PyQgsDBManagerGpkg|PyQgsAuxiliaryStorage|PyQgsFieldValidator|PyQgsSelectiveMasking|PyQgsPalLabelingServer|PyQgsServerWMSGetMap|PyQgsServerWMSGetLegendGraphic|PyQgsServerWMSGetPrint|PyQgsServerWMSGetPrintExtra|PyQgsServerWMSGetPrintOutputs|PyQgsServerWMSGetPrintAtlas|PyQgsServerWMSDimension|PyQgsServerAccessControlWMS|PyQgsServerAccessControlWFSTransactional|PyQgsServerCacheManager|PyQgsServerWMTS|PyQgsServerWFS|qgis_sipify|qgis_sip_include|qgis_sip_uptodate)' + + --output-on-failure + ) + + virtx cmake_src_test -j1 +} + src_install() { cmake_src_install -- cgit v1.2.3