Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/
Date: Wed, 01 Mar 2017 18:12:49
Message-Id: 1488391940.a5305c425c3000f1807d9a5f46dba060d77710d0.asturm@gentoo
1 commit: a5305c425c3000f1807d9a5f46dba060d77710d0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 1 18:11:55 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 1 18:12:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5305c42
7
8 sci-geosciences/qgis: Move opt. gdal[oracle] dep below oracle conditional
9
10 Makes repoman happy for stabilisation w/ masked oracle flag.
11
12 Package-Manager: Portage-2.3.3, Repoman-2.3.1
13
14 sci-geosciences/qgis/qgis-2.18.3-r1.ebuild | 7 +++++--
15 1 file changed, 5 insertions(+), 2 deletions(-)
16
17 diff --git a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
18 index d355be2a099..f5fc89568ff 100644
19 --- a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
20 +++ b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
21 @@ -36,7 +36,7 @@ COMMON_DEPEND="
22 dev-qt/qtscript:4
23 dev-qt/qtsvg:4
24 dev-qt/qtsql:4
25 - sci-libs/gdal:=[geos,oracle?,python?,${PYTHON_USEDEP}]
26 + sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
27 sci-libs/geos
28 sci-libs/libspatialindex:=
29 sci-libs/proj
30 @@ -46,7 +46,10 @@ COMMON_DEPEND="
31 georeferencer? ( sci-libs/gsl:= )
32 grass? ( >=sci-geosciences/grass-7.0.0:= )
33 mapserver? ( dev-libs/fcgi )
34 - oracle? ( dev-db/oracle-instantclient:= )
35 + oracle? (
36 + dev-db/oracle-instantclient:=
37 + sci-libs/gdal:=[oracle]
38 + )
39 postgres? ( dev-db/postgresql:= )
40 python? ( ${PYTHON_DEPS}
41 dev-python/future[${PYTHON_USEDEP}]