Diff grass-8.2.1-r2 with a grass-8.3.0

/usr/portage/sci-geosciences/grass/grass-8.3.0.ebuild 2023-10-09 14:52:35.048368490 +0300
46 46
	>=app-admin/eselect-1.2
47 47
	$(python_gen_cond_dep '
48 48
		dev-python/numpy[${PYTHON_USEDEP}]
49
		dev-python/ply[${PYTHON_USEDEP}]
50
		dev-python/python-dateutil[${PYTHON_USEDEP}]
49 51
		dev-python/six[${PYTHON_USEDEP}]
50 52
	')
51 53
	sci-libs/gdal:=
......
77 79
	tiff? ( media-libs/tiff:= )
78 80
	truetype? ( media-libs/freetype:2 )
79 81
	X? (
80
		>=dev-python/wxpython-4.1:4.0
82
		$(python_gen_cond_dep '
83
			>=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}]
84
			dev-python/pillow[${PYTHON_USEDEP}]
85
			>=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}]
86
		')
81 87
		x11-libs/cairo[X]
82 88
		x11-libs/libICE
83 89
		x11-libs/libSM
......
170 176
		--with-proj-share="${EPREFIX}"/usr/share/proj/
171 177
		$(use_with cxx)
172 178
		$(use_with tiff)
173
		$(use_with png)
179
		$(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config)
174 180
		$(use_with postgres)
175 181
		$(use_with mysql)
176 182
		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
......
234 240
	dodir /usr/include/
235 241
	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
236 242

  
237
	# fix paths in addons makefile includes
238
	local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/
239
	for f in "${scriptMakeDir}"/*; do
240
		file="${f##*/}"
241
		echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
242
		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
243
	done
244

  
245
	# get proper folder for grass path in script
246
	local gisbase=/usr/$(get_libdir)/${MY_PM}
247
	sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
248
GISBASE = os.path.normpath(\"${gisbase}\"):" \
249
		-i "${ED}"/usr/bin/grass || die
250

  
251
	# get proper fonts path for fontcap
252
	sed -i \
253
		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
254
		"${ED}"${gisbase}/etc/fontcap || die
255

  
256 243
	# set proper python interpreter
257 244
	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
258 245
os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
259 246
		-i "${ED}"/usr/bin/grass || die
260 247

  
261
	# set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file
262
	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
263
		-i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
264

  
265 248
	if use X; then
266 249
		local GUI="--gui"
267 250
		make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
Thank you!