[gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/

["Benda XU" <heroxbd@gentoo.org>]

commit:     0f5c9a88263f904bbda0ed4bc3593f298c63949f
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 05:08:25 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> 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"
 }