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@gentoo.org>

diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index f07d1e12062a9a3c936e58e812e9d094e3beaeba..5c66058b8ceadc1548a6e37ddf5778cf3e8ce08b 100644 (file)
--- 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