From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DDA57138239 for ; Sun, 5 Jan 2020 17:40:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 249D3E09F3; Sun, 5 Jan 2020 17:40:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE1D4E09F3 for ; Sun, 5 Jan 2020 17:40:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 628F834DDCB for ; Sun, 5 Jan 2020 17:40:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 007DF42 for ; Sun, 5 Jan 2020 17:40:44 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1578246023.26f7969f0ff20bdf16ba2c1fd294900521e6a840.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/liblas/, sci-geosciences/laszip/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/laszip/laszip-3.4.1.ebuild sci-geosciences/liblas/liblas-1.8.1-r2.ebuild sci-geosciences/qgis/qgis-3.10.1.ebuild sci-geosciences/qgis/qgis-9999.ebuild X-VCS-Directories: sci-geosciences/qgis/ sci-geosciences/liblas/ sci-geosciences/laszip/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 26f7969f0ff20bdf16ba2c1fd294900521e6a840 X-VCS-Branch: master Date: Sun, 5 Jan 2020 17:40:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8a7c1507-263b-44ac-a786-f6fba348e0ce X-Archives-Hash: 6584ef3a46a809ef603989a05fbf6cee commit: 26f7969f0ff20bdf16ba2c1fd294900521e6a840 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 4 10:03:28 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 5 17:40:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f7969f sci-geosciences: Switch to cmake.eclass Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-geosciences/laszip/laszip-3.4.1.ebuild | 4 ++-- sci-geosciences/liblas/liblas-1.8.1-r2.ebuild | 8 ++++---- sci-geosciences/qgis/qgis-3.10.1.ebuild | 12 ++++++------ sci-geosciences/qgis/qgis-9999.ebuild | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sci-geosciences/laszip/laszip-3.4.1.ebuild b/sci-geosciences/laszip/laszip-3.4.1.ebuild index 921a1551882..242f5063c11 100644 --- 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 377be29abea..949af96ab07 100644 --- 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 f3f9c8e4e2f..cffda470c4a 100644 --- 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 f3f9c8e4e2f..cffda470c4a 100644 --- 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