From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 23 Jan 2017 02:32:42 +0000 (+0100)
Subject: sci-geosciences/qgis: Depend on x11-libs/qwtpolar[qt4]
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4247577fa23d7e956e2df610fad7519c4ac77d8;p=gentoo.git

sci-geosciences/qgis: Depend on x11-libs/qwtpolar[qt4]

Package-Manager: portage-2.3.0
---

diff --git a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
index f4fa4774431a..8c73a7c1c591 100644
--- a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	x11-libs/qscintilla:=[qt4(-)]
 	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
 	)
 	grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
index 9e687a8dcd27..1add6e5a97b6 100644
--- a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	x11-libs/qscintilla:=[qt4(-)]
 	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
 	)
 	georeferencer? ( sci-libs/gsl:= )
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
index 7dc1b69a3e25..f85044f39855 100644
--- a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	x11-libs/qscintilla:=[qt4(-)]
 	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
 	)
 	georeferencer? ( sci-libs/gsl:= )
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
index 96193db8c9dd..7fb7a91863c1 100644
--- a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	x11-libs/qscintilla:=[qt4(-)]
 	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
 	)
 	georeferencer? ( sci-libs/gsl:= )
diff --git a/sci-geosciences/qgis/qgis-2.18.3.ebuild b/sci-geosciences/qgis/qgis-2.18.3.ebuild
index 6afa49f4292c..051afe811517 100644
--- a/sci-geosciences/qgis/qgis-2.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.3.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	sci-libs/proj
 	x11-libs/qscintilla:=[qt4(-)]
 	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
 		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
 	)
 	georeferencer? ( sci-libs/gsl:= )