gentoo resync : 24.07.2021

17 files changed, 20 insertions, 370 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index df6b1b05d518..99c252566c9d 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index eca4955b2b47..72ff39e1b300 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,6 +1,6 @@
 AUX bspwm-session 1876 BLAKE2B 8e1a9eaf2a1721d2b6272b6f0e1f9692fbab8b94aacf2dd52db7dc4ebd97189d36f6d464e588c06084fd433f16901576ea9f682dd54858b7780a9c8732767fdd SHA512 04d89bdd5ca5a9163e576c41dee9420fff8c51ab4a53aca179060b9f6b348537ad96d4257964e7bc4422d836a21c52f82fdc30a6b7b07c229c9934d7620d90ee
 DIST bspwm-0.9.10.tar.gz 114099 BLAKE2B 0fd14d3605e05146435d408846844b7e5015290f97fdd00683eb5388b43678df42a76f1710660ee8036b7100d79a54400c13bf9450333d573a78846d2124516e SHA512 9ccb98c4e80635a781b3f889d8c3ae621c0926a79e9607268924b78bd11137caf70ee9a1edf5bc137d362d2acbe2984645f58ba31c586e6b017797758a66f9cf
 DIST bspwm-0.9.9.tar.gz 111119 BLAKE2B b4f80f090582c48ff5322bf6b03db5aee5bab1868b39ee3c4a3ca9f46f0f5d243a94bd869f2c91dcfbca22136c632b4fa0a2dee0e5fd2f27bd170b1f85c69545 SHA512 17f70e44667813fafcf0df144ed211df5a4479af6dfaf6e0a6bb7154a7380fa48d6135e8c440b6202d07012b76ac7372f73d4bf2f0c3a6716ed998d2ee4e59a2
-EBUILD bspwm-0.9.10.ebuild 956 BLAKE2B d2ca8f3e2289b61a6b419fb4662888b9b40d6e6638f1837ec017477954de634d95b2c39b89f59b767dbb9dfa037c039f3e66d52b49c46ec43ea735345c24c8e2 SHA512 cf5c82585bebf09385bbf47bb7b1b11cd875e6b6ffcaa63a912639d4ef203b4e29f2fcc4ebf113aafcbd1181e12ea660ad132ca4938e132352a9eee41f785849
+EBUILD bspwm-0.9.10.ebuild 963 BLAKE2B 63c3c721e8a8fcb374d5d82a37b2415a57fd514601fc1ce02d8a2dfc5d863271ccc378bf8a4cc06601748dfc37a6d610ed770c3e645d709d22565ff5b2b4b5f4 SHA512 de2814bec71e338da2b2cde5f378b51d94ad548bdf60740cefd1e1d27daa6d1d786080e9810f57b4484b3bdc59624c6f0bba068faf17ea059c93f2828c5a703a
 EBUILD bspwm-0.9.9.ebuild 980 BLAKE2B 6334d4ef01fd74ed27c02b016784721c635567bf71c431bac57b02c5b510cb7916c3a6516e36482d84686ccd1f9683dd4365b3a55374a240d3e4970afeb45003 SHA512 674eed848ffd30d8cf299ab7606a2165b35e17e4f2c98aad47c9941edc43ba878b9ef6fcfd3f81e56571fd10591aa832565e66496de35ee8fefa48ef26f48147
 MISC metadata.xml 327 BLAKE2B 0ac0432bb0c38fca77a88690a6d85c1ace3569fc8099ce12551fd1cb4d532b3673e3c85b2655222113c4b24f139902967bfe2ad2ba638d8dfdbe874d1c9a8ff6 SHA512 fcafc9a074be2d2a64c868494a8ddb156cbc763e6d31e6999343e72df2d101469275e39eab02fc98c3ff2118203105f9b63d18277ae70997e85e021c7126293b
diff --git a/x11-wm/bspwm/bspwm-0.9.10.ebuild b/x11-wm/bspwm/bspwm-0.9.10.ebuild
index 84e87f407073..78c44c3c2ea1 100644
--- a/x11-wm/bspwm/bspwm-0.9.10.ebuild
+++ b/x11-wm/bspwm/bspwm-0.9.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="examples"
 
 DEPEND="
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index cf2fdc1c6f62..4ab0e935e9c5 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,6 +2,6 @@ AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee919
 AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
