Merge updates from master

96 files changed, 130 insertions, 130 deletions

diff --git a/app-accessibility/accerciser/accerciser-3.38.0.ebuild b/app-accessibility/accerciser/accerciser-3.38.0.ebuild
index d3daff14e3e0..cda40b42789e 100644
--- a/app-accessibility/accerciser/accerciser-3.38.0.ebuild
+++ b/app-accessibility/accerciser/accerciser-3.38.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit gnome2 python-single-r1
 
diff --git a/app-accessibility/caribou/caribou-0.4.21-r4.ebuild b/app-accessibility/caribou/caribou-0.4.21-r4.ebuild
index 745819795ea7..24394a7692dd 100644
--- a/app-accessibility/caribou/caribou-0.4.21-r4.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit autotools gnome.org gnome2-utils python-single-r1 vala
 
diff --git a/app-accessibility/caribou/caribou-0.4.21-r5.ebuild b/app-accessibility/caribou/caribou-0.4.21-r5.ebuild
index 030435bd3c6b..36e2ad773a6f 100644
--- a/app-accessibility/caribou/caribou-0.4.21-r5.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit autotools gnome.org gnome2-utils python-single-r1 vala
 
diff --git a/app-admin/clustershell/clustershell-1.8.3-r1.ebuild b/app-admin/clustershell/clustershell-1.8.3-r1.ebuild
index 53371ad3d6a7..1bd9e3fc1a8d 100644
--- a/app-admin/clustershell/clustershell-1.8.3-r1.ebuild
+++ b/app-admin/clustershell/clustershell-1.8.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
 
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.16-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.16-r1.ebuild
index 6eccbf19762f..4636baffbb83 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.16-r1.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.16-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-single-r1 systemd udev xdg
 
 DESCRIPTION="Graphical user interface for CUPS administration"
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.17.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.17.ebuild
index b3d54f6d76b2..da888acedc10 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.17.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.17.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-single-r1 systemd udev xdg
 
 DESCRIPTION="Graphical user interface for CUPS administration"
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
index b3d54f6d76b2..da888acedc10 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-single-r1 systemd udev xdg
 
 DESCRIPTION="Graphical user interface for CUPS administration"
diff --git a/app-doc/devmanual/devmanual-0_pre20220326.ebuild b/app-doc/devmanual/devmanual-0_pre20220326.ebuild
index e79bb12d99c5..28d7e7f900db 100644
--- a/app-doc/devmanual/devmanual-0_pre20220326.ebuild
+++ b/app-doc/devmanual/devmanual-0_pre20220326.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="The Gentoo Development Guide"
diff --git a/app-doc/devmanual/devmanual-0_pre20220625.ebuild b/app-doc/devmanual/devmanual-0_pre20220625.ebuild
index f4df71ec1d10..a1decf4426b2 100644
--- a/app-doc/devmanual/devmanual-0_pre20220625.ebuild
+++ b/app-doc/devmanual/devmanual-0_pre20220625.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="The Gentoo Development Guide"
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index f4df71ec1d10..a1decf4426b2 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="The Gentoo Development Guide"
diff --git a/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
index e908fd082b71..2c43fcc16023 100644
--- a/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 VALA_MIN_API_VERSION="0.28"
 
 inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
index 7d28ebbe54c9..178d0c9af101 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
index 063dbe74d8c3..9811c4382c98 100644
--- a/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 prefix
 
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index b84d0b9c191a..16a255b5950c 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 git-r3 prefix
 
diff --git a/app-portage/pfl/pfl-3.1-r1.ebuild b/app-portage/pfl/pfl-3.1-r1.ebuild
index 3f28082c92e7..215899e860a3 100644
--- a/app-portage/pfl/pfl-3.1-r1.ebuild
+++ b/app-portage/pfl/pfl-3.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 systemd
 
diff --git a/app-portage/pfl/pfl-3.2-r2.ebuild b/app-portage/pfl/pfl-3.2-r2.ebuild
index b50b1ccd7565..c8d37953dd7d 100644
--- a/app-portage/pfl/pfl-3.2-r2.ebuild
+++ b/app-portage/pfl/pfl-3.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 systemd
 
