| 1 |
commit: e4247577fa23d7e956e2df610fad7519c4ac77d8 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 23 02:32:42 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 23 02:38:00 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4247577 |
| 7 |
|
| 8 |
sci-geosciences/qgis: Depend on x11-libs/qwtpolar[qt4] |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
sci-geosciences/qgis/qgis-2.14.5-r1.ebuild | 2 +- |
| 13 |
sci-geosciences/qgis/qgis-2.18.2-r1.ebuild | 2 +- |
| 14 |
sci-geosciences/qgis/qgis-2.18.2-r2.ebuild | 2 +- |
| 15 |
sci-geosciences/qgis/qgis-2.18.2-r3.ebuild | 2 +- |
| 16 |
sci-geosciences/qgis/qgis-2.18.3.ebuild | 2 +- |
| 17 |
5 files changed, 5 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild |
| 20 |
index f4fa477..8c73a7c 100644 |
| 21 |
--- a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild |
| 22 |
+++ b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild |
| 23 |
@@ -41,7 +41,7 @@ RDEPEND=" |
| 24 |
dev-qt/qtwebkit:4 |
| 25 |
x11-libs/qscintilla:=[qt4(-)] |
| 26 |
|| ( |
| 27 |
- ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) |
| 28 |
+ ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] ) |
| 29 |
( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) |
| 30 |
) |
| 31 |
grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) ) |
| 32 |
|
| 33 |
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild |
| 34 |
index 9e687a8..1add6e5 100644 |
| 35 |
--- a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild |
| 36 |
+++ b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild |
| 37 |
@@ -41,7 +41,7 @@ RDEPEND=" |
| 38 |
dev-qt/qtwebkit:4 |
| 39 |
x11-libs/qscintilla:=[qt4(-)] |
| 40 |
|| ( |
| 41 |
- ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) |
| 42 |
+ ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] ) |
| 43 |
( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) |
| 44 |
) |
| 45 |
georeferencer? ( sci-libs/gsl:= ) |
| 46 |
|
| 47 |
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild |
| 48 |
index 7dc1b69..f85044f 100644 |
| 49 |
--- a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild |
| 50 |
+++ b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild |
| 51 |
@@ -41,7 +41,7 @@ RDEPEND=" |
| 52 |
dev-qt/qtwebkit:4 |
| 53 |
x11-libs/qscintilla:=[qt4(-)] |
| 54 |
|| ( |
| 55 |
- ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) |
| 56 |
+ ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] ) |
| 57 |
( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) |
| 58 |
) |
| 59 |
georeferencer? ( sci-libs/gsl:= ) |
| 60 |
|
| 61 |
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild |
| 62 |
index 96193db..7fb7a91 100644 |
| 63 |
--- a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild |
| 64 |
+++ b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild |
| 65 |
@@ -42,7 +42,7 @@ RDEPEND=" |
| 66 |
dev-qt/qtwebkit:4 |
| 67 |
x11-libs/qscintilla:=[qt4(-)] |
| 68 |
|| ( |
| 69 |
- ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) |
| 70 |
+ ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] ) |
| 71 |
( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) |
| 72 |
) |
| 73 |
georeferencer? ( sci-libs/gsl:= ) |
| 74 |
|
| 75 |
diff --git a/sci-geosciences/qgis/qgis-2.18.3.ebuild b/sci-geosciences/qgis/qgis-2.18.3.ebuild |
| 76 |
index 6afa49f..051afe8 100644 |
| 77 |
--- a/sci-geosciences/qgis/qgis-2.18.3.ebuild |
| 78 |
+++ b/sci-geosciences/qgis/qgis-2.18.3.ebuild |
| 79 |
@@ -43,7 +43,7 @@ COMMON_DEPEND=" |
| 80 |
sci-libs/proj |
| 81 |
x11-libs/qscintilla:=[qt4(-)] |
| 82 |
|| ( |
| 83 |
- ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) |
| 84 |
+ ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] ) |
| 85 |
( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) |
| 86 |
) |
| 87 |
georeferencer? ( sci-libs/gsl:= ) |
Archives