From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C629B1581C1 for ; Sat, 6 Jul 2024 14:09:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA53E2BC03D; Sat, 6 Jul 2024 14:09:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7B202BC03D for ; Sat, 6 Jul 2024 14:09:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C55EC342F94 for ; Sat, 6 Jul 2024 14:09:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DD9D1DC6 for ; Sat, 6 Jul 2024 14:09:21 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1720274921.46a9dd4de7bca2152a3403726e50375563e37003.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/xpra/xpra-6.0.1-r1.ebuild x11-wm/xpra/xpra-6.9999.ebuild x11-wm/xpra/xpra-9999.ebuild X-VCS-Directories: x11-wm/xpra/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 46a9dd4de7bca2152a3403726e50375563e37003 X-VCS-Branch: master Date: Sat, 6 Jul 2024 14:09:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fdf81829-ccf8-43af-adce-f523cc8099eb X-Archives-Hash: d9c837ccc0c7af05a18463368035a0bc commit: 46a9dd4de7bca2152a3403726e50375563e37003 Author: James Le Cuirot gentoo org> AuthorDate: Sat Jul 6 14:08:41 2024 +0000 Commit: James Le Cuirot gentoo 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 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