From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2020 21:05:55 +0000 Subject: gentoo resync : 10.02.2020 --- sci-geosciences/qgis/Manifest | 8 +- .../qgis/files/qgis-2.18.12-cmake-lib-suffix.patch | 11 -- .../qgis/files/qgis-3.4.12-qt-5.13.patch | 22 --- sci-geosciences/qgis/qgis-3.10.2-r1.ebuild | 206 ++++++++++++++++++++ sci-geosciences/qgis/qgis-3.10.2.ebuild | 204 ------------------- sci-geosciences/qgis/qgis-3.4.12.ebuild | 216 --------------------- sci-geosciences/qgis/qgis-9999.ebuild | 34 ++-- 7 files changed, 226 insertions(+), 475 deletions(-) delete mode 100644 sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch delete mode 100644 sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch create mode 100644 sci-geosciences/qgis/qgis-3.10.2-r1.ebuild delete mode 100644 sci-geosciences/qgis/qgis-3.10.2.ebuild delete mode 100644 sci-geosciences/qgis/qgis-3.4.12.ebuild (limited to 'sci-geosciences/qgis') diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 5e238fcb8ef5..cecd0cc83476 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,12 +1,8 @@ -AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7 AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81bef294b79705589f537a9a7a2054806df06550a54525e307cc1eec2ecb81340faaf595a706d3d504190d720efe638ef3e2fb SHA512 a21ff313e4d1768dc15ac7dae8901d7245efb30f3caf7f9c0dbd667647e96b282f3451e7f52c8168df23ba2e953832995d975805a8f8bc176d20bd0862d9a51d -AUX qgis-3.4.12-qt-5.13.patch 707 BLAKE2B 3a6e14a77403980df16008345c1f8a6edeba6d7bc027e6c2844501af2d902277360d0ef3955bdc9845da3c2b8a688f4d98fd3d4062c388476c20900e08827be7 SHA512 66af7639e1ab475ae1f6d89d44bef75b5904024b04209fddb6b855f3f08e823a1224233a39f595412de196f6739d026e2c0a9384694ca308d8a5bea0ab4942e5 AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716eda662437a4d8469c055483b0e8c0014d0bc35e071b50a6e1a23138e8b6822df226d4d80b18f789976ff922a35311200 SHA512 59fee5497129856a15bf573d2682a4c837df044ccb44bc914fb64ad6e27d321251723131ae3ab5ffffdce876be954f2fd4db52931cd3fb6fbeb2f38a41419133 AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f -DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d -EBUILD qgis-3.10.2.ebuild 5462 BLAKE2B 1dda9fc92e04689fa73a0bda51d4d87cedcc0d50ab72c07b7512f1a740b1ff5247a53d9ed40a88d4c03174e97607488f2b1639eb857115f05654fd106b19526e SHA512 3483ad1c06e894e1546c426fda33bd27a4884df2c1a7b11580c72a3f3c59f44620438baa6e778f7c3257b4a62218b10a3ed9226371e10309093026ea69caefd9 -EBUILD qgis-3.4.12.ebuild 6069 BLAKE2B 56308d01f866770d39f9dc90998f7e0a1116f1701ce1a3485d098cad49f40f3aaedb73d498de1af1bd63f33062e4f4b73f15e8a0b5d0bb6d8b8f4ceb14f7824b SHA512 adbe42974b73c82bb3ad8f0fa3e26549b19e742c6a922d7bda9ee736bb4def0aee9837e4e22ad1439835db5f8f9c3a1aaec5d8dfdc073a30def851547e0cbf36 -EBUILD qgis-9999.ebuild 5464 BLAKE2B bc5374f93fec200d1a1c824bb9da5755d4871b4a041bce481ced386470bf66795c32d0266e07fa249dbc07399a328c9902edab5e2a03d035615811d8b46436a1 SHA512 2fbe115ef3ff9dad4af0174b6e11082d2a1468935fd5fae870bc5de33f664a16e15ed7667b8d66d23c0420d56e2037a2285f9f5e86a155f64051ec52178b366e +EBUILD qgis-3.10.2-r1.ebuild 5605 BLAKE2B 6a843e029a5428a3908d8029056b0dcf50b59417d3f0f3b0f0de269b049bae110d69d80c11d588c769b54539457bbdae425820d2c1438684db2a13e8875a2fd6 SHA512 a2ade40ebb1b8ed733af9b36c265cd9254a3b13d4f46a6ae0640f0786d760878d4bc6667c3c413f3f24b5880692c72b9254c564edbe01799a4864fa16bf757a8 +EBUILD qgis-9999.ebuild 5607 BLAKE2B 3acd63ef9604d2860ff2a8d6a2291d35f8d39ba277ecbedf81336b6d7142ec6ae9509c1325cfc5d1595aa4b669d5e69b9740020b251c59b9e009a28f17607037 SHA512 f86052c3b6d11030293712bddf071a969fb7cbff86ecca27d920019bb735fd8be0485ba1066b069d57067533071302af780d19d5c2034325e861c7a9c12e7706 MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99 diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch deleted file mode 100644 index 5a1e8fcd9551..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/PyQtMacros.cmake 2016-08-26 05:58:37.000000000 -0600 -+++ b/cmake/PyQtMacros.cmake 2016-09-21 16:25:55.921411011 -0600 -@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles ) - ELSE(WIN32) - # TODO osx - SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh") -- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib") -+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}") - ENDIF(WIN32) - - FOREACH(it ${ARGN}) diff --git a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch b/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch deleted file mode 100644 index 9edb44276098..000000000000 --- a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001 -From: Matthias Kuhn -Date: Sat, 22 Jun 2019 10:11:31 +0200 -Subject: [PATCH] Add missing include - -Fix https://github.com/qgis/QGIS/issues/30316 ---- - src/analysis/interpolation/qgsinterpolator.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h -index 35343ccdf7f..5d694418299 100644 ---- a/src/analysis/interpolation/qgsinterpolator.h -+++ b/src/analysis/interpolation/qgsinterpolator.h -@@ -19,6 +19,7 @@ - #define QGSINTERPOLATOR_H - - #include -+#include - #include "qgis_sip.h" - #include "qgis_analysis.h" - diff --git a/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild new file mode 100644 index 000000000000..cc6d86b4b702 --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="sqlite" +QT_MIN_VER="5.9.4" + +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 desktop python-single-r1 qmake-utils 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 webkit" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" + +BDEPEND=" + ${PYTHON_DEPS} + >=dev-qt/linguist-tools-${QT_MIN_VER}:5 + sys-devel/bison + sys-devel/flex +" +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/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-2.2.3:=[geos] + sci-libs/geos + sci-libs/libspatialindex:= + >=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:= ) + 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_MULTI_USEDEP}] + dev-python/httplib2[${PYTHON_MULTI_USEDEP}] + dev-python/jinja[${PYTHON_MULTI_USEDEP}] + dev-python/markupsafe[${PYTHON_MULTI_USEDEP}] + dev-python/owslib[${PYTHON_MULTI_USEDEP}] + dev-python/pygments[${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.1[qt5(+),${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/sip:=[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) + ') + ) + qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) + webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qttest-${QT_MIN_VER}:5 + python? ( ${PYTHON_DEPS} ) +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" + +# Disabling test suite because upstream disallow running from install path +RESTRICT="test" + +PATCHES=( + # git master + "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch" + # TODO upstream + "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" + "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" +) + +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 + -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_GEOREFERENCER=$(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_QTWEBKIT=$(usex webkit) + ) + + if use grass; then + mycmakeargs+=( + -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 + ) + fi + + use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) + + # 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.10.2.ebuild b/sci-geosciences/qgis/qgis-3.10.2.ebuild deleted file mode 100644 index 232d4a5b49c5..000000000000 --- a/sci-geosciences/qgis/qgis-3.10.2.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="sqlite" -QT_MIN_VER="5.9.4" - -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 desktop python-single-r1 qmake-utils 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 webkit" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" - -BDEPEND=" - ${PYTHON_DEPS} - >=dev-qt/linguist-tools-${QT_MIN_VER}:5 - sys-devel/bison - sys-devel/flex -" -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/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-2.2.3:=[geos] - sci-libs/geos - sci-libs/libspatialindex:= - >=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:= ) - 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} - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/owslib[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${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}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ) - qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/qttest-${QT_MIN_VER}:5 - python? ( ${PYTHON_DEPS} ) -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" - -PATCHES=( - # git master - "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch" - # TODO upstream - "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" - "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" -) - -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 - -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_GEOREFERENCER=$(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_QTWEBKIT=$(usex webkit) - ) - - if use grass; then - mycmakeargs+=( - -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 - ) - fi - - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) - - # 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.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild deleted file mode 100644 index ae1b97d37ba2..000000000000 --- a/sci-geosciences/qgis/qgis-3.4.12.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="sqlite" -QT_MIN_VER="5.9.4" - -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-utils desktop python-single-r1 qmake-utils 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 webkit" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" - -BDEPEND=" - >=dev-qt/linguist-tools-${QT_MIN_VER}:5 - sys-devel/bison - sys-devel/flex -" -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/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 - >=sci-libs/gdal-2.2.3:=[geos] - sci-libs/geos - sci-libs/libspatialindex:= - sci-libs/proj:= - >=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:= ) - 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} - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/owslib[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${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}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - ) - qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/qttest-${QT_MIN_VER}:5 - >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 - python? ( ${PYTHON_DEPS} ) -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" - -PATCHES=( - # git master - "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" - "${FILESDIR}/${P}-qt-5.13.patch" - # TODO upstream - "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" - "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - sed -e "/FIND_PACKAGE(QtQmlTools/s/ REQUIRED//" \ - -i CMakeLists.txt || die # TODO fixed in master -} - -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 - -DPEDANTIC=OFF - -DUSE_CCACHE=OFF - -DWITH_APIDOC=OFF - -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 - -DWITH_QSPATIALITE=ON - -DENABLE_TESTS=OFF - -DWITH_3D=$(usex 3d) - -DWITH_GEOREFERENCER=$(usex georeferencer) - -DWITH_GRASS7=$(usex grass) - $(cmake-utils_use_find_package hdf5 HDF5) - -DWITH_SERVER=$(usex mapserver) - $(cmake-utils_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_QTWEBKIT=$(usex webkit) - ) - - if use grass; then - mycmakeargs+=( - -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 - ) - fi - - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) - - # bugs 612956, 648726 - addpredict /dev/dri/renderD128 - addpredict /dev/dri/renderD129 - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop - - local size type - for size in 16 22 24 32 48 64 96 128 256; do - newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png - newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png - for type in qgs qml qlr qpt; do - newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png - done - done - newicon -s scalable images/icons/qgis_icon.svg qgis.svg - - 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 "${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 14ca3c37210b..74129055f6bb 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -73,22 +73,24 @@ COMMON_DEPEND=" postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/owslib[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[designer,network,sql,svg,webkit?,${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}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + $(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/owslib[${PYTHON_MULTI_USEDEP}] + dev-python/pygments[${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.1[qt5(+),${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/sip:=[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) + ') ) qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) -- cgit v1.2.3