From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ACF4D139085 for ; Thu, 22 Dec 2016 18:27:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF889E0DC9; Thu, 22 Dec 2016 18:27:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0051E0DC9 for ; Thu, 22 Dec 2016 18:27:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2D034341142 for ; Thu, 22 Dec 2016 18:26:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D6D124EF for ; Thu, 22 Dec 2016 18:26:56 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1482431183.7aaa20c630efeeb8b1be3bfe27c5e401ffca13f0.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/qgis/qgis-2.12.1-r1.ebuild sci-geosciences/qgis/qgis-2.12.1.ebuild sci-geosciences/qgis/qgis-2.12.2-r1.ebuild sci-geosciences/qgis/qgis-2.12.2.ebuild sci-geosciences/qgis/qgis-2.14.5-r1.ebuild sci-geosciences/qgis/qgis-2.14.5.ebuild sci-geosciences/qgis/qgis-2.18.2-r1.ebuild sci-geosciences/qgis/qgis-2.18.2.ebuild X-VCS-Directories: sci-geosciences/qgis/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 7aaa20c630efeeb8b1be3bfe27c5e401ffca13f0 X-VCS-Branch: master Date: Thu, 22 Dec 2016 18:26:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3ef62e3d-64d8-4cc9-8946-2390e4f3ae3d X-Archives-Hash: 523132f8217b80c18ad947ce6a7e1960 commit: 7aaa20c630efeeb8b1be3bfe27c5e401ffca13f0 Author: David Seifert gentoo org> AuthorDate: Thu Dec 22 17:46:39 2016 +0000 Commit: David Seifert gentoo 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,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]