commit: 7aaa20c630efeeb8b1be3bfe27c5e401ffca13f0 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Dec 22 17:46:39 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Dec 22 18:26:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aaa20c6
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 sci-geosciences/qgis/{qgis-2.12.1.ebuild => qgis-2.12.1-r1.ebuild} | 4 ++-- sci-geosciences/qgis/{qgis-2.12.2.ebuild => qgis-2.12.2-r1.ebuild} | 4 ++-- sci-geosciences/qgis/{qgis-2.14.5.ebuild => qgis-2.14.5-r1.ebuild} | 2 +- sci-geosciences/qgis/{qgis-2.18.2.ebuild => qgis-2.18.2-r1.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 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 04e08cc..a243e54 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 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 01573b3..3616ead 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 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 0e8baaf..3416afd 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 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 4985e33..dec2e4d 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 )
