From 7aaa20c630efeeb8b1be3bfe27c5e401ffca13f0 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Thu, 22 Dec 2016 18:46:39 +0100 Subject: [PATCH] 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 --- .../qgis/{qgis-2.12.1.ebuild => qgis-2.12.1-r1.ebuild} | 4 ++-- .../qgis/{qgis-2.12.2.ebuild => qgis-2.12.2-r1.ebuild} | 4 ++-- .../qgis/{qgis-2.14.5.ebuild => qgis-2.14.5-r1.ebuild} | 2 +- .../qgis/{qgis-2.18.2.ebuild => qgis-2.18.2-r1.ebuild} | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename sci-geosciences/qgis/{qgis-2.12.1.ebuild => qgis-2.12.1-r1.ebuild} (98%) rename sci-geosciences/qgis/{qgis-2.12.2.ebuild => qgis-2.12.2-r1.ebuild} (98%) rename sci-geosciences/qgis/{qgis-2.14.5.ebuild => qgis-2.14.5-r1.ebuild} (99%) rename sci-geosciences/qgis/{qgis-2.18.2.ebuild => qgis-2.18.2-r1.ebuild} (99%) 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 04e08ccc06a0..a243e54b5cb1 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,qt4] ) >=x11-libs/qwtpolar-1 ) ( x11-libs/qwt:5[svg] =x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) ( x11-libs/qwt:5[svg]