gentoo auto-resync : 17:05:2023 - 04:08:35

7 files changed, 12 insertions, 131 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index f296a42927af..d565ca08a1c9 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 5f6c5125b29d..c92791efd681 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,14 +1,12 @@
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
 AUX xpra-4.3-no-service.patch 779 BLAKE2B 5232b103b47601b4340d6a863d2cd3cc6641a55d6c252702034902a4d5189c7df45b7d6280ae9bf2a3dbe8c96a73847f936032cc9b58c4bdd91025974fa84005 SHA512 d5045da20f4fdcb2b434f280c42b26ee1c8c280e4037a116c3edd0990a97acc5017bf428c4c222a1c38e23a6dd5709789ac80e62187144d334068deecc99d20e
-AUX xpra-4.4-tests.patch 3657 BLAKE2B 9121dc5c3f13cbc37a8cf7d88a36224a4a537e2ac22f24b672d11e57f036b6c12ad12b0afc0c1e71cb77448ec62bb9ccf19eb138b2979b7cd0948fef5622a495 SHA512 452085c255716241552d3e41227dbdfd521064cbd89c06a91e0a29a83b14cccc0735539857a284918d2ff5a4cf12d4945343f040df743addff93413df42dd89c
 AUX xpra-4.4-xdummy.patch 614 BLAKE2B 9b502fa836caea212f90730e0238adb16c74814a55a2a5b32e062880d29b1fa05247fc3c5e8edddf0acdd1d93620dafb507ec9a14996c3aea248d204510a0e2c SHA512 71efb726f50b85890bb3508bd3943b3bb9e34a8f5d3c92c6fa4f7c2ea6b8c51551243ea0d4d52802f17e5aaed7716b9ee0b462cde1941dae9273651dcc461a9a
-AUX xpra-4.5-no-service.patch 651 BLAKE2B 6f453a9b8a2d1b561596a71f5ad6ebb168fe0a0cb6f329d521bc4d6d4efecee4371d1af09bfd7a9c8749e96912e7fa8bce9613cfc75a398208cf904495efc604 SHA512 e7b6f7e39e460b2362422b5393662a23865d1277eb37ff209b6717e09026860f20ba7137b80b3595d6cf7c51d2e8dca1b6adbfe68e76a4a16b9bdcac4d3cc941
 AUX xpra-9999-tests.patch 1242 BLAKE2B b4bd59046e3286e6eb22b75eb5c1c5e1045419cf9744803d37fe1675ce0f9e21e98ecc89f76f8895b64bf2a3d15e2ea000b5c5691ad63681323a474d73d9c1c8 SHA512 efe4c89758f9eab01ccf0f1d68e488ee79d187b633af65f41b3a87a16e6d44b14d038a7d375a41121a7743215531ffe9918bbb0fa7eca023ed7d815c7f755aca
 AUX xpra-9999-xdummy.patch 489 BLAKE2B 284d109be06fc68dc6567adab1c8e514a69a316e82041175dac530eb190ed2d42b9572ca8cd722dae1295b9c84f35ec750953a80dc0064d835de0d3cc0bf8447 SHA512 98daab5c16755564af06bf139e3b57e2f88dd2ce3503eb75d79f066f8ed3efab4c668e9dc00988267b3ca0f876a607df332a9fcfe7f00c1d54a0d84c01159c17
 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
 DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
 DIST xpra-4.4.4.tar.gz 4324840 BLAKE2B d39f83b5f6ea960f12170bcc55d3c46d290682bb26424dc57a3ab62f01a4dad513466883287e6197231c96ac81872403d27ff1b65c7c0e520adcda8846766e02 SHA512 807fb3b12b5ecc8dbf73aef9dddf509c3397c97d04db4f397d4672b6f097ff977ce71f6ba00fb585ea7dfaf047a4c68e5cca099436da28bc20f4bc2c229c98c9
