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 4B1D6158009 for ; Tue, 27 Jun 2023 13:38:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BFBCE085A; Tue, 27 Jun 2023 13:38:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44A0DE085A for ; Tue, 27 Jun 2023 13:38:48 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D165341030 for ; Tue, 27 Jun 2023 13:38:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64DE4136 for ; Tue, 27 Jun 2023 13:38:45 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1687873115.4fbc88cb60bd8dcd547a8800726eeb24155c173b.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/xpra/xpra-4.4.6-r1.ebuild X-VCS-Directories: x11-wm/xpra/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 4fbc88cb60bd8dcd547a8800726eeb24155c173b X-VCS-Branch: master Date: Tue, 27 Jun 2023 13:38:45 +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: 272f4013-ce46-4d85-94b3-55168b1bf625 X-Archives-Hash: f9d59ee51d18d068edc5c26a7b2bb17b commit: 4fbc88cb60bd8dcd547a8800726eeb24155c173b Author: Benda Xu gentoo org> AuthorDate: Mon Jun 26 14:53:12 2023 +0000 Commit: Benda XU gentoo org> CommitDate: Tue Jun 27 13:38:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fbc88cb x11-wm/xpra: migrate to PEP517. A /usr/etc installation location bug is unveiled. Fix it. Signed-off-by: Benda Xu gentoo.org> x11-wm/xpra/xpra-4.4.6-r1.ebuild | 12 ++++++++++-- 1 file 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)