commit: d41469167b90b0a16722c68b95d149b24cd6540b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 18:49:48 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 00:25:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4146916
sci-geosciences/qgis: Drop 3.16.0-r1
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 -
.../qgis/files/qgis-3.4.7-default-qmldir.patch | 25 ---
.../qgis/files/qgis-3.4.7-featuresummary.patch | 31 ----
sci-geosciences/qgis/qgis-3.16.0-r1.ebuild | 206 ---------------------
4 files changed, 263 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 89be781dcfc..f6515188344 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B
42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4
SHA512
c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B
85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6
SHA512
93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
DIST qgis-3.16.3.tar.bz2 114542609 BLAKE2B
e194881fbc25420c85dbe061388371da195e9696e86f441eb85a420d10a8e14ee01a7a4e4a353cdde2105ab54503b57f6f022a1800ae0dc3dc6fe87edccdeee2
SHA512
f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B
2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac
SHA512
6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch
b/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch
deleted file mode 100644
index 97f8ac12858..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlech...@gmail.com>
-Date: Sun, 28 Apr 2019 12:41:51 +0200
-Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4626042ca4..fe93ff3c4f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -660,7 +660,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 (APPLE)
---
-2.21.0
-
diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch
b/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch
deleted file mode 100644
index ec971cef779..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlech...@gmail.com>
-Date: Sun, 28 Apr 2019 00:10:21 +0200
-Subject: [PATCH] cmake: Use FeatureSummary
-
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4dff8ea0f4..4626042ca4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,6 +71,8 @@ IF(NOT MSVC)
- endif(USE_CCACHE)
- endif(NOT MSVC)
-
-+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
- #
-@@ -937,3 +939,5 @@ ENDIF (WITH_CORE)
- IF (UNIX AND NOT APPLE)
- ADD_SUBDIRECTORY(linux)
- ENDIF (UNIX AND NOT APPLE)
-+
-+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
---
-2.21.0
-
diff --git a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
b/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
deleted file mode 100644
index d952288f81f..00000000000
--- a/sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 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"
-
-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/qtserialport: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}]
- 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: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}/${P}-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
- 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_QTWEBKIT=OFF
- )
-
- if use grass; then
- mycmakeargs+=(
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- 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
-}
