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 6893B138333 for ; Sun, 22 Apr 2018 23:11:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F24AE09E6; Sun, 22 Apr 2018 23:11:33 +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 57190E09E6 for ; Sun, 22 Apr 2018 23:11:32 +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 9824C335C78 for ; Sun, 22 Apr 2018 23:11:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3B08293 for ; Sun, 22 Apr 2018 23:11:29 +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: <1524438667.8fd3069bffafbc3c77440170c41609d225404766.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-3.0.2.ebuild 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: 8fd3069bffafbc3c77440170c41609d225404766 X-VCS-Branch: master Date: Sun, 22 Apr 2018 23:11:29 +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-Archives-Salt: 7e8bfb7f-d4e8-47e0-80bf-4b6a9f1f55b9 X-Archives-Hash: 4a8604f4a8d72bf66fe7671d5780900f commit: 8fd3069bffafbc3c77440170c41609d225404766 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 22 20:20:55 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 22 23:11:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd3069b sci-geosciences/qgis: Fix USE=grass Upstream commit eb6301e023e8cfa9d83fbbfc6ca5797b62d8d535 Thanks-to: Chris Mayo gmail.com> Closes: https://bugs.gentoo.org/653718 Package-Manager: Portage-2.3.31, Repoman-2.3.9 sci-geosciences/qgis/qgis-3.0.2.ebuild | 5 ++--- sci-geosciences/qgis/qgis-9999.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sci-geosciences/qgis/qgis-3.0.2.ebuild b/sci-geosciences/qgis/qgis-3.0.2.ebuild index 9c686b0dc1a..0b888637f80 100644 --- a/sci-geosciences/qgis/qgis-3.0.2.ebuild +++ b/sci-geosciences/qgis/qgis-3.0.2.ebuild @@ -56,7 +56,7 @@ COMMON_DEPEND=" >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) georeferencer? ( sci-libs/gsl:= ) - grass? ( >=sci-geosciences/grass-7.0.0:= ) + grass? ( =sci-geosciences/grass-7*:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= @@ -136,7 +136,7 @@ src_configure() { -DENABLE_TESTS=OFF -DWITH_3D=$(usex 3d) -DWITH_GEOREFERENCER=$(usex georeferencer) - -DWITH_GRASS=$(usex grass) + -DWITH_GRASS7=$(usex grass) -DWITH_SERVER=$(usex mapserver) -DWITH_ORACLE=$(usex oracle) -DWITH_QWTPOLAR=$(usex polar) @@ -148,7 +148,6 @@ src_configure() { if use grass; then mycmakeargs+=( - -DWITH_GRASS7=ON -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 ) fi diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 9c686b0dc1a..0b888637f80 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -56,7 +56,7 @@ COMMON_DEPEND=" >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) georeferencer? ( sci-libs/gsl:= ) - grass? ( >=sci-geosciences/grass-7.0.0:= ) + grass? ( =sci-geosciences/grass-7*:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= @@ -136,7 +136,7 @@ src_configure() { -DENABLE_TESTS=OFF -DWITH_3D=$(usex 3d) -DWITH_GEOREFERENCER=$(usex georeferencer) - -DWITH_GRASS=$(usex grass) + -DWITH_GRASS7=$(usex grass) -DWITH_SERVER=$(usex mapserver) -DWITH_ORACLE=$(usex oracle) -DWITH_QWTPOLAR=$(usex polar) @@ -148,7 +148,6 @@ src_configure() { if use grass; then mycmakeargs+=( - -DWITH_GRASS7=ON -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 ) fi