diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2023-06-26 22:53:12 +0800 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2023-06-27 21:38:35 +0800 |
| commit | 4fbc88cb60bd8dcd547a8800726eeb24155c173b (patch) | |
| tree | b35254b44954d7901e11cd333d2b2277307e166b /x11-wm | |
| parent | x11-wm/xpra: retry to prefixify Xpra. (diff) | |
| download | gentoo-4fbc88cb60bd8dcd547a8800726eeb24155c173b.tar.gz gentoo-4fbc88cb60bd8dcd547a8800726eeb24155c173b.tar.bz2 gentoo-4fbc88cb60bd8dcd547a8800726eeb24155c173b.zip | |
x11-wm/xpra: migrate to PEP517.
A /usr/etc installation location bug is unveiled. Fix it.
Signed-off-by: Benda Xu <heroxbd@gentoo.org>
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xpra/xpra-4.4.6-r1.ebuild | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/x11-wm/xpra/xpra-4.4.6-r1.ebuild b/x11-wm/xpra/xpra-4.4.6-r1.ebuild index 70ff28512e72..b9dcf632b0fc 100644 --- a/x11-wm/xpra/xpra-4.4.6-r1.ebuild +++ b/x11-wm/xpra/xpra-4.4.6-r1.ebuild @@ -12,11 +12,11 @@ else fi PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=yes -DISTUTILS_USE_SETUPTOOLS=no DISTUTILS_EXT=1 -inherit xdg xdg-utils distutils-r1 prefix tmpfiles udev +inherit xdg xdg-utils distutils-r1 multibuild prefix tmpfiles udev DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" HOMEPAGE="https://xpra.org/" @@ -193,6 +193,14 @@ python_test() { python_install_all() { distutils-r1_python_prepare_all + # Switching to PEP517 gives /usr/etc. Previously, setup.py hardcodes + # if root_prefix.endswith("/usr"): + # root_prefix = root_prefix[:-4] + # But now setuptools uses data/* to represent out-of-sitedir files. + # The upstream hack no longer works. We are on our own. + + mv -v "${ED}"/usr/etc "${ED}"/ || die + # Move udev dir to the right place if necessary. if use udev; then local dir=$(get_udevdir) |