diff --git a/app-text/pastebinit/pastebinit-1.5.1.ebuild b/app-text/pastebinit/pastebinit-1.5.1.ebuild
index 2813fc45c493..1f6b2139f192 100644
--- a/app-text/pastebinit/pastebinit-1.5.1.ebuild
+++ b/app-text/pastebinit/pastebinit-1.5.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-single-r1
 
 MY_P="${PN}_${PV}"
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
index 73061b4a3f00..1561e35e91bf 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/dev-ada/e3-core/e3-core-22.1.0.ebuild b/dev-ada/e3-core/e3-core-22.1.0.ebuild
index 98ae628c722e..b2affb6abb5e 100644
--- a/dev-ada/e3-core/e3-core-22.1.0.ebuild
+++ b/dev-ada/e3-core/e3-core-22.1.0.ebuild
@@ -48,7 +48,3 @@ src_compile() {
 	$(tc-getCC) ${CFLAGS} -o src/e3/os/data/rlimit-${PLATFORM} tools/rlimit/rlimit.c ${LDFLAGS}
 	distutils-r1_src_compile
 }
-
-python_test() {
-	epytest -p no:markdown
-}
diff --git a/dev-python/fs/fs-2.4.16.ebuild b/dev-python/fs/fs-2.4.16.ebuild
index 780dc3deb94f..e086bb3bb361 100644
--- a/dev-python/fs/fs-2.4.16.ebuild
+++ b/dev-python/fs/fs-2.4.16.ebuild
@@ -36,15 +36,10 @@ BDEPEND="
 distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/recommonmark
 distutils_enable_tests pytest
 
-python_test() {
-	local EPYTEST_IGNORE=(
-		# TODO: fails at teardown due to unfreed resources
-		tests/test_ftpfs.py
-	)
-
-	# pytest-xvfb causes test failures due to a zombie Xvfb process
-	epytest -p no:xvfb
-}
+EPYTEST_IGNORE=(
+	# TODO: fails at teardown due to unfreed resources
+	tests/test_ftpfs.py
+)
 
 pkg_postinst() {
 	optfeature "S3 support" dev-python/boto
diff --git a/dev-python/loky/loky-3.1.0.ebuild b/dev-python/loky/loky-3.1.0.ebuild
index 7d1bdf178dce..4a8d620ec72c 100644
--- a/dev-python/loky/loky-3.1.0.ebuild
+++ b/dev-python/loky/loky-3.1.0.ebuild
@@ -37,5 +37,5 @@ python_test() {
 	)
 
 	# high memory test needs a lot of memory + is broken on 32-bit platforms
-	epytest --skip-high-memory -p no:xvfb
+	epytest --skip-high-memory
 }
diff --git a/dev-python/nbconvert/nbconvert-7.0.0.ebuild b/dev-python/nbconvert/nbconvert-7.0.0.ebuild
index 4328f080d184..525a585dcb7b 100644
--- a/dev-python/nbconvert/nbconvert-7.0.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.0.0.ebuild
@@ -83,7 +83,7 @@ python_test() {
 		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
 	)
 