-EBUILD openbox-3.6.1-r3.ebuild 2733 BLAKE2B 5377ed1b8f2f8c7c11af7e03baeab132d7951ab6cd7d694c3ec797cb477f3b04b920e29d32b58956d49f08cbdb1e98e3a7ddaf166dc9578a1b165b0f0b4455de SHA512 06c7cc75ddc95431e0d7b3c56331ca8c3bb08f046b7fa153976c0b3366a1c9c0b7248410b47345d38e0cf3d1303277d966dce17cf10b6c34fbf27d1da33477d1
-EBUILD openbox-9999.ebuild 2733 BLAKE2B 27aa4985831c42d02302b822f5116dfa0c42f052420d858c7c9e469f2228b0f81bae74d3365fc8a1cb88d3cb7bfd39f6e7aa6c8e99046842ffb6f0952ce28e26 SHA512 595f05188de1d3239fcacd4eebcab66bd9fae7f6c322ba1f3ca7e5fca3867735fea6c7a9b6778344c3e52d1cc0845b46c0f936debb9cb3be1ec66eaa1f3e607a
+EBUILD openbox-3.6.1-r3.ebuild 2725 BLAKE2B 2aaac63e7b3ab473d61bda45fe1320704196ef628870ae8d9832ea66c392148b95c75237baeed0ff719030fb6bf1ced566902cddbd0b1ac379c5abd76e20c0fa SHA512 585e0fd7d07792a08a707c90d3bc3d05141302cab9c47a027cbe8a3d4aeea3bab1b93349a37c6174927ab93f59b8b390c0566e37eb88822f931c2563cea33f37
+EBUILD openbox-9999.ebuild 2725 BLAKE2B 9ab0875311bfb8e294ca5884806ab04709d0b003aabff25922800018773f163c438d2d0005ba895b74ce56e842bc3421dc56ea43b45fcc0395c3a8900ba7a0c7 SHA512 2aa0d0d544ceec85efc9ca6c850a02f9148c0dfa851c8a99f602ad374b1da627178e5d0314f2791efbf284c66d49196adce4552d27d282992b03c0eb38a53cf2
 MISC metadata.xml 704 BLAKE2B 6a8354358ddaa1b4af8e662aa43800168e49aecc074ec4e9c353813e70650e5e44c6647a1848f465e74571367d873a5d32ead3a340e4da730432524adfc4eec5 SHA512 f232879857441d09e1a0b7251849ab466e0a1a5c75e035ab28aa5bc91a7d11e962cd618672aaa65746ec019fb5cd08a190a28e001a89b9e6a82f9afc11d5c207
diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 2e055c88caa3..2288b82914b0 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager"
@@ -47,7 +47,7 @@ RDEPEND="
 	xdg? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index f608dddb2d71..996da0e28250 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager"
@@ -47,7 +47,7 @@ RDEPEND="
 	xdg? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index 96c44f8cc504..76982e129037 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -3,6 +3,6 @@ AUX ratpoison.desktop 122 BLAKE2B f72c9cfdb0712eef05037b1fdedbc5806f6f4957d2d549
 AUX ratpoison.el-gentoo.patch 220 BLAKE2B 4c5339912466401efcc6a3a3e23178af24da58e27304a38053eaee7de6a025ae872049e6fc75f7480dba3fe31c89d04e537469ff54dbe421cb26b0e9fd228c20 SHA512 c9e0e322b0c632b6bd7cee0c34269accfd0cf2d12751b9f2a65955f5ae5aa72804f819ca0147da5e0ff571357b34460337668adc07ad77afdf7a50b512f6b36f
 AUX ratpoison.xsession 19 BLAKE2B fa3cca1a3a03b0b6da08f6976cd6436fd2e115961fd1c8b7f5603483b7be6e90a6f3f57e35ae06f9b9c609d3d02765c3e5e5085b10f80bd8abb6e7f51a29913c SHA512 684dbc8aa49355bac63254beaef79ec0d499f5f4d20976fae9daa686102c5120e564fc3a60eb9a770c0c648c998e49b63414fb92b8e5b5af0f5fc23695cd6b8e
 DIST ratpoison-1.4.9.tar.xz 315584 BLAKE2B 18cff2ed835579b606ea99defda04db6ebaedc8bc71d3f7d12cf859caf908d427f50b345089ca3aae52a407ae763818d91a2dd4026c9b32ead95adfb2d065c25 SHA512 97f705efd2092b8e12528496890c59f613e6fcec010aca94a5a59bd641e22dfc50dd500a4b94af7a07553a8a6359f6bec4eee0db1a7ded29d7f051904b09beef
