| 1 |
commit: 7aaa20c630efeeb8b1be3bfe27c5e401ffca13f0 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 22 17:46:39 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 22 18:26:23 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aaa20c6 |
| 7 |
|
| 8 |
sci-geosciences/qgis: Depend on x11-libs/qscintilla[qt4] |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/3188 |
| 12 |
|
| 13 |
sci-geosciences/qgis/{qgis-2.12.1.ebuild => qgis-2.12.1-r1.ebuild} | 4 ++-- |
| 14 |
sci-geosciences/qgis/{qgis-2.12.2.ebuild => qgis-2.12.2-r1.ebuild} | 4 ++-- |
| 15 |
sci-geosciences/qgis/{qgis-2.14.5.ebuild => qgis-2.14.5-r1.ebuild} | 2 +- |
| 16 |
sci-geosciences/qgis/{qgis-2.18.2.ebuild => qgis-2.18.2-r1.ebuild} | 2 +- |
| 17 |
4 files changed, 6 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-geosciences/qgis/qgis-2.12.1.ebuild b/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild |
| 20 |
similarity index 98% |
| 21 |
rename from sci-geosciences/qgis/qgis-2.12.1.ebuild |
| 22 |
rename to sci-geosciences/qgis/qgis-2.12.1-r1.ebuild |
| 23 |
index 04e08cc..a243e54 100644 |
| 24 |
--- a/sci-geosciences/qgis/qgis-2.12.1.ebuild |
| 25 |
+++ b/sci-geosciences/qgis/qgis-2.12.1-r1.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2015 Gentoo Foundation |
| 28 |
+# Copyright 1999-2016 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
# $Id$ |
| 31 |
|
| 32 |
@@ -38,7 +38,7 @@ RDEPEND=" |
| 33 |
dev-qt/qtsql:4 |
| 34 |
dev-qt/qtwebkit:4 |
| 35 |
dev-qt/designer:4 |
| 36 |
- x11-libs/qscintilla |
| 37 |
+ x11-libs/qscintilla:=[qt4(-)] |
| 38 |
|| ( |
| 39 |
( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) |
| 40 |
( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) |
| 41 |
|
| 42 |
diff --git a/sci-geosciences/qgis/qgis-2.12.2.ebuild b/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild |
| 43 |
similarity index 98% |
| 44 |
rename from sci-geosciences/qgis/qgis-2.12.2.ebuild |
| 45 |
rename to sci-geosciences/qgis/qgis-2.12.2-r1.ebuild |
| 46 |
index 01573b3..3616ead 100644 |
| 47 |
--- a/sci-geosciences/qgis/qgis-2.12.2.ebuild |
| 48 |
+++ b/sci-geosciences/qgis/qgis-2.12.2-r1.ebuild |
| 49 |
@@ -1,4 +1,4 @@ |
| 50 |
-# Copyright 1999-2015 Gentoo Foundation |
| 51 |
+# Copyright 1999-2016 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Id$ |
| 54 |
|
| 55 |
@@ -38,7 +38,7 @@ RDEPEND=" |
| 56 |
dev-qt/qtsql:4 |
| 57 |
dev-qt/qtwebkit:4 |
| 58 |
dev-qt/designer:4 |
| 59 |
- x11-libs/qscintilla |
| 60 |
+ x11-libs/qscintilla:=[qt4(-)] |
| 61 |
|| ( |
| 62 |
( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) |
| 63 |
( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) |
| 64 |
|
| 65 |
diff --git a/sci-geosciences/qgis/qgis-2.14.5.ebuild b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild |
| 66 |
similarity index 99% |
| 67 |
rename from sci-geosciences/qgis/qgis-2.14.5.ebuild |
| 68 |
rename to sci-geosciences/qgis/qgis-2.14.5-r1.ebuild |
| 69 |
index 0e8baaf..3416afd 100644 |
| 70 |
--- a/sci-geosciences/qgis/qgis-2.14.5.ebuild |
| 71 |
+++ b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild |
| 72 |
@@ -39,7 +39,7 @@ RDEPEND=" |
| 73 |
dev-qt/qtsvg:4 |
| 74 |
dev-qt/qtsql:4 |
| 75 |
dev-qt/qtwebkit:4 |
| 76 |
- x11-libs/qscintilla:= |
| 77 |
+ x11-libs/qscintilla:=[qt4(-)] |
| 78 |
|| ( |
| 79 |
( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) |
| 80 |
( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) |
| 81 |
|
| 82 |
diff --git a/sci-geosciences/qgis/qgis-2.18.2.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild |
| 83 |
similarity index 99% |
| 84 |
rename from sci-geosciences/qgis/qgis-2.18.2.ebuild |
| 85 |
rename to sci-geosciences/qgis/qgis-2.18.2-r1.ebuild |
| 86 |
index 4985e33..dec2e4d 100644 |
| 87 |
--- a/sci-geosciences/qgis/qgis-2.18.2.ebuild |
| 88 |
+++ b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild |
| 89 |
@@ -39,7 +39,7 @@ RDEPEND=" |
| 90 |
dev-qt/qtsvg:4 |
| 91 |
dev-qt/qtsql:4 |
| 92 |
dev-qt/qtwebkit:4 |
| 93 |
- x11-libs/qscintilla:= |
| 94 |
+ x11-libs/qscintilla:=[qt4(-)] |
| 95 |
|| ( |
| 96 |
( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) |
| 97 |
( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) |
Archives