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 AD2D6139118 for ; Wed, 23 Oct 2019 23:32:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6558E0845; Wed, 23 Oct 2019 23:32:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 BE9D3E0845 for ; Wed, 23 Oct 2019 23:32:40 +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 7010F34C2E5 for ; Wed, 23 Oct 2019 23:32:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA0E8892 for ; Wed, 23 Oct 2019 23:32:36 +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: <1571873542.567699c1e23dc53dd85f75f25689af945419ef35.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/qgis/qgis-9999.ebuild X-VCS-Directories: sci-geosciences/qgis/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 567699c1e23dc53dd85f75f25689af945419ef35 X-VCS-Branch: master Date: Wed, 23 Oct 2019 23:32:36 +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: b6702288-1b5c-4313-abc5-6a7d82ef6477 X-Archives-Hash: 93d6f8fa46570cfc71b4e4179c3c510e commit: 567699c1e23dc53dd85f75f25689af945419ef35 Author: Chris Mayo gmail com> AuthorDate: Thu May 9 19:23:16 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Oct 23 23:32:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=567699c1 sci-geosciences/qgis: Update dependencies, mycmakeargs and install - Python 3 is required for building QGIS - media-gfx/exiv2 required for analysis/raster/qgsexiftools.cpp - dev-qt/qtxmlpatterns was never used and now not required - explicitly enable WITH_ANALYSIS and WITH_GUI - icons and desktop file are now installed by CMake - optimize Python installed in site-packages Closes: https://github.com/gentoo/gentoo/pull/11932 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-geosciences/qgis/qgis-9999.ebuild | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index e7a74b82fac..73aa5dd5022 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -27,6 +27,7 @@ IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" BDEPEND=" + ${PYTHON_DEPS} >=dev-qt/linguist-tools-${QT_MIN_VER}:5 sys-devel/bison sys-devel/flex @@ -50,6 +51,7 @@ COMMON_DEPEND=" >=dev-qt/qtsql-${QT_MIN_VER}:5 >=dev-qt/qtwidgets-${QT_MIN_VER}:5 >=dev-qt/qtxml-${QT_MIN_VER}:5 + media-gfx/exiv2:= >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= @@ -93,7 +95,6 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} >=dev-qt/qttest-${QT_MIN_VER}:5 - >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 python? ( ${PYTHON_DEPS} ) " RDEPEND="${COMMON_DEPEND} @@ -128,7 +129,9 @@ src_configure() { -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so -DPEDANTIC=OFF -DUSE_CCACHE=OFF + -DWITH_ANALYSIS=ON -DWITH_APIDOC=OFF + -DWITH_GUI=ON -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 -DWITH_QSPATIALITE=ON -DENABLE_TESTS=OFF @@ -166,18 +169,6 @@ src_configure() { src_install() { cmake-utils_src_install - newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop - - local size type - for size in 16 22 24 32 48 64 96 128 256; do - newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png - newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png - for type in qgs qml qlr qpt; do - newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png - done - done - newicon -s scalable images/icons/qgis_icon.svg qgis.svg - insinto /usr/share/mime/packages doins debian/qgis.xml @@ -188,6 +179,7 @@ src_install() { fi if use python; then + python_optimize python_optimize "${ED}"/usr/share/qgis/python fi