1 |
commit: 0eb013faa01916545544abbcaae5d9952fe683a2 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 27 22:14:17 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 1 15:56:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb013fa |
7 |
|
8 |
sci-geosciences/qgis: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
sci-geosciences/qgis/Manifest | 2 - |
13 |
.../qgis-2.18.9-broken-psycopg2-encoding.patch | 32 --- |
14 |
.../qgis-2.18.9-dbmanager-plugin-exceptions.patch | 89 -------- |
15 |
.../qgis-2.18.9-fix-plugin-config-settings.patch | 23 --- |
16 |
.../files/qgis-2.18.9-uncaught-exception.patch | 40 ---- |
17 |
sci-geosciences/qgis/qgis-2.18.7.ebuild | 221 -------------------- |
18 |
sci-geosciences/qgis/qgis-2.18.9.ebuild | 226 --------------------- |
19 |
7 files changed, 633 deletions(-) |
20 |
|
21 |
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest |
22 |
index b5df166015b..b922dbe1347 100644 |
23 |
--- a/sci-geosciences/qgis/Manifest |
24 |
+++ b/sci-geosciences/qgis/Manifest |
25 |
@@ -1,5 +1,3 @@ |
26 |
DIST qgis-2.18.10.tar.bz2 84503710 SHA256 b2754daa6870008132702008c285dc94830e92ef0bd64e548ce5b47f2dec3fef SHA512 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8 WHIRLPOOL ea983e6f0043df1484496c341ad905d672c55b548494ad9ae10ec0cf8731ecd148f0536a0557489a8d42cbe97bd91db261de868609bd4004997f35f7a00bee3d |
27 |
DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48 |
28 |
-DIST qgis-2.18.7.tar.bz2 84928689 SHA256 ab05060e6b91909f61a21205ee12ddf79ebd85a7d7b81ab3b7dabfd032aa2e5b SHA512 e7908ebe8049d0ca2e99980ba8ac6e9b6941811c96d6139db87072315404987da0ec7272f77abacaddf5fb4bd540a0be7f64e44662fa32d2d4eb11b85421744d WHIRLPOOL 25320b1bacaeaf1486aa6a95b8df32e0a1b4713aedb5237f46e7aa538ef682b9cbd9eff70914727e426193fb0821df437e4732b118e71a4e12d90308cbbb066f |
29 |
-DIST qgis-2.18.9.tar.bz2 84453524 SHA256 a922af0e4b3bcf8e790d7fc50752bc96771abfc2d093365cb3260b45c27225a1 SHA512 2495d9bc4f22f22882beb322d01465dd456a6db8a59a7e8e8056555b6ab4c895e9fc70d423f36a856d3a3b890bb3fbab607f7fd34736a8d2bc69f29bf1d91ca4 WHIRLPOOL cfc6006eed3e948407eea79c57eb543be700d99ff0eb38e07263ec8659dee4ceafac8879dc95ac7b275efe44708d4a949d71dfd9800e8a9cb013527aabcea8e3 |
30 |
DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5 |
31 |
|
32 |
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 |
33 |
deleted file mode 100644 |
34 |
index b6eb1d17159..00000000000 |
35 |
--- a/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch |
36 |
+++ /dev/null |
37 |
@@ -1,32 +0,0 @@ |
38 |
-From 2c8e03de391ac8a878d56e0a491c6a70b7a4c589 Mon Sep 17 00:00:00 2001 |
39 |
-From: Borys Jurgiel <info@××××××××××××.pl> |
40 |
-Date: Sat, 3 Jun 2017 16:54:54 +0200 |
41 |
-Subject: [PATCH] [PROCESSING] [regression] One more fix for broken encoding of |
42 |
- psycopg2 error messages |
43 |
- |
44 |
---- |
45 |
- python/plugins/processing/tools/postgis.py | 4 ++-- |
46 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
47 |
- |
48 |
-diff --git a/python/plugins/processing/tools/postgis.py b/python/plugins/processing/tools/postgis.py |
49 |
-index 69fab99b7f4..96c88f95f63 100644 |
50 |
---- a/python/plugins/processing/tools/postgis.py |
51 |
-+++ b/python/plugins/processing/tools/postgis.py |
52 |
-@@ -205,7 +205,7 @@ def __init__(self, host=None, port=None, dbname=None, user=None, |
53 |
- break |
54 |
- except psycopg2.OperationalError as e: |
55 |
- if i == 3: |
56 |
-- raise DbError(unicode(e)) |
57 |
-+ raise DbError(unicode(e.pgerror, e.cursor.connection.encoding, 'replace')) |
58 |
- |
59 |
- err = unicode(e) |
60 |
- user = self.uri.username() |
61 |
-@@ -821,7 +821,7 @@ def _exec_sql(self, cursor, sql): |
62 |
- try: |
63 |
- cursor.execute(sql) |
64 |
- except psycopg2.Error as e: |
65 |
-- raise DbError(unicode(e), e.cursor.query) |
66 |
-+ raise DbError(unicode(e.pgerror, e.cursor.connection.encoding, 'replace'), e.cursor.query) |
67 |
- |
68 |
- def _exec_sql_and_commit(self, sql): |
69 |
- """Tries to execute and commit some action, on error it rolls |
70 |
|
71 |
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 |
72 |
deleted file mode 100644 |
73 |
index 0b780c22ca6..00000000000 |
74 |
--- a/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch |
75 |
+++ /dev/null |
76 |
@@ -1,89 +0,0 @@ |
77 |
-From dae921c51f85f2dde2bab9b18a0d7c7c31bc700b Mon Sep 17 00:00:00 2001 |
78 |
-From: Luigi Pirelli <luipir@×××××.com> |
79 |
-Date: Thu, 11 May 2017 17:40:32 +0200 |
80 |
-Subject: [PATCH] [DB Manager] previewing layers in Virtual layers section |
81 |
- remove them from the Layers panel: fixies #16476 plus more vlayer db_manager |
82 |
- plugin fixes to reduce (but can't avoid) exceptions due to C++/SIP object |
83 |
- removes |
84 |
- |
85 |
---- |
86 |
- python/plugins/db_manager/db_plugins/vlayers/connector.py | 10 ++++++++++ |
87 |
- python/plugins/db_manager/layer_preview.py | 11 +++++++---- |
88 |
- 2 files changed, 17 insertions(+), 4 deletions(-) |
89 |
- |
90 |
-diff --git a/python/plugins/db_manager/db_plugins/vlayers/connector.py b/python/plugins/db_manager/db_plugins/vlayers/connector.py |
91 |
-index e64f2ec57b6..4c8cb4dca1b 100644 |
92 |
---- a/python/plugins/db_manager/db_plugins/vlayers/connector.py |
93 |
-+++ b/python/plugins/db_manager/db_plugins/vlayers/connector.py |
94 |
-@@ -96,6 +96,10 @@ def getLayer(self, l): |
95 |
- lid = self.layers.get(l) |
96 |
- if lid is None: |
97 |
- return lid |
98 |
-+ # the instance can refer to a layer in map previe and not in qgis general canvas |
99 |
-+ if lid not in QgsMapLayerRegistry.instance().mapLayers().keys(): |
100 |
-+ self.layers.pop(l) |
101 |
-+ return None |
102 |
- return QgsMapLayerRegistry.instance().mapLayer(lid) |
103 |
- |
104 |
- |
105 |
-@@ -246,12 +250,16 @@ def getRasterTables(self, schema=None): |
106 |
- def getTableRowCount(self, table): |
107 |
- t = table[1] |
108 |
- l = VLayerRegistry.instance().getLayer(t) |
109 |
-+ if not l or not l.isValid(): |
110 |
-+ return None |
111 |
- return l.featureCount() |
112 |
- |
113 |
- def getTableFields(self, table): |
114 |
- """ return list of columns in table """ |
115 |
- t = table[1] |
116 |
- l = VLayerRegistry.instance().getLayer(t) |
117 |
-+ if not l or not l.isValid(): |
118 |
-+ return [] |
119 |
- # id, name, type, nonnull, default, pk |
120 |
- n = l.dataProvider().fields().size() |
121 |
- f = [(i, f.name(), f.typeName(), False, None, False) |
122 |
-@@ -277,6 +285,8 @@ def getTableExtent(self, table, geom): |
123 |
- l = QgsMapLayerRegistry.instance().mapLayer(t) |
124 |
- else: |
125 |
- l = VLayerRegistry.instance().getLayer(t) |
126 |
-+ if not l or not l.isValid(): |
127 |
-+ return None |
128 |
- e = l.extent() |
129 |
- r = (e.xMinimum(), e.yMinimum(), e.xMaximum(), e.yMaximum()) |
130 |
- return r |
131 |
-diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py |
132 |
-index 1f7cec65526..27bba0a8f13 100644 |
133 |
---- a/python/plugins/db_manager/layer_preview.py |
134 |
-+++ b/python/plugins/db_manager/layer_preview.py |
135 |
-@@ -25,7 +25,7 @@ |
136 |
- from qgis.PyQt.QtWidgets import QApplication |
137 |
- |
138 |
- from qgis.gui import QgsMapCanvas, QgsMapCanvasLayer, QgsMessageBar |
139 |
--from qgis.core import QgsVectorLayer, QgsMapLayerRegistry |
140 |
-+from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject |
141 |
- |
142 |
- from .db_plugins.plugin import Table |
143 |
- |
144 |
-@@ -113,15 +113,18 @@ def _loadTablePreview(self, table, limit=False): |
145 |
- else: |
146 |
- vl = table.toMapLayer() |
147 |
- |
148 |
-- if not vl.isValid(): |
149 |
-+ if vl and not vl.isValid(): |
150 |
- vl.deleteLater() |
151 |
- vl = None |
152 |
- |
153 |
- # remove old layer (if any) and set new |
154 |
- if self.currentLayer: |
155 |
-- QgsMapLayerRegistry.instance().removeMapLayers([self.currentLayer.id()]) |
156 |
-+ # but not remove it if in layer list panel |
157 |
-+ # fix https://issues.qgis.org/issues/16476 |
158 |
-+ if not QgsProject.instance().layerTreeRoot().findLayer(self.currentLayer.id()): |
159 |
-+ QgsMapLayerRegistry.instance().removeMapLayers([self.currentLayer.id()]) |
160 |
- |
161 |
-- if vl: |
162 |
-+ if vl and vl.isValid(): |
163 |
- self.setLayerSet([QgsMapCanvasLayer(vl)]) |
164 |
- QgsMapLayerRegistry.instance().addMapLayers([vl], False) |
165 |
- self.zoomToFullExtent() |
166 |
|
167 |
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 |
168 |
deleted file mode 100644 |
169 |
index cbf03f146ca..00000000000 |
170 |
--- a/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch |
171 |
+++ /dev/null |
172 |
@@ -1,23 +0,0 @@ |
173 |
-From 008f38574e78f0557aae890f508cf5e148545d15 Mon Sep 17 00:00:00 2001 |
174 |
-From: "Juergen E. Fischer" <jef@××××××.de> |
175 |
-Date: Wed, 31 May 2017 13:50:03 +0200 |
176 |
-Subject: [PATCH] processing: only reset existing menu 'settings' (followup |
177 |
- e78fc620) |
178 |
- |
179 |
---- |
180 |
- python/plugins/processing/gui/ConfigDialog.py | 2 ++ |
181 |
- 1 file changed, 2 insertions(+) |
182 |
- |
183 |
-diff --git a/python/plugins/processing/gui/ConfigDialog.py b/python/plugins/processing/gui/ConfigDialog.py |
184 |
-index 85d8641fb48..d2776b7dca0 100644 |
185 |
---- a/python/plugins/processing/gui/ConfigDialog.py |
186 |
-+++ b/python/plugins/processing/gui/ConfigDialog.py |
187 |
-@@ -256,6 +256,8 @@ def resetMenusToDefaults(self): |
188 |
- for provider in providers: |
189 |
- for alg in provider.algs: |
190 |
- d = defaultMenuEntries.get(alg.commandLineName(), "") |
191 |
-+ if "MENU_" + alg.commandLineName() not in ProcessingConfig.settings: |
192 |
-+ continue |
193 |
- setting = ProcessingConfig.settings["MENU_" + alg.commandLineName()] |
194 |
- item = self.items[setting] |
195 |
- item.setData(d, Qt.EditRole) |
196 |
|
197 |
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 |
198 |
deleted file mode 100644 |
199 |
index 4785385458b..00000000000 |
200 |
--- a/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch |
201 |
+++ /dev/null |
202 |
@@ -1,40 +0,0 @@ |
203 |
-From ed03e99ee582cb4abd1ae08cf333da8c0975a4c8 Mon Sep 17 00:00:00 2001 |
204 |
-From: Luigi Pirelli <luipir@×××××.com> |
205 |
-Date: Tue, 9 May 2017 13:39:23 +0200 |
206 |
-Subject: [PATCH] catch uncatched exception when item has lost reference. |
207 |
- fixies #15868 |
208 |
- |
209 |
---- |
210 |
- python/plugins/db_manager/layer_preview.py | 10 ++++++---- |
211 |
- 1 file changed, 6 insertions(+), 4 deletions(-) |
212 |
- |
213 |
-diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py |
214 |
-index 27bba0a8f13..9947b1ef4d8 100644 |
215 |
---- a/python/plugins/db_manager/layer_preview.py |
216 |
-+++ b/python/plugins/db_manager/layer_preview.py |
217 |
-@@ -25,7 +25,7 @@ |
218 |
- from qgis.PyQt.QtWidgets import QApplication |
219 |
- |
220 |
- from qgis.gui import QgsMapCanvas, QgsMapCanvasLayer, QgsMessageBar |
221 |
--from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject |
222 |
-+from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject, QgsMessageLog |
223 |
- |
224 |
- from .db_plugins.plugin import Table |
225 |
- |
226 |
-@@ -78,11 +78,13 @@ def setDirty(self, val=True): |
227 |
- def _clear(self): |
228 |
- """ remove any layers from preview canvas """ |
229 |
- if self.item is not None: |
230 |
-- ## skip exception on RuntimeError fixes #6892 |
231 |
- try: |
232 |
- self.item.aboutToChange.disconnect(self.setDirty) |
233 |
-- except RuntimeError: |
234 |
-- pass |
235 |
-+ ## skip exception on RuntimeError fixes #6892 |
236 |
-+ ## skip TypeError and generic Exceptions fixes #15868 |
237 |
-+ ## generally due the remove of self.item object or C++ referenced object |
238 |
-+ except Exception as ex: |
239 |
-+ QgsMessageLog.logMessage(unicode(ex)) |
240 |
- |
241 |
- self.item = None |
242 |
- self.dirty = False |
243 |
|
244 |
diff --git a/sci-geosciences/qgis/qgis-2.18.7.ebuild b/sci-geosciences/qgis/qgis-2.18.7.ebuild |
245 |
deleted file mode 100644 |
246 |
index 72e00e7022a..00000000000 |
247 |
--- a/sci-geosciences/qgis/qgis-2.18.7.ebuild |
248 |
+++ /dev/null |
249 |
@@ -1,221 +0,0 @@ |
250 |
-# Copyright 1999-2017 Gentoo Foundation |
251 |
-# Distributed under the terms of the GNU General Public License v2 |
252 |
- |
253 |
-EAPI=6 |
254 |
- |
255 |
-PYTHON_COMPAT=( python2_7 ) |
256 |
-PYTHON_REQ_USE="sqlite" |
257 |
- |
258 |
-if [[ ${PV} != *9999 ]]; then |
259 |
- SRC_URI="http://qgis.org/downloads/${P}.tar.bz2 |
260 |
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )" |
261 |
- KEYWORDS="~amd64 ~x86" |
262 |
-else |
263 |
- GIT_ECLASS="git-r3" |
264 |
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" |
265 |
-fi |
266 |
-inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1 |
267 |
-unset GIT_ECLASS |
268 |
- |
269 |
-DESCRIPTION="User friendly Geographic Information System" |
270 |
-HOMEPAGE="http://www.qgis.org/" |
271 |
- |
272 |
-LICENSE="GPL-2+ GPL-3+" |
273 |
-SLOT="0" |
274 |
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch" |
275 |
- |
276 |
-REQUIRED_USE=" |
277 |
- mapserver? ( python ) |
278 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
279 |
- |
280 |
-COMMON_DEPEND=" |
281 |
- app-crypt/qca:2[qt5,ssl] |
282 |
- >=dev-db/spatialite-4.1.0 |
283 |
- dev-db/sqlite:3 |
284 |
- dev-libs/expat |
285 |
- dev-qt/qtconcurrent:5 |
286 |
- dev-qt/qtcore:5 |
287 |
- dev-qt/qtgui:5 |
288 |
- dev-qt/qtnetwork:5 |
289 |
- dev-qt/qtpositioning:5 |
290 |
- dev-qt/qtprintsupport:5 |
291 |
- dev-qt/qtscript:5 |
292 |
- dev-qt/qtsvg:5 |
293 |
- dev-qt/qtsql:5 |
294 |
- dev-qt/qtwebkit:5 |
295 |
- dev-qt/qtwidgets:5 |
296 |
- dev-qt/qtxml:5 |
297 |
- sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}] |
298 |
- sci-libs/geos |
299 |
- sci-libs/libspatialindex:= |
300 |
- sci-libs/proj |
301 |
- x11-libs/qscintilla:=[qt5] |
302 |
- >=x11-libs/qwt-6.1.2:6=[qt5,svg] |
303 |
- >=x11-libs/qwtpolar-1.1.1-r1[qt5] |
304 |
- designer? ( dev-qt/designer:5 ) |
305 |
- georeferencer? ( sci-libs/gsl:= ) |
306 |
- grass? ( >=sci-geosciences/grass-7.0.0:= ) |
307 |
- mapserver? ( dev-libs/fcgi ) |
308 |
- oracle? ( |
309 |
- dev-db/oracle-instantclient:= |
310 |
- sci-libs/gdal:=[oracle] |
311 |
- ) |
312 |
- postgres? ( dev-db/postgresql:= ) |
313 |
- python? ( ${PYTHON_DEPS} |
314 |
- dev-python/future[${PYTHON_USEDEP}] |
315 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
316 |
- dev-python/jinja[${PYTHON_USEDEP}] |
317 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
318 |
- dev-python/pygments[${PYTHON_USEDEP}] |
319 |
- dev-python/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}] |
320 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
321 |
- dev-python/pytz[${PYTHON_USEDEP}] |
322 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
323 |
- dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}] |
324 |
- dev-python/requests[${PYTHON_USEDEP}] |
325 |
- dev-python/sip:=[${PYTHON_USEDEP}] |
326 |
- dev-python/six[${PYTHON_USEDEP}] |
327 |
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
328 |
- ) |
329 |
-" |
330 |
-DEPEND="${COMMON_DEPEND} |
331 |
- dev-qt/qttest:5 |
332 |
- dev-qt/qtxmlpatterns:5 |
333 |
- sys-devel/bison |
334 |
- sys-devel/flex |
335 |
-" |
336 |
-RDEPEND="${COMMON_DEPEND} |
337 |
- sci-geosciences/gpsbabel |
338 |
-" |
339 |
- |
340 |
-# Disabling test suite because upstream disallow running from install path |
341 |
-RESTRICT="test" |
342 |
- |
343 |
-PATCHES=( |
344 |
- "${FILESDIR}/${PN}-2.18.6-featuresummary.patch" |
345 |
- "${FILESDIR}/${PN}-2.18.6-python.patch" |
346 |
-) |
347 |
- |
348 |
-pkg_setup() { |
349 |
- python-single-r1_pkg_setup |
350 |
-} |
351 |
- |
352 |
-src_prepare() { |
353 |
- cmake-utils_src_prepare |
354 |
- |
355 |
- cd src/plugins || die |
356 |
- use georeferencer || cmake_comment_add_subdirectory georeferencer |
357 |
-} |
358 |
- |
359 |
-src_configure() { |
360 |
- local mycmakeargs=( |
361 |
- -DQGIS_MANUAL_SUBDIR=/share/man/ |
362 |
- -DBUILD_SHARED_LIBS=ON |
363 |
- -DQGIS_LIB_SUBDIR=$(get_libdir) |
364 |
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis |
365 |
- -DQWT_INCLUDE_DIR=/usr/include/qwt6 |
366 |
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so |
367 |
- -DWITH_INTERNAL_QWTPOLAR=OFF |
368 |
- -DPEDANTIC=OFF |
369 |
- -DWITH_APIDOC=OFF |
370 |
- -DWITH_QSPATIALITE=ON |
371 |
- -DENABLE_TESTS=OFF |
372 |
- -DENABLE_QT5=ON |
373 |
- -DENABLE_PYTHON3=$(python_is_python3) |
374 |
- -DWITH_CUSTOM_WIDGETS=$(usex designer) |
375 |
- -DWITH_GRASS=$(usex grass) |
376 |
- -DWITH_SERVER=$(usex mapserver) |
377 |
- -DWITH_ORACLE=$(usex oracle) |
378 |
- -DWITH_POSTGRESQL=$(usex postgres) |
379 |
- -DWITH_BINDINGS=$(usex python) |
380 |
- -DWITH_TOUCH="$(usex touch)" |
381 |
- ) |
382 |
-# # FIXME: Re-add when segfaults were figured out upstream, bug #612070 |
383 |
-# -DWITH_QTWEBKIT=$(usex webkit) |
384 |
- |
385 |
- if has_version '<x11-libs/qscintilla-2.10'; then |
386 |
- mycmakeargs+=( |
387 |
- -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so |
388 |
- ) |
389 |
- fi |
390 |
- |
391 |
- if use grass; then |
392 |
- mycmakeargs+=( |
393 |
- -DWITH_GRASS7=ON |
394 |
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 |
395 |
- ) |
396 |
- fi |
397 |
- |
398 |
- if use python; then |
399 |
- mycmakeargs+=( |
400 |
- -DBINDINGS_GLOBAL_INSTALL=ON |
401 |
- -DWITH_PYSPATIALITE=ON |
402 |
- -DWITH_INTERNAL_DATEUTIL=OFF |
403 |
- -DWITH_INTERNAL_FUTURE=OFF |
404 |
- -DWITH_INTERNAL_MARKUPSAFE=OFF |
405 |
- -DWITH_INTERNAL_PYTZ=OFF |
406 |
- -DWITH_INTERNAL_SIX=OFF |
407 |
- -DWITH_INTERNAL_YAML=OFF |
408 |
- ) |
409 |
- fi |
410 |
- |
411 |
- cmake-utils_src_configure |
412 |
-} |
413 |
- |
414 |
-src_install() { |
415 |
- cmake-utils_src_install |
416 |
- |
417 |
- domenu debian/qgis.desktop |
418 |
- |
419 |
- local size type |
420 |
- for size in 16 22 24 32 48 64 96 128 256; do |
421 |
- newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png |
422 |
- newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png |
423 |
- for type in qgs qml qlr qpt; do |
424 |
- newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png |
425 |
- done |
426 |
- done |
427 |
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg |
428 |
- |
429 |
- insinto /usr/share/mime/packages |
430 |
- doins debian/qgis.xml |
431 |
- |
432 |
- if use examples; then |
433 |
- docinto examples |
434 |
- dodoc -r "${WORKDIR}"/qgis_sample_data/. |
435 |
- docompress -x /usr/share/doc/${PF}/examples |
436 |
- fi |
437 |
- |
438 |
- python_optimize "${ED%/}"/usr/share/qgis/python |
439 |
- |
440 |
- if use grass; then |
441 |
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts |
442 |
- fi |
443 |
-} |
444 |
- |
445 |
-pkg_preinst() { |
446 |
- gnome2_icon_savelist |
447 |
-} |
448 |
- |
449 |
-pkg_postinst() { |
450 |
- if use postgres; then |
451 |
- elog "If you don't intend to use an external PostGIS server" |
452 |
- elog "you should install:" |
453 |
- elog " dev-db/postgis" |
454 |
- elif use python; then |
455 |
- elog "Support of PostgreSQL is disabled." |
456 |
- elog "But some installed python-plugins import the psycopg2 module." |
457 |
- elog "If you do not need these plugins just disable them" |
458 |
- elog "in the Plugins menu, else you need to set USE=\"postgres\"" |
459 |
- fi |
460 |
- |
461 |
- gnome2_icon_cache_update |
462 |
- fdo-mime_mime_database_update |
463 |
- fdo-mime_desktop_database_update |
464 |
-} |
465 |
- |
466 |
-pkg_postrm() { |
467 |
- gnome2_icon_cache_update |
468 |
- fdo-mime_mime_database_update |
469 |
- fdo-mime_desktop_database_update |
470 |
-} |
471 |
|
472 |
diff --git a/sci-geosciences/qgis/qgis-2.18.9.ebuild b/sci-geosciences/qgis/qgis-2.18.9.ebuild |
473 |
deleted file mode 100644 |
474 |
index 5464545389b..00000000000 |
475 |
--- a/sci-geosciences/qgis/qgis-2.18.9.ebuild |
476 |
+++ /dev/null |
477 |
@@ -1,226 +0,0 @@ |
478 |
-# Copyright 1999-2017 Gentoo Foundation |
479 |
-# Distributed under the terms of the GNU General Public License v2 |
480 |
- |
481 |
-EAPI=6 |
482 |
- |
483 |
-PYTHON_COMPAT=( python2_7 ) |
484 |
-PYTHON_REQ_USE="sqlite" |
485 |
- |
486 |
-if [[ ${PV} != *9999 ]]; then |
487 |
- SRC_URI="http://qgis.org/downloads/${P}.tar.bz2 |
488 |
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )" |
489 |
- KEYWORDS="~amd64 ~x86" |
490 |
-else |
491 |
- GIT_ECLASS="git-r3" |
492 |
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" |
493 |
-fi |
494 |
-inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1 |
495 |
-unset GIT_ECLASS |
496 |
- |
497 |
-DESCRIPTION="User friendly Geographic Information System" |
498 |
-HOMEPAGE="http://www.qgis.org/" |
499 |
- |
500 |
-LICENSE="GPL-2+ GPL-3+" |
501 |
-SLOT="0" |
502 |
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch" |
503 |
- |
504 |
-REQUIRED_USE=" |
505 |
- mapserver? ( python ) |
506 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
507 |
- |
508 |
-COMMON_DEPEND=" |
509 |
- app-crypt/qca:2[qt5,ssl] |
510 |
- >=dev-db/spatialite-4.1.0 |
511 |
- dev-db/sqlite:3 |
512 |
- dev-libs/expat |
513 |
- dev-qt/qtconcurrent:5 |
514 |
- dev-qt/qtcore:5 |
515 |
- dev-qt/qtgui:5 |
516 |
- dev-qt/qtnetwork:5 |
517 |
- dev-qt/qtpositioning:5 |
518 |
- dev-qt/qtprintsupport:5 |
519 |
- dev-qt/qtscript:5 |
520 |
- dev-qt/qtsvg:5 |
521 |
- dev-qt/qtsql:5 |
522 |
- dev-qt/qtwebkit:5 |
523 |
- dev-qt/qtwidgets:5 |
524 |
- dev-qt/qtxml:5 |
525 |
- sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}] |
526 |
- sci-libs/geos |
527 |
- sci-libs/libspatialindex:= |
528 |
- sci-libs/proj |
529 |
- x11-libs/qscintilla:=[qt5] |
530 |
- >=x11-libs/qwt-6.1.2:6=[qt5,svg] |
531 |
- >=x11-libs/qwtpolar-1.1.1-r1[qt5] |
532 |
- designer? ( dev-qt/designer:5 ) |
533 |
- georeferencer? ( sci-libs/gsl:= ) |
534 |
- grass? ( >=sci-geosciences/grass-7.0.0:= ) |
535 |
- mapserver? ( dev-libs/fcgi ) |
536 |
- oracle? ( |
537 |
- dev-db/oracle-instantclient:= |
538 |
- sci-libs/gdal:=[oracle] |
539 |
- ) |
540 |
- postgres? ( dev-db/postgresql:= ) |
541 |
- python? ( ${PYTHON_DEPS} |
542 |
- dev-python/future[${PYTHON_USEDEP}] |
543 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
544 |
- dev-python/jinja[${PYTHON_USEDEP}] |
545 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
546 |
- dev-python/pygments[${PYTHON_USEDEP}] |
547 |
- dev-python/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}] |
548 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
549 |
- dev-python/pytz[${PYTHON_USEDEP}] |
550 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
551 |
- dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}] |
552 |
- dev-python/requests[${PYTHON_USEDEP}] |
553 |
- dev-python/sip:=[${PYTHON_USEDEP}] |
554 |
- dev-python/six[${PYTHON_USEDEP}] |
555 |
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
556 |
- ) |
557 |
-" |
558 |
-DEPEND="${COMMON_DEPEND} |
559 |
- dev-qt/qttest:5 |
560 |
- dev-qt/qtxmlpatterns:5 |
561 |
- sys-devel/bison |
562 |
- sys-devel/flex |
563 |
-" |
564 |
-RDEPEND="${COMMON_DEPEND} |
565 |
- sci-geosciences/gpsbabel |
566 |
-" |
567 |
- |
568 |
-# Disabling test suite because upstream disallow running from install path |
569 |
-RESTRICT="test" |
570 |
- |
571 |
-PATCHES=( |
572 |
- "${FILESDIR}/${P}-broken-psycopg2-encoding.patch" |
573 |
- "${FILESDIR}/${P}-fix-plugin-config-settings.patch" |
574 |
- "${FILESDIR}/${P}-dbmanager-plugin-exceptions.patch" |
575 |
- "${FILESDIR}/${P}-uncaught-exception.patch" |
576 |
- # TODO upstream |
577 |
- "${FILESDIR}/${PN}-2.18.6-featuresummary.patch" |
578 |
- "${FILESDIR}/${PN}-2.18.6-python.patch" |
579 |
-) |
580 |
- |
581 |
-pkg_setup() { |
582 |
- python-single-r1_pkg_setup |
583 |
-} |
584 |
- |
585 |
-src_prepare() { |
586 |
- cmake-utils_src_prepare |
587 |
- |
588 |
- cd src/plugins || die |
589 |
- use georeferencer || cmake_comment_add_subdirectory georeferencer |
590 |
-} |
591 |
- |
592 |
-src_configure() { |
593 |
- local mycmakeargs=( |
594 |
- -DQGIS_MANUAL_SUBDIR=/share/man/ |
595 |
- -DBUILD_SHARED_LIBS=ON |
596 |
- -DQGIS_LIB_SUBDIR=$(get_libdir) |
597 |
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis |
598 |
- -DQWT_INCLUDE_DIR=/usr/include/qwt6 |
599 |
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so |
600 |
- -DWITH_INTERNAL_QWTPOLAR=OFF |
601 |
- -DPEDANTIC=OFF |
602 |
- -DWITH_APIDOC=OFF |
603 |
- -DWITH_QSPATIALITE=ON |
604 |
- -DENABLE_TESTS=OFF |
605 |
- -DENABLE_QT5=ON |
606 |
- -DENABLE_PYTHON3=$(python_is_python3) |
607 |
- -DWITH_CUSTOM_WIDGETS=$(usex designer) |
608 |
- -DWITH_GRASS=$(usex grass) |
609 |
- -DWITH_SERVER=$(usex mapserver) |
610 |
- -DWITH_ORACLE=$(usex oracle) |
611 |
- -DWITH_POSTGRESQL=$(usex postgres) |
612 |
- -DWITH_BINDINGS=$(usex python) |
613 |
- -DWITH_TOUCH="$(usex touch)" |
614 |
- ) |
615 |
-# # FIXME: Re-add when segfaults were figured out upstream, bug #612070 |
616 |
-# -DWITH_QTWEBKIT=$(usex webkit) |
617 |
- |
618 |
- if has_version '<x11-libs/qscintilla-2.10'; then |
619 |
- mycmakeargs+=( |
620 |
- -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so |
621 |
- ) |
622 |
- fi |
623 |
- |
624 |
- if use grass; then |
625 |
- mycmakeargs+=( |
626 |
- -DWITH_GRASS7=ON |
627 |
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 |
628 |
- ) |
629 |
- fi |
630 |
- |
631 |
- if use python; then |
632 |
- mycmakeargs+=( |
633 |
- -DBINDINGS_GLOBAL_INSTALL=ON |
634 |
- -DWITH_PYSPATIALITE=ON |
635 |
- -DWITH_INTERNAL_DATEUTIL=OFF |
636 |
- -DWITH_INTERNAL_FUTURE=OFF |
637 |
- -DWITH_INTERNAL_MARKUPSAFE=OFF |
638 |
- -DWITH_INTERNAL_PYTZ=OFF |
639 |
- -DWITH_INTERNAL_SIX=OFF |
640 |
- -DWITH_INTERNAL_YAML=OFF |
641 |
- ) |
642 |
- fi |
643 |
- |
644 |
- cmake-utils_src_configure |
645 |
-} |
646 |
- |
647 |
-src_install() { |
648 |
- cmake-utils_src_install |
649 |
- |
650 |
- domenu debian/qgis.desktop |
651 |
- |
652 |
- local size type |
653 |
- for size in 16 22 24 32 48 64 96 128 256; do |
654 |
- newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png |
655 |
- newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png |
656 |
- for type in qgs qml qlr qpt; do |
657 |
- newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png |
658 |
- done |
659 |
- done |
660 |
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg |
661 |
- |
662 |
- insinto /usr/share/mime/packages |
663 |
- doins debian/qgis.xml |
664 |
- |
665 |
- if use examples; then |
666 |
- docinto examples |
667 |
- dodoc -r "${WORKDIR}"/qgis_sample_data/. |
668 |
- docompress -x /usr/share/doc/${PF}/examples |
669 |
- fi |
670 |
- |
671 |
- python_optimize "${ED%/}"/usr/share/qgis/python |
672 |
- |
673 |
- if use grass; then |
674 |
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts |
675 |
- fi |
676 |
-} |
677 |
- |
678 |
-pkg_preinst() { |
679 |
- gnome2_icon_savelist |
680 |
-} |
681 |
- |
682 |
-pkg_postinst() { |
683 |
- if use postgres; then |
684 |
- elog "If you don't intend to use an external PostGIS server" |
685 |
- elog "you should install:" |
686 |
- elog " dev-db/postgis" |
687 |
- elif use python; then |
688 |
- elog "Support of PostgreSQL is disabled." |
689 |
- elog "But some installed python-plugins import the psycopg2 module." |
690 |
- elog "If you do not need these plugins just disable them" |
691 |
- elog "in the Plugins menu, else you need to set USE=\"postgres\"" |
692 |
- fi |
693 |
- |
694 |
- gnome2_icon_cache_update |
695 |
- fdo-mime_mime_database_update |
696 |
- fdo-mime_desktop_database_update |
697 |
-} |
698 |
- |
699 |
-pkg_postrm() { |
700 |
- gnome2_icon_cache_update |
701 |
- fdo-mime_mime_database_update |
702 |
- fdo-mime_desktop_database_update |
703 |
-} |