-	nonfatal epytest -p no:xvfb --pyargs nbconvert || die
+	nonfatal epytest --pyargs nbconvert || die
 }
 
 pkg_postinst() {
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
index a3f60ad551f6..15015919c5d6 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
@@ -37,7 +37,7 @@ python_test() {
 	# so we need to run them separately and not pass any args to pytest
 	pytest ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}"
 	# Some of these tests tend to fail
-	local skipped_tests=(
+	local EPYTEST_DESELECT=(
 		# Those tests are run separately
 		pyftpdlib/test/test_misc.py
 		# https://github.com/giampaolo/pyftpdlib/issues/471
@@ -70,7 +70,7 @@ python_test() {
 	local -x TZ=UTC+1
 	# Skips some shoddy tests plus increases timeouts
 	local -x TRAVIS=1
-	epytest -p no:xvfb ${skipped_tests[@]/#/--deselect }
+	epytest
 }
 
 python_install_all() {
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.12.4.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.12.4.ebuild
index c7a36040467f..5d15ae1e159f 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.12.4.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.12.4.ebuild
@@ -10,13 +10,18 @@ inherit distutils-r1 multiprocessing
 
 TEST_DATA_TAG=test-data-8
 DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
-HOMEPAGE="https://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/"
+HOMEPAGE="
+	https://www.pyqtgraph.org/
+	https://github.com/pyqtgraph/pyqtgraph/
+	https://pypi.org/project/pyqtgraph/
+"
 SRC_URI="
 	https://github.com/pyqtgraph/pyqtgraph/archive/${P}.tar.gz
 	test? (
 		https://github.com/pyqtgraph/test-data/archive/${TEST_DATA_TAG}.tar.gz
 			-> ${PN}-${TEST_DATA_TAG}.tar.gz
-	)"
+	)
+"
 S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
@@ -68,7 +73,7 @@ python_test() {
 		'pyqtgraph/examples/test_examples.py::testExamples[ designerExample.py - PySide2 ]'
 	)
 
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	epytest -p xvfb -n "$(makeopts_jobs)"
 }
 
 src_test() {
diff --git a/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild b/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
index f44d7562aadf..2736b77249da 100644
--- a/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
@@ -44,7 +44,3 @@ PATCHES=(
 	"${FILESDIR}/pytest-services-2.0.1-no-mysql.patch"
 	"${FILESDIR}/pytest-services-2.0.1-lockdir.patch"
 )
-
-python_test() {
-	epytest -p no:xvfb
-}
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
index c6df7830347a..b355f4bb403a 100644
--- a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
+++ b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
@@ -23,3 +23,7 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
+
+python_test() {
+	epytest -p xvfb
+}
diff --git a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
index b4335d933bdb..c06fb1a428eb 100644
--- a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='xml'
+PYTHON_REQ_USE='xml(+)'
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-util/gprof2dot/gprof2dot-2021.02.21-r1.ebuild b/dev-util/gprof2dot/gprof2dot-2021.02.21-r1.ebuild
index 877e56b88b78..4be4d1a4eb84 100644
--- a/dev-util/gprof2dot/gprof2dot-2021.02.21-r1.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2021.02.21-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE='xml'
+PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
 
diff --git a/dev-util/gprof2dot/gprof2dot-2021.02.21.ebuild b/dev-util/gprof2dot/gprof2dot-2021.02.21.ebuild
index acd56059218a..c06fb1a428eb 100644
--- a/dev-util/gprof2dot/gprof2dot-2021.02.21.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2021.02.21.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='xml'
+PYTHON_REQ_USE='xml(+)'
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-util/gprof2dot/gprof2dot-2022.07.29.ebuild b/dev-util/gprof2dot/gprof2dot-2022.07.29.ebuild
index f488c858ed67..5c3acb5f936a 100644
--- a/dev-util/gprof2dot/gprof2dot-2022.07.29.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2022.07.29.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='xml'
+PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
 
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
index 3b9e91c04696..294e4a580033 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 GNOME_ORG_MODULE="gtk+"
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit gnome.org python-single-r1
 
diff --git a/dev-util/itstool/itstool-2.0.7.ebuild b/dev-util/itstool/itstool-2.0.7.ebuild
index 1671401847eb..246c57c2cdde 100644
--- a/dev-util/itstool/itstool-2.0.7.ebuild
+++ b/dev-util/itstool/itstool-2.0.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit python-single-r1
 
diff --git a/dev-util/meld/meld-3.20.4.ebuild b/dev-util/meld/meld-3.20.4.ebuild
index a747164ecbc2..1a416d7610fc 100644
--- a/dev-util/meld/meld-3.20.4.ebuild
+++ b/dev-util/meld/meld-3.20.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 89013591c31b..7a5f84bd561e 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1334,6 +1334,11 @@ epytest() {
 		# pytest-sugar undoes everything that's good about pytest output
 		# and makes it hard to read logs
 		-p no:sugar
+		# pytest-xvfb automatically spawns Xvfb for every test suite,
+		# effectively forcing it even when we'd prefer the tests
+		# not to have DISPLAY at all, causing crashes sometimes
+		# and causing us to miss missing virtualx usage
+		-p no:xvfb
 	)
 	local x
 	for x in "${EPYTEST_DESELECT[@]}"; do
diff --git a/gnome-base/gconf/gconf-3.2.6-r5.ebuild b/gnome-base/gconf/gconf-3.2.6-r5.ebuild
index 2102f9517875..92ebc45a813e 100644
--- a/gnome-base/gconf/gconf-3.2.6-r5.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r5.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=6
@@ -6,7 +6,7 @@ EAPI=6
 GNOME_ORG_MODULE="GConf"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit gnome2 multilib-minimal python-single-r1
 
diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
index f3850a65ba15..1e5fd0b76c77 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit meson gnome2-utils pax-utils python-single-r1 xdg
 
diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index 714016bcc03f..052661b4241c 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
index ee780ca4c180..e888907c7a7f 100644
--- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
index 9abebe68bbcb..502e42c4c678 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
diff --git a/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
index 92e3b044afaf..07c6545b959f 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild
index 5f60b384ddc5..8a3676d83cfa 100644
--- a/media-gfx/inkscape/inkscape-1.1.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
diff --git a/media-gfx/inkscape/inkscape-1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.2-r1.ebuild
index 8b952b447c1e..3362bab86f5d 100644
--- a/media-gfx/inkscape/inkscape-1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 MY_P="${P/_/}"
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
diff --git a/media-libs/libplacebo/libplacebo-2.72.2.ebuild b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
index 12deb1498de2..92ded149cb27 100644
--- a/media-libs/libplacebo/libplacebo-2.72.2.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 if [[ "${PV}" == "9999" ]]; then
diff --git a/media-libs/libplacebo/libplacebo-3.120.3.ebuild b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
index 2480715bf384..63b43f4e9800 100644
--- a/media-libs/libplacebo/libplacebo-3.120.3.ebuild
+++ b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ "${PV}" == "9999" ]]; then
diff --git a/media-libs/libplacebo/libplacebo-4.192.1.ebuild b/media-libs/libplacebo/libplacebo-4.192.1.ebuild
index 1f996e6c78c2..4335fb6d6a04 100644
--- a/media-libs/libplacebo/libplacebo-4.192.1.ebuild
+++ b/media-libs/libplacebo/libplacebo-4.192.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ "${PV}" == "9999" ]]; then
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 59e93dcd9835..5037bfc4033d 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ "${PV}" == "9999" ]]; then
diff --git a/media-libs/vigra/vigra-1.11.1-r6.ebuild b/media-libs/vigra/vigra-1.11.1-r6.ebuild
index 6724c62fa033..d8a4ffb3a5e0 100644
--- a/media-libs/vigra/vigra-1.11.1-r6.ebuild
+++ b/media-libs/vigra/vigra-1.11.1-r6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
+PYTHON_REQ_USE="threads(+),xml(+)"
 inherit cmake flag-o-matic python-r1
 
 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild
