gentoo resync : 16.01.2021

13 files changed, 19 insertions, 165 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 03278563c648..9813451cc9a9 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest
index 1bae4f1d3c8f..2260bc483d07 100644
--- a/x11-wm/amiwm/Manifest
+++ b/x11-wm/amiwm/Manifest
@@ -1,3 +1,3 @@
 DIST amiwm-0.22.01_p20200826.tar.gz 153787 BLAKE2B eebd61436bff6c063c0946f61632f5a56ba01d62f01e2761de62fed1c2c5049a191dbbaf836ac0b0771b38a84dc6f52a40ee53b9c73666855cfe03b6a829f9a8 SHA512 a4329eb8ea98b631611a6e069f27a6c640bfac94aa5a2c3591c9c35c4b08ea6f123fadcd56597353b27ec67bc079e8268e1b700fe85c0d545c9bb93439362c1b
-EBUILD amiwm-0.22.01_p20200826.ebuild 871 BLAKE2B 5f90b34bf74abd5f20f2a1e754ae38a0cb82a07e5a13e0a5e004a888d1bcb16e39591206fc333d546375d00ce4b78813654480aa973cdeecbe0e09560670d451 SHA512 cccbdb9156c475271dd15a9693bf9528d1a4db26c5d5053858bdfb98c96ecb0f6f5cd84c7da3217692faa743dbdec50573c493842b9192c0c5063ae2306b04ae
+EBUILD amiwm-0.22.01_p20200826.ebuild 877 BLAKE2B 5df81f947a3d03db5777c3939c75ca3851f84f17e92136af36ac265108b998eeeb83255ca6f6910f66237a2821cc44d0b6a8605b9e68ee555404710c68c3e376 SHA512 7d87ddf8c47380dbb8f7dabdcfc47e138270945ee269010a1b75d875549db74694951f59e10ffd9886eaaa11166df9551957af57ccc186c26b0bfde6ea1301f3
 MISC metadata.xml 505 BLAKE2B 7119e6837f04891a784f4abdfc7bd0b6b63b7e43a233c362ce20f38a2a981ad09cf2f74dfb161a1eede4515226f50119835887206fee4ee0b4425dbb81d753f3 SHA512 9be59734ead94c2eec4b5a5a4f07713ff8bfe4b00da2fcb2487bbd4a64a4e1857a721114cb3dfd8f40a8a633d61c600d6545274afc49fb7190fc50b7538eaf9e
diff --git a/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild b/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
index 7e7eaed103a1..01783f64e26e 100644
--- a/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
+++ b/x11-wm/amiwm/amiwm-0.22.01_p20200826.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/chewi/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="amiwm"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~m68k ~ppc ~x86"
 
 COMMON_DEPEND="
 	x11-libs/libX11
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 00a2731a4945..a1c467ae67d8 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -1,4 +1,4 @@
 AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a084ba90b160e54824f95f228999128efe76c7c11509e89e85a2e2fa49f0f00f43777a7f65c0afe2ec01 SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d
 DIST blackbox-0.77.tar.gz 394176 BLAKE2B c52872fd02eba6857d2a3f5a8e122a6a8a0cdaa9c2d83f5b2510f9e770e650626d07f6d2b43b18bc3d77de4bfefc9bb9fb10321de0e72d4f82e5988f3c670d59 SHA512 d1f86707d9a2acb68db6a9af947e47acfd687752d06e3e2a60932550fbfa087730e6890b6ceb086f8aa8cf04e932ed7864f92266368fc43dc70b4b58140a792d
-EBUILD blackbox-0.77.ebuild 1343 BLAKE2B 33cd5af2ec6bc7dedf0ac4c7dff8419220eefc32e8d5c12f249427cb87c04ac72e65703b4a66788f461902b27924e26fb7c4a3612e70dcdaca345980bc48ccf6 SHA512 3510c6cfb8a005cf07700e50cd8173c7bbc88459b3039969d1aa0971518a33e8dbb99ae2d4a09255463296b03ea5dc460f9805d92422bfbf8d8184192d381d4a
+EBUILD blackbox-0.77.ebuild 1349 BLAKE2B 5ffe3a6e3da61b87c4c5e7b579cf4e4d51be454ba62d05dc17566a4a8d1bbdea197454b7445bff1355214fb4c03865f662090113e2b92ca1adc372f0a0fe4e61 SHA512 85a80f6e81227fdc8b183c1a313d89ddf4a08208c3714eb6bdfaae18ea6824a4b7c06754598e5b625a2c80ef58c42a91097c0c09664c7194c5c25217ecb2dacb
 MISC metadata.xml 573 BLAKE2B a267119a25e9f1ea39b05b705a9b186f428b5723f7d8abf43f55561f6929d5e0c1800aed851c81c2b6ddc655974848f43fd79426fc4907a77da0fccf571c2556 SHA512 0dabe8daa4a79b684c1654722ac9d7f958d4511046a7d2a28bd2500751695621bbf4043579f08f73ad98745c921e766b0f19112995324e31e3bf9efa78df221a
