Сравнение xpra-4.4.5-r2 с xpra-4.4.6-r2

/usr/portage/x11-wm/xpra/xpra-4.4.6-r2.ebuild 2023-10-09 14:52:36.004368514 +0300
8 8
	inherit git-r3
9 9
else
10 10
	inherit pypi
11
	KEYWORDS="amd64 x86"
11
	KEYWORDS="~amd64 ~x86"
12 12
fi
13 13

  
14 14
PYTHON_COMPAT=( python3_{9..11} )
15
DISTUTILS_USE_PEP517=setuptools
15 16
DISTUTILS_SINGLE_IMPL=yes
16
DISTUTILS_USE_SETUPTOOLS=no
17 17
DISTUTILS_EXT=1
18 18

  
19
inherit xdg xdg-utils distutils-r1 tmpfiles udev
19
inherit xdg xdg-utils distutils-r1 multibuild prefix tmpfiles udev
20 20

  
21 21
DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
22 22
HOMEPAGE="https://xpra.org/"
......
35 35
TEST_DEPEND="
36 36
	$(python_gen_cond_dep '
37 37
		dev-python/netifaces[${PYTHON_USEDEP}]
38
		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
38
		dev-python/pillow[jpeg?,webp?,${PYTHON_USEDEP}]
39 39
		dev-python/rencode[${PYTHON_USEDEP}]
40 40
		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
41 41
		xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
......
121 121
)
122 122

  
123 123
python_prepare_all() {
124
	distutils-r1_python_prepare_all
125

  
126
	# FIXME: There are hardcoded paths all over the place but the following
127
	# double-prefixes some files under /etc. Looks tricky to fix. :(
128
	#hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
129

  
130
	sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \
131
		-i setup.py || die
132

  
133 124
	if use minimal; then
134 125
		sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
135 126
			-e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
136 127
			-i setup.py || die
128
		PATCHES+=( "${FILESDIR}"/${PN}-4.4.6_xpra-4.4.6_minimal-features.patch )
137 129
	fi
130

  
131
	distutils-r1_python_prepare_all
132

  
133
	hprefixify xpra/scripts/config.py
134

  
135
	sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \
136
		-i setup.py || die
138 137
}
139 138

  
140 139
python_configure_all() {
......
195 194
python_install_all() {
196 195
	distutils-r1_python_prepare_all
197 196

  
197
	# Switching to PEP517 gives /usr/etc. Previously, setup.py hardcodes
198
	# if root_prefix.endswith("/usr"):
199
	#     root_prefix = root_prefix[:-4]
200
	# But now setuptools uses data/* to represent out-of-sitedir files.
201
	# The upstream hack no longer works. We are on our own.
202

  
203
	mv -v "${ED}"/usr/etc "${ED}"/ || die
204

  
198 205
	# Move udev dir to the right place if necessary.
199 206
	if use udev; then
200 207
		local dir=$(get_udevdir)
Спасибо!