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

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3188

diff --git a/sci-geosciences/qgis/qgis-2.12.1.ebuild b/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild
similarity index 98%
rename from sci-geosciences/qgis/qgis-2.12.1.ebuild
rename to sci-geosciences/qgis/qgis-2.12.1-r1.ebuild
index 04e08ccc06a030c2b345f2a8813e5d16a96a41f4..a243e54b5cb182ff99bfed19cb40e296155c61e7 100644 (file)
--- a/sci-geosciences/qgis/qgis-2.12.1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,7 +38,7 @@ RDEPEND="
        dev-qt/qtsql:4
        dev-qt/qtwebkit:4
        dev-qt/designer:4
-       x11-libs/qscintilla
+       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:5[svg] <x11-libs/qwtpolar-1 )

diff --git a/sci-geosciences/qgis/qgis-2.12.2.ebuild b/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild
similarity index 98%
rename from sci-geosciences/qgis/qgis-2.12.2.ebuild
rename to sci-geosciences/qgis/qgis-2.12.2-r1.ebuild
index 01573b3bff06282e14d44ee3cb7ab6844650d65a..3616eadb191b189fd5f9c4ac6ffdef3145dc99f4 100644 (file)
--- a/sci-geosciences/qgis/qgis-2.12.2.ebuild
+++ b/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,7 +38,7 @@ RDEPEND="
        dev-qt/qtsql:4
        dev-qt/qtwebkit:4
        dev-qt/designer:4
-       x11-libs/qscintilla
+       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:5[svg] <x11-libs/qwtpolar-1 )

diff --git a/sci-geosciences/qgis/qgis-2.14.5.ebuild b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-2.14.5.ebuild
rename to sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
index 0e8baafe7d9675a3ef6ad62ef19fc9674e5730c6..3416afd9cc5e753a602cfb1768ba60a613e2f3e5 100644 (file)
--- a/sci-geosciences/qgis/qgis-2.14.5.ebuild
+++ b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
        dev-qt/qtsvg:4
        dev-qt/qtsql:4
        dev-qt/qtwebkit:4
-       x11-libs/qscintilla:=
+       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:5[svg] <x11-libs/qwtpolar-1 )

diff --git a/sci-geosciences/qgis/qgis-2.18.2.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
similarity index 99%
rename from sci-geosciences/qgis/qgis-2.18.2.ebuild
rename to sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
index 4985e33ae671c35f31f1242f2cb7433b4f1ce92b..dec2e4df2e0f416b12a7cb0e1638ad92a9de9228 100644 (file)
--- a/sci-geosciences/qgis/qgis-2.18.2.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
        dev-qt/qtsvg:4
        dev-qt/qtsql:4
        dev-qt/qtwebkit:4
-       x11-libs/qscintilla:=
+       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:5[svg] <x11-libs/qwtpolar-1 )