diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2019-10-04 12:18:35 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2019-10-04 12:21:04 -0700 |
| commit | 7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff (patch) | |
| tree | 726e434124a85e258c97b3052dc23367e5fe3f33 /sci-geosciences | |
| parent | sci-geosciences/gpsd: fix DuplicateFiles (diff) | |
| download | gentoo-7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff.tar.gz gentoo-7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff.tar.bz2 gentoo-7c30c4b5478eaf2c2fea3fc0a7e8ce90f229a2ff.zip | |
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>
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/gpsd/gpsd-9999.ebuild | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index f07d1e12062a..5c66058b8cea 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 |