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 38C62138334 for ; Fri, 4 Oct 2019 19:23:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E9AAE0849; Fri, 4 Oct 2019 19:23:57 +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 2DB80E0849 for ; Fri, 4 Oct 2019 19:23:57 +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 E983C34B916 for ; Fri, 4 Oct 2019 19:23:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AEA5A7FE for ; Fri, 4 Oct 2019 19:23:53 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1570216864.7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gpsd/gpsd-9999.ebuild X-VCS-Directories: sci-geosciences/gpsd/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff X-VCS-Branch: master Date: Fri, 4 Oct 2019 19:23:53 +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: 6ae9cadf-6976-4d4c-9e00-8cbe6a5c3f52 X-Archives-Hash: b850c51ce0ac7074fb9ad8edb5e311c3 commit: 7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff Author: Robin H. Johnson gentoo org> AuthorDate: Fri Oct 4 19:18:35 2019 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Oct 4 19:21:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c30c4b5 sci-geosciences/gpsd: update 9999 bugs Package-Manager: Portage-2.3.76, Repoman-2.3.17 Fixes: https://bugs.gentoo.org/658834 Fixes: https://bugs.gentoo.org/693136 Fixes: https://bugs.gentoo.org/695110 Signed-off-by: Robin H. Johnson gentoo.org> sci-geosciences/gpsd/gpsd-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index f07d1e12062..5c66058b8ce 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -112,14 +112,14 @@ python_prepare_all() { use gpsd_protocols_greis && pybins+="+ ['zerk']" local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") - local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") + # Post 3.19 the clienthelpers were merged into gps.packet sed \ -e "s|@VERSION@|$(pyvar gpsd_version)|" \ -e "s|@URL@|$(pyvar website)|" \ -e "s|@EMAIL@|$(pyvar devmail)|" \ -e "s|@SCRIPTS@|${pybins}|" \ -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ - -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ + -e "/@GPS_CLIENT_SOURCES@/d" \ -e "s|@SCRIPTS@|${pybins}|" \ "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die distutils-r1_python_prepare_all