gentoo auto-resync : 27:06:2023 - 19:35:48

5 files changed, 24 insertions, 48 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 77653374057d..d2d9ca883654 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 1bd5f101d45b..fbaf98ee8049 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,9 +1,8 @@
 AUX xpra-4.4-xdummy.patch 614 BLAKE2B 9b502fa836caea212f90730e0238adb16c74814a55a2a5b32e062880d29b1fa05247fc3c5e8edddf0acdd1d93620dafb507ec9a14996c3aea248d204510a0e2c SHA512 71efb726f50b85890bb3508bd3943b3bb9e34a8f5d3c92c6fa4f7c2ea6b8c51551243ea0d4d52802f17e5aaed7716b9ee0b462cde1941dae9273651dcc461a9a
-AUX xpra-9999-tests.patch 1242 BLAKE2B b4bd59046e3286e6eb22b75eb5c1c5e1045419cf9744803d37fe1675ce0f9e21e98ecc89f76f8895b64bf2a3d15e2ea000b5c5691ad63681323a474d73d9c1c8 SHA512 efe4c89758f9eab01ccf0f1d68e488ee79d187b633af65f41b3a87a16e6d44b14d038a7d375a41121a7743215531ffe9918bbb0fa7eca023ed7d815c7f755aca
 AUX xpra-9999-xdummy.patch 489 BLAKE2B 284d109be06fc68dc6567adab1c8e514a69a316e82041175dac530eb190ed2d42b9572ca8cd722dae1295b9c84f35ec750953a80dc0064d835de0d3cc0bf8447 SHA512 98daab5c16755564af06bf139e3b57e2f88dd2ce3503eb75d79f066f8ed3efab4c668e9dc00988267b3ca0f876a607df332a9fcfe7f00c1d54a0d84c01159c17
 DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B 64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a SHA512 6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f
 DIST xpra-4.4.6.tar.gz 4334932 BLAKE2B 0518c6807be85777bb67b0a3283a610c06a97813671bff6edc701533aaa8f26b96e423e56ba56491ede120697277f6935ee26976b49550dfd2d52bbcd2daebd8 SHA512 273ee959647c1281f18c7b1b24d3a5179c4b6ce81515cc34618c698e55bdc2a8e94f0e236d7ab41c7bf29fa7fde0b1a2a1432445b8aaaa0a75cd5a90f4858419
 EBUILD xpra-4.4.5-r2.ebuild 5457 BLAKE2B d2896d731465a657e0ff214b8c2f91173398956a430ddd5a5dc80bc00b3767e93adb406441d9320ef6ae5d39ca6ae363deac3660e4ebf5ba90b91e50e3ecbf61 SHA512 80e0960496bed8217eedae760d8aa561be4e650b67eee4672d4c3cf9558c52716ff7f280837e15fca59048573b8c6b3a845d46b48ec8689344002900826174a3
-EBUILD xpra-4.4.6-r1.ebuild 5465 BLAKE2B 0382dff1885324f40403ce9c0c8765d17c4839a05de4596026ca6fb5f7f7b5b7a3c9134c2c9296520694f0004e900a245e5ce9a3a81c321ff39c609fb0f5fc00 SHA512 f15256118045003becafa355ae0edaca26681c2c440b6f9e9211002cf3f8a5995766fbfc7ed0481942d09c84368cdb9712e5dcbea649a4b71033c41e0d03ee6e
-EBUILD xpra-9999.ebuild 5510 BLAKE2B d230c0694b67656e8ccbb997ca54afb1167ca53685f86385f85913d72d0ae5ce55994a8067bc4ccd66da6bd9b15a8ad03c14bffffb22f45947be5a4b74a3f9c1 SHA512 005948b079d6e89df46d9c235c0b628943529dcc64c8d7b4fb44fbc93d059296dce623e00efd6e0fe15e9bba84f5380e271f6f4a75b33fac597f2961fb9b7a5e
+EBUILD xpra-4.4.6-r1.ebuild 5628 BLAKE2B c7e705cb83feabc39be9a0b9d6fe4aec00a743a2a8a843e60deba07d0c83aee396f2e09a1a8574cd5a8dc8f0fba3ab436bd4c1db546908fe4d36ae63b7f6414c SHA512 e99f2f29d9ddb047e13e6daa1a76c1bff3ab61ab71d53da00019bfbb469678fbbe5372b46f8cc09931786df9e4f019af167c156a4674fed856c0f86aba2b0d07
+EBUILD xpra-9999.ebuild 5635 BLAKE2B 2f8307ace03da68e6a558585a4fedca002fe9eb793add7bd21ff2d4795ce9d89fe00bd15d9659187f08be245557896f636329243bcc653247f760d0f297787f1 SHA512 6a29e51d893696edd3852e5d5438d070fa3783430346119958aa71df5a6a69839e31689dd41442f4423cbbdce26849b0d44e61b43862b80bc380e73c8c85f9e6
 MISC metadata.xml 1366 BLAKE2B aacb6e033511f82a78999942ae8ffd91bab51cad255dce0c49d80b8641c8bdb14637b546b155f51d76c31967844af4efee0e7b0897a240943964189b0ab9ebeb SHA512 e5960c9bebc2d66f6d8c111b08bca76fa6f1c6e5f5cf962098386cb21e7074fe3a06859250270183497d52ba3bd166fc3a627e6694a544702cbcba6483ce7311
diff --git a/x11-wm/xpra/files/xpra-9999-tests.patch b/x11-wm/xpra/files/xpra-9999-tests.patch
deleted file mode 100644
index 746966577dcd..000000000000
--- a/x11-wm/xpra/files/xpra-9999-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 79573c7f1241225922bee992f2caaf730cfbe3ac Mon Sep 17 00:00:00 2001
-From: totaam <antoine@xpra.org>
-Date: Sun, 9 Oct 2022 21:37:39 +0700
-Subject: [PATCH 3/3] Revert "don't use GLib directly"
-
-This reverts commit bc8bf26c44d1b151d709232460483f5432f79f5b.
----
- xpra/server/mixins/child_command_server.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/xpra/server/mixins/child_command_server.py b/xpra/server/mixins/child_command_server.py
-index 8dea3c1f7..1c2a60e27 100644
---- a/xpra/server/mixins/child_command_server.py
-+++ b/xpra/server/mixins/child_command_server.py
-@@ -11,6 +11,8 @@ import os.path
- from time import monotonic
- from subprocess import Popen
-
-+from gi.repository import GLib
-+
- from xpra.platform.features import COMMAND_SIGNALS
- from xpra.child_reaper import getChildReaper, reaper_cleanup
- from xpra.os_util import (
-@@ -72,7 +74,7 @@ class ChildCommandServer(StubServerMixin):
-         #even if __init__ is called multiple times:
-         if not getattr(self, "late_start_requested", False):
-             self.late_start_requested = True
--            self.idle_add(self.late_start)
-+            GLib.idle_add(self.late_start)
-
-     def late_start(self):
-         def do_late_start():
---
-2.38.0
diff --git a/x11-wm/xpra/xpra-4.4.6-r1.ebuild b/x11-wm/xpra/xpra-4.4.6-r1.ebuild
index 322e28c739e9..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 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/"
@@ -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
@@ -195,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)
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
index bc63326e1601..09e2d5b2a699 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-9999.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 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/"
@@ -118,15 +118,12 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-xdummy.patch
-	"${FILESDIR}"/${PN}-9999-tests.patch
 )
 
 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
@@ -196,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)