Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
Date: Fri, 23 Oct 2020 23:27:16
Message-Id: 1603495617.04ec15cf24cdde041b3816f5f2d984b42109e2e0.asturm@gentoo
1 commit: 04ec15cf24cdde041b3816f5f2d984b42109e2e0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 23 18:49:17 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 23 23:26:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ec15cf
7
8 sci-geosciences/qgis: 3.16.0 version bump
9
10 - python3_9
11 - Update HOMEPAGE
12 - Cleanup outdated qt5(+) IUSE defaults
13 - Drop IUSE=webkit
14 - Drop obsolete QTMIN
15
16 Package-Manager: Portage-3.0.8, Repoman-3.0.2
17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
18
19 sci-geosciences/qgis/Manifest | 1 +
20 .../qgis/files/qgis-3.16.0-cmake-lib-suffix.patch | 12 +++++
21 .../qgis/{qgis-9999.ebuild => qgis-3.16.0.ebuild} | 60 +++++++++++-----------
22 sci-geosciences/qgis/qgis-9999.ebuild | 60 +++++++++++-----------
23 4 files changed, 73 insertions(+), 60 deletions(-)
24
25 diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
26 index e377493e5a9..212b0bba175 100644
27 --- a/sci-geosciences/qgis/Manifest
28 +++ b/sci-geosciences/qgis/Manifest
29 @@ -1,2 +1,3 @@
30 DIST qgis-3.10.9.tar.bz2 102418680 BLAKE2B 53599dab784fc42b7a4505e13b1fd97cdb7c696bf1a004425ea0e7b88659b9af40f74b7107ef6103a138f4bc8886eda0a99a07a1c1466fb73c94d55ea39d8ea8 SHA512 91bba01db04094a194d1437a00276f076cd88d9ebcfe4792f20da8fb4339c984262e2bf79f666cf23af13081da358bbfb69bdff086e4988701c4431f53732275
31 +DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
32 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
33
34 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
35 new file mode 100644
36 index 00000000000..1edba1f0e74
37 --- /dev/null
38 +++ b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
39 @@ -0,0 +1,12 @@
40 +diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
41 +--- a/cmake/PyQtMacros.cmake 2019-10-28 08:23:18.776024266 +0100
42 ++++ b/cmake/PyQtMacros.cmake 2019-10-28 08:24:17.316024213 +0100
43 +@@ -36,7 +36,7 @@
44 + ELSE(CMAKE_HOST_WIN32)
45 + # TODO osx
46 + SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh")
47 +- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
48 ++ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
49 + ENDIF(CMAKE_HOST_WIN32)
50 +
51 + FOREACH(it ${ARGN})
52
53 diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.16.0.ebuild
54 similarity index 79%
55 copy from sci-geosciences/qgis/qgis-9999.ebuild
56 copy to sci-geosciences/qgis/qgis-3.16.0.ebuild
57 index 5009332eb58..21e60cc41b1 100644
58 --- a/sci-geosciences/qgis/qgis-9999.ebuild
59 +++ b/sci-geosciences/qgis/qgis-3.16.0.ebuild
60 @@ -3,9 +3,8 @@
61
62 EAPI=7
63
64 -PYTHON_COMPAT=( python3_{6,7,8} )
65 +PYTHON_COMPAT=( python3_{7,8,9} )
66 PYTHON_REQ_USE="sqlite"
67 -QTMIN="5.9.4"
68
69 if [[ ${PV} = *9999 ]]; then
70 EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
71 @@ -18,46 +17,46 @@ fi
72 inherit cmake desktop python-single-r1 qmake-utils xdg
73
74 DESCRIPTION="User friendly Geographic Information System"
75 -HOMEPAGE="https://www.qgis.org/"
76 +HOMEPAGE="https://www.qgis.org/en/site/"
77
78 LICENSE="GPL-2+ GPL-3+"
79 SLOT="0"
80 -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
81 +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
82
83 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
84
85 BDEPEND="${PYTHON_DEPS}
86 - >=dev-qt/linguist-tools-${QTMIN}:5
87 + dev-qt/linguist-tools:5
88 sys-devel/bison
89 sys-devel/flex
90 "
91 COMMON_DEPEND="
92 - app-crypt/qca:2[qt5(+),ssl]
93 + >=app-crypt/qca-2.3.0:2[ssl]
94 >=dev-db/spatialite-4.2.0
95 dev-db/sqlite:3
96 dev-libs/expat
97 dev-libs/libzip:=
98 - dev-libs/qtkeychain[qt5(+)]
99 - >=dev-qt/designer-${QTMIN}:5
100 - >=dev-qt/qtconcurrent-${QTMIN}:5
101 - >=dev-qt/qtcore-${QTMIN}:5
102 - >=dev-qt/qtgui-${QTMIN}:5
103 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
104 - >=dev-qt/qtpositioning-${QTMIN}:5
105 - >=dev-qt/qtprintsupport-${QTMIN}:5
106 - >=dev-qt/qtserialport-${QTMIN}:5
107 - >=dev-qt/qtsvg-${QTMIN}:5
108 - >=dev-qt/qtsql-${QTMIN}:5
109 - >=dev-qt/qtwidgets-${QTMIN}:5
110 - >=dev-qt/qtxml-${QTMIN}:5
111 + dev-libs/qtkeychain:=
112 + dev-qt/designer:5
113 + dev-qt/qtconcurrent:5
114 + dev-qt/qtcore:5
115 + dev-qt/qtgui:5
116 + dev-qt/qtnetwork:5[ssl]
117 + dev-qt/qtpositioning:5
118 + dev-qt/qtprintsupport:5
119 + dev-qt/qtserialport:5
120 + dev-qt/qtsvg:5
121 + dev-qt/qtsql:5
122 + dev-qt/qtwidgets:5
123 + dev-qt/qtxml:5
124 media-gfx/exiv2:=
125 >=sci-libs/gdal-3.0.4:=[geos]
126 sci-libs/geos
127 sci-libs/libspatialindex:=
128 >=sci-libs/proj-6.3.1:=
129 - >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
130 - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
131 - 3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
132 + >=x11-libs/qscintilla-2.10.3:=
133 + >=x11-libs/qwt-6.1.3-r2:6=[svg]
134 + 3d? ( dev-qt/qt3d:5 )
135 georeferencer? ( sci-libs/gsl:= )
136 grass? ( =sci-geosciences/grass-7*:= )
137 hdf5? ( sci-libs/hdf5:= )
138 @@ -68,7 +67,7 @@ COMMON_DEPEND="
139 dev-db/oracle-instantclient:=
140 sci-libs/gdal:=[oracle]
141 )
142 - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
143 + polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
144 postgres? ( dev-db/postgresql:= )
145 python? (
146 ${PYTHON_DEPS}
147 @@ -78,11 +77,11 @@ COMMON_DEPEND="
148 dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
149 dev-python/owslib[${PYTHON_MULTI_USEDEP}]
150 dev-python/pygments[${PYTHON_MULTI_USEDEP}]
151 - dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
152 + dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
153 dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
154 dev-python/pytz[${PYTHON_MULTI_USEDEP}]
155 dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
156 - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
157 + >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
158 dev-python/requests[${PYTHON_MULTI_USEDEP}]
159 dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
160 dev-python/six[${PYTHON_MULTI_USEDEP}]
161 @@ -90,11 +89,10 @@ COMMON_DEPEND="
162 postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
163 ')
164 )
165 - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
166 - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
167 + qml? ( dev-qt/qtdeclarative:5 )
168 "
169 DEPEND="${COMMON_DEPEND}
170 - >=dev-qt/qttest-${QTMIN}:5
171 + dev-qt/qttest:5
172 "
173 RDEPEND="${COMMON_DEPEND}
174 sci-geosciences/gpsbabel
175 @@ -105,7 +103,7 @@ RESTRICT="test"
176
177 PATCHES=(
178 # git master
179 - "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
180 + "${FILESDIR}/${P}-cmake-lib-suffix.patch"
181 # TODO upstream
182 "${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
183 "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
184 @@ -117,6 +115,8 @@ pkg_setup() {
185
186 src_prepare() {
187 cmake_src_prepare
188 + sed -e "/QtWebKit.*.py/d" \
189 + -i python/PyQt/CMakeLists.txt || die
190 }
191
192 src_configure() {
193 @@ -147,7 +147,7 @@ src_configure() {
194 -DWITH_BINDINGS=$(usex python)
195 -DWITH_CUSTOM_WIDGETS=$(usex python)
196 -DWITH_QUICK=$(usex qml)
197 - -DWITH_QTWEBKIT=$(usex webkit)
198 + -DWITH_QTWEBKIT=OFF
199 )
200
201 if use grass; then
202
203 diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
204 index 5009332eb58..21e60cc41b1 100644
205 --- a/sci-geosciences/qgis/qgis-9999.ebuild
206 +++ b/sci-geosciences/qgis/qgis-9999.ebuild
207 @@ -3,9 +3,8 @@
208
209 EAPI=7
210
211 -PYTHON_COMPAT=( python3_{6,7,8} )
212 +PYTHON_COMPAT=( python3_{7,8,9} )
213 PYTHON_REQ_USE="sqlite"
214 -QTMIN="5.9.4"
215
216 if [[ ${PV} = *9999 ]]; then
217 EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
218 @@ -18,46 +17,46 @@ fi
219 inherit cmake desktop python-single-r1 qmake-utils xdg
220
221 DESCRIPTION="User friendly Geographic Information System"
222 -HOMEPAGE="https://www.qgis.org/"
223 +HOMEPAGE="https://www.qgis.org/en/site/"
224
225 LICENSE="GPL-2+ GPL-3+"
226 SLOT="0"
227 -IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
228 +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
229
230 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
231
232 BDEPEND="${PYTHON_DEPS}
233 - >=dev-qt/linguist-tools-${QTMIN}:5
234 + dev-qt/linguist-tools:5
235 sys-devel/bison
236 sys-devel/flex
237 "
238 COMMON_DEPEND="
239 - app-crypt/qca:2[qt5(+),ssl]
240 + >=app-crypt/qca-2.3.0:2[ssl]
241 >=dev-db/spatialite-4.2.0
242 dev-db/sqlite:3
243 dev-libs/expat
244 dev-libs/libzip:=
245 - dev-libs/qtkeychain[qt5(+)]
246 - >=dev-qt/designer-${QTMIN}:5
247 - >=dev-qt/qtconcurrent-${QTMIN}:5
248 - >=dev-qt/qtcore-${QTMIN}:5
249 - >=dev-qt/qtgui-${QTMIN}:5
250 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
251 - >=dev-qt/qtpositioning-${QTMIN}:5
252 - >=dev-qt/qtprintsupport-${QTMIN}:5
253 - >=dev-qt/qtserialport-${QTMIN}:5
254 - >=dev-qt/qtsvg-${QTMIN}:5
255 - >=dev-qt/qtsql-${QTMIN}:5
256 - >=dev-qt/qtwidgets-${QTMIN}:5
257 - >=dev-qt/qtxml-${QTMIN}:5
258 + dev-libs/qtkeychain:=
259 + dev-qt/designer:5
260 + dev-qt/qtconcurrent:5
261 + dev-qt/qtcore:5
262 + dev-qt/qtgui:5
263 + dev-qt/qtnetwork:5[ssl]
264 + dev-qt/qtpositioning:5
265 + dev-qt/qtprintsupport:5
266 + dev-qt/qtserialport:5
267 + dev-qt/qtsvg:5
268 + dev-qt/qtsql:5
269 + dev-qt/qtwidgets:5
270 + dev-qt/qtxml:5
271 media-gfx/exiv2:=
272 >=sci-libs/gdal-3.0.4:=[geos]
273 sci-libs/geos
274 sci-libs/libspatialindex:=
275 >=sci-libs/proj-6.3.1:=
276 - >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
277 - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
278 - 3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
279 + >=x11-libs/qscintilla-2.10.3:=
280 + >=x11-libs/qwt-6.1.3-r2:6=[svg]
281 + 3d? ( dev-qt/qt3d:5 )
282 georeferencer? ( sci-libs/gsl:= )
283 grass? ( =sci-geosciences/grass-7*:= )
284 hdf5? ( sci-libs/hdf5:= )
285 @@ -68,7 +67,7 @@ COMMON_DEPEND="
286 dev-db/oracle-instantclient:=
287 sci-libs/gdal:=[oracle]
288 )
289 - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
290 + polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
291 postgres? ( dev-db/postgresql:= )
292 python? (
293 ${PYTHON_DEPS}
294 @@ -78,11 +77,11 @@ COMMON_DEPEND="
295 dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
296 dev-python/owslib[${PYTHON_MULTI_USEDEP}]
297 dev-python/pygments[${PYTHON_MULTI_USEDEP}]
298 - dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
299 + dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
300 dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
301 dev-python/pytz[${PYTHON_MULTI_USEDEP}]
302 dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
303 - >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
304 + >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
305 dev-python/requests[${PYTHON_MULTI_USEDEP}]
306 dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
307 dev-python/six[${PYTHON_MULTI_USEDEP}]
308 @@ -90,11 +89,10 @@ COMMON_DEPEND="
309 postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
310 ')
311 )
312 - qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
313 - webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
314 + qml? ( dev-qt/qtdeclarative:5 )
315 "
316 DEPEND="${COMMON_DEPEND}
317 - >=dev-qt/qttest-${QTMIN}:5
318 + dev-qt/qttest:5
319 "
320 RDEPEND="${COMMON_DEPEND}
321 sci-geosciences/gpsbabel
322 @@ -105,7 +103,7 @@ RESTRICT="test"
323
324 PATCHES=(
325 # git master
326 - "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
327 + "${FILESDIR}/${P}-cmake-lib-suffix.patch"
328 # TODO upstream
329 "${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
330 "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
331 @@ -117,6 +115,8 @@ pkg_setup() {
332
333 src_prepare() {
334 cmake_src_prepare
335 + sed -e "/QtWebKit.*.py/d" \
336 + -i python/PyQt/CMakeLists.txt || die
337 }
338
339 src_configure() {
340 @@ -147,7 +147,7 @@ src_configure() {
341 -DWITH_BINDINGS=$(usex python)
342 -DWITH_CUSTOM_WIDGETS=$(usex python)
343 -DWITH_QUICK=$(usex qml)
344 - -DWITH_QTWEBKIT=$(usex webkit)
345 + -DWITH_QTWEBKIT=OFF
346 )
347
348 if use grass; then