-EBUILD ratpoison-1.4.9-r1.ebuild 1864 BLAKE2B a0642c53b08dab4525b9a012d18d01dd6734d055164c689b40b7ff725311e51a348ce222fcc9d0abf6933a137d750fba791d812f250b79298fe9bc549394f564 SHA512 2db87d3e5ea4171ea2493911e2092de7639c9217e7d198e03084e85a50436922376dcb885e2b7c0c703fda9b49227ee00770ee5cf91f26265fdc8b08c619ba5a
-EBUILD ratpoison-9999.ebuild 1875 BLAKE2B 98c9866887a3f81a6f6ef11f5b2252fda5d22f9ce9bc43baa6099d00faecd9c0e8ecab8d8d9573e47dfcb6359499d53302ac82cd4229c762ace384fdc6df326f SHA512 5631ad7c74d54258061b77dc786e367fa77934599dc13884f4bf4d022b433731f0ca602662ae1dcd245eb03c9b7507c578f18a9d0e224f1a38c5d970f425fa01
+EBUILD ratpoison-1.4.9-r2.ebuild 1860 BLAKE2B a33d022808600d55789f2c9b26b95d587b5b0659c7cc0f44bf2476225558e9248d863d1a6a9d9221ed91fc246db97806c4d1d1fb260f71921c8f645fad319f1a SHA512 15556af45ba30d19cf0f5f694a67639bdd616cc22bd34cbc091433244cad4a076b373002bddb0a8a3fb30d8b831d82344127b1fb6e595ee332a60411850f258b
+EBUILD ratpoison-9999.ebuild 1871 BLAKE2B 602d7c558ffba67d7b210ef1a794ca5062728d82b9505768fdadfa0ac4222ea879b1929e1b745bef1d7490595beb04b812b4b9775440ec40411e529e5f3e104f SHA512 a5648cb9bc66de6ee63acb45192148167f616d1e73ddfb61723ec9cc09c415529d5d0cbd48d878a498ff2e7d8a7433e1e6fb286e15046338a99f3fc28070954b
 MISC metadata.xml 994 BLAKE2B da7a977d643d540812fffa082f5cba76cd79728302533e77627825a08fb0bace3a2b3bb917cd8b6cd3cecd2c03182b72ac902909a4c7d575f8e2ea936a510953 SHA512 f64106b49cfcfb17e08d3c897be4de0ef3df083fded72804d9b0e0f4e2eedcc2c8c679dea96c59dcb41937b547497ac1445102c0a63ef965f92b450dda0edec4
diff --git a/x11-wm/ratpoison/ratpoison-1.4.9-r1.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9-r2.ebuild
index 001e9b843227..8346af3e1dc3 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.9-r1.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.9-r2.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	history? ( sys-libs/readline:= )
 	xft? ( x11-libs/libXft )
 	xrandr? ( x11-libs/libXrandr )
-	virtual/perl-Pod-Parser
+	dev-perl/Pod-Parser
 	x11-libs/libX11
 	x11-libs/libXtst
 "
diff --git a/x11-wm/ratpoison/ratpoison-9999.ebuild b/x11-wm/ratpoison/ratpoison-9999.ebuild
index 70a7773144bc..b22f59987d42 100644
--- a/x11-wm/ratpoison/ratpoison-9999.ebuild
+++ b/x11-wm/ratpoison/ratpoison-9999.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	history? ( sys-libs/readline:= )
 	xft? ( x11-libs/libXft )
 	xrandr? ( x11-libs/libXrandr )
-	virtual/perl-Pod-Parser
+	dev-perl/Pod-Parser
 	x11-libs/libX11
 	x11-libs/libXtst
 "
