From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 22 Apr 2018 20:20:55 +0000 (+0200)
Subject: sci-geosciences/qgis: Fix USE=grass
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8fd3069bffafbc3c77440170c41609d225404766;p=gentoo.git

sci-geosciences/qgis: Fix USE=grass

Upstream commit eb6301e023e8cfa9d83fbbfc6ca5797b62d8d535
Thanks-to: Chris Mayo <aklhfex@gmail.com>
Closes: https://bugs.gentoo.org/653718
Package-Manager: Portage-2.3.31, Repoman-2.3.9
---

diff --git a/sci-geosciences/qgis/qgis-3.0.2.ebuild b/sci-geosciences/qgis/qgis-3.0.2.ebuild
index 9c686b0dc1a5..0b888637f800 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 9c686b0dc1a5..0b888637f800 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