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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3027E138206 for ; Thu, 18 Jan 2018 05:18:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 630F4E097B; Thu, 18 Jan 2018 05:18:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FFC7E097B for ; Thu, 18 Jan 2018 05:18:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D2224335C33 for ; Thu, 18 Jan 2018 05:18:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CFDB1AF for ; Thu, 18 Jan 2018 05:18:05 +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: <1516252677.0f5c9a88263f904bbda0ed4bc3593f298c63949f.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-2.2.1.ebuild X-VCS-Directories: x11-wm/xpra/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 0f5c9a88263f904bbda0ed4bc3593f298c63949f X-VCS-Branch: master Date: Thu, 18 Jan 2018 05:18:05 +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-Archives-Salt: 7b5be4fc-77eb-4e9f-99b1-8b2add0eb5f1 X-Archives-Hash: 6fd0a23cf7f0f722e1a61ff8a5439f3b commit: 0f5c9a88263f904bbda0ed4bc3593f298c63949f Author: Benda Xu gentoo org> AuthorDate: Thu Jan 18 05:08:25 2018 +0000 Commit: Benda XU gentoo org> CommitDate: Thu Jan 18 05:17:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5c9a88 x11-wm/xpra: support Prefix again. 1. xdg also exposes src_prepare(), which should be overridden by distutils-r1. 2. by PMS: EROOT is not defined in src_*. Should use EPREFIX 3. prefixify hard-coded paths. Package-Manager: Portage-2.3.19, Repoman-2.3.6 x11-wm/xpra/xpra-2.2.1.ebuild | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/x11-wm/xpra/xpra-2.2.1.ebuild b/x11-wm/xpra/xpra-2.2.1.ebuild index 977f0a20612..bfe8a102633 100644 --- a/x11-wm/xpra/xpra-2.2.1.ebuild +++ b/x11-wm/xpra/xpra-2.2.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 # PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3 PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 eutils flag-o-matic user tmpfiles xdg +inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" HOMEPAGE="http://xpra.org/ http://xpra.org/src/" @@ -96,8 +96,9 @@ pkg_postinst() { } python_prepare_all() { - sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \ - -i tmpfiles.d/xpra.conf + hprefixify -w '/os.path/' setup.py + hprefixify tmpfiles.d/xpra.conf xpra/server/{server,socket}_util.py \ + xpra/platform{/xposix,}/paths.py xpra/scripts/server.py distutils-r1_python_prepare_all } @@ -142,5 +143,5 @@ python_configure_all() { # and http://trac.cython.org/ticket/395 append-cflags -fno-strict-aliasing - export XPRA_SOCKET_DIRS="${EROOT}run/xpra" + export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" }