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: Sat, 09 Sep 2017 12:40:15
Message-Id: 1504960782.36920beabdb32e72dde1214430df67d7c8eb7cf2.asturm@gentoo
1 commit: 36920beabdb32e72dde1214430df67d7c8eb7cf2
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 9 12:39:42 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 9 12:39:42 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36920bea
7
8 sci-geosciences/qgis: Drop USE=webkit
9
10 Gentoo-bug: 620748
11 Package-Manager: Portage-2.3.8, Repoman-2.3.3
12
13 sci-geosciences/qgis/qgis-2.18.12.ebuild | 7 +++----
14 1 file changed, 3 insertions(+), 4 deletions(-)
15
16 diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
17 index d0a0f668239..7a2dbf01e06 100644
18 --- a/sci-geosciences/qgis/qgis-2.18.12.ebuild
19 +++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild
20 @@ -17,7 +17,7 @@ SRC_URI="
21 LICENSE="GPL-2+ GPL-3+"
22 SLOT="0"
23 KEYWORDS="~amd64 ~x86"
24 -IUSE="examples georeferencer grass mapserver oracle postgres python webkit"
25 +IUSE="examples georeferencer grass mapserver oracle postgres python"
26
27 REQUIRED_USE="
28 mapserver? ( python )
29 @@ -56,7 +56,7 @@ COMMON_DEPEND="
30 dev-python/jinja[${PYTHON_USEDEP}]
31 dev-python/markupsafe[${PYTHON_USEDEP}]
32 dev-python/pygments[${PYTHON_USEDEP}]
33 - dev-python/PyQt4[X,sql,svg,webkit?,${PYTHON_USEDEP}]
34 + dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}]
35 dev-python/python-dateutil[${PYTHON_USEDEP}]
36 dev-python/pytz[${PYTHON_USEDEP}]
37 dev-python/pyyaml[${PYTHON_USEDEP}]
38 @@ -66,7 +66,6 @@ COMMON_DEPEND="
39 dev-python/six[${PYTHON_USEDEP}]
40 postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
41 )
42 - webkit? ( dev-qt/qtwebkit:4 )
43 "
44 DEPEND="${COMMON_DEPEND}
45 sys-devel/bison
46 @@ -121,7 +120,7 @@ src_configure() {
47 -DWITH_ORACLE=$(usex oracle)
48 -DWITH_POSTGRESQL=$(usex postgres)
49 -DWITH_BINDINGS=$(usex python)
50 - -DWITH_QTWEBKIT=$(usex webkit)
51 + -DWITH_QTWEBKIT=OFF
52 )
53
54 if has_version '<x11-libs/qscintilla-2.10'; then