index f10aa9a71fbf..a7f34a358cb8 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
+PYTHON_REQ_USE="threads(+),xml(+)"
 inherit cmake flag-o-matic python-r1
 
 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
diff --git a/net-analyzer/wapiti/wapiti-3.0.5.ebuild b/net-analyzer/wapiti/wapiti-3.0.5.ebuild
index d4ca3fb0a6d2..0095d0831bcd 100644
--- a/net-analyzer/wapiti/wapiti-3.0.5.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='xml'
+PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
 
diff --git a/net-analyzer/wapiti/wapiti-3.1.2.ebuild b/net-analyzer/wapiti/wapiti-3.1.2.ebuild
index 8d4a9ed067d8..d70075f9b901 100644
--- a/net-analyzer/wapiti/wapiti-3.1.2.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='xml'
+PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
 
diff --git a/net-analyzer/wapiti/wapiti-3.1.3.ebuild b/net-analyzer/wapiti/wapiti-3.1.3.ebuild
index 8d4a9ed067d8..d70075f9b901 100644
--- a/net-analyzer/wapiti/wapiti-3.1.3.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.1.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='xml'
+PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
 
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index e9d25d0eedfd..a2339af0b033 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='xml'
+PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1 git-r3
 
diff --git a/net-im/gajim/gajim-1.3.3-r2.ebuild b/net-im/gajim/gajim-1.3.3-r2.ebuild
index 726c404f14f1..6e5f155ed93d 100644
--- a/net-im/gajim/gajim-1.3.3-r2.ebuild
+++ b/net-im/gajim/gajim-1.3.3-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.3.3_p2-r1.ebuild b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
index 9228c4d00e2f..0edac94fa59b 100644
--- a/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
+++ b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.4.0-r1.ebuild b/net-im/gajim/gajim-1.4.0-r1.ebuild
index 60900668dd5d..fb118fea5c42 100644
--- a/net-im/gajim/gajim-1.4.0-r1.ebuild
+++ b/net-im/gajim/gajim-1.4.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.4.0.ebuild b/net-im/gajim/gajim-1.4.0.ebuild
index dbb2ac846a85..48b15ddd3f96 100644
--- a/net-im/gajim/gajim-1.4.0.ebuild
+++ b/net-im/gajim/gajim-1.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.4.1.ebuild b/net-im/gajim/gajim-1.4.1.ebuild
index 60900668dd5d..fb118fea5c42 100644
--- a/net-im/gajim/gajim-1.4.1.ebuild
+++ b/net-im/gajim/gajim-1.4.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.4.2.ebuild b/net-im/gajim/gajim-1.4.2.ebuild
index 60900668dd5d..fb118fea5c42 100644
--- a/net-im/gajim/gajim-1.4.2.ebuild
+++ b/net-im/gajim/gajim-1.4.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.4.6.ebuild b/net-im/gajim/gajim-1.4.6.ebuild
index 88ea72121bd8..b9ec7f21e3dc 100644
--- a/net-im/gajim/gajim-1.4.6.ebuild
+++ b/net-im/gajim/gajim-1.4.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.4.7.ebuild b/net-im/gajim/gajim-1.4.7.ebuild
index 88ea72121bd8..b9ec7f21e3dc 100644
--- a/net-im/gajim/gajim-1.4.7.ebuild
+++ b/net-im/gajim/gajim-1.4.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 xdg-utils
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
index 9e53f3cc8b69..a98e75125f0a 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit gnome2 python-any-r1 virtualx
 
 DESCRIPTION="Daemon that centralizes the communication logging within the Telepathy framework"
