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/files/, sci-geosciences/qgis/
Date: Mon, 02 Dec 2019 15:02:52
Message-Id: 1575298948.dd4be423102fa51a4195233e716b15d341892531.asturm@gentoo
1 commit: dd4be423102fa51a4195233e716b15d341892531
2 Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
3 AuthorDate: Mon Oct 28 08:42:26 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 2 15:02:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4be423
7
8 sci-geosciences/qgis: bump to version 3.10.0
9
10 https://github.com/gentoo/gentoo/pull/12512
11
12 Bug: https://bugs.gentoo.org/672952
13 Package-Manager: Portage-2.3.76, Repoman-2.3.16
14 Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 sci-geosciences/qgis/Manifest | 1 +
18 .../qgis/files/qgis-3.10.0-cmake-lib-suffix.patch | 12 ++
19 sci-geosciences/qgis/qgis-3.10.0.ebuild | 204 +++++++++++++++++++++
20 3 files changed, 217 insertions(+)
21
22 diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
23 index 415ec9dd917..5b7a90c2d8c 100644
24 --- a/sci-geosciences/qgis/Manifest
25 +++ b/sci-geosciences/qgis/Manifest
26 @@ -1,2 +1,3 @@
27 +DIST qgis-3.10.0.tar.bz2 101075584 BLAKE2B ec2bb34a0e49c6291f02b3bd92e44999042c7f7ea77047f9ad61066503ffbe9678be91964b7300b4f0d22fe7bc51d7df53fb370a402157c3ce93949ace70c3af SHA512 0666e93998b7022b83f0321ba8848d8d0a182e3ced55a91f8d5119d4bfa971949a07b82668f7e6a4801bb9ca5a6e0c551ff4c346920feaed2ece24e61c4f2b4c
28 DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
29 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
30
31 diff --git a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
32 new file mode 100644
33 index 00000000000..472b8aa466c
34 --- /dev/null
35 +++ b/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch
36 @@ -0,0 +1,12 @@
37 +diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
38 +--- a/cmake/PyQtMacros.cmake 2019-10-28 08:23:18.776024266 +0100
39 ++++ b/cmake/PyQtMacros.cmake 2019-10-28 08:24:17.316024213 +0100
40 +@@ -36,7 +36,7 @@
41 + ELSE(CMAKE_HOST_WIN32)
42 + # TODO osx
43 + SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
44 +- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
45 ++ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
46 + ENDIF(CMAKE_HOST_WIN32)
47 +
48 + FOREACH(it ${ARGN})
49
50 diff --git a/sci-geosciences/qgis/qgis-3.10.0.ebuild b/sci-geosciences/qgis/qgis-3.10.0.ebuild
51 new file mode 100644
52 index 00000000000..f2da3eb9a47
53 --- /dev/null
54 +++ b/sci-geosciences/qgis/qgis-3.10.0.ebuild
55 @@ -0,0 +1,204 @@
56 +# Copyright 1999-2019 Gentoo Authors
57 +# Distributed under the terms of the GNU General Public License v2
58 +
59 +EAPI=7
60 +
61 +PYTHON_COMPAT=( python3_{6,7} )
62 +PYTHON_REQ_USE="sqlite"
63 +QT_MIN_VER="5.9.4"
64 +
65 +if [[ ${PV} = *9999 ]]; then
66 + EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
67 + inherit git-r3
68 +else
69 + SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
70 + examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
71 + KEYWORDS="~amd64 ~x86"
72 +fi
73 +inherit cmake-utils desktop python-single-r1 qmake-utils xdg
74 +
75 +DESCRIPTION="User friendly Geographic Information System"
76 +HOMEPAGE="https://www.qgis.org/"
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 +
82 +REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
83 +
84 +BDEPEND="
85 + ${PYTHON_DEPS}
86 + >=dev-qt/linguist-tools-${QT_MIN_VER}:5
87 + sys-devel/bison
88 + sys-devel/flex
89 +"
90 +COMMON_DEPEND="
91 + app-crypt/qca:2[qt5(+),ssl]
92 + >=dev-db/spatialite-4.2.0
93 + dev-db/sqlite:3
94 + dev-libs/expat
95 + dev-libs/libzip:=
96 + dev-libs/qtkeychain[qt5(+)]
97 + >=dev-qt/designer-${QT_MIN_VER}:5
98 + >=dev-qt/qtconcurrent-${QT_MIN_VER}:5
99 + >=dev-qt/qtcore-${QT_MIN_VER}:5
100 + >=dev-qt/qtgui-${QT_MIN_VER}:5
101 + >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
102 + >=dev-qt/qtpositioning-${QT_MIN_VER}:5
103 + >=dev-qt/qtprintsupport-${QT_MIN_VER}:5
104 + >=dev-qt/qtserialport-${QT_MIN_VER}:5
105 + >=dev-qt/qtsvg-${QT_MIN_VER}:5
106 + >=dev-qt/qtsql-${QT_MIN_VER}:5
107 + >=dev-qt/qtwidgets-${QT_MIN_VER}:5
108 + >=dev-qt/qtxml-${QT_MIN_VER}:5
109 + media-gfx/exiv2:=
110 + >=sci-libs/gdal-2.2.3:=[geos]
111 + sci-libs/geos
112 + sci-libs/libspatialindex:=
113 + sci-libs/proj:=
114 + >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
115 + >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
116 + 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
117 + georeferencer? ( sci-libs/gsl:= )
118 + grass? ( =sci-geosciences/grass-7*:= )
119 + hdf5? ( sci-libs/hdf5:= )
120 + mapserver? ( dev-libs/fcgi )
121 + netcdf? ( sci-libs/netcdf:= )
122 + opencl? ( virtual/opencl )
123 + oracle? (
124 + dev-db/oracle-instantclient:=
125 + sci-libs/gdal:=[oracle]
126 + )
127 + polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
128 + postgres? ( dev-db/postgresql:= )
129 + python? (
130 + ${PYTHON_DEPS}
131 + dev-python/future[${PYTHON_USEDEP}]
132 + dev-python/httplib2[${PYTHON_USEDEP}]
133 + dev-python/jinja[${PYTHON_USEDEP}]
134 + dev-python/markupsafe[${PYTHON_USEDEP}]
135 + dev-python/owslib[${PYTHON_USEDEP}]
136 + dev-python/pygments[${PYTHON_USEDEP}]
137 + dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
138 + dev-python/python-dateutil[${PYTHON_USEDEP}]
139 + dev-python/pytz[${PYTHON_USEDEP}]
140 + dev-python/pyyaml[${PYTHON_USEDEP}]
141 + >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
142 + dev-python/requests[${PYTHON_USEDEP}]
143 + dev-python/sip:=[${PYTHON_USEDEP}]
144 + dev-python/six[${PYTHON_USEDEP}]
145 + >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
146 + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
147 + )
148 + qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
149 + webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
150 +"
151 +DEPEND="${COMMON_DEPEND}
152 + >=dev-qt/qttest-${QT_MIN_VER}:5
153 + python? ( ${PYTHON_DEPS} )
154 +"
155 +RDEPEND="${COMMON_DEPEND}
156 + sci-geosciences/gpsbabel
157 +"
158 +
159 +# Disabling test suite because upstream disallow running from install path
160 +RESTRICT="test"
161 +
162 +PATCHES=(
163 + # git master
164 + "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
165 + # TODO upstream
166 + "${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
167 + "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
168 +)
169 +
170 +pkg_setup() {
171 + python-single-r1_pkg_setup
172 +}
173 +
174 +src_prepare() {
175 + cmake-utils_src_prepare
176 +}
177 +
178 +src_configure() {
179 + local mycmakeargs=(
180 + -DQGIS_MANUAL_SUBDIR=share/man/
181 + -DQGIS_LIB_SUBDIR=$(get_libdir)
182 + -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
183 + -DQWT_INCLUDE_DIR=/usr/include/qwt6
184 + -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
185 + -DPEDANTIC=OFF
186 + -DUSE_CCACHE=OFF
187 + -DWITH_ANALYSIS=ON
188 + -DWITH_APIDOC=OFF
189 + -DWITH_GUI=ON
190 + -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
191 + -DWITH_QSPATIALITE=ON
192 + -DENABLE_TESTS=OFF
193 + -DWITH_3D=$(usex 3d)
194 + -DWITH_GEOREFERENCER=$(usex georeferencer)
195 + -DWITH_GRASS7=$(usex grass)
196 + $(cmake-utils_use_find_package hdf5 HDF5)
197 + -DWITH_SERVER=$(usex mapserver)
198 + $(cmake-utils_use_find_package netcdf NetCDF)
199 + -DUSE_OPENCL=$(usex opencl)
200 + -DWITH_ORACLE=$(usex oracle)
201 + -DWITH_QWTPOLAR=$(usex polar)
202 + -DWITH_POSTGRESQL=$(usex postgres)
203 + -DWITH_BINDINGS=$(usex python)
204 + -DWITH_CUSTOM_WIDGETS=$(usex python)
205 + -DWITH_QUICK=$(usex qml)
206 + -DWITH_QTWEBKIT=$(usex webkit)
207 + )
208 +
209 + if use grass; then
210 + mycmakeargs+=(
211 + -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
212 + )
213 + fi
214 +
215 + use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
216 +
217 + # bugs 612956, 648726
218 + addpredict /dev/dri/renderD128
219 + addpredict /dev/dri/renderD129
220 +
221 + cmake-utils_src_configure
222 +}
223 +
224 +src_install() {
225 + cmake-utils_src_install
226 +
227 + insinto /usr/share/mime/packages
228 + doins debian/qgis.xml
229 +
230 + if use examples; then
231 + docinto examples
232 + dodoc -r "${WORKDIR}"/qgis_sample_data/.
233 + docompress -x /usr/share/doc/${PF}/examples
234 + fi
235 +
236 + if use python; then
237 + python_optimize
238 + python_optimize "${ED}"/usr/share/qgis/python
239 + fi
240 +
241 + if use grass; then
242 + python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
243 + fi
244 +}
245 +
246 +pkg_postinst() {
247 + if use postgres; then
248 + elog "If you don't intend to use an external PostGIS server"
249 + elog "you should install:"
250 + elog " dev-db/postgis"
251 + elif use python; then
252 + elog "Support of PostgreSQL is disabled."
253 + elog "But some installed python-plugins import the psycopg2 module."
254 + elog "If you do not need these plugins just disable them"
255 + elog "in the Plugins menu, else you need to set USE=\"postgres\""
256 + fi
257 +
258 + xdg_pkg_postinst
259 +}