diff --git a/x11-wm/subtle/Manifest b/x11-wm/subtle/Manifest
index bc16c84b3d91..b86fe3243c25 100644
--- a/x11-wm/subtle/Manifest
+++ b/x11-wm/subtle/Manifest
@@ -1,4 +1,4 @@
 DIST subtle-0.11.3244.tar.gz 190549 BLAKE2B bb4b78165741ef30c1e9e145d4f26c8903d597dfa210688246210bb6f04ffb8b62b9295ffdfd0829f1c36019287ff82677253daf87878562b7ba55a517fb00ce SHA512 3d6edd5cb1b5dcd058caeddf3ead024c7cce39684baca8bac9709683ce3130a5c8433cbe046d28dc7420637dd855a2b6775638097f78a5e701bb85e505e8167c
+EBUILD subtle-0.11.3244-r1.ebuild 1924 BLAKE2B ddaf40394ae07529b812de11215296a60fe776edc6cc667247be915a419bf9c651f6d09d19fa802feeb8070e024b5262dcc7cdc29e7c7ead94cea37d8e89bfe8 SHA512 dce8fa1370489615ec717f64cd735ebc015fd4eb9c4d665176e4c4a374fae4de4ce4ebaaf125f01730e7c5c5ca9d2be8488b3adae708832dc099f8f52e4fc57e
 EBUILD subtle-0.11.3244.ebuild 2070 BLAKE2B 1c2d16eeb72c171c164e4ec5862b18e52380b72aa26a3252d0192cdb4c3098d2e906fce700d2b2892ed96e3530078b39fc37415d967f81bb6e9a565273047df2 SHA512 c98a5bf12b1d3322344cdcf80ff612e5f4bc0f25ca637f6872538674e26c8aeed9a87ea4a2200f3636ea3f654256c64ec1c520f6a8e175a7f28ac7b301ea2fb2
-EBUILD subtle-9999.ebuild 2070 BLAKE2B 1c2d16eeb72c171c164e4ec5862b18e52380b72aa26a3252d0192cdb4c3098d2e906fce700d2b2892ed96e3530078b39fc37415d967f81bb6e9a565273047df2 SHA512 c98a5bf12b1d3322344cdcf80ff612e5f4bc0f25ca637f6872538674e26c8aeed9a87ea4a2200f3636ea3f654256c64ec1c520f6a8e175a7f28ac7b301ea2fb2
 MISC metadata.xml 1071 BLAKE2B 174307dc5589d03b7ed88424c575b0f1aa3c88ac4e4c13e05d7cbec349247abb7da98c1b75a86e34e61f1e26a49f0623334383845a1e052f0789484f229e0774 SHA512 43820c6deb320cf15afee6d9e77d24da9f9084c1006b97e6b8a46a0208575af238500c1a635eb44f594498f8c74e3048ee9cd5085a9e1b7566e67c0cf5cf41d2
diff --git a/x11-wm/subtle/subtle-9999.ebuild b/x11-wm/subtle/subtle-0.11.3244-r1.ebuild
index ef71c3fce45f..1375736daf48 100644
--- a/x11-wm/subtle/subtle-9999.ebuild
+++ b/x11-wm/subtle/subtle-0.11.3244-r1.ebuild
@@ -1,19 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 inherit ruby-ng toolchain-funcs
 
-if [[ ${PV} == "9999" ]]; then
-	EHG_REPO_URI="https://hg.subforge.org/subtle"
-	EHG_CHECKOUT_DIR=${S}/all
-	inherit mercurial
-else
-	SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="A manual tiling window manager"
 HOMEPAGE="https://subforge.org/projects/subtle/wiki"
