From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
Date: Sat, 1 Jul 2017 15:56:50 +0000 (UTC) [thread overview]
Message-ID: <1498924592.0eb013faa01916545544abbcaae5d9952fe683a2.asturm@gentoo> (raw)
commit: 0eb013faa01916545544abbcaae5d9952fe683a2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 22:14:17 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 15:56:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb013fa
sci-geosciences/qgis: Drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.1
sci-geosciences/qgis/Manifest | 2 -
.../qgis-2.18.9-broken-psycopg2-encoding.patch | 32 ---
.../qgis-2.18.9-dbmanager-plugin-exceptions.patch | 89 --------
.../qgis-2.18.9-fix-plugin-config-settings.patch | 23 ---
.../files/qgis-2.18.9-uncaught-exception.patch | 40 ----
sci-geosciences/qgis/qgis-2.18.7.ebuild | 221 --------------------
sci-geosciences/qgis/qgis-2.18.9.ebuild | 226 ---------------------
7 files changed, 633 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index b5df166015b..b922dbe1347 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,3 @@
DIST qgis-2.18.10.tar.bz2 84503710 SHA256 b2754daa6870008132702008c285dc94830e92ef0bd64e548ce5b47f2dec3fef SHA512 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8 WHIRLPOOL ea983e6f0043df1484496c341ad905d672c55b548494ad9ae10ec0cf8731ecd148f0536a0557489a8d42cbe97bd91db261de868609bd4004997f35f7a00bee3d
DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
-DIST qgis-2.18.7.tar.bz2 84928689 SHA256 ab05060e6b91909f61a21205ee12ddf79ebd85a7d7b81ab3b7dabfd032aa2e5b SHA512 e7908ebe8049d0ca2e99980ba8ac6e9b6941811c96d6139db87072315404987da0ec7272f77abacaddf5fb4bd540a0be7f64e44662fa32d2d4eb11b85421744d WHIRLPOOL 25320b1bacaeaf1486aa6a95b8df32e0a1b4713aedb5237f46e7aa538ef682b9cbd9eff70914727e426193fb0821df437e4732b118e71a4e12d90308cbbb066f
-DIST qgis-2.18.9.tar.bz2 84453524 SHA256 a922af0e4b3bcf8e790d7fc50752bc96771abfc2d093365cb3260b45c27225a1 SHA512 2495d9bc4f22f22882beb322d01465dd456a6db8a59a7e8e8056555b6ab4c895e9fc70d423f36a856d3a3b890bb3fbab607f7fd34736a8d2bc69f29bf1d91ca4 WHIRLPOOL cfc6006eed3e948407eea79c57eb543be700d99ff0eb38e07263ec8659dee4ceafac8879dc95ac7b275efe44708d4a949d71dfd9800e8a9cb013527aabcea8e3
DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch b/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch
deleted file mode 100644
index b6eb1d17159..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2c8e03de391ac8a878d56e0a491c6a70b7a4c589 Mon Sep 17 00:00:00 2001
-From: Borys Jurgiel <info@borysjurgiel.pl>
-Date: Sat, 3 Jun 2017 16:54:54 +0200
-Subject: [PATCH] [PROCESSING] [regression] One more fix for broken encoding of
- psycopg2 error messages
-
----
- python/plugins/processing/tools/postgis.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/plugins/processing/tools/postgis.py b/python/plugins/processing/tools/postgis.py
-index 69fab99b7f4..96c88f95f63 100644
---- a/python/plugins/processing/tools/postgis.py
-+++ b/python/plugins/processing/tools/postgis.py
-@@ -205,7 +205,7 @@ def __init__(self, host=None, port=None, dbname=None, user=None,
- break
- except psycopg2.OperationalError as e:
- if i == 3:
-- raise DbError(unicode(e))
-+ raise DbError(unicode(e.pgerror, e.cursor.connection.encoding, 'replace'))
-
- err = unicode(e)
- user = self.uri.username()
-@@ -821,7 +821,7 @@ def _exec_sql(self, cursor, sql):
- try:
- cursor.execute(sql)
- except psycopg2.Error as e:
-- raise DbError(unicode(e), e.cursor.query)
-+ raise DbError(unicode(e.pgerror, e.cursor.connection.encoding, 'replace'), e.cursor.query)
-
- def _exec_sql_and_commit(self, sql):
- """Tries to execute and commit some action, on error it rolls
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch b/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch
deleted file mode 100644
index 0b780c22ca6..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From dae921c51f85f2dde2bab9b18a0d7c7c31bc700b Mon Sep 17 00:00:00 2001
-From: Luigi Pirelli <luipir@gmail.com>
-Date: Thu, 11 May 2017 17:40:32 +0200
-Subject: [PATCH] [DB Manager] previewing layers in Virtual layers section
- remove them from the Layers panel: fixies #16476 plus more vlayer db_manager
- plugin fixes to reduce (but can't avoid) exceptions due to C++/SIP object
- removes
-
----
- python/plugins/db_manager/db_plugins/vlayers/connector.py | 10 ++++++++++
- python/plugins/db_manager/layer_preview.py | 11 +++++++----
- 2 files changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/python/plugins/db_manager/db_plugins/vlayers/connector.py b/python/plugins/db_manager/db_plugins/vlayers/connector.py
-index e64f2ec57b6..4c8cb4dca1b 100644
---- a/python/plugins/db_manager/db_plugins/vlayers/connector.py
-+++ b/python/plugins/db_manager/db_plugins/vlayers/connector.py
-@@ -96,6 +96,10 @@ def getLayer(self, l):
- lid = self.layers.get(l)
- if lid is None:
- return lid
-+ # the instance can refer to a layer in map previe and not in qgis general canvas
-+ if lid not in QgsMapLayerRegistry.instance().mapLayers().keys():
-+ self.layers.pop(l)
-+ return None
- return QgsMapLayerRegistry.instance().mapLayer(lid)
-
-
-@@ -246,12 +250,16 @@ def getRasterTables(self, schema=None):
- def getTableRowCount(self, table):
- t = table[1]
- l = VLayerRegistry.instance().getLayer(t)
-+ if not l or not l.isValid():
-+ return None
- return l.featureCount()
-
- def getTableFields(self, table):
- """ return list of columns in table """
- t = table[1]
- l = VLayerRegistry.instance().getLayer(t)
-+ if not l or not l.isValid():
-+ return []
- # id, name, type, nonnull, default, pk
- n = l.dataProvider().fields().size()
- f = [(i, f.name(), f.typeName(), False, None, False)
-@@ -277,6 +285,8 @@ def getTableExtent(self, table, geom):
- l = QgsMapLayerRegistry.instance().mapLayer(t)
- else:
- l = VLayerRegistry.instance().getLayer(t)
-+ if not l or not l.isValid():
-+ return None
- e = l.extent()
- r = (e.xMinimum(), e.yMinimum(), e.xMaximum(), e.yMaximum())
- return r
-diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py
-index 1f7cec65526..27bba0a8f13 100644
---- a/python/plugins/db_manager/layer_preview.py
-+++ b/python/plugins/db_manager/layer_preview.py
-@@ -25,7 +25,7 @@
- from qgis.PyQt.QtWidgets import QApplication
-
- from qgis.gui import QgsMapCanvas, QgsMapCanvasLayer, QgsMessageBar
--from qgis.core import QgsVectorLayer, QgsMapLayerRegistry
-+from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject
-
- from .db_plugins.plugin import Table
-
-@@ -113,15 +113,18 @@ def _loadTablePreview(self, table, limit=False):
- else:
- vl = table.toMapLayer()
-
-- if not vl.isValid():
-+ if vl and not vl.isValid():
- vl.deleteLater()
- vl = None
-
- # remove old layer (if any) and set new
- if self.currentLayer:
-- QgsMapLayerRegistry.instance().removeMapLayers([self.currentLayer.id()])
-+ # but not remove it if in layer list panel
-+ # fix https://issues.qgis.org/issues/16476
-+ if not QgsProject.instance().layerTreeRoot().findLayer(self.currentLayer.id()):
-+ QgsMapLayerRegistry.instance().removeMapLayers([self.currentLayer.id()])
-
-- if vl:
-+ if vl and vl.isValid():
- self.setLayerSet([QgsMapCanvasLayer(vl)])
- QgsMapLayerRegistry.instance().addMapLayers([vl], False)
- self.zoomToFullExtent()
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch b/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch
deleted file mode 100644
index cbf03f146ca..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 008f38574e78f0557aae890f508cf5e148545d15 Mon Sep 17 00:00:00 2001
-From: "Juergen E. Fischer" <jef@norbit.de>
-Date: Wed, 31 May 2017 13:50:03 +0200
-Subject: [PATCH] processing: only reset existing menu 'settings' (followup
- e78fc620)
-
----
- python/plugins/processing/gui/ConfigDialog.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/python/plugins/processing/gui/ConfigDialog.py b/python/plugins/processing/gui/ConfigDialog.py
-index 85d8641fb48..d2776b7dca0 100644
---- a/python/plugins/processing/gui/ConfigDialog.py
-+++ b/python/plugins/processing/gui/ConfigDialog.py
-@@ -256,6 +256,8 @@ def resetMenusToDefaults(self):
- for provider in providers:
- for alg in provider.algs:
- d = defaultMenuEntries.get(alg.commandLineName(), "")
-+ if "MENU_" + alg.commandLineName() not in ProcessingConfig.settings:
-+ continue
- setting = ProcessingConfig.settings["MENU_" + alg.commandLineName()]
- item = self.items[setting]
- item.setData(d, Qt.EditRole)
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch b/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch
deleted file mode 100644
index 4785385458b..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ed03e99ee582cb4abd1ae08cf333da8c0975a4c8 Mon Sep 17 00:00:00 2001
-From: Luigi Pirelli <luipir@gmail.com>
-Date: Tue, 9 May 2017 13:39:23 +0200
-Subject: [PATCH] catch uncatched exception when item has lost reference.
- fixies #15868
-
----
- python/plugins/db_manager/layer_preview.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py
-index 27bba0a8f13..9947b1ef4d8 100644
---- a/python/plugins/db_manager/layer_preview.py
-+++ b/python/plugins/db_manager/layer_preview.py
-@@ -25,7 +25,7 @@
- from qgis.PyQt.QtWidgets import QApplication
-
- from qgis.gui import QgsMapCanvas, QgsMapCanvasLayer, QgsMessageBar
--from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject
-+from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject, QgsMessageLog
-
- from .db_plugins.plugin import Table
-
-@@ -78,11 +78,13 @@ def setDirty(self, val=True):
- def _clear(self):
- """ remove any layers from preview canvas """
- if self.item is not None:
-- ## skip exception on RuntimeError fixes #6892
- try:
- self.item.aboutToChange.disconnect(self.setDirty)
-- except RuntimeError:
-- pass
-+ ## skip exception on RuntimeError fixes #6892
-+ ## skip TypeError and generic Exceptions fixes #15868
-+ ## generally due the remove of self.item object or C++ referenced object
-+ except Exception as ex:
-+ QgsMessageLog.logMessage(unicode(ex))
-
- self.item = None
- self.dirty = False
diff --git a/sci-geosciences/qgis/qgis-2.18.7.ebuild b/sci-geosciences/qgis/qgis-2.18.7.ebuild
deleted file mode 100644
index 72e00e7022a..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.7.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-else
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch"
-
-REQUIRED_USE="
- mapserver? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5,ssl]
- >=dev-db/spatialite-4.1.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- x11-libs/qscintilla:=[qt5]
- >=x11-libs/qwt-6.1.2:6=[qt5,svg]
- >=x11-libs/qwtpolar-1.1.1-r1[qt5]
- designer? ( dev-qt/designer:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( >=sci-geosciences/grass-7.0.0:= )
- mapserver? ( dev-libs/fcgi )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- 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/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[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[qt5,${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/sip:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
- dev-qt/qtxmlpatterns:5
- sys-devel/bison
- sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
- "${FILESDIR}/${PN}-2.18.6-python.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- cd src/plugins || die
- use georeferencer || cmake_comment_add_subdirectory georeferencer
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=/share/man/
- -DBUILD_SHARED_LIBS=ON
- -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
- -DWITH_INTERNAL_QWTPOLAR=OFF
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DENABLE_QT5=ON
- -DENABLE_PYTHON3=$(python_is_python3)
- -DWITH_CUSTOM_WIDGETS=$(usex designer)
- -DWITH_GRASS=$(usex grass)
- -DWITH_SERVER=$(usex mapserver)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_TOUCH="$(usex touch)"
- )
-# # FIXME: Re-add when segfaults were figured out upstream, bug #612070
-# -DWITH_QTWEBKIT=$(usex webkit)
-
- if has_version '<x11-libs/qscintilla-2.10'; then
- mycmakeargs+=(
- -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
- )
- fi
-
- if use grass; then
- mycmakeargs+=(
- -DWITH_GRASS7=ON
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DBINDINGS_GLOBAL_INSTALL=ON
- -DWITH_PYSPATIALITE=ON
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_FUTURE=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYTZ=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DWITH_INTERNAL_YAML=OFF
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/${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
-
- python_optimize "${ED%/}"/usr/share/qgis/python
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-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
-
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
diff --git a/sci-geosciences/qgis/qgis-2.18.9.ebuild b/sci-geosciences/qgis/qgis-2.18.9.ebuild
deleted file mode 100644
index 5464545389b..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.9.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-else
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch"
-
-REQUIRED_USE="
- mapserver? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5,ssl]
- >=dev-db/spatialite-4.1.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- x11-libs/qscintilla:=[qt5]
- >=x11-libs/qwt-6.1.2:6=[qt5,svg]
- >=x11-libs/qwtpolar-1.1.1-r1[qt5]
- designer? ( dev-qt/designer:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( >=sci-geosciences/grass-7.0.0:= )
- mapserver? ( dev-libs/fcgi )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- 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/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[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[qt5,${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/sip:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
- dev-qt/qtxmlpatterns:5
- sys-devel/bison
- sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${P}-broken-psycopg2-encoding.patch"
- "${FILESDIR}/${P}-fix-plugin-config-settings.patch"
- "${FILESDIR}/${P}-dbmanager-plugin-exceptions.patch"
- "${FILESDIR}/${P}-uncaught-exception.patch"
- # TODO upstream
- "${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
- "${FILESDIR}/${PN}-2.18.6-python.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- cd src/plugins || die
- use georeferencer || cmake_comment_add_subdirectory georeferencer
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=/share/man/
- -DBUILD_SHARED_LIBS=ON
- -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
- -DWITH_INTERNAL_QWTPOLAR=OFF
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DENABLE_QT5=ON
- -DENABLE_PYTHON3=$(python_is_python3)
- -DWITH_CUSTOM_WIDGETS=$(usex designer)
- -DWITH_GRASS=$(usex grass)
- -DWITH_SERVER=$(usex mapserver)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_TOUCH="$(usex touch)"
- )
-# # FIXME: Re-add when segfaults were figured out upstream, bug #612070
-# -DWITH_QTWEBKIT=$(usex webkit)
-
- if has_version '<x11-libs/qscintilla-2.10'; then
- mycmakeargs+=(
- -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
- )
- fi
-
- if use grass; then
- mycmakeargs+=(
- -DWITH_GRASS7=ON
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DBINDINGS_GLOBAL_INSTALL=ON
- -DWITH_PYSPATIALITE=ON
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_FUTURE=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYTZ=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DWITH_INTERNAL_YAML=OFF
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/${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
-
- python_optimize "${ED%/}"/usr/share/qgis/python
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-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
-
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
next reply other threads:[~2017-07-01 15:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-01 15:56 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-18 20:12 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/ Andreas Sturmlechner
2024-11-08 13:31 Andreas Sturmlechner
2023-08-23 7:55 Andreas Sturmlechner
2020-12-22 22:54 Andreas Sturmlechner
2020-11-23 22:10 Andreas Sturmlechner
2020-11-20 20:40 Andreas Sturmlechner
2020-10-23 23:27 Andreas Sturmlechner
2020-02-09 17:41 Andreas Sturmlechner
2019-11-20 17:46 Andreas Sturmlechner
2019-04-28 15:27 Andreas Sturmlechner
2018-06-24 13:18 Andreas Sturmlechner
[not found] <1523569335.91435c00d97ec375328fdc6b56d03fb98e0b4adc.asturm@gentoo>
2018-04-12 21:42 ` Andreas Sturmlechner
2018-03-28 21:46 Andreas Sturmlechner
2018-03-05 6:06 Andreas Sturmlechner
2017-12-21 2:38 Andreas Sturmlechner
2017-08-26 19:19 Andreas Sturmlechner
2017-06-04 10:25 Andreas Sturmlechner
2017-04-09 20:42 Andreas Sturmlechner
2017-02-19 22:01 Andreas Sturmlechner
2017-02-19 14:55 Andreas Sturmlechner
2017-02-19 14:55 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1498924592.0eb013faa01916545544abbcaae5d9952fe683a2.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox