summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2016-12-22 18:46:39 +0100
committerDavid Seifert <soap@gentoo.org>2016-12-22 20:26:23 +0200
commit7aaa20c630efeeb8b1be3bfe27c5e401ffca13f0 (patch)
tree8654a65e4c795e9516dd6464ba3094c597838c33 /sci-geosciences
parentmedia-gfx/openscad: Depend on x11-libs/qscintilla[qt4] (diff)
downloadgentoo-7aaa20c630efeeb8b1be3bfe27c5e401ffca13f0.tar.gz
gentoo-7aaa20c630efeeb8b1be3bfe27c5e401ffca13f0.tar.bz2
gentoo-7aaa20c630efeeb8b1be3bfe27c5e401ffca13f0.zip
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
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/qgis/qgis-2.12.1-r1.ebuild (renamed from sci-geosciences/qgis/qgis-2.12.1.ebuild)4
-rw-r--r--sci-geosciences/qgis/qgis-2.12.2-r1.ebuild (renamed from sci-geosciences/qgis/qgis-2.12.2.ebuild)4
-rw-r--r--sci-geosciences/qgis/qgis-2.14.5-r1.ebuild (renamed from sci-geosciences/qgis/qgis-2.14.5.ebuild)2
-rw-r--r--sci-geosciences/qgis/qgis-2.18.2-r1.ebuild (renamed from sci-geosciences/qgis/qgis-2.18.2.ebuild)2
4 files changed, 6 insertions, 6 deletions
diff --git a/sci-geosciences/qgis/qgis-2.12.1.ebuild b/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild
index 04e08ccc06a..a243e54b5cb 100644
--- 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
index 01573b3bff0..3616eadb191 100644
--- 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
index 0e8baafe7d9..3416afd9cc5 100644
--- 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
index 4985e33ae67..dec2e4df2e0 100644
--- 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 )