gentoo resync : 02.02.2022

6 files changed, 12 insertions, 121 deletions

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 7db0df52d7d5..46c0c362ec0c 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,14 +1,11 @@
 AUX xpra-3.0.2-ldconfig.patch 1270 BLAKE2B b4eaa81610899c16a43b43c5f11f93335ca48add1302ed2bc2d6f1d6a1df3c234a65562c42b19b7ad53b0d267d9763606d43ba3ce18cfb6d70565d2f684dbe7c SHA512 09684ac0ac9626d1a441fb17a61919b3b1685520affcc72aa59e64c24ad55ffc7712af57e2ec392710e7dc412039daa6c76456ee6d5464a3e4057fb61d9ad7b1
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
 AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d
-AUX xpra-4.2.2-bad-tests.patch 1909 BLAKE2B 35388169dad048ec457a197e922cbe137ab9438d4c25b952999be0bb0ec579092e04e5637e1e61c3800b2a284365ecbac49490f13f1590147be5f0ae572d925b SHA512 1e19e959ba08b4e273428b7192b3a347ea0330e76063a094fafc81eb20eb5d648c309280cb012abd7358098b9e2ef814ce16bc2dcd0eb45a5291132fe7e7bae3
-AUX xpra-4.2.2-true-false-bin-path.patch 1555 BLAKE2B 90882a8071e3a9d7e4d3e1a31a66de70c7b26c069ac848dbbbf3396917797df96e1bb08aabe96007c079fce570e361cc50078ab66cba8445edebf86ce02508e1 SHA512 a1e9498942c7c8fad0740b4aeeed098bb6d2c28a15506c8044c0c7b21ebfe954ffcf2b6be1439357cdef229a047841caa5b1dfcac7fc96b083041fe5f2c997a4
-AUX xpra-4.2.3-dup-ip.patch 1486 BLAKE2B 2da134f53c9cf8fefd4df5e6a2edc0c7c6d8cbda4320df09cd3c3b56b3807e418b1efe22c187dc93830c15ea4fe1ddbe4e05bc5293bd4337960df086a37acd93 SHA512 8716f58fcfb423adcc6c34f712a51251717682e38c05724004ebcbcb7d0c1b2fc505d214c75c9a1eb18428205d2117cb2be9003a639b63d19ed95d131c0d86e4
-DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b SHA512 cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
 DIST xpra-4.3.1.tar.gz 4174135 BLAKE2B ac007f812fa7d27c4a5edc231f5f0b79311916b4dcfd43f14bfce5cf9d55a5b5738ec484f9ec653e2901d0b1d9d316ac14202668e77b80a56da34b6f98b3cf32 SHA512 0423a2c3bf5df0b6fafffc788b9e648a5f4e41d68a5b8ea014349ea78062be91cfca38f68656d1399ad0e3ba21952e216f3acc3e5bc3387d992c29d4388b6a07
-EBUILD xpra-4.2.3.ebuild 5083 BLAKE2B 55ea7ae97a9071291189cc3930ecedc5ffe4c8c83c4de3035487fe4128f42f3ddc21781d93cdcc4b59d87a1907ebe17766caf9c9b4465bffe57dd0a5c644a2d6 SHA512 432959ac0e2ce1e430645a02c45cfd55951483cfe7e7139266e508531e9e4ab42fd48feb671b716b0bc7e57bcb722395dbd73dea97dce31b7a02b0fdf1a75d9c
+DIST xpra-4.3.2.tar.gz 4175968 BLAKE2B 16d42f9509c1ac3cf3f345a6cdd3711496019064c890268d1c1612e37e34ffe93016488f8a6d1bf8509da1d32500571e80bb4143a2f870f07530386515107735 SHA512 b9bc89a0d042e4ef2a416b7787bd1588a9d151d482319c637073749383e2b3f3361eb0f95c0e39ba98c9ae87ef5acb68c4980645fb9a2feea37215f88f7a8a95
 EBUILD xpra-4.2.ebuild 4151 BLAKE2B ed1a85aee717a2aca5d7c7b5f76ebba8a3514b3fd7f0261429836b363bd30d69a8312bc6e2526ce3f8bd92b8ebf3f7bb0a2047192b11527f8257595b72bb5e69 SHA512 73dc455a42f2ea0365c8344adeb39dc75976ad2e737d4e956e09bb2bcefcbeda9968bd8c203e307ce28eaa8ae6b176a3a4253e6e8a870b6922e70aa2e59ddcd4