@@ -32,7 +26,7 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-ruby_add_rdepend "dev-ruby/archive-tar-minitar"
+ruby_add_rdepend "dev-ruby/minitar"
 ruby_add_bdepend "dev-ruby/rake doc? ( dev-ruby/rdoc )"
 
 all_ruby_unpack() {
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 97a38c35f6ed..a11ea9f6c1d6 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,14 +1,8 @@
-AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb43855619a1c34bc29c05536c4dea30c8131179ea17ca30ce3ae2c87d7b374f7a02a5afcde89b6bf29921fc0a9de457e3d54 SHA512 f0d69a6e57435d6c9ef1ecb10e9fa6916b2a8b11f5979b7dffcc37c0a8ec387306b651d50ca3fe10a489cb28f6c2384fbe578510bd7f9bc7a51249e66c4d17ab
 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.0.3-suid-warning.patch 731 BLAKE2B 6e576c088bc59ee7a52e15a8fbceb9117a47e4bf818b6777ffe977b5db1f9e72077ffeea07570312603f160d5556d2980914887f56d9733b1b6bf49ae385d0e4 SHA512 d3a3c2a2510159e83d6d6bda11f37b5500ce80d4bac059d3bcee8293caa93652a132d074f46a728204b012c61707994ebb87e0e02afd0c4efeab7a705ba5ea69
 AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d
-DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c SHA512 e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39
 DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9 SHA512 553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
-EBUILD xpra-3.0.5-r2.ebuild 3834 BLAKE2B 774548ad7f6e2f9f1cf4751d8ef1119e7fb93ac3d1fb9a1d89367e6ec8a20430fd3787a8681b7abd72a2da4e7b05c4f078f92a7a13fcf96b8e448449aa490254 SHA512 f019c875c6e5feffb6ff09d4ef2c3c9cfeb360c98e03a59863e5c3e0b43c4e143d24434559659f5e85577e2e80a332e7fd7889a48041c32b8e97f810c50be598
-EBUILD xpra-4.1.3.ebuild 4103 BLAKE2B d279ddb09bcb0c784d98387b7e4ef61b73a550b865085f9d24f1863902759cff57f573df5fcb1b8e2c0f1e2e93f09b9e49ec95b323157f3d965e41e40e5e0257 SHA512 27330d1b6a9e95ab2c93bf6620fe357b863d3a1493ea129c6d3154ccd953ed4379f4b21fb8858177d040f5bb01bfa205e2aa49d41c72c5a327453be4c0a1d982
 EBUILD xpra-4.2.1.ebuild 4174 BLAKE2B 407e6d7a2da77c89bac668cb3708f519cd72133f7cea2cd3c7d039e4706417298929d102d24f13b0392f63b4dedbe4bd66feb838d51d26131fdd7d6f4c1b7bff SHA512 35ae0360bfcd7978c5b38be30498e26c78b7c02a6ffa2c18acb2755c08e70356056ab793b896e6e95cf08c24a6349780560054b5e321f318b1c4f53e5cf3fe65
-EBUILD xpra-4.2.ebuild 4174 BLAKE2B 407e6d7a2da77c89bac668cb3708f519cd72133f7cea2cd3c7d039e4706417298929d102d24f13b0392f63b4dedbe4bd66feb838d51d26131fdd7d6f4c1b7bff SHA512 35ae0360bfcd7978c5b38be30498e26c78b7c02a6ffa2c18acb2755c08e70356056ab793b896e6e95cf08c24a6349780560054b5e321f318b1c4f53e5cf3fe65
+EBUILD xpra-4.2.ebuild 4172 BLAKE2B 0310419a1ce47d0a7b58d141845dbf13609e2633d0fd481e53c091340ec0c643b71095bc39b393a2639a21c61983de03aeb34533b1d8226d35ec6898870f4247 SHA512 54179fbdbfa576c03e0ec1263c453c8f08e0a80d3614cf3b782e2595a8edb4402ee968ffad6d67ba9cd47bdee2bbe172d2860e3a45ace1d2da0b31b9071034ca
 MISC metadata.xml 1250 BLAKE2B 925a45bc8dccabae8b537ac5b2bc5ed8a1add84a7fb42d69165fe2a79ec38bc87ac264f16649fa37282dfb4a411e2cc5579802f61dde8129df2f5dade3850bf5 SHA512 a4efcabc1ef671a0c47bc4201b2fd89a0452f620e05d3d9419ee6ba19728275ba7405b943e151944939b6e9cba20ed321c6021b84a438bef61094ca0bd05b204
diff --git a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch b/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
deleted file mode 100644
index 806694f24312..000000000000
--- a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpra-2.0/xpra/scripts/config.py
-+++ xpra-2.0/xpra/scripts/config.py
-@@ -127,7 +127,7 @@
-             xorg_stat = os.stat(xorg_bin)
-             if (xorg_stat.st_mode & stat.S_ISUID)!=0:
-                 if (xorg_stat.st_mode & stat.S_IROTH)==0:
--                    warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-+                    debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-                     return get_Xvfb_command()
-                 debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
-                 use_wrapper = True
diff --git a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch b/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
deleted file mode 100644
index ae590110f1c3..000000000000
--- a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/xpra/scripts/config.py b/xpra/scripts/config.py
---- a/xpra/scripts/config.py	2020-05-10 19:00:55.000000000 +0200
-+++ b/xpra/scripts/config.py	2020-06-07 18:35:49.361899872 +0200
-@@ -150,7 +150,7 @@
-             if (xorg_stat.st_mode & stat.S_ISUID)!=0:
-                 if (xorg_stat.st_mode & stat.S_IROTH)==0:
-                     if warn:
--                        warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-+                        debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-                     return get_Xvfb_command()
-                 debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
-                 use_wrapper = True
diff --git a/x11-wm/xpra/xpra-3.0.5-r2.ebuild b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
deleted file mode 100644
index 1371e2b78d86..000000000000
--- a/x11-wm/xpra/xpra-3.0.5-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 flag-o-matic user tmpfiles prefix
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( client server )
-	cups? ( dbus )
-	opengl? ( client )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${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
-	csc? ( >=media-video/ffmpeg-1.2.2:0= )
-	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
-	jpeg? ( media-libs/libjpeg-turbo )
-	opengl? ( dev-python/pyopengl )
-	pulseaudio? (
-		media-sound/pulseaudio
-		media-plugins/gst-plugins-pulse:1.0
-	)
-	sound? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		dev-python/gst-python:1.0 )
-	vpx? ( media-libs/libvpx media-video/ffmpeg )
-	webp? ( media-libs/libwebp )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/xmodmap
-	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-	dbus? ( dev-python/dbus-python[${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}] )
-	)
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-	)
-	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
-		media-libs/opencv[python]
-		dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-2.0-suid-warning.patch
-	"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
-)
-
-src_install() {
-	distutils-r1_src_install
-
-	mkdir -p "${ED}/usr/share/metainfo" || die
-	mv "${ED}/usr/share/appdata/"* "${ED}/usr/share/metainfo/" || die
-	rmdir "${ED}/usr/share/appdata" || die
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
-	xdg_pkg_postinst
-}
-
-python_prepare_all() {
-	hprefixify -w '/os.path/' setup.py
-	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
-		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
-
-	distutils-r1_python_prepare_all
-}
-
-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 ffmpeg dec_avcodec2)
-		$(use_with ffmpeg enc_ffmpeg)
-		$(use_with ffmpeg enc_x264)
-		$(use_with ffmpeg enc_x265)
-		--without-gtk2
-		--with-gtk3
-		--without-html5
-		$(use_with jpeg jpeg_encoder)
-		$(use_with jpeg jpeg_decoder)
-		--without-mdns
-		--without-minify
-		$(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
-	)
-
-	# see https://www.xpra.org/trac/ticket/1080
-	# and http://trac.cython.org/ticket/395
-	append-cflags -fno-strict-aliasing
-
-	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
diff --git a/x11-wm/xpra/xpra-4.1.3.ebuild b/x11-wm/xpra/xpra-4.1.3.ebuild
deleted file mode 100644
index db407cd0db72..000000000000
--- a/x11-wm/xpra/xpra-4.1.3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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 distutils-r1 tmpfiles prefix 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 +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( client server )
-	cups? ( dbus )
-	opengl? ( client )
-"
-
-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}
-	$(python_gen_cond_dep '
-		dev-python/netifaces[${PYTHON_USEDEP}]
-		dev-python/rencode[${PYTHON_USEDEP}]
-		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-		cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-		dbus? ( dev-python/dbus-python[${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/xmodmap
-	server? (
-		x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	$(python_gen_cond_dep '
-		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
-	')
-	doc? ( app-text/pandoc )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
-	"${FILESDIR}"/${PN}-4.0.3-suid-warning.patch
-)
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
-	xdg_pkg_postinst
-}
-
-python_prepare_all() {
-	hprefixify -w '/os.path/' setup.py
-	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
-		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
-
-	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
-
-	distutils-r1_python_prepare_all
-}
-
-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_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
-}
diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
index 1f8dc0a75fa6..f79d0e144a07 100644
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ b/x11-wm/xpra/xpra-4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://xpra.org/src/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}