commit: 46a9dd4de7bca2152a3403726e50375563e37003 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Jul 6 14:08:41 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Jul 6 14:08:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a9dd4d
x11-wm/xpra: Fix file collision caused by failed tests Closes: https://bugs.gentoo.org/935476 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> x11-wm/xpra/xpra-6.0.1-r1.ebuild | 8 ++++++-- x11-wm/xpra/xpra-6.9999.ebuild | 8 ++++++-- x11-wm/xpra/xpra-9999.ebuild | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/x11-wm/xpra/xpra-6.0.1-r1.ebuild b/x11-wm/xpra/xpra-6.0.1-r1.ebuild index 44f903773195..fef6cb43651c 100644 --- a/x11-wm/xpra/xpra-6.0.1-r1.ebuild +++ b/x11-wm/xpra/xpra-6.0.1-r1.ebuild @@ -338,13 +338,17 @@ python_test() { --skip-slow unit.server.server_sockets_test \ --skip-slow unit.server.source.source_mixins_test \ || die -n +} +python_install() { # remove test file - rm "${INSTALL_ROOT}/usr/share/xpra/www" -r || die + rm -vrf "${BUILD_DIR}/install/usr/share/xpra/www" + + distutils-r1_python_install } python_install_all() { - distutils-r1_python_prepare_all + distutils-r1_python_install_all mv -v "${ED}"/usr/etc "${ED}"/ || die diff --git a/x11-wm/xpra/xpra-6.9999.ebuild b/x11-wm/xpra/xpra-6.9999.ebuild index 44f903773195..fef6cb43651c 100644 --- a/x11-wm/xpra/xpra-6.9999.ebuild +++ b/x11-wm/xpra/xpra-6.9999.ebuild @@ -338,13 +338,17 @@ python_test() { --skip-slow unit.server.server_sockets_test \ --skip-slow unit.server.source.source_mixins_test \ || die -n +} +python_install() { # remove test file - rm "${INSTALL_ROOT}/usr/share/xpra/www" -r || die + rm -vrf "${BUILD_DIR}/install/usr/share/xpra/www" + + distutils-r1_python_install } python_install_all() { - distutils-r1_python_prepare_all + distutils-r1_python_install_all mv -v "${ED}"/usr/etc "${ED}"/ || die diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild index 44f903773195..fef6cb43651c 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.ebuild @@ -338,13 +338,17 @@ python_test() { --skip-slow unit.server.server_sockets_test \ --skip-slow unit.server.source.source_mixins_test \ || die -n +} +python_install() { # remove test file - rm "${INSTALL_ROOT}/usr/share/xpra/www" -r || die + rm -vrf "${BUILD_DIR}/install/usr/share/xpra/www" + + distutils-r1_python_install } python_install_all() { - distutils-r1_python_prepare_all + distutils-r1_python_install_all mv -v "${ED}"/usr/etc "${ED}"/ || die