-EBUILD xpra-4.3.1.ebuild 4899 BLAKE2B 294ce78296f2d07757710a703287bab93896c83c8c3031863b129ccc2e36d4d96fb9116ec27c553e3318514e1690260a7e68299084044edfb03e253310505ad4 SHA512 72711a7701027892d546797c07376bc277cab26704d81a597aaf7a55d531a45fa0739528cbdd394888c01611cde5630a70cb56372ddb05a0b15c906857089689
+EBUILD xpra-4.3.1-r1.ebuild 4917 BLAKE2B 8d7d38a5d578ba69617da85ee50788e5dd824bd3a8dbbe264016466abfc609afea09f3a1dd52434af8ab974d2b6d653ea0e457f149a78871ca2fe5a9e3bc438d SHA512 3bc06602a7ca7600dc97dbfb89a0675fb7c5e56a055bf90fdf418d86dc86cdfa76649e0c2f190175b7b43b7ed8566ba9cbc6f1d7215d383f16ad78f1bef37cdd
+EBUILD xpra-4.3.2.ebuild 4917 BLAKE2B 8d7d38a5d578ba69617da85ee50788e5dd824bd3a8dbbe264016466abfc609afea09f3a1dd52434af8ab974d2b6d653ea0e457f149a78871ca2fe5a9e3bc438d SHA512 3bc06602a7ca7600dc97dbfb89a0675fb7c5e56a055bf90fdf418d86dc86cdfa76649e0c2f190175b7b43b7ed8566ba9cbc6f1d7215d383f16ad78f1bef37cdd
 MISC metadata.xml 1362 BLAKE2B aedd143fbf55007c51f421515caa31daa954f6430ae0412ee33796471ac5beb1cec88b0e70f6598ab69640362804d67c75f9e04b2f43bddae5363644bcd0f547 SHA512 1a80da8c0e353a3ef671b3756b12cafa546def2935dca133bf349b8207b64a3f60d4de38b677b7c1ef2de69febe37d75e6950ee4b5873f8b466a75325e3b89d6
diff --git a/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch b/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
deleted file mode 100644
index 0d34ab0ef2fa..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/tests/unittests/unit/net/compression_test.py b/tests/unittests/unit/net/compression_test.py
-index 29ac7f2d2..89b68fdbf 100755
---- a/tests/unittests/unit/net/compression_test.py
-+++ b/tests/unittests/unit/net/compression_test.py
-@@ -11,7 +11,6 @@ from xpra.net import compression
- class TestCompression(unittest.TestCase):
- 
-     def test_main(self):
--        compression.sanity_checks()
-         compression.init_all()
-         assert compression.use("zlib")
-         assert compression.get_compression_caps()
-diff --git a/tests/unittests/unit/net/packet_encoding_test.py b/tests/unittests/unit/net/packet_encoding_test.py
-index 69ef95c65..eead158b0 100755
---- a/tests/unittests/unit/net/packet_encoding_test.py
-+++ b/tests/unittests/unit/net/packet_encoding_test.py
-@@ -12,7 +12,6 @@ class TestPacketEncoding(unittest.TestCase):
- 
-     def test_env_log(self):
-         packet_encoding.init_all()
--        packet_encoding.sanity_checks()
-         assert packet_encoding.get_packet_encoding_caps()
-         assert packet_encoding.get_enabled_encoders()
-         for x in packet_encoding.get_enabled_encoders():
-diff --git a/tests/unittests/unit/scripts/main_test.py b/tests/unittests/unit/scripts/main_test.py
-index 6dd54069c..f9478c2ab 100755
---- a/tests/unittests/unit/scripts/main_test.py
-+++ b/tests/unittests/unit/scripts/main_test.py
-@@ -121,7 +121,6 @@ class TestMain(unittest.TestCase):
-         t("tcp://fe80::c1:ac45:7351:ea69%eth1:14500", {"host" : "fe80::c1:ac45:7351:ea69%eth1", "port" : 14500})
-         t("tcp://[fe80::c1:ac45:7351:ea69]:14500", {"host" : "fe80::c1:ac45:7351:ea69", "port" : 14500})
-         t("tcp://host/100,key1=value1", {"key1" : "value1"})
--        t("tcp://host/key1=value1", {"key1" : "value1"})
-         try:
-             from xpra.net.vsock import CID_ANY, PORT_ANY    #@UnresolvedImport
-             t("vsock://any:any/", {"vsock" : (CID_ANY, PORT_ANY)})
diff --git a/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch b/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
deleted file mode 100644
index 255e80738616..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6e9ef70facfcc280e4c98892d2af6636d122c762 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 24 Aug 2021 09:56:26 +0100
-Subject: [PATCH] Execute true and false from /bin, not /usr/bin
-
-Some distributions now have /bin symlinked to /usr/bin, but not all of
-them. /bin should work everywhere.
----
- tests/unittests/unit/server/auth_test.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/unittests/unit/server/auth_test.py b/tests/unittests/unit/server/auth_test.py
-index 373db96e5..8e6be8e20 100755
---- a/tests/unittests/unit/server/auth_test.py
-+++ b/tests/unittests/unit/server/auth_test.py
-@@ -73,7 +73,7 @@ class TestAuth(unittest.TestCase):
-             kwargs["connection"] = "fake-connection-data"
-         #exec auth would fail during rpmbuild without a default command:
-         if "command" not in kwargs:
--            kwargs["command"] = "/usr/bin/true"
-+            kwargs["command"] = "/bin/true"
-         return c(username, **kwargs)
- 
-     def _test_module(self, module):
-@@ -380,8 +380,8 @@ class TestAuth(unittest.TestCase):
-             a = self._init_auth("exec", **kwargs)
-             assert not a.requires_challenge(), "%s should not require a challenge" % a
-             assert self.capsauth(a)==success, "%s should have %s using cmd=%s" % (a, ["failed", "succeeded"][success], cmd)
--        exec_cmd("/usr/bin/true", True)
--        exec_cmd("/usr/bin/false", False)
-+        exec_cmd("/bin/true", True)
-+        exec_cmd("/bin/false", False)
- 
- 
- def main():
--- 
-2.32.0
-
diff --git a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
deleted file mode 100644
index 337527305ecc..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/tests/unittests/unit/net/net_util_test.py b/tests/unittests/unit/net/net_util_test.py
-index 5c6e3096c..870801666 100755
---- a/tests/unittests/unit/net/net_util_test.py
-+++ b/tests/unittests/unit/net/net_util_test.py
-@@ -27,11 +27,8 @@ class TestVersionUtilModule(unittest.TestCase):
-         ifaces = get_interfaces()
-         if not ifaces:
-             return
-+        ip_ifaces = defaultdict(list)
-         for iface in ifaces:
--            ipmasks = do_get_bind_ifacemask(iface)
--            for ip, _ in ipmasks:
--                assert get_iface(ip)==iface, "expected interface %s for ip %s but got %s" % (
--                    iface, ip, get_iface(ip))
-             if if_nametoindex:
-                 try:
-                     i = if_nametoindex(iface)
-@@ -41,6 +38,12 @@ class TestVersionUtilModule(unittest.TestCase):
-                     if if_indextoname:
-                         assert if_indextoname(i)==iface, "expected interface %s for index %i but got %s" % (
-                             iface, i, if_indextoname(i))
-+            ipmasks = do_get_bind_ifacemask(iface)
-+            for ip, _ in ipmasks:
-+                ip_ifaces[ip].append(iface)
-+        for ip, ifaces in ip_ifaces.items():
-+            assert get_iface(ip) in ifaces, "expected interface for ip %s to be one of %s but got %s" % (
-+                    ip, ifaces, get_iface(ip))
-         ia = get_interfaces_addresses()
-         assert ia
-         #for iface, address in ia.items():
diff --git a/x11-wm/xpra/xpra-4.3.1.ebuild b/x11-wm/xpra/xpra-4.3.1-r1.ebuild
index dbc1bee840bb..b0bbdd1cfe13 100644
--- a/x11-wm/xpra/xpra-4.3.1.ebuild
+++ b/x11-wm/xpra/xpra-4.3.1-r1.ebuild
@@ -53,6 +53,7 @@ DEPEND="
 	x11-libs/libXdamage
 	x11-libs/libXfixes
 	x11-libs/libXrandr