-EBUILD xpra-4.3.4-r1.ebuild 5387 BLAKE2B 5034f2967a1ba0beae0e78562d6a31b5993bb81cbe53b3251fff27e3c12692e058a98ecc7702f2edfc1359e74e4c7df6cdb2db65ea4d969bb4a78148e5cb5f13 SHA512 3c47cbb22d4d4dc6f12e4190f3eaa9846a6c4469fc815754f4b6b869ae4c92bd4ed2c1407c33252882d9cd17eafce5fe7b91c967e406606152082e2167f2f9f0
-EBUILD xpra-4.4.4.ebuild 5309 BLAKE2B 1517e8597e862ad03d36400c1551b24be170192affab7f5252277d286ffbe64dc8318878c212006d899c2fa4f2b31807bd8f4eada7ae00e438db46f7a2e26efd SHA512 8e492124a5804db514f22b17c01800e7c6c3f067f9c1c22ceac508957884fbc99c3bad5a188d17ead53123ca6e9bc7f12c7ceb5898326f4b902a00d2d35c4b80
-EBUILD xpra-9999.ebuild 5354 BLAKE2B e95c4c583042f2be7ed8c7c576e318f80ad15177359e6f304edb47e56c0b86edba5ca7280e5bb1be780678527e72f20c3be803f3e6f68029411bfd69933e848a SHA512 924827465b16522e6cb466f93deacc5860b13f235cb6970655722aea43cf5f2ea1f67aef88708a268948c5418f61ba02fefece8c37b1ef40d804f9ddd2cb9469
+EBUILD xpra-4.3.4-r1.ebuild 5390 BLAKE2B 3dfe1a1b3eb8d3c9ece31e0c555b8ab6aa597d1b81850cac88e005dcfa146faa6c72bab4a219d0251ee9690948bfcfc618d2c396e25fd7642b1fcfe7467beb8a SHA512 89346bc7b8d08e36b206db561b650074fb67e7312dcefdc6ba5a784d4b48abaef45890c09cf964ca2947cb05c88d9ac767361c1f95f17a5761dbc1cae4253b25
+EBUILD xpra-4.4.4.ebuild 5321 BLAKE2B d85b41fe7f73a6824f4d96b75a88fb9ed765ff2f1253520fe1900af6a632709cc2d7e2663ec1297eaf55cc20544da370963c9f48eb86596d7c1bb5989a620f4e SHA512 a0784105c747f0137314cb568f14604796c461cdd91383b27dd68b580f45032a9304304dad8dd0cdc61fbb92fa3a8d448699b9b4d795af2c3a56f4b1e64878f0
+EBUILD xpra-9999.ebuild 5366 BLAKE2B 663f5dd4b2cbe65fc5ff2523bc9daa98e541651612120b01df26317928b2fc1e898a7e05f0bd52ccc03d7fee22846512409d972ee8783e9159ca41a5fbd5ce47 SHA512 ca90fe9c47a761c4de7a1164e45b909967dadf9e531da9049074fdb98221722c28fd06fe5809a43b8978079eb886a759d6af78907740d8b3bc51fad3614d086f
 MISC metadata.xml 1362 BLAKE2B 45c6814b17e7a45062d196f71ee109bceb16a58c9f7a3dacf58f03274574a149a403d2209af6252d719f0490a199b008e12fa64051a976d0a156e7de88428ef0 SHA512 2a6140a68e883710fc829ad4b25dd3d503c9df68c1be983b6fdfdb793ae8edcff5ea7a30d21f224f8c5aa942811b3b326ff23fe5d557e7de2a7126c3658ed7e2
