From 9aa80713372911cec499b3adb2cd746790920916 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 Jun 2021 10:15:54 +0100 Subject: gentoo resync : 29.06.2021 --- sci-geosciences/qgis/Manifest | 10 +- sci-geosciences/qgis/qgis-3.16.4.ebuild | 207 ----------------------------- sci-geosciences/qgis/qgis-3.16.8.ebuild | 207 ----------------------------- sci-geosciences/qgis/qgis-3.18.3.ebuild | 2 +- sci-geosciences/qgis/qgis-3.20.0-r1.ebuild | 57 ++++---- sci-geosciences/qgis/qgis-9999.ebuild | 57 ++++---- 6 files changed, 60 insertions(+), 480 deletions(-) delete mode 100644 sci-geosciences/qgis/qgis-3.16.4.ebuild delete mode 100644 sci-geosciences/qgis/qgis-3.16.8.ebuild (limited to 'sci-geosciences/qgis') diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index eb204fe7c624..3f05da9d7a2e 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,14 +1,10 @@ AUX qgis-3.16.0-cmake-lib-suffix.patch 507 BLAKE2B 0a8943fe06f4065d5c0b1cf7797ecedb9fed40616121cbfd9f0c97568dd7da0b7c3e6a526b9408b6268b20988fe7a216d94cc394c01a693fcac6b321f7c7ca01 SHA512 5014fb01e7caa56f5fcb8a7f6b81e1f99acac50e7edff524071808f2b145f87dd440ce8c4897b7c781cb8e30c5ee3a873a6d977c6ecd65a54dc3157de8b0bfd1 AUX qgis-3.16.1-default-qmldir.patch 899 BLAKE2B b5f573445c80cf991864320d80644aacdfc28095f3657839dec0c084544d44405857a2cf1f644c8a47ac271cf51953f861cde285f37e30c490623fbbf96f7470 SHA512 4d794cdc730c55d59163bce7d1c23cab7ab3c384e09dccfe3b541d12ef365a180035fd51d998128c59c493b6039fff13dafe392c5935bbdedb39c22c05748a5c AUX qgis-3.16.1-featuresummary.patch 905 BLAKE2B 318239edfc14562cccf0a0c79e330fc24c03f8468d4df3a3ece0286f2448df275d117afc0ed63f8d7c682cebef84a62fda3a992a9e4746f37fe1e8b52e82ecf7 SHA512 c3b563fcfac199756f4f8212cf1f0ceb301c7d4cc751d2b9b1b6f3f8d69d88ae1d6cab33c952a2ff15bdbe33a4151f93eaf9308a486ca330fd45c533f9fa3b36 -DIST qgis-3.16.4.tar.bz2 115427023 BLAKE2B 1526350974b634d13f55b77e99ec54c8cd29eb523657657f72de0f9e9b2b47d931e503404b202fe2e181c8e1918888732cc4353091dd8dffcaefb6caa32ad47f SHA512 a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25 -DIST qgis-3.16.8.tar.bz2 116478775 BLAKE2B b4a310745ec24a41471073c390063e4aae2d58001dae18b8ea1f1b7f430e7380ae541c3fb7efc05a7bafe617f3bcc0b1f123654941622ee6d1d29cde40acc301 SHA512 4b4941c78a4eebf0ad2d6eaebdcd15cd1fa0a4435b4043b2c23bf388b9dc2e4ad0211cf9921e8c3b336bc94e619842ea9b21fe42ca4084e8c1bc889586f86db7 DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33 SHA512 0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d -EBUILD qgis-3.16.4.ebuild 5425 BLAKE2B 37675d37a35b5f000c137d5461ceb0749608cec33210eda98838b76a202474230c982f6276bf1cac3c87fe53fa56b33232a04e7bcb9a17bfb54a87f18599a9d6 SHA512 4e9d8b1ef1453942995df58a8bc6ba00a02a3231bfc2e379124a71fdca3f1e7cd6db026f6a4e7454f3af6c9810caed065717082c06f8f8cb75b44a27afccf658 -EBUILD qgis-3.16.8.ebuild 5427 BLAKE2B 3d8bd83df0a05c798102e8f47ebf9220620a869d624e194f61fe9faf88237fd6bc4a12afa5f1929405f33f39041b11c7317dad61d0d7f53c86ed3df4b3faac3b SHA512 2eaecc9029a8cba70261ae12c5eb892bedf7645b30f552378697a7e520111a7146eccf79d0106becfa9f673507aa5e09d2c2b5bef65a4f27d98e73aeae9fc328 -EBUILD qgis-3.18.3.ebuild 5427 BLAKE2B 3d8bd83df0a05c798102e8f47ebf9220620a869d624e194f61fe9faf88237fd6bc4a12afa5f1929405f33f39041b11c7317dad61d0d7f53c86ed3df4b3faac3b SHA512 2eaecc9029a8cba70261ae12c5eb892bedf7645b30f552378697a7e520111a7146eccf79d0106becfa9f673507aa5e09d2c2b5bef65a4f27d98e73aeae9fc328 -EBUILD qgis-3.20.0-r1.ebuild 5723 BLAKE2B 683c5399abccc9d435408a8773c7d51b3307742a9ca345bcf9feb9b6abdea3623297844a1fdae866a0e8c800c3e495b3fa375094fb04c49b01b6eb68e547b9ef SHA512 32f449643d33558bb110dc51ea03087229a31cae0e23f7653d7be4df285bf54118cbe76fe48bfe7fc0c721573b651e8de33b4001f2f4171afa02d56a87f02ab6 -EBUILD qgis-9999.ebuild 5723 BLAKE2B 683c5399abccc9d435408a8773c7d51b3307742a9ca345bcf9feb9b6abdea3623297844a1fdae866a0e8c800c3e495b3fa375094fb04c49b01b6eb68e547b9ef SHA512 32f449643d33558bb110dc51ea03087229a31cae0e23f7653d7be4df285bf54118cbe76fe48bfe7fc0c721573b651e8de33b4001f2f4171afa02d56a87f02ab6 +EBUILD qgis-3.18.3.ebuild 5425 BLAKE2B 37675d37a35b5f000c137d5461ceb0749608cec33210eda98838b76a202474230c982f6276bf1cac3c87fe53fa56b33232a04e7bcb9a17bfb54a87f18599a9d6 SHA512 4e9d8b1ef1453942995df58a8bc6ba00a02a3231bfc2e379124a71fdca3f1e7cd6db026f6a4e7454f3af6c9810caed065717082c06f8f8cb75b44a27afccf658 +EBUILD qgis-3.20.0-r1.ebuild 5464 BLAKE2B 1f3cda341ef61a0f6ab08335cbec01fb585982a777ceb7420c0b8e86255d7676718aebc6d6fb5ede2b742074bd0cb4c7d879f4fde24a380a36938f3f2595691c SHA512 01cd73d0c0bb8db1dafee8c9ea223a8efe40009eeada333d7c3245f97717492adfa7e56caaf5c440d55e94defd313e6cde795e84994390baa57c6f234af16189 +EBUILD qgis-9999.ebuild 5464 BLAKE2B 1f3cda341ef61a0f6ab08335cbec01fb585982a777ceb7420c0b8e86255d7676718aebc6d6fb5ede2b742074bd0cb4c7d879f4fde24a380a36938f3f2595691c SHA512 01cd73d0c0bb8db1dafee8c9ea223a8efe40009eeada333d7c3245f97717492adfa7e56caaf5c440d55e94defd313e6cde795e84994390baa57c6f234af16189 MISC metadata.xml 1482 BLAKE2B 87925de85329041a784559b99dc67fd0c787afe25ec6238c19a4200dcabdc3edd45e327605e9178d9c3242ac41be92aa7c048a32c96d72e10af8a32e9461f549 SHA512 22ce6a29e4ddba67939f639e2b7dbf0a0632b3844a599bd4e6300b59f63bd11a447c19a530810fd172ca84a6009a65523445ff8000a2312ebe483c5591b3533f diff --git a/sci-geosciences/qgis/qgis-3.16.4.ebuild b/sci-geosciences/qgis/qgis-3.16.4.ebuild deleted file mode 100644 index 7e4e3237f9fb..000000000000 --- a/sci-geosciences/qgis/qgis-3.16.4.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -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 desktop python-single-r1 qmake-utils xdg - -DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/en/site/" - -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 )" - -BDEPEND="${PYTHON_DEPS} - dev-qt/linguist-tools:5 - sys-devel/bison - sys-devel/flex -" -COMMON_DEPEND=" - >=app-crypt/qca-2.3.0:2[ssl] - >=dev-db/spatialite-4.2.0 - dev-db/sqlite:3 - dev-libs/expat - dev-libs/libzip:= - dev-libs/protobuf:= - dev-libs/qtkeychain:= - 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/qtsql:5 - dev-qt/qtsvg: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:= - >=sci-libs/proj-6.3.1:= - sys-libs/zlib - >=x11-libs/qscintilla-2.10.3:= - >=x11-libs/qwt-6.1.3-r2:6=[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-r2 ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - 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,gui,network,printsupport,sql,svg,${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.3[${PYTHON_MULTI_USEDEP}] - dev-python/requests[${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:5 ) - serial? ( dev-qt/qtserialport:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" - -PATCHES=( - # git master - "${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch" - # TODO upstream - "${FILESDIR}/${PN}-3.16.1-featuresummary.patch" - "${FILESDIR}/${PN}-3.16.1-default-qmldir.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - sed -e "/QtWebKit.*.py/d" \ - -i python/PyQt/CMakeLists.txt || die -} - -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_QT5SERIALPORT=$(usex serial) - -DWITH_QTWEBKIT=OFF - ) - - if use grass; then - mycmakeargs+=( - -DGRASS_PREFIX7=/usr/$(get_libdir)/grass78 - ) - 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.16.8.ebuild b/sci-geosciences/qgis/qgis-3.16.8.ebuild deleted file mode 100644 index b9241f08516d..000000000000 --- a/sci-geosciences/qgis/qgis-3.16.8.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -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 desktop python-single-r1 qmake-utils xdg - -DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="https://www.qgis.org/en/site/" - -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 )" - -BDEPEND="${PYTHON_DEPS} - dev-qt/linguist-tools:5 - sys-devel/bison - sys-devel/flex -" -COMMON_DEPEND=" - >=app-crypt/qca-2.3.0:2[ssl] - >=dev-db/spatialite-4.2.0 - dev-db/sqlite:3 - dev-libs/expat - dev-libs/libzip:= - dev-libs/protobuf:= - dev-libs/qtkeychain:= - 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/qtsql:5 - dev-qt/qtsvg: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:= - >=sci-libs/proj-6.3.1:= - sys-libs/zlib - >=x11-libs/qscintilla-2.10.3:= - >=x11-libs/qwt-6.1.3-r2:6=[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-r2 ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - 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,gui,network,printsupport,sql,svg,${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.3[${PYTHON_MULTI_USEDEP}] - dev-python/requests[${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:5 ) - serial? ( dev-qt/qtserialport:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 -" -RDEPEND="${COMMON_DEPEND} - sci-geosciences/gpsbabel -" - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" - -PATCHES=( - # git master - "${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch" - # TODO upstream - "${FILESDIR}/${PN}-3.16.1-featuresummary.patch" - "${FILESDIR}/${PN}-3.16.1-default-qmldir.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - sed -e "/QtWebKit.*.py/d" \ - -i python/PyQt/CMakeLists.txt || die -} - -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_QT5SERIALPORT=$(usex serial) - -DWITH_QTWEBKIT=OFF - ) - - if use grass; then - mycmakeargs+=( - -DGRASS_PREFIX7=/usr/$(get_libdir)/grass78 - ) - 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.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild index b9241f08516d..7e4e3237f9fb 100644 --- a/sci-geosciences/qgis/qgis-3.18.3.ebuild +++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild @@ -12,7 +12,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 x86" fi inherit cmake desktop python-single-r1 qmake-utils xdg diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild index 54363b3b17a6..d7f5ec4633f4 100644 --- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild +++ b/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild @@ -5,9 +5,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="sqlite" -QT_MIN_VER="5.9.4" -if [[ ${PV} = *9999 ]]; then +if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" inherit git-r3 else @@ -26,12 +25,9 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-qt/linguist-tools-${QT_MIN_VER}:5 - sys-devel/bison - sys-devel/flex -" +# 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 @@ -40,18 +36,18 @@ COMMON_DEPEND=" dev-libs/libzip:= dev-libs/protobuf:= 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 + 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/qtserialport: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 @@ -60,7 +56,7 @@ COMMON_DEPEND=" >=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 ) + 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) @@ -95,19 +91,22 @@ COMMON_DEPEND=" postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) ') ) - qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) - serial? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 ) + qml? ( dev-qt/qtdeclarative:5 ) + serial? ( dev-qt/qtserialport:5 ) " DEPEND="${COMMON_DEPEND} - >=dev-qt/qttest-${QT_MIN_VER}:5 + dev-qt/qttest:5 python? ( ${PYTHON_DEPS} ) " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" +BDEPEND=" + ${PYTHON_DEPS} + dev-qt/linguist-tools:5 + sys-devel/bison + sys-devel/flex +" pkg_setup() { python-single-r1_pkg_setup @@ -134,7 +133,6 @@ src_configure() { -DENABLE_TESTS=OFF -DWITH_3D=$(usex 3d) -DWITH_GSL=$(usex georeferencer) - -DWITH_GEOREFERENCER=$(usex georeferencer) -DWITH_GRASS7=$(usex grass) $(cmake_use_find_package hdf5 HDF5) -DWITH_SERVER=$(usex mapserver) @@ -159,7 +157,8 @@ src_configure() { mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} ) fi - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) + use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) || + mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 # bugs 612956, 648726 addpredict /dev/dri/renderD128 diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 54363b3b17a6..d7f5ec4633f4 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -5,9 +5,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="sqlite" -QT_MIN_VER="5.9.4" -if [[ ${PV} = *9999 ]]; then +if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" inherit git-r3 else @@ -26,12 +25,9 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-qt/linguist-tools-${QT_MIN_VER}:5 - sys-devel/bison - sys-devel/flex -" +# 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 @@ -40,18 +36,18 @@ COMMON_DEPEND=" dev-libs/libzip:= dev-libs/protobuf:= 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 + 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/qtserialport: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 @@ -60,7 +56,7 @@ COMMON_DEPEND=" >=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 ) + 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) @@ -95,19 +91,22 @@ COMMON_DEPEND=" postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] ) ') ) - qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) - serial? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 ) + qml? ( dev-qt/qtdeclarative:5 ) + serial? ( dev-qt/qtserialport:5 ) " DEPEND="${COMMON_DEPEND} - >=dev-qt/qttest-${QT_MIN_VER}:5 + dev-qt/qttest:5 python? ( ${PYTHON_DEPS} ) " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " - -# Disabling test suite because upstream disallow running from install path -RESTRICT="test" +BDEPEND=" + ${PYTHON_DEPS} + dev-qt/linguist-tools:5 + sys-devel/bison + sys-devel/flex +" pkg_setup() { python-single-r1_pkg_setup @@ -134,7 +133,6 @@ src_configure() { -DENABLE_TESTS=OFF -DWITH_3D=$(usex 3d) -DWITH_GSL=$(usex georeferencer) - -DWITH_GEOREFERENCER=$(usex georeferencer) -DWITH_GRASS7=$(usex grass) $(cmake_use_find_package hdf5 HDF5) -DWITH_SERVER=$(usex mapserver) @@ -159,7 +157,8 @@ src_configure() { mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} ) fi - use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) + use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) || + mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973 # bugs 612956, 648726 addpredict /dev/dri/renderD128 -- cgit v1.2.3