sci-geosciences/qgis: Set WITH_INTERNAL_MDAL=ON, add USE hdf5, netcdf

As long as sci-libs/mdal is not packaged.

Upstream commits:
50422a116516cfb7e05f2e60062eb9d7555592ae
14fa499ed3ce0358dd4835cd1f43b4b93df8f473
97c95803c623f234b13a921325b050f235170d00

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 868a026b6c1ecf495e5c75c4a508662b3183d9ef..56b0fd7a351eafe645435434ae8c900693da6b13 100644 (file)
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -17,7 +17,9 @@
                <flag name="3d">Build QGIS 3D library using <pkg>dev-qt/qt3d</pkg></flag>
                <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
                <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
+               <flag name="hdf5">Enable MDAL support for <pkg>sci-libs/hdf5</pkg></flag>
                <flag name="mapserver">Determines whether mapserver should be built</flag>
+               <flag name="netcdf">Enable MDAL support for GRIB and XMDF formats</flag>
                <flag name="opencl">Enable OpenCL support</flag>
                <flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
                <flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag>

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index ab077fc720a4e1f042aa57ac561cc2933ef2a74a..6aa2463ff1cdf1f20b96f7bcf50d0397b0149b42 100644 (file)
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d examples georeferencer grass mapserver opencl oracle polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
 
@@ -59,7 +59,9 @@ COMMON_DEPEND="
        3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
        georeferencer? ( sci-libs/gsl:= )
        grass? ( =sci-geosciences/grass-7*:= )
+       hdf5? ( sci-libs/hdf5:= )
        mapserver? ( dev-libs/fcgi )
+       netcdf? ( sci-libs/netcdf:= )
        opencl? ( virtual/opencl )
        oracle? (
                dev-db/oracle-instantclient:=
@@ -126,12 +128,15 @@ src_configure() {
                -DPEDANTIC=OFF
                -DUSE_CCACHE=OFF
                -DWITH_APIDOC=OFF
+               -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
                -DWITH_QSPATIALITE=ON
                -DENABLE_TESTS=OFF
                -DWITH_3D=$(usex 3d)
                -DWITH_GEOREFERENCER=$(usex georeferencer)
                -DWITH_GRASS7=$(usex grass)
+               $(cmake-utils_use_find_package hdf5 HDF5)
                -DWITH_SERVER=$(usex mapserver)
+               $(cmake-utils_use_find_package netcdf NetCDF)
                -DUSE_OPENCL=$(usex opencl)
                -DWITH_ORACLE=$(usex oracle)
                -DWITH_QWTPOLAR=$(usex polar)