gentoo resync : 10.09.2021

12 files changed, 392 insertions, 38 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index bd9446f0a551..50f14cbaa76a 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index c95041d7348c..ebe611cb2d83 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -8,7 +8,7 @@ DIST i3-4.19.tar.xz 1278600 BLAKE2B 3af5eac9cb618bc3b3da0bca430e1882701802f49e09
 EBUILD i3-4.18.3.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
 EBUILD i3-4.18.ebuild 2126 BLAKE2B 29048fa9165965ccd572cbacc8fdcc15697384bb75039c2c77caa3970040b31592359c1aa4b8df9242fd8c455e0b1a44d33c76422a9e603235651828cb7020d3 SHA512 527a652e1c6e05b1730a404c38a612820aebc2619ea8baf63c3403cbaaa8a4a5608ba63586c4f5ab09d7d57225727ed3f1207da317110b2b50b31b224440820c
 EBUILD i3-4.19-r1.ebuild 2009 BLAKE2B 879d419a2519c1a9ed7d6450f2c61a2fd55e0092f372affcdf71a695b037086d02ba89563b2157cb10ed82b31abadc96e5b610a5a9d7b615256ca54da3e47b1f SHA512 1b102e92604ae0b0cb10dac8fba11f263915c87ca5572aa779d8c77be92e3bb2c9304229a2031a1cd32937d0bab56a1e7777ad70a3c8ac7bb42fa256ff93eb1b
-EBUILD i3-4.19.1.ebuild 1964 BLAKE2B 0efd370883036b7cd359cf3fe4d98d96943d04a649d43aa826bca482def052b6ad9721b6b21ab561599dd97817ba8feebd2551bca690fde5117b762978e4d014 SHA512 350da5c0f9cb8b490567d6aeeb0b013376e667164df060fb012b563e77b6ccca2e623b0e3cf4e72bf1b1e1c48a577f74e2f0952ddfa11b8a78f260b7bd38a9c0
-EBUILD i3-4.19.2.ebuild 1971 BLAKE2B be37919b839646d9fb218db3b9d964c1b7d26d07a01039d6e2891c9aa235081fd92f14d1abf3e31b533a7e2ae4171d54f3501d0be12cb35e852b355b1f8eb5d1 SHA512 4191952f094743d0f6a4ce32ec2fb1098647478235e871007cfa193454f1d7406280aaf2bb81e48648879e414b18d4e7682854dc0ab5bacd76cf924f96fe447c
-EBUILD i3-9999.ebuild 1964 BLAKE2B 0efd370883036b7cd359cf3fe4d98d96943d04a649d43aa826bca482def052b6ad9721b6b21ab561599dd97817ba8feebd2551bca690fde5117b762978e4d014 SHA512 350da5c0f9cb8b490567d6aeeb0b013376e667164df060fb012b563e77b6ccca2e623b0e3cf4e72bf1b1e1c48a577f74e2f0952ddfa11b8a78f260b7bd38a9c0
+EBUILD i3-4.19.1.ebuild 1963 BLAKE2B c4c67cbfe2936a71dbe28975de1ba900e38c0b6e950c5d2651f0495ce79070ead37168b97ebee170c23f27e96e50b93311296360e4bd42f2c7dd056649b9133b SHA512 b3e605f591aaed7fe4281efe32fc4172988b225f6445537ec4512564e9eb2dee08baf365b7361bcac10f0d0614140d1e4ccb6395df51ca72ead2c014e40d0e02
+EBUILD i3-4.19.2.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6
+EBUILD i3-9999.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6
 MISC metadata.xml 466 BLAKE2B 68dae84f55852f76b6ad6df28add5f7db85c6f705bee50eb74cb2a85c22d52bdeed558e1548a32da4ff5e117112d9a0640ebe04080878a02ebedcaf18b4e6de0 SHA512 d634203a4ee1e160540f7d71531148d7a1694692c6f1b0287ac50930be6b3a0b545d01da674806d3afb637c9af99f0bd68a4215930a46463099a8ac8628aa97d
