From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- sci-geosciences/qgis/Manifest | 8 +- sci-geosciences/qgis/qgis-3.10.0.ebuild | 204 -------------------------------- sci-geosciences/qgis/qgis-3.10.1.ebuild | 204 ++++++++++++++++++++++++++++++++ sci-geosciences/qgis/qgis-3.4.12.ebuild | 4 +- sci-geosciences/qgis/qgis-9999.ebuild | 18 +-- 5 files changed, 219 insertions(+), 219 deletions(-) delete mode 100644 sci-geosciences/qgis/qgis-3.10.0.ebuild create mode 100644 sci-geosciences/qgis/qgis-3.10.1.ebuild (limited to 'sci-geosciences/qgis') diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 96f597d5523b..9398aab42f90 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -3,10 +3,10 @@ AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81b 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.0.tar.bz2 101075584 BLAKE2B ec2bb34a0e49c6291f02b3bd92e44999042c7f7ea77047f9ad61066503ffbe9678be91964b7300b4f0d22fe7bc51d7df53fb370a402157c3ce93949ace70c3af SHA512 0666e93998b7022b83f0321ba8848d8d0a182e3ced55a91f8d5119d4bfa971949a07b82668f7e6a4801bb9ca5a6e0c551ff4c346920feaed2ece24e61c4f2b4c +DIST qgis-3.10.1.tar.bz2 99813767 BLAKE2B 52c7708ddfb6252152ce13e19422481737b5ac20465929398d7af8997043f4fcb45f67cb2d78fa96278726c8841fc6949c25b80ffa5d1efafaa5d380bc9ace2b SHA512 0e3620d4f6aefc64c243ffd307ad5a4ed44be540d5e11f5a1cf49f046e0c7a09d3470ebb6c6efbe1481c80b3f694636044c071143daa37f3b5d8d67a273cc536 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.0.ebuild 5492 BLAKE2B c80a9774aae4a055711d6cf61f9407173bf7fe2eba09fcea01563166378b01d4af903d347fd6556d33a9bf9f4de8aea35882ed41203b22d1aa833abaade1d5c6 SHA512 3ec865d805c4829ab01246583d725066878af3984831df95cab852d79d4abba26af358ef88d423948481a151d50414365507f1a7770ad1f8799d557245856da9 -EBUILD qgis-3.4.12.ebuild 6073 BLAKE2B 50be207fe2ab5581b0eff3bd44a513f46b96002bfa00b80a820543b141f8c418320344e655ba519654c021de6f122198a07f2f0ffc07479f7150a10fc46c27d3 SHA512 d2a520ab4f7e492a54f5a0780627b089ce48f5b58377cfb5f44436ef8303d43601652b20f257dfb4e4901f9fd7e07f1013a206ccad507b2b082d8b95c8f1f8e1 -EBUILD qgis-9999.ebuild 5493 BLAKE2B f5ba71539f41e02cbab1cf2f6e39cab371d5af9167b318f671f55d3167d6fd125392b6ac02a6799bf0321ea428e2f3d5cddc8779d0672222bde21cb160e1f41c SHA512 df8c87b10bbb48c92904fef7690b35c557d04f7c432322302bb92dd14edd66aafd93b79f21fff505b5aee4c4864bc4d425cdb7b5eafafc9abd474f3df87b16fc +EBUILD qgis-3.10.1.ebuild 5464 BLAKE2B 05f29a1d558eb85aa15dfd6d5c18b3162f4341e09be395b4386b29e446ccd021b510a684f2065b05590a6000cd9c17ee7213ba26bff9fa3399fe0fbf634c1c1c SHA512 8b62b65d4aaa9f105b44adbac655e1018e0f1c503817abd523e60bde4e3dfe3b0f00d1f638c643d28cba56606db49e507182091f75a63f7c5b6c5e1f744be163 +EBUILD qgis-3.4.12.ebuild 6069 BLAKE2B 56308d01f866770d39f9dc90998f7e0a1116f1701ce1a3485d098cad49f40f3aaedb73d498de1af1bd63f33062e4f4b73f15e8a0b5d0bb6d8b8f4ceb14f7824b SHA512 adbe42974b73c82bb3ad8f0fa3e26549b19e742c6a922d7bda9ee736bb4def0aee9837e4e22ad1439835db5f8f9c3a1aaec5d8dfdc073a30def851547e0cbf36 +EBUILD qgis-9999.ebuild 5464 BLAKE2B 05f29a1d558eb85aa15dfd6d5c18b3162f4341e09be395b4386b29e446ccd021b510a684f2065b05590a6000cd9c17ee7213ba26bff9fa3399fe0fbf634c1c1c SHA512 8b62b65d4aaa9f105b44adbac655e1018e0f1c503817abd523e60bde4e3dfe3b0f00d1f638c643d28cba56606db49e507182091f75a63f7c5b6c5e1f744be163 MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99 diff --git a/sci-geosciences/qgis/qgis-3.10.0.ebuild b/sci-geosciences/qgis/qgis-3.10.0.ebuild deleted file mode 100644 index 365b9209d058..000000000000 --- a/sci-geosciences/qgis/qgis-3.10.0.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2019 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-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=" - ${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:= - >=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-utils_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-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 - - 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.1.ebuild b/sci-geosciences/qgis/qgis-3.10.1.ebuild new file mode 100644 index 000000000000..cffda470c4af --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.10.1.ebuild @@ -0,0 +1,204 @@ +# 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 index e26eca9f9a28..ae1b97d37ba2 100644 --- a/sci-geosciences/qgis/qgis-3.4.12.ebuild +++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{5,6} ) +PYTHON_COMPAT=( python3_6 ) PYTHON_REQ_USE="sqlite" QT_MIN_VER="5.9.4" diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 9813d2056fe6..cffda470c4af 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ 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-utils desktop python-single-r1 qmake-utils xdg +inherit cmake desktop python-single-r1 qmake-utils xdg DESCRIPTION="User friendly Geographic Information System" HOMEPAGE="https://www.qgis.org/" @@ -55,7 +55,7 @@ COMMON_DEPEND=" >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= - sci-libs/proj:= + >=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 ) @@ -106,7 +106,7 @@ RESTRICT="test" PATCHES=( # git master - "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" + "${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" @@ -117,7 +117,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -138,9 +138,9 @@ src_configure() { -DWITH_3D=$(usex 3d) -DWITH_GEOREFERENCER=$(usex georeferencer) -DWITH_GRASS7=$(usex grass) - $(cmake-utils_use_find_package hdf5 HDF5) + $(cmake_use_find_package hdf5 HDF5) -DWITH_SERVER=$(usex mapserver) - $(cmake-utils_use_find_package netcdf NetCDF) + $(cmake_use_find_package netcdf NetCDF) -DUSE_OPENCL=$(usex opencl) -DWITH_ORACLE=$(usex oracle) -DWITH_QWTPOLAR=$(usex polar) @@ -163,11 +163,11 @@ src_configure() { addpredict /dev/dri/renderD128 addpredict /dev/dri/renderD129 - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install insinto /usr/share/mime/packages doins debian/qgis.xml -- cgit v1.2.3