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 5819B138332 for ; Sun, 22 Apr 2018 23:11:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74551E09DB; Sun, 22 Apr 2018 23:11:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 52D4CE09DB for ; Sun, 22 Apr 2018 23:11:32 +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 05B7A335C36 for ; Sun, 22 Apr 2018 23:11:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BEB63292 for ; Sun, 22 Apr 2018 23:11:29 +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: <1524438666.3fc25a22193c3dc265c9dde733bd50d65dab29a9.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-3.0.2.ebuild 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: 3fc25a22193c3dc265c9dde733bd50d65dab29a9 X-VCS-Branch: master Date: Sun, 22 Apr 2018 23:11:29 +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: c052d83b-67e3-48c9-8adf-6e0afb9a53c9 X-Archives-Hash: 973abfc09f2ff78ef7feb38de70ec71e commit: 3fc25a22193c3dc265c9dde733bd50d65dab29a9 Author: Kalin KOZHUHAROV gmail com> AuthorDate: Sun Apr 22 19:23:37 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 22 23:11:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc25a22 sci-geosciences/qgis: Fix USE=-python building Closes: https://bugs.gentoo.org/653712 Closes: https://github.com/gentoo/gentoo/pull/8102 sci-geosciences/qgis/qgis-3.0.2.ebuild | 11 +++++++---- sci-geosciences/qgis/qgis-9999.ebuild | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sci-geosciences/qgis/qgis-3.0.2.ebuild b/sci-geosciences/qgis/qgis-3.0.2.ebuild index cc3eaaa7055..9c686b0dc1a 100644 --- a/sci-geosciences/qgis/qgis-3.0.2.ebuild +++ b/sci-geosciences/qgis/qgis-3.0.2.ebuild @@ -26,6 +26,7 @@ SLOT="0" IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit" REQUIRED_USE=" + grass? ( python ) mapserver? ( python ) python? ( ${PYTHON_REQUIRED_USE} )" @@ -104,7 +105,7 @@ PATCHES=( ) pkg_setup() { - python-single-r1_pkg_setup + use python && python-single-r1_pkg_setup } src_prepare() { @@ -185,10 +186,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 } diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index cc3eaaa7055..9c686b0dc1a 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -26,6 +26,7 @@ SLOT="0" IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit" REQUIRED_USE=" + grass? ( python ) mapserver? ( python ) python? ( ${PYTHON_REQUIRED_USE} )" @@ -104,7 +105,7 @@ PATCHES=( ) pkg_setup() { - python-single-r1_pkg_setup + use python && python-single-r1_pkg_setup } src_prepare() { @@ -185,10 +186,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 }