diff --git a/net-libs/gupnp/gupnp-1.4.3.ebuild b/net-libs/gupnp/gupnp-1.4.3.ebuild
index 3eedfc589df6..fd0322db488d 100644
--- a/net-libs/gupnp/gupnp-1.4.3.ebuild
+++ b/net-libs/gupnp/gupnp-1.4.3.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 VALA_USE_DEPEND="vapigen"
 PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit gnome.org meson-multilib python-single-r1 vala xdg
 
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
index b640178ba851..1d2660d924e3 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{8..10} )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
diff --git a/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
index 2290b4caea08..7a237fe563cb 100644
--- a/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite,ssl,xml"
+PYTHON_REQ_USE="sqlite,ssl,xml(+)"
 
 inherit distutils-r1 optfeature
 
diff --git a/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
index 0e2805dbf2af..8929eb231f1e 100644
--- a/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite,ssl,xml"
+PYTHON_REQ_USE="sqlite,ssl,xml(+)"
 
 inherit distutils-r1 optfeature
 
diff --git a/net-misc/gallery-dl/gallery-dl-1.22.4.ebuild b/net-misc/gallery-dl/gallery-dl-1.22.4.ebuild
index 2290b4caea08..7a237fe563cb 100644
--- a/net-misc/gallery-dl/gallery-dl-1.22.4.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.22.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite,ssl,xml"
+PYTHON_REQ_USE="sqlite,ssl,xml(+)"
 
 inherit distutils-r1 optfeature
 
