commit: 7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Fri Oct 4 19:18:35 2019 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> 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 <robbat2 <AT> 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
