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 5DB6D138359 for ; Fri, 25 Sep 2020 17:52:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E278E0824; Fri, 25 Sep 2020 17:52:02 +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 79496E0824 for ; Fri, 25 Sep 2020 17:52:02 +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 32C48340DBF for ; Fri, 25 Sep 2020 17:52:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5982373 for ; Fri, 25 Sep 2020 17:51:59 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1601056308.7a670969b8e815cc1919e0d5734544ef0a55174d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gpsd/gpsd-3.21.ebuild X-VCS-Directories: sci-geosciences/gpsd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7a670969b8e815cc1919e0d5734544ef0a55174d X-VCS-Branch: master Date: Fri, 25 Sep 2020 17:51:59 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f7637893-cefc-4da7-a8e9-68d9d9d3b50b X-Archives-Hash: 99b749e4312d553917b5579fbb91e03e commit: 7a670969b8e815cc1919e0d5734544ef0a55174d Author: Sam James gentoo org> AuthorDate: Fri Sep 25 17:51:48 2020 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 25 17:51:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a670969 sci-geosciences/gpsd: misc fixes - Add missing || dies - Guard python-bindings build system workaround with USE=python (issue uncovered by added || die) Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> sci-geosciences/gpsd/gpsd-3.21.ebuild | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild index 8083dc4252b..427bd9baf5c 100644 --- a/sci-geosciences/gpsd/gpsd-3.21.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild @@ -6,7 +6,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{6..9} ) -inherit eutils udev multilib distutils-r1 scons-utils toolchain-funcs +inherit distutils-r1 scons-utils toolchain-funcs udev if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git" @@ -94,9 +94,9 @@ src_prepare() { -e 's:\:SYSROOT:g' \ SConstruct || die - #Fix systemd binary paths - sed -i -e 's/local\///' 'systemd/gpsd.service' - sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in' + # Fix systemd binary paths + sed -i -e 's/local\///' 'systemd/gpsd.service' || die + sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in' || die default @@ -190,8 +190,11 @@ src_install() { newinitd "${FILESDIR}"/gpsd.init-2 gpsd # Cleanup bad alt copy due to Scons - rm -rf "${D}"/python-discard/gps* - find "${D}"/python-discard/ -type d -delete + if use python ; then + rm -rf "${ED}"/python-discard/gps* || die + find "${ED}"/python-discard/ -type d -delete || die + fi + # Install correct multi-python copy use python && distutils-r1_src_install }