diff --git a/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild
index 60c3846252ce..adeefda919ee 100644
--- a/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.23.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite,ssl,xml"
+PYTHON_REQ_USE="sqlite,ssl,xml(+)"
 
 inherit distutils-r1 optfeature
 
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index 60c3846252ce..adeefda919ee 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite,ssl,xml"
+PYTHON_REQ_USE="sqlite,ssl,xml(+)"
 
 inherit distutils-r1 optfeature
 
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild
index 85dfa8ae0db8..1b7130aa70c2 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit python-any-r1 systemd
 
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.34.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.34.ebuild
index afe6892d7d5f..c2a5e18a7c75 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.34.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.34.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit python-any-r1 systemd
 
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.9.20.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.9.20.ebuild
index afe6892d7d5f..c2a5e18a7c75 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.9.20.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.9.20.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit python-any-r1 systemd
 
diff --git a/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild b/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
index 0206e5fe4679..956b31286cec 100644
--- a/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
 
diff --git a/net-misc/s3cmd/s3cmd-2.1.0.ebuild b/net-misc/s3cmd/s3cmd-2.1.0.ebuild
index cafc9522fdfd..e20c06c77889 100644
--- a/net-misc/s3cmd/s3cmd-2.1.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
 
diff --git a/net-misc/s3cmd/s3cmd-2.2.0.ebuild b/net-misc/s3cmd/s3cmd-2.2.0.ebuild
index 7904b28a3b7c..6071aa7c9675 100644
--- a/net-misc/s3cmd/s3cmd-2.2.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
 
diff --git a/net-misc/s4cmd/s4cmd-2.1.0.ebuild b/net-misc/s4cmd/s4cmd-2.1.0.ebuild
index c15fbeeee59f..27794ebca164 100644
--- a/net-misc/s4cmd/s4cmd-2.1.0.ebuild
+++ b/net-misc/s4cmd/s4cmd-2.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_7 python3_8 python3_9 python3_10 )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 bash-completion-r1
 
diff --git a/net-print/hplip/hplip-3.22.4.ebuild b/net-print/hplip/hplip-3.22.4.ebuild
index bced46b2f6eb..21eee2462754 100644
--- a/net-print/hplip/hplip-3.22.4.ebuild
+++ b/net-print/hplip/hplip-3.22.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="threads(+),xml"
+PYTHON_REQ_USE="threads(+),xml(+)"
 
 inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
 
diff --git a/net-print/hplip/hplip-3.22.6.ebuild b/net-print/hplip/hplip-3.22.6.ebuild
index adf5ee96e5af..913ac328e5e2 100644
--- a/net-print/hplip/hplip-3.22.6.ebuild
+++ b/net-print/hplip/hplip-3.22.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="threads(+),xml"
+PYTHON_REQ_USE="threads(+),xml(+)"
 
 inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
 
diff --git a/net-vpn/openconnect/openconnect-9.01-r1.ebuild b/net-vpn/openconnect/openconnect-9.01-r1.ebuild
index b316f68adb45..b94349f0b451 100644
--- a/net-vpn/openconnect/openconnect-9.01-r1.ebuild
+++ b/net-vpn/openconnect/openconnect-9.01-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit linux-info python-any-r1
 
diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild
index 17a4eb7c23bf..8386defade57 100644
--- a/net-vpn/openconnect/openconnect-9.01.ebuild
+++ b/net-vpn/openconnect/openconnect-9.01.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit linux-info python-any-r1
 
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index d39bf7565861..a051d4ea91a0 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit linux-info python-any-r1
 