+	x11-libs/libXres
 	x11-libs/libXtst
 	x11-libs/libxkbfile
 	brotli? ( app-arch/brotli )
diff --git a/x11-wm/xpra/xpra-4.2.3.ebuild b/x11-wm/xpra/xpra-4.3.2.ebuild
index 6280862e546a..b0bbdd1cfe13 100644
--- a/x11-wm/xpra/xpra-4.2.3.ebuild
+++ b/x11-wm/xpra/xpra-4.3.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=yes
@@ -10,7 +10,8 @@ inherit xdg xdg-utils distutils-r1 tmpfiles udev
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="https://xpra.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
@@ -52,6 +53,7 @@ DEPEND="
 	x11-libs/libXdamage
 	x11-libs/libXfixes
 	x11-libs/libXrandr
+	x11-libs/libXres
 	x11-libs/libXtst
 	x11-libs/libxkbfile
 	brotli? ( app-arch/brotli )
@@ -108,9 +110,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
 	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
-	"${FILESDIR}"/${PN}-4.2.2-true-false-bin-path.patch
-	"${FILESDIR}"/${PN}-4.2.3-dup-ip.patch
-	"${FILESDIR}"/${PN}-4.2.2-bad-tests.patch
+	"${DISTDIR}"/${PN}-4.3.1-tests.patch
 )
 
 python_prepare_all() {
@@ -127,16 +127,13 @@ python_prepare_all() {
 		sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
 			-i setup.py || die
 	fi
-
-	# Upstream says these tests are currently broken.
-	rm tests/unittests/unit/net/subprocess_wrapper_test.py tests/unittests/unit/net/protocol_test.py || die
 }
 
 python_configure_all() {
 	sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
 		-i setup.py || die
 
-	mydistutilsargs=(
+	DISTUTILS_ARGS=(
 		--without-PIC
 		--without-Xdummy
 		$(use_with client)
@@ -181,7 +178,7 @@ python_test() {
 
 	PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
 	XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
-		"${PYTHON}" tests/unittests/unit/run.py || die
+		"${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
 }
 
 python_install_all() {