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 347BC138334 for ; Sun, 24 Jun 2018 13:18:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39148E087A; Sun, 24 Jun 2018 13:18:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DEF71E0874 for ; Sun, 24 Jun 2018 13:18:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8CC78335CAB for ; Sun, 24 Jun 2018 13:18:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB3F42A1 for ; Sun, 24 Jun 2018 13:18:15 +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: <1529846282.e12ccf4e38b42bd4e4dd118eb6010bd7edb79002.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-9999.ebuild X-VCS-Directories: sci-geosciences/qgis/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e12ccf4e38b42bd4e4dd118eb6010bd7edb79002 X-VCS-Branch: master Date: Sun, 24 Jun 2018 13:18:15 +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: 34d130ea-2672-45ca-b1f7-151fa3d80652 X-Archives-Hash: 68046624d93895079aee044fec88324d commit: e12ccf4e38b42bd4e4dd118eb6010bd7edb79002 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 24 10:48:54 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 24 13:18:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12ccf4e sci-geosciences/qgis: Always depend on python Reported-by: Sławomir Nizio sabayon.org> Thanks-to: Kalin KOZHUHAROV ThinRope.net> Closes: https://bugs.gentoo.org/658250 Package-Manager: Portage-2.3.40, Repoman-2.3.9 sci-geosciences/qgis/qgis-9999.ebuild | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 0b888637f80..a64e21fa38a 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -25,10 +25,7 @@ LICENSE="GPL-2+ GPL-3+" SLOT="0" IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit" -REQUIRED_USE=" - grass? ( python ) - mapserver? ( python ) - python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" COMMON_DEPEND=" app-crypt/qca:2[qt5(+),ssl] @@ -48,7 +45,7 @@ COMMON_DEPEND=" >=dev-qt/qtsql-${QT_MIN_VER}:5 >=dev-qt/qtwidgets-${QT_MIN_VER}:5 >=dev-qt/qtxml-${QT_MIN_VER}:5 - >=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}] + >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj @@ -64,7 +61,8 @@ COMMON_DEPEND=" ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) - python? ( ${PYTHON_DEPS} + python? ( + ${PYTHON_DEPS} dev-python/future[${PYTHON_USEDEP}] dev-python/httplib2[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] @@ -79,6 +77,7 @@ COMMON_DEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] + >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) @@ -89,6 +88,7 @@ DEPEND="${COMMON_DEPEND} >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 sys-devel/bison sys-devel/flex + python? ( ${PYTHON_DEPS} ) " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel @@ -105,7 +105,7 @@ PATCHES=( ) pkg_setup() { - use python && python-single-r1_pkg_setup + python-single-r1_pkg_setup } src_prepare() { @@ -187,10 +187,10 @@ src_install() { if use python; then python_optimize "${ED%/}"/usr/share/qgis/python + fi - if use grass; then - python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts - fi + if use grass; then + python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts fi }