diff --git a/x11-wm/xpra/files/xpra-4.4-tests.patch b/x11-wm/xpra/files/xpra-4.4-tests.patch
deleted file mode 100644
index 28691606304d..000000000000
--- a/x11-wm/xpra/files/xpra-4.4-tests.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 5e657b3fbed2f8495272d6b207d1b3c0a660a72f Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 2 Oct 2022 22:59:17 +0100
-Subject: [PATCH 1/3] Fix test_root_window_model by formatting geometry string
- correctly
-
-You can't use `{geometry:24}` style formatting on a list or tuple. It
-must be converted to a string first.
----
- xpra/server/shadow/root_window_model.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xpra/server/shadow/root_window_model.py b/xpra/server/shadow/root_window_model.py
-index cb89466ef..e69949e7d 100644
---- a/xpra/server/shadow/root_window_model.py
-+++ b/xpra/server/shadow/root_window_model.py
-@@ -65,7 +65,7 @@ class RootWindowModel:
-         self.signal_listeners = {}
-
-     def __repr__(self):
--        return f"RootWindowModel({self.capture} : {self.geometry:24})"
-+        return f"RootWindowModel({self.capture} : {str(self.geometry):24})"
-
-     def get_info(self) -> dict:
-         info = {}
---
-2.38.0
-
-
-From 3fe12855383831f10442a1f4451d206dfee2cb92 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 2 Oct 2022 21:51:01 +0100
-Subject: [PATCH 2/3] Fix test_get_version_info when the revision is 0
-
-The 4.4 tarball has revision 0, which causes it to not be included in
-the version info dict. Check for `not None` instead of truthiness.
----
- xpra/version_util.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xpra/version_util.py b/xpra/version_util.py
-index 17c0ec27a..5dd38fd3e 100755
---- a/xpra/version_util.py
-+++ b/xpra/version_util.py
-@@ -158,7 +158,7 @@ def get_version_info(full=1) -> dict:
-                 "branch"                : BRANCH,
-                 "commit"                : COMMIT,
-                 }.items():
--                if v and v!="unknown":
-+                if v is not None and v!="unknown":
-                     props[k] = v
-         except ImportError as e:
-             warn("missing some source information: %s", e)
-@@ -181,7 +181,7 @@ def get_version_info_full() -> dict:
-                     "cython"               : "CYTHON_VERSION",
-                   }.items():
-             v = getattr(build_info, bk, None)
--            if v:
-+            if v is not None:
-                 props[k] = v
-         #record library versions:
-         d = dict((k.lstrip("lib_"), getattr(build_info, k)) for k in dir(build_info) if k.startswith("lib_"))
---
-2.38.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/files/xpra-4.5-no-service.patch b/x11-wm/xpra/files/xpra-4.5-no-service.patch
deleted file mode 100644
index 329c492784ac..000000000000
--- a/x11-wm/xpra/files/xpra-4.5-no-service.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Don't install the service files. Auto-detection is used to determine what files
-to install, and where, which can be unpredictable on Gentoo. The init.d script
-is also not suitable for Gentoo.
-
-diff --git a/setup.py b/setup.py
-index 529b591b1..ad23d6ecc 100755
---- a/setup.py
-+++ b/setup.py
-@@ -187,8 +187,8 @@ rfb_ENABLED = DEFAULT
- quic_ENABLED = DEFAULT
- ssh_ENABLED = DEFAULT
- http_ENABLED = DEFAULT
--service_ENABLED = LINUX and server_ENABLED
--sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
-+service_ENABLED = False
-+sd_listen_ENABLED = False
- proxy_ENABLED  = DEFAULT
- client_ENABLED = DEFAULT
- scripts_ENABLED = not WIN32
diff --git a/x11-wm/xpra/xpra-4.3.4-r1.ebuild b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
index 88e345b4b4c5..1bb5ff518511 100644
--- a/x11-wm/xpra/xpra-4.3.4-r1.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
@@ -169,7 +169,7 @@ python_configure_all() {
 		$(use_with server shadow)
 		$(use_with server)
 		$(use_with sound)
-		--with-strict
+		--without-strict
 		$(use_with vpx)
 		--with-warn
 		$(use_with webcam)
diff --git a/x11-wm/xpra/xpra-4.4.4.ebuild b/x11-wm/xpra/xpra-4.4.4.ebuild
index 5683ea5b33ce..e1b6b335baab 100644
--- a/x11-wm/xpra/xpra-4.4.4.ebuild
+++ b/x11-wm/xpra/xpra-4.4.4.ebuild
@@ -115,7 +115,6 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.3-no-service.patch
 	"${FILESDIR}"/${PN}-4.4-xdummy.patch
 )
 
@@ -161,11 +160,13 @@ python_configure_all() {
 		$(use_with jpeg jpeg_encoder)
 		$(use_with jpeg jpeg_decoder)
 		--without-mdns
+		--without-sd_listen
+		--without-service
 		$(use_with opengl)
 		$(use_with server shadow)
 		$(use_with server)
 		$(use_with sound)
-		--with-strict
+		--without-strict
 		$(use_with vpx)
 		--with-warn
 		$(use_with webcam)
@@ -199,7 +200,7 @@ python_install_all() {
 		mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
 	else
 		rm -vr "${ED}"/usr/lib/udev || die
-		rm -v "${ED}"/usr/bin/xpra_udev_product_version || die
+		rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die
 	fi
 }
 
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
index c4e11b241ef1..b338f3df7a4f 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-9999.ebuild
@@ -115,7 +115,6 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.5-no-service.patch
 	"${FILESDIR}"/${PN}-9999-xdummy.patch
 	"${FILESDIR}"/${PN}-9999-tests.patch
 )
@@ -163,10 +162,12 @@ python_configure_all() {
 		$(use_with jpeg jpeg_encoder)
 		$(use_with jpeg jpeg_decoder)
 		--without-mdns
+		--without-sd_listen
+		--without-service
 		$(use_with opengl)
 		$(use_with server shadow)
 		$(use_with server)
-		--with-strict
+		--without-strict
 		$(use_with vpx)
 		--with-warn
 		$(use_with webcam)
@@ -200,7 +201,7 @@ python_install_all() {
 		mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
 	else
 		rm -vr "${ED}"/usr/lib/udev || die
-		rm -v "${ED}"/usr/bin/xpra_udev_product_version || die
+		rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die
 	fi
 }