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 f4fa4774431ae8f22d7784456cc8d08dbbf266ef..8c73a7c1c591e266b86c5b41e137892df807b609 100644 (file)
--- 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 9e687a8dcd27e1d4e841e179578d352770ddd5c5..1add6e5a97b666be46a5f56027f2ab84cf4dff06 100644 (file)
--- 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 7dc1b69a3e253661a5c68de304aaeaee5fea7810..f85044f3985517507759e1f39d32ec3da4b206f0 100644 (file)
--- 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 96193db8c9ddc91ce812d89f7daf2b816627307a..7fb7a91863c15c0d257979bea013a555dad2fe18 100644 (file)
--- 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 6afa49f4292c9fd091dc240c453d1b65a5244336..051afe8115172948140652c54ce5cefbe22f762a 100644 (file)
--- 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:= )