diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2023-06-26 23:10:17 +0800 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2023-06-27 21:38:35 +0800 |
| commit | 68e45f8e359cda963c67c7e2755effcbb72c1242 (patch) | |
| tree | 9ee3d5a83624ba29fe3ca102752720b9bd63750f /x11-wm/xpra/xpra-9999.ebuild | |
| parent | x11-wm/xpra: migrate to PEP517. (diff) | |
| download | gentoo-68e45f8e359cda963c67c7e2755effcbb72c1242.tar.gz gentoo-68e45f8e359cda963c67c7e2755effcbb72c1242.tar.bz2 gentoo-68e45f8e359cda963c67c7e2755effcbb72c1242.zip | |
x11-wm/xpra: sync the live ebuild with 4.4.6-r1.
Signed-off-by: Benda Xu <heroxbd@gentoo.org>
Diffstat (limited to 'x11-wm/xpra/xpra-9999.ebuild')
| -rw-r--r-- | x11-wm/xpra/xpra-9999.ebuild | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild index bc63326e1601..09e2d5b2a699 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.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 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/" @@ -118,15 +118,12 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-9999-xdummy.patch - "${FILESDIR}"/${PN}-9999-tests.patch ) python_prepare_all() { distutils-r1_python_prepare_all - # FIXME: There are hardcoded paths all over the place but the following - # double-prefixes some files under /etc. Looks tricky to fix. :( - #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \)) + hprefixify xpra/scripts/config.py sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \ -i setup.py || die @@ -196,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) |