Diff gpsd-3.19 with a gpsd-9999

/usr/portage/sci-geosciences/gpsd/gpsd-9999.ebuild 2020-05-07 18:39:00.000000000 +0300
4 4
EAPI=5
5 5

  
6 6
DISTUTILS_OPTIONAL=1
7
PYTHON_COMPAT=( python3_{6,7,8} )
7
PYTHON_COMPAT=( python3_6 )
8 8
SCONS_MIN_VERSION="2.3.0"
9 9

  
10 10
inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
......
84 84
		die "please sync ebuild & source"
85 85
	fi
86 86

  
87
	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
87
	epatch "${FILESDIR}"/${PN}-3.19-do_not_rm_library.patch
88 88
	# Merged upstream
89 89
	#epatch "${FILESDIR}"/${P}-scons-print.patch
90 90
	#epatch "${FILESDIR}"/${P}-scons-py3.patch
......
112 112
	use gpsd_protocols_greis && pybins+="+ ['zerk']"
113 113
	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
114 114
	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
115
	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
115
	# Post 3.19 the clienthelpers were merged into gps.packet
116 116
	sed \
117 117
		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
118 118
		-e "s|@URL@|$(pyvar website)|" \
119 119
		-e "s|@EMAIL@|$(pyvar devmail)|" \
120 120
		-e "s|@SCRIPTS@|${pybins}|" \
121 121
		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
122
		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
122
		-e "/@GPS_CLIENT_SOURCES@/d" \
123 123
		-e "s|@SCRIPTS@|${pybins}|" \
124 124
		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
125 125
	distutils-r1_python_prepare_all
Thank you!