diff --git a/x11-wm/blackbox/blackbox-0.77.ebuild b/x11-wm/blackbox/blackbox-0.77.ebuild
index ce6f439f6dd1..815969ba46db 100644
--- a/x11-wm/blackbox/blackbox-0.77.ebuild
+++ b/x11-wm/blackbox/blackbox-0.77.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bbidulock/blackboxwm/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 IUSE="debug nls static-libs truetype"
 
 RDEPEND="x11-libs/libXft
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 97dfaf425513..7b47b2f2ee38 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,5 +1,3 @@
-DIST marco-1.24.1.tar.xz 1860008 BLAKE2B b147e6ce8aad9382b2e8d96eec2da0356cce91977f4387776359ffb1f26903d7f0b9d9a1d43a436d1a64033f545600e7f810a29e3ae6ecdfb0d73ef8073b782c SHA512 55607898b64f0da3a85dd8d7fd092d847c8f67cefa096a63dbe074c197157a3d661fcb3f2a495b4425340b583b600cda3d1c92ac08b7327904dbd4aab8e92c85
 DIST marco-1.24.2.tar.xz 1845356 BLAKE2B 9308e07fec5319f741f7d78007e68e916c407c515fc2076c0e26a760830d3c79edf39888f265f7edc1baf0c8dc29661fb6598be16352103455cc441bc2a1daf5 SHA512 2e699935fb72ddc34aa1f98f5771f252141245ad8fd0983aafe5ea55aeeb3f90b5d68a61c27704adf0b929565180367aae46486d45e789d7de101ec9a7bc9f96
-EBUILD marco-1.24.1-r1.ebuild 1481 BLAKE2B 51998a385ac740af4e5f8be0a1c11e003aa2616196f6feba41e46c237ed473d0c7e38d137eef9158cff77f9381a36ff06244fdbae55517797515e9bc40f4a2c5 SHA512 aa21ffea9dd30126fd29fca608c2bba4a6186b52769d84505d16ef5c414ebacbead9dcd19bd1d5a6e0f1dbc81d164c3e7f729a688a36c2e6d84a935a4546d371
 EBUILD marco-1.24.2.ebuild 1488 BLAKE2B 8fe9eb2628956fe81b139953720ed5b138f3dfbb7ddd2adcf63291d40ac9d8d999718834d1abe3f73eb295715f14c701d164eeb97f0dc35eade55038c03dbb38 SHA512 d7d9a4377a92558b9d9361713278685db5894a900cbcd327b7fb754a9de2097640917234b6079f94fae6323c222d5f877e176deab3811373875be2b2608fc36a
 MISC metadata.xml 335 BLAKE2B 6ea6ccc130219ab51421a230c3725468d1981748dff6f5b5978d7dbceb67dbe6aa81d26f77f36cea462256133109f8ea125bfed41653deac552e09855cde46af SHA512 8b165e204f4c7420fbeb618ce2b19d01ab08dde6f870155c8d03b5edb959d9ea82b15d926ae2ddfd9ca445139d06f32b370016b585a1c227808e26988794ecd8
