summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-02-09 18:40:45 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2020-02-09 18:40:45 +0100
commit1db2ae292920e796c4419317db3c4a30a44d8d53 (patch)
tree6ed0e845e7c878eaa823e186cb9b9337794bba07 /sci-geosciences
parentmedia-gfx/gnofract4d: remove unused patch(es) (diff)
downloadgentoo-1db2ae292920e796c4419317db3c4a30a44d8d53.tar.gz
gentoo-1db2ae292920e796c4419317db3c4a30a44d8d53.tar.bz2
gentoo-1db2ae292920e796c4419317db3c4a30a44d8d53.zip
sci-geosciences/qgis: Drop 3.4.12
Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/qgis/Manifest1
-rw-r--r--sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch11
-rw-r--r--sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch22
-rw-r--r--sci-geosciences/qgis/qgis-3.4.12.ebuild218
4 files changed, 0 insertions, 252 deletions
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 0065053e9ae..4716dc2a28a 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
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
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 5a1e8fcd955..00000000000
--- 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 9edb4427609..00000000000
--- 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 <matthias@opengis.ch>
-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 <QVector>
-+#include <QList>
- #include "qgis_sip.h"
- #include "qgis_analysis.h"
-
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 d5cb18ca5d4..00000000000
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild
+++ /dev/null
@@ -1,218 +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}
- $(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
- >=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
-}