Diff grass-8.3.0_rc1 with a grass-9999

/usr/portage/sci-geosciences/grass/grass-9999.ebuild 2023-10-09 14:52:35.048368490 +0300
14 14
LICENSE="GPL-2"
15 15

  
16 16
if [[ ${PV} =~ "9999" ]]; then
17
	SLOT="0/8.3"
17
	SLOT="0/8.4"
18 18
else
19 19
	SLOT="0/$(ver_cut 1-2 ${PV})"
20 20
fi
......
101 101
	virtual/pkgconfig
102 102
	X? ( dev-lang/swig )"
103 103

  
104
PATCHES=(
105
	# bug 746590
106
	"${FILESDIR}/${PN}-flock.patch"
107
)
108

  
109 104
pkg_setup() {
110 105
	if use lapack; then
111 106
		local mylapack=$(eselect lapack show)
......
240 235
	dodir /usr/include/
241 236
	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
242 237

  
243
	# fix paths in addons makefile includes
244
	local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/
245
	for f in "${scriptMakeDir}"/*; do
246
		file="${f##*/}"
247
		echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
248
		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
249
	done
250

  
251
	# get proper folder for grass path in script
252
	local gisbase=/usr/$(get_libdir)/${MY_PM}
253
	sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
254
GISBASE = os.path.normpath(\"${gisbase}\"):" \
255
		-i "${ED}"/usr/bin/grass || die
256

  
257
	# get proper fonts path for fontcap
258
	sed -i \
259
		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
260
		"${ED}"${gisbase}/etc/fontcap || die
261

  
262 238
	# set proper python interpreter
263 239
	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
264 240
os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
265 241
		-i "${ED}"/usr/bin/grass || die
266 242

  
267
	# set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file
268
	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
269
		-i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
270

  
271 243
	if use X; then
272 244
		local GUI="--gui"
273 245
		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
Thank you!