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/
Date: Sun, 28 Apr 2019 15:27:18
Message-Id: 1556465204.09b59bc06697355114cfd40a521e379a1cbdcec6.asturm@gentoo
1 commit: 09b59bc06697355114cfd40a521e379a1cbdcec6
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 27 22:22:29 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 28 15:26:44 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b59bc0
7
8 sci-geosciences/qgis: Set WITH_INTERNAL_MDAL=ON, add USE hdf5, netcdf
9
10 As long as sci-libs/mdal is not packaged.
11
12 Upstream commits:
13 50422a116516cfb7e05f2e60062eb9d7555592ae
14 14fa499ed3ce0358dd4835cd1f43b4b93df8f473
15 97c95803c623f234b13a921325b050f235170d00
16
17 Package-Manager: Portage-2.3.65, Repoman-2.3.12
18 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
19
20 sci-geosciences/qgis/metadata.xml | 2 ++
21 sci-geosciences/qgis/qgis-9999.ebuild | 7 ++++++-
22 2 files changed, 8 insertions(+), 1 deletion(-)
23
24 diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
25 index 868a026b6c1..56b0fd7a351 100644
26 --- a/sci-geosciences/qgis/metadata.xml
27 +++ b/sci-geosciences/qgis/metadata.xml
28 @@ -17,7 +17,9 @@
29 <flag name="3d">Build QGIS 3D library using <pkg>dev-qt/qt3d</pkg></flag>
30 <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
31 <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
32 + <flag name="hdf5">Enable MDAL support for <pkg>sci-libs/hdf5</pkg></flag>
33 <flag name="mapserver">Determines whether mapserver should be built</flag>
34 + <flag name="netcdf">Enable MDAL support for GRIB and XMDF formats</flag>
35 <flag name="opencl">Enable OpenCL support</flag>
36 <flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
37 <flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag>
38
39 diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
40 index ab077fc720a..6aa2463ff1c 100644
41 --- a/sci-geosciences/qgis/qgis-9999.ebuild
42 +++ b/sci-geosciences/qgis/qgis-9999.ebuild
43 @@ -22,7 +22,7 @@ HOMEPAGE="https://www.qgis.org/"
44
45 LICENSE="GPL-2+ GPL-3+"
46 SLOT="0"
47 -IUSE="3d examples georeferencer grass mapserver opencl oracle polar postgres python qml webkit"
48 +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
49
50 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
51
52 @@ -59,7 +59,9 @@ COMMON_DEPEND="
53 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
54 georeferencer? ( sci-libs/gsl:= )
55 grass? ( =sci-geosciences/grass-7*:= )
56 + hdf5? ( sci-libs/hdf5:= )
57 mapserver? ( dev-libs/fcgi )
58 + netcdf? ( sci-libs/netcdf:= )
59 opencl? ( virtual/opencl )
60 oracle? (
61 dev-db/oracle-instantclient:=
62 @@ -126,12 +128,15 @@ src_configure() {
63 -DPEDANTIC=OFF
64 -DUSE_CCACHE=OFF
65 -DWITH_APIDOC=OFF
66 + -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
67 -DWITH_QSPATIALITE=ON
68 -DENABLE_TESTS=OFF
69 -DWITH_3D=$(usex 3d)
70 -DWITH_GEOREFERENCER=$(usex georeferencer)
71 -DWITH_GRASS7=$(usex grass)
72 + $(cmake-utils_use_find_package hdf5 HDF5)
73 -DWITH_SERVER=$(usex mapserver)
74 + $(cmake-utils_use_find_package netcdf NetCDF)
75 -DUSE_OPENCL=$(usex opencl)
76 -DWITH_ORACLE=$(usex oracle)
77 -DWITH_QWTPOLAR=$(usex polar)