diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-12-08 14:18:20 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-12-08 16:07:47 +0100 |
commit | 1507e46e6af69496a92caf3c6690035d1d90e13c (patch) | |
tree | 12f5f5a1db01cfe4761dfe2a6af9d59d8eb7ff73 /sci-geosciences | |
parent | app-text/libmwaw: 0.3.21 version bump (diff) | |
download | gentoo-1507e46e6af69496a92caf3c6690035d1d90e13c.tar.gz gentoo-1507e46e6af69496a92caf3c6690035d1d90e13c.tar.bz2 gentoo-1507e46e6af69496a92caf3c6690035d1d90e13c.zip |
sci-geosciences/qgis: Drop 3.18.3
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/qgis/Manifest | 1 | ||||
-rw-r--r-- | sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch | 12 | ||||
-rw-r--r-- | sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch | 26 | ||||
-rw-r--r-- | sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch | 32 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-3.18.3.ebuild | 207 |
5 files changed, 0 insertions, 278 deletions
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index d4a7736de149..1f703bc557ef 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,4 +1,3 @@ -DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826 SHA512 b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9 diff --git a/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch deleted file mode 100644 index 1edba1f0e747..000000000000 --- a/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake ---- a/cmake/PyQtMacros.cmake 2019-10-28 08:23:18.776024266 +0100 -+++ b/cmake/PyQtMacros.cmake 2019-10-28 08:24:17.316024213 +0100 -@@ -36,7 +36,7 @@ - ELSE(CMAKE_HOST_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(CMAKE_HOST_WIN32) - - FOREACH(it ${ARGN}) diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch deleted file mode 100644 index 9a57d45984e2..000000000000 --- a/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ad432e066fcc3d985fb5a451ad128cdf35c1dad9 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 20 Nov 2020 20:41:36 +0100 -Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 61b4c863d0..e7d0bdc8d3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -750,7 +750,7 @@ if (WITH_CORE) - set (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis) - set (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins) - set (DEFAULT_INCLUDE_SUBDIR include/qgis) -- set (DEFAULT_QML_SUBDIR qml) -+ set (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml) - - set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server) - endif() --- -2.29.2 - diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch deleted file mode 100644 index b1098175647c..000000000000 --- a/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f0fd6e80ad034cf7c49f4ba3708819424b6857b2 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 20 Nov 2020 20:41:06 +0100 -Subject: [PATCH] cmake: Use FeatureSummary - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f581b2c889..61b4c863d0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -111,6 +111,8 @@ if (FORCE_STATIC_PROVIDERS) - set (HAVE_STATIC_PROVIDERS TRUE) - endif() - -+include(FeatureSummary) -+ - # in generated makefiles use relative paths so the project dir is moveable - # Note commented out since it cause problems but it would be nice to resolve these and enable - # -@@ -1035,3 +1037,5 @@ endif() - if (UNIX AND NOT APPLE) - add_subdirectory(linux) - endif() -+ -+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) --- -2.29.2 - diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild deleted file mode 100644 index 9f48c0bfa4e3..000000000000 --- a/sci-geosciences/qgis/qgis-3.18.3.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_{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_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,gui,network,printsupport,sql,svg,${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.10.3[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - <dev-python/sip-5:=[${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: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 -} |