From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E07DA139089 for ; Sat, 21 Jan 2017 16:14:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B978D14214; Sat, 21 Jan 2017 16:14:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 848F114214 for ; Sat, 21 Jan 2017 16:14:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47BC3341694 for ; Sat, 21 Jan 2017 16:14:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0E9D2B83 for ; Sat, 21 Jan 2017 16:14:49 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1485015119.0333e35edc0fe153dcf8227974ee05cec0844ce8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/qgis/qgis-2.18.3.ebuild X-VCS-Directories: sci-geosciences/qgis/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0333e35edc0fe153dcf8227974ee05cec0844ce8 X-VCS-Branch: master Date: Sat, 21 Jan 2017 16:14:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b548868a-c67d-44c1-a204-a0757c33727b X-Archives-Hash: 7cd99994a0fa5910bffc25403c236e0f commit: 0333e35edc0fe153dcf8227974ee05cec0844ce8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jan 20 23:19:53 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 21 16:11:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0333e35e 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 67371af..b631f4b 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 }