From 0333e35edc0fe153dcf8227974ee05cec0844ce8 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 21 Jan 2017 00:19:53 +0100 Subject: sci-geosciences/qgis: Add USE=webkit, make python really optional Package-Manager: portage-2.3.0 --- sci-geosciences/qgis/qgis-2.18.3.ebuild | 43 ++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/sci-geosciences/qgis/qgis-2.18.3.ebuild b/sci-geosciences/qgis/qgis-2.18.3.ebuild index 67371af98d4f..b631f4b20f11 100644 --- a/sci-geosciences/qgis/qgis-2.18.3.ebuild +++ b/sci-geosciences/qgis/qgis-2.18.3.ebuild @@ -18,13 +18,14 @@ SRC_URI=" LICENSE="GPL-2+ GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="examples georeferencer grass mapserver oracle postgres python" +IUSE="examples georeferencer grass mapserver oracle postgres python webkit" REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - mapserver? ( python )" + grass? ( python ) + mapserver? ( python ) + python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND=" +COMMON_DEPEND=" app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 @@ -36,8 +37,6 @@ RDEPEND=" dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 - dev-qt/qtwebkit:4 - sci-geosciences/gpsbabel >=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,${PYTHON_USEDEP}] sci-libs/geos sci-libs/libspatialindex:= @@ -52,28 +51,31 @@ RDEPEND=" mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= ) postgres? ( dev-db/postgresql:= ) - python? ( - dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}] - =x11-libs/qwtpolar-1' && has_version 'x11-libs/qwt:5' ; then @@ -157,10 +160,12 @@ src_install() { docompress -x /usr/share/doc/${PF}/examples fi - python_optimize "${ED%/}"/usr/share/qgis/python + if use python; then + python_optimize "${ED%/}"/usr/share/qgis/python - if use grass; then - python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts + if use grass; then + python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts + fi fi } -- cgit v1.2.3-65-gdbad