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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C6EEA158009 for ; Tue, 27 Jun 2023 13:38:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DEB3BE07FE; Tue, 27 Jun 2023 13:38:47 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BAB86E07FE for ; Tue, 27 Jun 2023 13:38:47 +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 B9B93341021 for ; Tue, 27 Jun 2023 13:38:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50D7B135 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: <1687873114.45a9b6d8547284abd64bc0035b215b312dcd8701.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: 45a9b6d8547284abd64bc0035b215b312dcd8701 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: 4491516c-4b3b-450b-bc29-e95225ba6302 X-Archives-Hash: 6cfeb710ad78bae5e48ba6969751057a commit: 45a9b6d8547284abd64bc0035b215b312dcd8701 Author: Benda Xu gentoo org> AuthorDate: Mon Jun 26 08:32:48 2023 +0000 Commit: Benda XU gentoo org> CommitDate: Tue Jun 27 13:38:34 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a9b6d8 x11-wm/xpra: retry to prefixify Xpra. Xpra likes to embed many hard-coded directory guess making the prefixify tricky in the past. This is an attempt to prefixify it from a minimal set of modifications. Bug: https://bugs.gentoo.org/802105 Signed-off-by: Benda Xu gentoo.org> x11-wm/xpra/xpra-4.4.6-r1.ebuild | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/x11-wm/xpra/xpra-4.4.6-r1.ebuild b/x11-wm/xpra/xpra-4.4.6-r1.ebuild index 322e28c739e9..70ff28512e72 100644 --- a/x11-wm/xpra/xpra-4.4.6-r1.ebuild +++ b/x11-wm/xpra/xpra-4.4.6-r1.ebuild @@ -16,7 +16,7 @@ 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 prefix tmpfiles udev DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" HOMEPAGE="https://xpra.org/" @@ -123,9 +123,7 @@ PATCHES=( 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