diff --git a/x11-wm/i3/i3-4.19.1.ebuild b/x11-wm/i3/i3-4.19.1.ebuild
index 99bd3b7ad0b6..8488d74426ae 100644
--- a/x11-wm/i3/i3-4.19.1.ebuild
+++ b/x11-wm/i3/i3-4.19.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = *9999 ]]; then
 	EGIT_BRANCH="next"
 else
 	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/x11-wm/i3/i3-4.19.2.ebuild b/x11-wm/i3/i3-4.19.2.ebuild
index 0b7b213271dd..8aedb5be5197 100644
--- a/x11-wm/i3/i3-4.19.2.ebuild
+++ b/x11-wm/i3/i3-4.19.2.ebuild
@@ -4,15 +4,13 @@
 EAPI=7
 
 inherit meson optfeature virtualx
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-fi
 
 DESCRIPTION="An improved dynamic tiling window manager"
 HOMEPAGE="https://i3wm.org/"
 if [[ "${PV}" = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/i3/i3"
 	EGIT_BRANCH="next"
+	inherit git-r3
 else
 	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@@ -21,12 +19,16 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="dev-libs/libev
+COMMON_DEPEND="
+	dev-libs/libev
 	dev-libs/libpcre
 	dev-libs/yajl
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
 	x11-libs/startup-notification
 	x11-libs/xcb-util
 	x11-libs/xcb-util-cursor
@@ -34,17 +36,17 @@ COMMON_DEPEND="dev-libs/libev
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
 	x11-misc/xkeyboard-config
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${COMMON_DEPEND}
+"
+DEPEND="
+	${COMMON_DEPEND}
 	test? (
 		dev-perl/AnyEvent
-		dev-perl/X11-XCB
+		dev-perl/ExtUtils-PkgConfig
 		dev-perl/Inline
 		dev-perl/Inline-C
 		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
 		dev-perl/local-lib
+		dev-perl/X11-XCB
 		virtual/perl-Test-Simple
 		x11-base/xorg-server[xephyr]
 		x11-misc/xvfb-run
@@ -53,15 +55,18 @@ DEPEND="${COMMON_DEPEND}
 		app-text/asciidoc
 		app-text/xmlto
 		dev-lang/perl
-	)"
-RDEPEND="${COMMON_DEPEND}
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
 	dev-lang/perl
 	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
+	dev-perl/JSON-XS
+"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
+	"${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch
 )
 
 src_prepare() {
@@ -75,7 +80,7 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(meson_use doc docs)
 		$(meson_use doc mans)
 	)
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 99bd3b7ad0b6..8aedb5be5197 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -4,15 +4,13 @@
 EAPI=7
 
 inherit meson optfeature virtualx
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-fi
 
 DESCRIPTION="An improved dynamic tiling window manager"
 HOMEPAGE="https://i3wm.org/"
 if [[ "${PV}" = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/i3/i3"
 	EGIT_BRANCH="next"
+	inherit git-r3
 else
 	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@@ -21,12 +19,16 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="dev-libs/libev
+COMMON_DEPEND="
+	dev-libs/libev
 	dev-libs/libpcre
 	dev-libs/yajl
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
 	x11-libs/startup-notification
 	x11-libs/xcb-util
 	x11-libs/xcb-util-cursor
@@ -34,17 +36,17 @@ COMMON_DEPEND="dev-libs/libev
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
 	x11-misc/xkeyboard-config
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${COMMON_DEPEND}
+"
+DEPEND="
+	${COMMON_DEPEND}
 	test? (
 		dev-perl/AnyEvent
-		dev-perl/X11-XCB
+		dev-perl/ExtUtils-PkgConfig
 		dev-perl/Inline
 		dev-perl/Inline-C
 		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
 		dev-perl/local-lib
+		dev-perl/X11-XCB
 		virtual/perl-Test-Simple
 		x11-base/xorg-server[xephyr]
 		x11-misc/xvfb-run
@@ -53,21 +55,24 @@ DEPEND="${COMMON_DEPEND}
 		app-text/asciidoc
 		app-text/xmlto
 		dev-lang/perl
-	)"
-RDEPEND="${COMMON_DEPEND}
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
 	dev-lang/perl
 	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
+	dev-perl/JSON-XS
+"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
+	"${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch
 )
 
 src_prepare() {
 	default
 
-	cat <<- EOF > "${T}"/i3wm
+	cat > "${T}"/i3wm <<- EOF || die
 		#!/bin/sh
 		exec /usr/bin/i3
 	EOF
@@ -75,7 +80,7 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(meson_use doc docs)
 		$(meson_use doc mans)
 	)
@@ -83,6 +88,10 @@ src_configure() {
 	meson_src_configure
 }
 
+src_test() {
+	virtx meson_src_test
+}
+
 src_install() {
 	meson_src_install
 
@@ -90,10 +99,6 @@ src_install() {
 	doexe "${T}"/i3wm
 }
 
-src_test() {
-	virtx meson_src_test
-}
-
 pkg_postinst() {
 	optfeature_header "There are several packages that may be useful with i3:"
 	optfeature "application launcher" x11-misc/dmenu
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index aac5695949b8..782b5c9a3fb4 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,8 +1,14 @@
 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-dup-ip.patch 1729 BLAKE2B 389daa60daa788293ea8fb2aff27f83cf4e681d933d3d903bacc288d366525757cdcc78bedc4c6147e6efb3b315c8da9009125cdef84db943bd16a553ed5ca29 SHA512 85a5da4377a1fc6a724040ccaddecfed6d6ea319e6d06325a8b9ac25a9eb1072d8f87971bf62d9814f9a2c6ec38e2e950baca2527d08590e00dc4f09086378b5
+AUX xpra-4.2.2-ldconfig.patch 862 BLAKE2B 747f5777f5e4a3b268bbe1a1ce850838011e50eaffce96a55d9888dd8be17d739d49d4582bb5229729631f38bae5783397f0e8bcfa2ffdaacb13a555401fdc46 SHA512 9285f44207da98992524c5445a49f246916e7b774fa3a82ab50265261cccae4378fe0a2d83a414e7376f674b0189259212ab5a48d0291ca08b9f9ed8dcf23546
+AUX xpra-4.2.2-true-false-bin-path.patch 1555 BLAKE2B 90882a8071e3a9d7e4d3e1a31a66de70c7b26c069ac848dbbbf3396917797df96e1bb08aabe96007c079fce570e361cc50078ab66cba8445edebf86ce02508e1 SHA512 a1e9498942c7c8fad0740b4aeeed098bb6d2c28a15506c8044c0c7b21ebfe954ffcf2b6be1439357cdef229a047841caa5b1dfcac7fc96b083041fe5f2c997a4
 DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9 SHA512 553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
+DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a SHA512 3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
 EBUILD xpra-4.2.1.ebuild 4153 BLAKE2B 83fabbba7623d98cd9fc4455f405eebf8d0c8d227f172ecc2e6db62f748a7c0452d37c15aefa61d29fe532afd80fe4a581c9703ba296e374654dcbeae25705b9 SHA512 7c78c3248308d8aff10618eb3dae089dea1206192e919f45a622455276b885a668ccce392cd87f1d124bc75b3a4cbd5584c839048f2112b79df7f463853d4850
+EBUILD xpra-4.2.2.ebuild 5116 BLAKE2B c6618758809c932323bbc82ce569d570596273090d1538a3091bfa6847faf465068451186018eaacaf398bf78bd040384d082a0235be76f5fbe843465d697594 SHA512 cca2d6c7de5d527ba4f68663e4fcfbe06f247f12865795c5145cae4ef9c1bf39995ffcd8e88f85de19fdb181098644ec285587ad1cd7903912d7040b122318c8
 EBUILD xpra-4.2.ebuild 4151 BLAKE2B ed1a85aee717a2aca5d7c7b5f76ebba8a3514b3fd7f0261429836b363bd30d69a8312bc6e2526ce3f8bd92b8ebf3f7bb0a2047192b11527f8257595b72bb5e69 SHA512 73dc455a42f2ea0365c8344adeb39dc75976ad2e737d4e956e09bb2bcefcbeda9968bd8c203e307ce28eaa8ae6b176a3a4253e6e8a870b6922e70aa2e59ddcd4
-MISC metadata.xml 1250 BLAKE2B 925a45bc8dccabae8b537ac5b2bc5ed8a1add84a7fb42d69165fe2a79ec38bc87ac264f16649fa37282dfb4a411e2cc5579802f61dde8129df2f5dade3850bf5 SHA512 a4efcabc1ef671a0c47bc4201b2fd89a0452f620e05d3d9419ee6ba19728275ba7405b943e151944939b6e9cba20ed321c6021b84a438bef61094ca0bd05b204
+MISC metadata.xml 1361 BLAKE2B 747b0399fbb5b4e6819114b9213124f41ac9bf536f827696cfda61e4b114334d3f2ddfdd3787738959420c92d05c96fac548c6893c09a940f8f89f5767e327f8 SHA512 30d1e46e95f72d454233ed1ef83b4af5be6e556fb83e10ea4ef5b5d7c4baa4aa58d8553bec3917f186a1849de4a1c5ceb6c56bcc6b28d4d7c24caf73735c0f30
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
new file mode 100644
index 000000000000..0d34ab0ef2fa
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
@@ -0,0 +1,36 @@
+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-dup-ip.patch b/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
new file mode 100644
index 000000000000..f689166dec9d
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
@@ -0,0 +1,40 @@
+diff --git a/tests/unittests/unit/net/net_util_test.py b/tests/unittests/unit/net/net_util_test.py
+index 1ceaf4573..870801666 100755
+--- a/tests/unittests/unit/net/net_util_test.py
++++ b/tests/unittests/unit/net/net_util_test.py
+@@ -6,6 +6,7 @@
+
+ import unittest
+
++from collections import defaultdict
+ from xpra.net.net_util import (
+     get_info, get_interfaces, get_interfaces_addresses, #get_interface,
+     get_gateways, get_bind_IPs, do_get_bind_ifacemask,
+@@ -26,10 +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
+             if if_nametoindex:
+                 try:
+                     i = if_nametoindex(iface)
+@@ -37,7 +36,14 @@ class TestVersionUtilModule(unittest.TestCase):
+                     pass
+                 else:
+                     if if_indextoname:
+-                        assert if_indextoname(i)==iface
++                        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/files/xpra-4.2.2-ldconfig.patch b/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch
new file mode 100644
index 000000000000..2cd009994c4b
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch
@@ -0,0 +1,22 @@
+From f97daef82521c9297f6cc2d7925fe5c6ed526ad1 Mon Sep 17 00:00:00 2001
+From: totaam <antoine@xpra.org>
+Date: Sun, 22 Aug 2021 21:31:52 +0700
+Subject: [PATCH] #3239 with shell=True, best not to use a list
+
+---
+ xpra/os_util.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xpra/os_util.py b/xpra/os_util.py
+index 2f8c0d64a..2f309f888 100644
+--- a/xpra/os_util.py
++++ b/xpra/os_util.py
+@@ -786,7 +786,7 @@ def find_lib_ldconfig(libname):
+             ldconfig = t
+             break
+     import subprocess
+-    p = subprocess.Popen([ldconfig, "-p"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
++    p = subprocess.Popen("%s -p" % ldconfig, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+     data = bytestostr(p.communicate()[0])
+ 
+     libpath = re.search(pattern, data, re.MULTILINE)        #@UndefinedVariable
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
new file mode 100644
index 000000000000..255e80738616
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
@@ -0,0 +1,38 @@
+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/metadata.xml b/x11-wm/xpra/metadata.xml
index a90f8afcffa0..3440980db471 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -25,11 +25,13 @@
 	<flag name="client">Build client-side code</flag>
 	<flag name="clipboard">Enable clipboard support</flag>
 	<flag name="csc">Enable csc softscaler support</flag>
+	<flag name="html">Install the HTML5 client</flag>
 	<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
 	<flag name="pillow">Enable pillow support</flag>
 	<flag name="pinentry">Use <pkg>app-crypt/pinentry</pkg> for password entry</flag>
 	<flag name="server">Build server-side code</flag>
 	<flag name="vpx">Enable vpx image format support</flag>
 	<flag name="webcam">Enable webcam support via opencv</flag>
+	<flag name="xdg">Enable support for XDG-based menus</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-wm/xpra/xpra-4.2.2.ebuild b/x11-wm/xpra/xpra-4.2.2.ebuild
new file mode 100644
index 000000000000..48f142fd675d
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.2.2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+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="https://xpra.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx webcam webp xdg xinerama"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( client server )
+	cups? ( dbus )
+	opengl? ( client )
+	test? ( client clipboard dbus html server sound xdg xinerama )
+"
+
+TDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/netifaces[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+	')
+	html? ( www-apps/xpra-html5 )
+	server? (
+		x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+	)
+	xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+		opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+		sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	brotli? ( app-arch/brotli )
+	csc? ( >=media-video/ffmpeg-1.2.2:0= )
+	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+	jpeg? ( media-libs/libjpeg-turbo )
+	pulseaudio? (
+		media-sound/pulseaudio
+		media-plugins/gst-plugins-pulse:1.0
+	)
+	sound? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	vpx? ( media-libs/libvpx media-video/ffmpeg )
+	webp? ( media-libs/libwebp )
+"
+RDEPEND="
+	${DEPEND}
+	${TDEPEND}
+	$(python_gen_cond_dep '
+		cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+		lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+		opengl? (
+			client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+		)
+		webcam? (
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pyinotify[${PYTHON_USEDEP}]
+			media-libs/opencv[${PYTHON_USEDEP},python]
+		)
+	')
+	acct-group/xpra
+	virtual/ssh
+	x11-apps/xauth
+	x11-apps/xmodmap
+	ibus? ( app-i18n/ibus )
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND+="
+	test? ( ${TDEPEND} )
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig
+	doc? ( app-text/pandoc )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-4.2.2-ldconfig.patch
+	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
+	"${FILESDIR}"/${PN}-4.2.2-true-false-bin-path.patch
+	"${FILESDIR}"/${PN}-4.2.2-dup-ip.patch
+	"${FILESDIR}"/${PN}-4.2.2-bad-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" \))
+
+	sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+		-i setup.py || die
+
+	if use minimal; then
+		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=(
+		--without-PIC
+		--without-Xdummy
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		--without-csc_libyuv
+		--without-cuda_rebuild
+		--without-cuda_kernels
+		$(use_with cups printing)
+		--without-debug
+		$(use_with dbus)
+		$(use_with doc docs)
+		$(use_with ffmpeg dec_avcodec2)
+		$(use_with ffmpeg enc_ffmpeg)
+		$(use_with ffmpeg enc_x264)
+		$(use_with ffmpeg enc_x265)
+		--with-gtk3
+		$(use_with jpeg jpeg_encoder)
+		$(use_with jpeg jpeg_decoder)
+		--without-mdns
+		$(use_with opengl)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		--with-strict
+		$(use_with vpx)
+		--with-warn
+		$(use_with webcam)
+		$(use_with webp)
+		--with-x11
+	)
+
+	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+}
+
+python_test() {
+	export XAUTHORITY=${HOME}/.Xauthority
+	touch "${XAUTHORITY}" || die
+
+	distutils_install_for_testing
+	xdg_environment_reset
+
+	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_install_all() {
+	distutils-r1_python_prepare_all
+
+	# Move udev dir to the right place.
+	local dir=$(get_udevdir)
+	dodir "${dir%/*}"
+	mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+}
+
+pkg_postinst() {
+	tmpfiles_process xpra.conf
+	xdg_pkg_postinst
+}