sci-geosciences: Switch to cmake.eclass

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

diff --git a/sci-geosciences/laszip/laszip-3.4.1.ebuild b/sci-geosciences/laszip/laszip-3.4.1.ebuild
index 921a15518827be6c6566d26ca3aa863c74b4ac4f..242f5063c11d46de7f75bc7580d2ca633725b4a9 100644 (file)
--- a/sci-geosciences/laszip/laszip-3.4.1.ebuild
+++ b/sci-geosciences/laszip/laszip-3.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Library for free and lossless compression of the LAS LiDAR format"
 HOMEPAGE="https://laszip.org/"

diff --git a/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
index 377be29abea5751051e57ca14ef49fce1a06db19..949af96ab07b12a251473015a23de0091437bfad 100644 (file)
--- a/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
 HOMEPAGE="https://github.com/libLAS/libLAS/"
@@ -34,7 +34,7 @@ PATCHES=(
 )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # add missing linkage
        sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \
@@ -46,5 +46,5 @@ src_configure() {
                -DLIBLAS_LIB_SUBDIR=$(get_libdir)
                -DWITH_GDAL=$(usex gdal)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }

diff --git a/sci-geosciences/qgis/qgis-3.10.1.ebuild b/sci-geosciences/qgis/qgis-3.10.1.ebuild
index f3f9c8e4e2f693151890c4c0c4ea9e9f0d4507e7..cffda470c4afb32bdff31028a4128feced51e74b 100644 (file)
--- a/sci-geosciences/qgis/qgis-3.10.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.1.ebuild
@@ -15,7 +15,7 @@ else
                examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
        KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake-utils desktop python-single-r1 qmake-utils xdg
+inherit cmake desktop python-single-r1 qmake-utils xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/"
@@ -117,7 +117,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -138,9 +138,9 @@ src_configure() {
                -DWITH_3D=$(usex 3d)
                -DWITH_GEOREFERENCER=$(usex georeferencer)
                -DWITH_GRASS7=$(usex grass)
-               $(cmake-utils_use_find_package hdf5 HDF5)
+               $(cmake_use_find_package hdf5 HDF5)
                -DWITH_SERVER=$(usex mapserver)
-               $(cmake-utils_use_find_package netcdf NetCDF)
+               $(cmake_use_find_package netcdf NetCDF)
                -DUSE_OPENCL=$(usex opencl)
                -DWITH_ORACLE=$(usex oracle)
                -DWITH_QWTPOLAR=$(usex polar)
@@ -163,11 +163,11 @@ src_configure() {
        addpredict /dev/dri/renderD128
        addpredict /dev/dri/renderD129
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        insinto /usr/share/mime/packages
        doins debian/qgis.xml

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index f3f9c8e4e2f693151890c4c0c4ea9e9f0d4507e7..cffda470c4afb32bdff31028a4128feced51e74b 100644 (file)
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -15,7 +15,7 @@ else
                examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
        KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake-utils desktop python-single-r1 qmake-utils xdg
+inherit cmake desktop python-single-r1 qmake-utils xdg
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="https://www.qgis.org/"
@@ -117,7 +117,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -138,9 +138,9 @@ src_configure() {
                -DWITH_3D=$(usex 3d)
                -DWITH_GEOREFERENCER=$(usex georeferencer)
                -DWITH_GRASS7=$(usex grass)
-               $(cmake-utils_use_find_package hdf5 HDF5)
+               $(cmake_use_find_package hdf5 HDF5)
                -DWITH_SERVER=$(usex mapserver)
-               $(cmake-utils_use_find_package netcdf NetCDF)
+               $(cmake_use_find_package netcdf NetCDF)
                -DUSE_OPENCL=$(usex opencl)
                -DWITH_ORACLE=$(usex oracle)
                -DWITH_QWTPOLAR=$(usex polar)
@@ -163,11 +163,11 @@ src_configure() {
        addpredict /dev/dri/renderD128
        addpredict /dev/dri/renderD129
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        insinto /usr/share/mime/packages
        doins debian/qgis.xml