diff --git a/sec-policy/selinux-base/selinux-base-2.20220106-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20220106-r1.ebuild
index 16ffa2766f65..794e2cddbca9 100644
--- a/sec-policy/selinux-base/selinux-base-2.20220106-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20220106-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base/selinux-base-2.20220106-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20220106-r2.ebuild
index 16ffa2766f65..794e2cddbca9 100644
--- a/sec-policy/selinux-base/selinux-base-2.20220106-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20220106-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base/selinux-base-2.20220106-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20220106-r3.ebuild
index 16ffa2766f65..794e2cddbca9 100644
--- a/sec-policy/selinux-base/selinux-base-2.20220106-r3.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20220106-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base/selinux-base-2.20220520-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20220520-r1.ebuild
index 659fad659691..6926182d8e27 100644
--- a/sec-policy/selinux-base/selinux-base-2.20220520-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20220520-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index f9dcacae70f1..6926182d8e27 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 inherit python-any-r1
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild
index 456189b1aac5..fb97df7db201 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
diff --git a/sys-apps/selinux-python/selinux-python-3.3.ebuild b/sys-apps/selinux-python/selinux-python-3.3.ebuild
index 3d954e03c653..cae5d3896456 100644
--- a/sys-apps/selinux-python/selinux-python-3.3.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit python-r1 toolchain-funcs
 
diff --git a/www-client/chromium/chromium-104.0.5112.101.ebuild b/www-client/chromium/chromium-104.0.5112.101.ebuild
index d378bd3735e8..4cf73b592641 100644
--- a/www-client/chromium/chromium-104.0.5112.101.ebuild
+++ b/www-client/chromium/chromium-104.0.5112.101.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 LLVM_MAX_SLOT=14
 
 CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
diff --git a/www-client/chromium/chromium-105.0.5195.102.ebuild b/www-client/chromium/chromium-105.0.5195.102.ebuild
index 4fc9ee8c8d10..84d2c34b29cf 100644
--- a/www-client/chromium/chromium-105.0.5195.102.ebuild
+++ b/www-client/chromium/chromium-105.0.5195.102.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 LLVM_MAX_SLOT=14
 
 CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
diff --git a/www-client/chromium/chromium-105.0.5195.52.ebuild b/www-client/chromium/chromium-105.0.5195.52.ebuild
index 3efd6dfdec9e..224b9703357a 100644
--- a/www-client/chromium/chromium-105.0.5195.52.ebuild
+++ b/www-client/chromium/chromium-105.0.5195.52.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 LLVM_MAX_SLOT=14
 
 CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
index a803b50c57ca..b531a2983052 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
@@ -100,7 +100,7 @@ python_test() {
 	use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
 
 	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
-	epytest -k 'not _bench and not _matches_tree and not _warning'
+	epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning'
 }
 
 python_install_all() {
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
index a08871af437f..28af4e718008 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
@@ -124,7 +124,7 @@ python_test() {
 	local jobs=$(($(makeopts_jobs) / 2 + 1))
 
 	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
-	epytest -n ${jobs} -k 'not _bench and not _matches_tree and not _warning'
+	epytest -p xvfb -n ${jobs} -k 'not _bench and not _matches_tree and not _warning'
 }
 
 python_install_all() {
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index db080c13371e..9721e0227ee9 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -100,7 +100,7 @@ python_test() {
 	use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
 
 	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
-	epytest -k 'not _bench and not _matches_tree and not _warning'
+	epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning'
 }
 
 python_install_all() {
diff --git a/x11-misc/mozo/mozo-1.24.0-r1.ebuild b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
index 35f56168a3af..53a32a721767 100644
--- a/x11-misc/mozo/mozo-1.24.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit mate python-r1
 
diff --git a/x11-misc/mozo/mozo-1.24.1.ebuild b/x11-misc/mozo/mozo-1.24.1.ebuild
index eb4001283a50..0019c072618a 100644
--- a/x11-misc/mozo/mozo-1.24.1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9,3_10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
 
 inherit mate python-r1
 
diff --git a/x11-terms/guake/guake-3.8.5-r1.ebuild b/x11-terms/guake/guake-3.8.5-r1.ebuild
index 3c4daa62d6d1..a7bc22cc3377 100644
--- a/x11-terms/guake/guake-3.8.5-r1.ebuild
+++ b/x11-terms/guake/guake-3.8.5-r1.ebuild
@@ -56,8 +56,7 @@ src_prepare() {
 
 python_test() {
 	# - uses /usr/bin/bash if SHELL is not exported
-	# - pytest-xvfb fails with Terminated, virtx alone works
-	SHELL=${SHELL} virtx epytest -p no:xvfb
+	SHELL=${SHELL} virtx epytest
 }
 
 python_install() {