diff options
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/Manifest.gz | bin | 11581 -> 11585 bytes | |||
-rw-r--r-- | sci-geosciences/gpsbabel/Manifest | 2 | ||||
-rw-r--r-- | sci-geosciences/gpsbabel/gpsbabel-9999.ebuild | 39 | ||||
-rw-r--r-- | sci-geosciences/qgis/Manifest | 7 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-3.36.1.ebuild | 285 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-3.36.3.ebuild | 285 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-3.38.0-r1.ebuild (renamed from sci-geosciences/qgis/qgis-3.38.0.ebuild) | 98 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-9999.ebuild | 98 |
8 files changed, 56 insertions, 758 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex 88c20bebb1e9..c05af330fba8 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest index a40ec8cb60a4..3251a09c4bbd 100644 --- a/sci-geosciences/gpsbabel/Manifest +++ b/sci-geosciences/gpsbabel/Manifest @@ -8,5 +8,5 @@ DIST gpsbabel_1_9_0.tar.gz 14514572 BLAKE2B cdea8c74c1a75c4707b071b8a08fe83ce7fd EBUILD gpsbabel-1.7.0-r1.ebuild 1919 BLAKE2B 83c144e9ca5ba4649378e1857694eb87549344d340c2e09d35ace00eb7359b0b0a63b365e9b29b82c61bc973c1a460522c181a110cb5f58f04bda66c8f475a36 SHA512 551fdfb9e4e7382e1f6b6769673b73768feed8085b40ff46e6c45e98d5799d1d9301ca8d88d1fa4b695c57802e3579fe54381f499a39e6c4fd35149f768c80db EBUILD gpsbabel-1.8.0-r1.ebuild 2336 BLAKE2B 9eb748c0078e7a03cdfdc6401bd03ca69f29e71d61201455951d833aa36b789ba085e434528fd5d75172c78771e5585096f42b912767c97adb5f884e4f618a7b SHA512 6639407ab52756284775d318a7d740340e42aa0aeb9a1f951cac344c70404a148defb85906ea3fcd892eb2ff7fd88c19ac79dd4da34be2bcfd588ccc79c85785 EBUILD gpsbabel-1.9.0.ebuild 2163 BLAKE2B 82a1ce7f824ade83a1058aa4f4f74e48962d2c7d09662395c6fc75744cf8f6e23ea7c27255fe13e69e0e181c33b6273923d557a740dabd65ea377ad049904907 SHA512 5c7870744ef723f411af1e92c91b7a7d5041553f5aff3550c1a34efd394eb8244d09df19268af564365f503b9bbc7853e27e76a40229f6cfd9feb2cdce3a61bb -EBUILD gpsbabel-9999.ebuild 2164 BLAKE2B c9f80a150a16129fe80637e5552628d5dd2f5ba41ada25500c720081f728137e3eb07a124116a21bfb88ece1746f5cff8df65fdecee64b5cb333a9ed00e2cdd9 SHA512 299ce4f9f654e00a21f0fafff72f883862c5a60be2257e72f78f9696aa530f1a5a273e639ebc2f79f88bd67eb7b992b41a537cce4901b4776e639144e7da5f18 +EBUILD gpsbabel-9999.ebuild 1896 BLAKE2B 69c0e2ac096587bebb9054a83315d8e7337d9cd2f01ba2626564839677beb485fdb931f7800ce6d81bb0a7442433698bee045c538b30999fde7747961e6dca39 SHA512 da7a6632c367847347392c0b769a6e35be97462274d14bdb5a60dbfa15368e5b92c1e596f12b69f63571982b778e8cfd28368038eb7dfb0603503ea6f66fc2b2 MISC metadata.xml 352 BLAKE2B 1b6ee2c488060cad27a6e3c0e6a0c767f0fd29664ae4d09cf3e373194e5b102e234f2d2b6fc80f6385f1d49bf581b8ae8bb591be9fea966e3f75a771cb0a6c12 SHA512 b7558f62d902eeff8165c7d4eb9b9dccdc1a8740b51de5a7283f83378974a6b375b04e3d01b48344eabce23b8b6a127a8c92c87ac49956225d15418ed0fdcfdc diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild index 5b61f9f33ebe..8f8e29366683 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild @@ -12,61 +12,44 @@ MY_P="${PN}_${MY_PV}" DESCRIPTION="GPS waypoints, tracks and routes converter" HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" -if [[ ${PV} == 9999 ]] ; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git" else SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}" fi LICENSE="GPL-2" SLOT="0" -IUSE="doc qt6" +IUSE="doc" BDEPEND=" + dev-qt/qttools:6[linguist] virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 dev-lang/perl dev-libs/libxslt ) - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) " - RDEPEND=" dev-libs/expat + dev-qt/qt5compat:6 + dev-qt/qtbase:6[gui,network,widgets,xml] + dev-qt/qtserialport:6 + dev-qt/qtwebchannel:6 + dev-qt/qtwebengine:6[widgets] sci-libs/shapelib:= sys-libs/zlib:=[minizip] virtual/libusb:1 - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtserialport:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets,xml] - dev-qt/qtserialport:6 - dev-qt/qtwebchannel:6 - dev-qt/qtwebengine:6[widgets] - dev-qt/qt5compat:6 - ) " - DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui ) -PATCHES=( - "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" -) +PATCHES=( "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" ) src_prepare() { cmake_src_prepare @@ -83,7 +66,7 @@ src_configure() { -DGPSBABEL_MAPPREVIEW=ON -DGPSBABEL_EMBED_MAP=ON -DGPSBABEL_EMBED_TRANSLATIONS=ON - -DUSE_QT6="$(usex qt6)" + -DUSE_QT6=ON ) cmake_src_configure diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 3f7a20bb2944..fc6228944d4f 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -4,14 +4,11 @@ AUX qgis-3.36.3-qt6-Fix-broken-test.patch 1091 BLAKE2B 5fc073355b71e4cc932c3a3f7 AUX qgis-3.36.3-qt6.patch 1523 BLAKE2B 2a79e10ea3cbccb75e2af8b59c717668c379159897c508ce5b9a471df0f4ff45a9f9e5511b5fbd7655c0e9137339ebbada1fcba18b65ce2998f3338eecbd55d5 SHA512 f108a26274acb8c7e871aa6dd214897873f31e521f9bc0811404b13d7025a8414c0f50e066afa281d23c085bf8bd846e60e75919f859b4e0456b330ea7728645 AUX qgis-3.36.3-testReportDir.patch 651 BLAKE2B 04dcbad99cfd7156f284284cd165b39231de5ee29d45cd132d5afef7ceaa6197920385ffaf2f339c0ab943e2af2ceb5d5a232d3c5f9f753df7621d4d9ef9e18b SHA512 faf701cd2f83c966826933fbb9f8abbfdd3cce4278a6c9ace55641ce31fc7e8d282872aff7e7ea5a8e31f7590d94b53b608b0344daff3107f095914ebbcb0fe8 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-3.36.3.tar.bz2 172648476 BLAKE2B 120ba5837e25b0a0ac1bd9588afccf1ee9a1cb6cb26500e010bdd81657d6c061acdf107dbbefc417cc94e113ee8039c3c4a6b664c892e8ea459c2d5f2135e6cc SHA512 534b7affb8dc0ca9aab55e3492b3b1aefd9f14f5d3e87bbecde5445d536516e6f0913f55078f2621227a6a75c18d402041d9b66c495a9e342602467e40b01e8a DIST qgis-3.38.0.tar.bz2 175129654 BLAKE2B 2ced37dd3d65ec53d523c3f6921274ce04c3450c663bd09895b076ad5be7ba43f4efc5c2efb486780204cbc1f8b15cb716a52c3a172eeb8d6bb6fb44ea010ba9 SHA512 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d EBUILD qgis-3.28.10.ebuild 11506 BLAKE2B c97b36829915ca90307b1881ae39945684ad6445bc7bef95c5e64215e9430fea6b6dc4aa286dd36b769fd92ed1d6fa657b335442c1e5fb44fad2ff76fb77cfc5 SHA512 40de0aa4183f1155081e1bf23fecb8e25c200eeb308a4a0b954899e0241ae01395142ccd501dea42bbd3b45255790dbcecc0bce384d909e457ce4ef1886f878d -EBUILD qgis-3.36.1.ebuild 11610 BLAKE2B bb4403eb004708735365e084cda82208c186922cef1f7f6f88a581bd04b06f9a52df12dd1db4ae7dbd4d0d03c5613d101878cf9f7ea10f2e65c2c19f391d41ab SHA512 09a86a2269682a93e8e6135c89a3a225fc1f2278f6f5d3ef0cd66f7b05716da8601350f920721773c63ca8c51875ec546b7e8a369feab0a24d946f94dc66acb6 EBUILD qgis-3.36.3-r1.ebuild 13296 BLAKE2B e497ec73b97ebe75fb3af133e346afb7cbba032058b0c1f9c76ee8eb2c73004da8df1bcf148154d4b5786770d897ac3d515f512f12e7ea23d17050e026964be7 SHA512 cd9e4548a8bec164d4160fd67044f75fb0554e6113c5a87fa332a19356f5e1247a81d431dab78d5b85e41bf7e48d86bbf0312ebeb9d8ac5fd6636f1cbf9c82cb -EBUILD qgis-3.36.3.ebuild 11610 BLAKE2B bb4403eb004708735365e084cda82208c186922cef1f7f6f88a581bd04b06f9a52df12dd1db4ae7dbd4d0d03c5613d101878cf9f7ea10f2e65c2c19f391d41ab SHA512 09a86a2269682a93e8e6135c89a3a225fc1f2278f6f5d3ef0cd66f7b05716da8601350f920721773c63ca8c51875ec546b7e8a369feab0a24d946f94dc66acb6 -EBUILD qgis-3.38.0.ebuild 13504 BLAKE2B 7eaeb76847d68e8c91b586e5a4d2deb18ba9588753f39872a3684d163f650f7c24e181f784cf455620783d2c6ae7dc408fa4f4d1c767fef98ff589203969f215 SHA512 301486d04f8429f3be0d4ae702bdd89d4052517f5db069feb1cd312525138b35c56f39efdf07b8530cec5e86f15fac14abf9d6e822382f80e22477f0ba17cd5b -EBUILD qgis-9999.ebuild 13504 BLAKE2B 7eaeb76847d68e8c91b586e5a4d2deb18ba9588753f39872a3684d163f650f7c24e181f784cf455620783d2c6ae7dc408fa4f4d1c767fef98ff589203969f215 SHA512 301486d04f8429f3be0d4ae702bdd89d4052517f5db069feb1cd312525138b35c56f39efdf07b8530cec5e86f15fac14abf9d6e822382f80e22477f0ba17cd5b +EBUILD qgis-3.38.0-r1.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e +EBUILD qgis-9999.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e MISC metadata.xml 1696 BLAKE2B 21bdfb035c471861aea5ab8c4ce2e632bcb6dafa0bd3cd0733a3533288c4a6a8f2e5e313a39db8757f11f204d15ca73b3d9b779f3156e7682293db58d24ec20b SHA512 189003c5dec06dd14c57bff372b656dfa5e5febc942ef418782d31f80eeab0d93c7e44bc850719543f5de6b1e08a3e2b2c1596b964d58c942e35441f913b43c3 diff --git a/sci-geosciences/qgis/qgis-3.36.1.ebuild b/sci-geosciences/qgis/qgis-3.36.1.ebuild deleted file mode 100644 index f0cc12843e19..000000000000 --- a/sci-geosciences/qgis/qgis-3.36.1.ebuild +++ /dev/null @@ -1,285 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="sqlite" - -# We only package the LTS releases right now -# We could package more but would ideally only stabilise the LTS ones -# at least. - -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 flag-o-matic 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 doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - mapserver? ( python ) - test? ( postgres ) -" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="!test? ( test )" - -# 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 - 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/qtmultimedia:5[widgets] - 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,spatialite,sqlite] - sci-libs/geos - sci-libs/libspatialindex:= - >=sci-libs/proj-4.9.3:= - sys-libs/zlib - >=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:= ) - hdf5? ( sci-libs/hdf5:= ) - mapserver? ( dev-libs/fcgi ) - netcdf? ( sci-libs/netcdf:= ) - opencl? ( virtual/opencl ) - oracle? ( - dev-db/oracle-instantclient:= - sci-libs/gdal:=[oracle] - ) - pdal? ( sci-libs/pdal:= ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - 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,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-python-2.10.1[qt5(+),${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ') - ) - qml? ( dev-qt/qtdeclarative:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" -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] - dev-python/nose2[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - ') - ) -" - -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 "larry@gentoo.org" || die - git config user.name "Larry the Cow" || die - git add . || die - git commit -m "init" || die - fi - fi -} - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/862660 - # https://github.com/qgis/QGIS/issues/56859 - # - # Do not trust with LTO either - append-flags -fno-strict-aliasing - filter-lto - - 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=$(usex doc) - -DWITH_GUI=ON - -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=$(usex test) - -DWITH_3D=$(usex 3d) - -DWITH_GSL=$(usex georeferencer) - $(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_PDAL=$(usex pdal) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_CUSTOM_WIDGETS=$(usex python) - -DWITH_QUICK=$(usex qml) - -DWITH_QTWEBKIT=OFF - -DWITH_DRACO=OFF - ) - - # We list all supported versions *by upstream for this version* - # here, even if we're not allowing it (e.g. bugs for now), so - # we enable/disable all the right versions. This is so qgis doesn't - # try to automatically use a version the build system knows about. - local supported_grass_versions=( 7 8 ) - if use grass; then - # We can do this because we have a := dep on grass & - # it changes subslot (ABI) when major versions change, so - # the logic here doesn't end up becoming stale. - 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} - - einfo "Supported versions: ${supported_grass_versions[@]}" - einfo "Found GRASS version: ${v[0]}*" - - local known_grass_version - # GRASS isn't slotted (in Gentoo, anyway) so we pick - # the best version we can to build against, and disable the others. - for known_grass_version in "${supported_grass_versions[@]}" ; do - case "${known_grass_version}" in - "${v[0]}") - einfo "GRASS version ${known_grass_version} is supported. Enabling." - mycmakeargs+=( - "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}" - "-DWITH_GRASS${known_grass_version}=ON" - ) - ;; - *) - einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling." - mycmakeargs+=( - "-DWITH_GRASS${known_grass_version}=OFF" - ) - ;; - esac - done - else - local known_grass_version - for known_grass_version in "${supported_grass_versions[@]}" ; do - mycmakeargs+=( - "-DWITH_GRASS${known_grass_version}=OFF" - ) - done - fi - - 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 - - cmake_src_configure -} - -src_test() { - local myctestargs=( - # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887 - -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_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_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$|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$|PyQgsVectorLayerEditBufferGroup$|PyQgsVectorLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)' - - --output-on-failure - ) - - virtx cmake_src_test -j1 -} - -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.36.3.ebuild b/sci-geosciences/qgis/qgis-3.36.3.ebuild deleted file mode 100644 index f0cc12843e19..000000000000 --- a/sci-geosciences/qgis/qgis-3.36.3.ebuild +++ /dev/null @@ -1,285 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="sqlite" - -# We only package the LTS releases right now -# We could package more but would ideally only stabilise the LTS ones -# at least. - -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 flag-o-matic 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 doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - mapserver? ( python ) - test? ( postgres ) -" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="!test? ( test )" - -# 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 - 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/qtmultimedia:5[widgets] - 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,spatialite,sqlite] - sci-libs/geos - sci-libs/libspatialindex:= - >=sci-libs/proj-4.9.3:= - sys-libs/zlib - >=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:= ) - hdf5? ( sci-libs/hdf5:= ) - mapserver? ( dev-libs/fcgi ) - netcdf? ( sci-libs/netcdf:= ) - opencl? ( virtual/opencl ) - oracle? ( - dev-db/oracle-instantclient:= - sci-libs/gdal:=[oracle] - ) - pdal? ( sci-libs/pdal:= ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - 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,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-python-2.10.1[qt5(+),${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ') - ) - qml? ( dev-qt/qtdeclarative:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" -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] - dev-python/nose2[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - ') - ) -" - -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 "larry@gentoo.org" || die - git config user.name "Larry the Cow" || die - git add . || die - git commit -m "init" || die - fi - fi -} - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/862660 - # https://github.com/qgis/QGIS/issues/56859 - # - # Do not trust with LTO either - append-flags -fno-strict-aliasing - filter-lto - - 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=$(usex doc) - -DWITH_GUI=ON - -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=$(usex test) - -DWITH_3D=$(usex 3d) - -DWITH_GSL=$(usex georeferencer) - $(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_PDAL=$(usex pdal) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_BINDINGS=$(usex python) - -DWITH_CUSTOM_WIDGETS=$(usex python) - -DWITH_QUICK=$(usex qml) - -DWITH_QTWEBKIT=OFF - -DWITH_DRACO=OFF - ) - - # We list all supported versions *by upstream for this version* - # here, even if we're not allowing it (e.g. bugs for now), so - # we enable/disable all the right versions. This is so qgis doesn't - # try to automatically use a version the build system knows about. - local supported_grass_versions=( 7 8 ) - if use grass; then - # We can do this because we have a := dep on grass & - # it changes subslot (ABI) when major versions change, so - # the logic here doesn't end up becoming stale. - 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} - - einfo "Supported versions: ${supported_grass_versions[@]}" - einfo "Found GRASS version: ${v[0]}*" - - local known_grass_version - # GRASS isn't slotted (in Gentoo, anyway) so we pick - # the best version we can to build against, and disable the others. - for known_grass_version in "${supported_grass_versions[@]}" ; do - case "${known_grass_version}" in - "${v[0]}") - einfo "GRASS version ${known_grass_version} is supported. Enabling." - mycmakeargs+=( - "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}" - "-DWITH_GRASS${known_grass_version}=ON" - ) - ;; - *) - einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling." - mycmakeargs+=( - "-DWITH_GRASS${known_grass_version}=OFF" - ) - ;; - esac - done - else - local known_grass_version - for known_grass_version in "${supported_grass_versions[@]}" ; do - mycmakeargs+=( - "-DWITH_GRASS${known_grass_version}=OFF" - ) - done - fi - - 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 - - cmake_src_configure -} - -src_test() { - local myctestargs=( - # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887 - -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_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_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$|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$|PyQgsVectorLayerEditBufferGroup$|PyQgsVectorLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)' - - --output-on-failure - ) - - virtx cmake_src_test -j1 -} - -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.38.0.ebuild b/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild index 76526560ee61..0284f8d105e8 100644 --- a/sci-geosciences/qgis/qgis-3.38.0.ebuild +++ b/sci-geosciences/qgis/qgis-3.38.0-r1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="~amd64" fi inherit cmake flag-o-matic python-single-r1 virtualx xdg @@ -25,11 +25,10 @@ HOMEPAGE="https://www.qgis.org/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal +polar postgres python qml qt6 test webengine" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python ) - qt6? ( polar ) " # test? ( postgres ) @@ -37,11 +36,19 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" COMMON_DEPEND=" + app-crypt/qca:2[qt6,ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= + dev-libs/qtkeychain[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-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] @@ -49,6 +56,9 @@ COMMON_DEPEND=" sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib + >=x11-libs/qscintilla-2.10.1:=[qt6] + >=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)] + 3d? ( dev-qt/qt3d:6 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) @@ -78,74 +88,14 @@ COMMON_DEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - !qt6? ( - dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5] - ) - qt6? ( - dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt6] - ) + dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt6] ') ) - !qt6? ( - app-crypt/qca:2[qt5,ssl] - dev-libs/qtkeychain[qt5] - x11-libs/qwt:=[qt5(+),svg(+)] - >=x11-libs/qscintilla-2.10.1:=[qt5] - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - 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 - 3d? ( dev-qt/qt3d:5 ) - polar? ( - || ( - ( - x11-libs/qwt:5 - x11-libs/qwtpolar - ) - ( - x11-libs/qwt:6/1.5 - x11-libs/qwtpolar - ) - ( - >=x11-libs/qwt-6.2[polar(+)] - ) - ) - ) - qml? ( dev-qt/qtdeclarative:5 ) - webengine? ( dev-qt/qtwebengine:5 ) - ) - qt6? ( - app-crypt/qca:2[qt6,ssl] - dev-libs/qtkeychain[qt6] - >=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)] - >=x11-libs/qscintilla-2.10.1:=[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 - 3d? ( dev-qt/qt3d:6 ) - polar? ( x11-libs/qwt:=[polar(+)] ) - qml? ( dev-qt/qtdeclarative:6 ) - webengine? ( dev-qt/qtwebengine:6 ) - ) + qml? ( dev-qt/qtdeclarative:6 ) + webengine? ( dev-qt/qtwebengine:6 ) " DEPEND="${COMMON_DEPEND} - !qt6? ( - dev-qt/qttest:5 - ) test? ( python? ( app-text/qpdf @@ -157,20 +107,14 @@ RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " BDEPEND="${PYTHON_DEPS} - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) + dev-qt/qttools:6[linguist] app-alternatives/yacc app-alternatives/lex doc? ( app-text/doxygen ) test? ( python? ( $(python_gen_cond_dep ' - !qt6? ( - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - ) - qt6? ( - dev-python/PyQt6[${PYTHON_USEDEP},testlib] - ) + dev-python/PyQt6[${PYTHON_USEDEP},testlib] dev-python/nose2[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] ') @@ -221,7 +165,7 @@ src_configure() { -DPEDANTIC=OFF -DUSE_CCACHE=OFF - -DBUILD_WITH_QT6="$(usex qt6)" + -DBUILD_WITH_QT6=ON -DWITH_ANALYSIS=ON -DWITH_APIDOC=$(usex doc) -DWITH_GUI=ON @@ -235,7 +179,7 @@ src_configure() { $(cmake_use_find_package netcdf NetCDF) -DUSE_OPENCL=$(usex opencl) -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) + -DWITH_QWTPOLAR=ON -DWITH_QTWEBENGINE=$(usex webengine) -DWITH_PDAL=$(usex pdal) -DWITH_POSTGRESQL=$(usex postgres) diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 76526560ee61..0284f8d105e8 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="~amd64" fi inherit cmake flag-o-matic python-single-r1 virtualx xdg @@ -25,11 +25,10 @@ HOMEPAGE="https://www.qgis.org/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal +polar postgres python qml qt6 test webengine" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python ) - qt6? ( polar ) " # test? ( postgres ) @@ -37,11 +36,19 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RESTRICT="!test? ( test )" COMMON_DEPEND=" + app-crypt/qca:2[qt6,ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= + dev-libs/qtkeychain[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-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] @@ -49,6 +56,9 @@ COMMON_DEPEND=" sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib + >=x11-libs/qscintilla-2.10.1:=[qt6] + >=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)] + 3d? ( dev-qt/qt3d:6 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) @@ -78,74 +88,14 @@ COMMON_DEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - !qt6? ( - dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt5] - ) - qt6? ( - dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.1[qt6] - ) + dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt6] ') ) - !qt6? ( - app-crypt/qca:2[qt5,ssl] - dev-libs/qtkeychain[qt5] - x11-libs/qwt:=[qt5(+),svg(+)] - >=x11-libs/qscintilla-2.10.1:=[qt5] - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - 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 - 3d? ( dev-qt/qt3d:5 ) - polar? ( - || ( - ( - x11-libs/qwt:5 - x11-libs/qwtpolar - ) - ( - x11-libs/qwt:6/1.5 - x11-libs/qwtpolar - ) - ( - >=x11-libs/qwt-6.2[polar(+)] - ) - ) - ) - qml? ( dev-qt/qtdeclarative:5 ) - webengine? ( dev-qt/qtwebengine:5 ) - ) - qt6? ( - app-crypt/qca:2[qt6,ssl] - dev-libs/qtkeychain[qt6] - >=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)] - >=x11-libs/qscintilla-2.10.1:=[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 - 3d? ( dev-qt/qt3d:6 ) - polar? ( x11-libs/qwt:=[polar(+)] ) - qml? ( dev-qt/qtdeclarative:6 ) - webengine? ( dev-qt/qtwebengine:6 ) - ) + qml? ( dev-qt/qtdeclarative:6 ) + webengine? ( dev-qt/qtwebengine:6 ) " DEPEND="${COMMON_DEPEND} - !qt6? ( - dev-qt/qttest:5 - ) test? ( python? ( app-text/qpdf @@ -157,20 +107,14 @@ RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " BDEPEND="${PYTHON_DEPS} - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) + dev-qt/qttools:6[linguist] app-alternatives/yacc app-alternatives/lex doc? ( app-text/doxygen ) test? ( python? ( $(python_gen_cond_dep ' - !qt6? ( - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - ) - qt6? ( - dev-python/PyQt6[${PYTHON_USEDEP},testlib] - ) + dev-python/PyQt6[${PYTHON_USEDEP},testlib] dev-python/nose2[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] ') @@ -221,7 +165,7 @@ src_configure() { -DPEDANTIC=OFF -DUSE_CCACHE=OFF - -DBUILD_WITH_QT6="$(usex qt6)" + -DBUILD_WITH_QT6=ON -DWITH_ANALYSIS=ON -DWITH_APIDOC=$(usex doc) -DWITH_GUI=ON @@ -235,7 +179,7 @@ src_configure() { $(cmake_use_find_package netcdf NetCDF) -DUSE_OPENCL=$(usex opencl) -DWITH_ORACLE=$(usex oracle) - -DWITH_QWTPOLAR=$(usex polar) + -DWITH_QWTPOLAR=ON -DWITH_QTWEBENGINE=$(usex webengine) -DWITH_PDAL=$(usex pdal) -DWITH_POSTGRESQL=$(usex postgres) |