diff --git a/x11-wm/marco/marco-1.24.1-r1.ebuild b/x11-wm/marco/marco-1.24.1-r1.ebuild
deleted file mode 100644
index 2664b2b46315..000000000000
--- a/x11-wm/marco/marco-1.24.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
-SLOT="0/2"
-
-IUSE="startup-notification test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.58:2
-	>=gnome-base/libgtop-2:2=
-	media-libs/libcanberra[gtk3]
-	x11-libs/cairo
-	>=x11-libs/pango-1.2[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.3
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXpresent
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/startup-notification-0.7
-	xinerama? ( x11-libs/libXinerama )
-	!!x11-wm/mate-window-manager
-"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity
-	>=mate-base/mate-desktop-1.20.0
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8
-	>=sys-devel/libtool-2.0.0
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc doc/*.txt
-}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 21e11a75cf79..66551b3fef84 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -2,10 +2,10 @@ AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9
 DIST mutter-40.4.tar.xz 2682648 BLAKE2B fe3ed2edc20b4502db17bf3e6413159047eaa9812baa01b49f64ca2e3f05fe6f2e922a8e84ffd01636e8b6e5e31381653311153db5910f2dd1c84431d1892f6b SHA512 a38fe7c1ba2c65cb4510ee3ecd9b3e726cf3cb35922977e55f8b49f5ab847601277e1efaec63e7068ce0f924b38085adfe6d26b6d0af148a8f87400b31aba805
 DIST mutter-40.5-r1-patchset.tar.xz 5568 BLAKE2B 3e1cc6a8cb0a792a4abedaaa1f856eae679acf17be8fa5be6c4bf764924d89950c8fcd264859049fcf326ed94e2b4d74433bbee16acf06bb0e180674a9d3a2c2 SHA512 8da4f92b2268a6966d468cd15063fb361a71299aff671203141225e74d5655ee1cb4f4e2f1922e06355c3f3b756638f3a2243ecafeb30273e3ff04897b6a23d8
 DIST mutter-40.5.tar.xz 2682916 BLAKE2B 9ba2eeb5962a5473804fab02b1209c6044b151a1bc64b533762a27e91f6701a0ad655f582c8831cf92defc7be82e9eaa2c72b772fe7ea5e032dab5ecc96fb1b1 SHA512 ebd4f2bc4e8eef99d66305347673cbd2e38c5a058eb91eab6b932671ea7cb4a2f893dd65c4c5028ece454f8dd293898821bd125b68e304cf905ad237abff8837
-DIST mutter-41.1.tar.xz 2712924 BLAKE2B 1b25f4a45be258f84ea29ccc85f4b70f228af9e2c6278edf0f2689436b33d320ae08b63f02736b59269ad9f4ac129d381a9c04e9118c58b6bb6f98512d744063 SHA512 797f857a6cc053e3639a002bc35f8431ed55bd887189f74f7b183bf9e54319dd66910c9d165826effffb9bec05ec7454ce21e4d0a78cb1a9d841c1eb37865d4e
 DIST mutter-41.2.tar.xz 2713924 BLAKE2B 271b5cd3eebf3b3c040876dc634d5316788ee566fece2ded6987e048d03ea8b4b4c76b482ca91e1eaf5cdcdf36294948b2ab902013874f100247dfb5b04a4cbb SHA512 9fd030e2c3e5956e4e7412ac36069ab0e81798688b0a4f2372d935f81190ae8fb383919b2c29b8af37e5eeea47d250647ce8466d7f2e9047edf60e1ca93a9e3c
+DIST mutter-41.3.tar.xz 2717692 BLAKE2B c31fa8c5e110b243dc9ce0a96d4ea28670adec27d519788de6d826bcb858eda9df209eb02c08a07e2fa3a16fb8a2a2e8bce1025721c43a1f96b062980b924dbe SHA512 daa0cc8d91f8f3a35d2e2218c1e8d1f9e7f57df95a209f4b87ba8f3f81284ad45aa5000d08a148ae6d408f60d7ff120565e9132e1a84c3b6f55f9e59d6585338
 EBUILD mutter-40.4-r3.ebuild 4910 BLAKE2B d509e7c6afc917844f1b917e8d065266fb1ffee6ee6edbb8b9c4998eb6b17e6fe4559f83b6d7fa9a0842f06ca060f25140523eb0eface392478ef2c794a0eb60 SHA512 13c5de3dd4cd4bb92a23dca2b8b52973f03c3001e8b86d390c6a61d313f88d8367fb4954f81ce525656eeb4382e8d01721d83ad3383824cc057fde66de3655a5
 EBUILD mutter-40.5-r6.ebuild 5011 BLAKE2B bfae9c5e5bb26f03f5ccf0bdf8a83662f8e38af61db302a394b4fe8c4f6e40527ad7708916d72b783794055ba6e7f86f9fb880990c541e43d9569a0c375bf290 SHA512 9b5c7540852636aa927279611ba256f40790adb2a41d558af3015758d02354fbd5ee7297b72d0bbae07ac5687c0b9d77905ab13df4752601d2ea1114dc31c5f4
-EBUILD mutter-41.1-r1.ebuild 4975 BLAKE2B 6426a03d413f77306d22d2702a2e9d30d9dba481d25a896566576bd6e0683dfc9f9a9d1f19bb5f0231fac4b265663d6592d1c55f9447ab98db8ab01ec1ad64b2 SHA512 63cbda626bfb9debebeed8c08eb958826c710ecacfb4d64703fe6b2e8013ebb273b43fec2d021fb8f9f3d91ce93318d5e4f30773848d4a4557729ee42b4fcfc7
 EBUILD mutter-41.2-r1.ebuild 4975 BLAKE2B 6426a03d413f77306d22d2702a2e9d30d9dba481d25a896566576bd6e0683dfc9f9a9d1f19bb5f0231fac4b265663d6592d1c55f9447ab98db8ab01ec1ad64b2 SHA512 63cbda626bfb9debebeed8c08eb958826c710ecacfb4d64703fe6b2e8013ebb273b43fec2d021fb8f9f3d91ce93318d5e4f30773848d4a4557729ee42b4fcfc7
+EBUILD mutter-41.3.ebuild 4975 BLAKE2B a8f837597e1ddaa78db2e07360b5ad4ca02cc7061f39cd4ba9eeedad07992985d1b48fe76795ffef848a9e1989d8dd14d24e5dbdfef5bb90a67c94bd7a6d7d59 SHA512 0c07d7730a58652e4d31807b40cbb066d40645e66aff76e2eb8e64f985c3ef0367d7210ab20c903b6edb17cc74cba2cdce9ae41239d72ac89b2986dda02077f2
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-41.1-r1.ebuild b/x11-wm/mutter/mutter-41.3.ebuild
index b05673366a97..1c8c1b5985a9 100644
--- a/x11-wm/mutter/mutter-41.1-r1.ebuild
+++ b/x11-wm/mutter/mutter-41.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 4f233b88047b..7db0df52d7d5 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,14 +2,13 @@ AUX xpra-3.0.2-ldconfig.patch 1270 BLAKE2B b4eaa81610899c16a43b43c5f11f93335ca48
 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
 AUX xpra-4.2.3-dup-ip.patch 1486 BLAKE2B 2da134f53c9cf8fefd4df5e6a2edc0c7c6d8cbda4320df09cd3c3b56b3807e418b1efe22c187dc93830c15ea4fe1ddbe4e05bc5293bd4337960df086a37acd93 SHA512 8716f58fcfb423adcc6c34f712a51251717682e38c05724004ebcbcb7d0c1b2fc505d214c75c9a1eb18428205d2117cb2be9003a639b63d19ed95d131c0d86e4
-DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a SHA512 3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
 DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b SHA512 cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
-EBUILD xpra-4.2.2.ebuild 5116 BLAKE2B c6618758809c932323bbc82ce569d570596273090d1538a3091bfa6847faf465068451186018eaacaf398bf78bd040384d082a0235be76f5fbe843465d697594 SHA512 cca2d6c7de5d527ba4f68663e4fcfbe06f247f12865795c5145cae4ef9c1bf39995ffcd8e88f85de19fdb181098644ec285587ad1cd7903912d7040b122318c8
+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
 EBUILD xpra-4.2.ebuild 4151 BLAKE2B ed1a85aee717a2aca5d7c7b5f76ebba8a3514b3fd7f0261429836b363bd30d69a8312bc6e2526ce3f8bd92b8ebf3f7bb0a2047192b11527f8257595b72bb5e69 SHA512 73dc455a42f2ea0365c8344adeb39dc75976ad2e737d4e956e09bb2bcefcbeda9968bd8c203e307ce28eaa8ae6b176a3a4253e6e8a870b6922e70aa2e59ddcd4
+EBUILD xpra-4.3.1.ebuild 4899 BLAKE2B 294ce78296f2d07757710a703287bab93896c83c8c3031863b129ccc2e36d4d96fb9116ec27c553e3318514e1690260a7e68299084044edfb03e253310505ad4 SHA512 72711a7701027892d546797c07376bc277cab26704d81a597aaf7a55d531a45fa0739528cbdd394888c01611cde5630a70cb56372ddb05a0b15c906857089689
 MISC metadata.xml 1362 BLAKE2B aedd143fbf55007c51f421515caa31daa954f6430ae0412ee33796471ac5beb1cec88b0e70f6598ab69640362804d67c75f9e04b2f43bddae5363644bcd0f547 SHA512 1a80da8c0e353a3ef671b3756b12cafa546def2935dca133bf349b8207b64a3f60d4de38b677b7c1ef2de69febe37d75e6950ee4b5873f8b466a75325e3b89d6
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
deleted file mode 100644
index f689166dec9d..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
deleted file mode 100644
index 2cd009994c4b..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/xpra-4.2.2.ebuild b/x11-wm/xpra/xpra-4.3.1.ebuild
index 48f142fd675d..dbc1bee840bb 100644
--- a/x11-wm/xpra/xpra-4.2.2.ebuild
+++ b/x11-wm/xpra/xpra-4.3.1.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="https://xpra.org/src/${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"
@@ -107,11 +108,8 @@ 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
+	"${DISTDIR}"/${PN}-4.3.1-tests.patch
 )
 
 python_prepare_all() {
@@ -128,16 +126,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)
@@ -182,7 +177,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() {