gentoo resync : 20.03.2021

41 files changed, 179 insertions, 219 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 329e63f5c0d1..fe08dae50f36 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/metadata.xml b/x11-drivers/metadata.xml
index 2357fd16f5cb..f025f7ccbf60 100644
--- a/x11-drivers/metadata.xml
+++ b/x11-drivers/metadata.xml
@@ -22,4 +22,3 @@
 		principal X11.
 	</longdescription>
 </catmetadata>
-
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index d6ab763690f5..eba38fb78453 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-evdev-2.10.6.tar.bz2 408138 BLAKE2B 2b5815e6ee71971e5023392e893d0b8bdba315ff73b34926b9facd95141ff541de052b84a569fe7bbd4b98810afb4d643a3bcaa97fe5a4e23c37e1ce410a9e12 SHA512 560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1
-EBUILD xf86-input-evdev-2.10.6.ebuild 533 BLAKE2B 85f3853d45721cbf7f2a0a95dcb01cf7e76097a078c0947d25bab982b8ab05eceb09efde990b70c4ff096a841e226f7e3cfdfbc9e62c5acb4ed55851e57d5ee5 SHA512 90a450718a369965fbe0427cb524f70cf68d6c43befa2031aeb33ba316cb87d5771b805e57941152ca0787580043205242f169c64362c6426d2a65bff8702567
+EBUILD xf86-input-evdev-2.10.6.ebuild 530 BLAKE2B fead986a959a3b953841cce792c7de5852afbeac09fae4a250aa0d271020e4b21470b9d1ea0067eae50b5f9780992037f20b3872cd9bbbab9bc0edb2115d69f8 SHA512 334f11940fe299fa92c4d2eebeef9b31698d4ac599efac799673083bdda8326400fcac50475c3e1d64ce10866f820c98609c256e940616a00f9780bbae78e3c7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
index c3d28955e86c..2bdf150ddc17 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit linux-info xorg-2
+EAPI=7
+
+inherit linux-info xorg-3
 
 DESCRIPTION="Generic Linux input driver"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.18[udev]
+RDEPEND="
+	>=x11-base/xorg-server-1.18[udev]
 	dev-libs/libevdev
 	sys-libs/mtdev
 	virtual/libudev:="
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	>=sys-kernel/linux-headers-2.6
 	x11-base/xorg-proto"
 
diff --git a/x11-drivers/xf86-input-joystick/Manifest b/x11-drivers/xf86-input-joystick/Manifest
index 1424c5cfb178..e2ff7d282dfa 100644
--- a/x11-drivers/xf86-input-joystick/Manifest
+++ b/x11-drivers/xf86-input-joystick/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-joystick-1.6.3.tar.bz2 351846 BLAKE2B 3cbba17066cce241d6ed1a04ae26d4a875b994b47eb2d1078704d9dd109c9477ca367aebfec15b3358a7c857b91a8e751a83c2c4bab28f26b7aa6c02119463d8 SHA512 541c993bd37dd74d96d90060407d9fb9ebd3fbca352189a08c6b0c899c84609a1b5a3c1ea3febb4ceb5e2b881b54e45c75b8f9b2e475e16d7cffbbe42a3221e5
-EBUILD xf86-input-joystick-1.6.3.ebuild 448 BLAKE2B 81bdba0b3f39d058716640d46ae9e90010dfb33832de937d847a4cae924e73096c88fb1733c3eb07a1d11987673d07ccb65116edeaa41c7a8edc6bfc4a462c86 SHA512 e04e10f8d636a948f4d11c909988d7b82007203875a683916fd39a54c6b231a6dbfb140507ad3dae39c1b2812d16185f3a5d36d36984446bbe37837191507b78
+EBUILD xf86-input-joystick-1.6.3.ebuild 435 BLAKE2B 7a2b84da0d3556bb05319113a6fe5200b3ecccb34b160cfd1a659be865420baa874f2fea68aca7ae0ef65364a16ab0e03ca0583865d3b72cf0b3b2dd7e8d778f SHA512 b621e198991611ad8a70592a72af1d6e34f0b6961a0a8241b3650c94394a2f79fe1255f85d1da0b393399437c5da853f762a758617a670cdb81ac1f01b06f9e4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
index 34cdc10a84f3..ebf5a3965895 100644
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="X.Org driver for joystick input devices"
 
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.10"
+RDEPEND="x11-base/xorg-server"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 src_install() {
-	xorg-2_src_install
+	xorg-3_src_install
+
 	insinto /usr/share/X11/xorg.conf.d
 	doins config/50-joystick-all.conf
 }
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 0e099df81315..95a9cdec5677 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-synaptics-1.9.0.tar.bz2 501814 BLAKE2B 7720136dba4e3cb76d21a9624e7e684bc09e22ebd0bc3b53fb170bbfebc29133dcfb471df326ac7b2eec1e4d3e2a3eeef56e57f649ddcc8f4d5e66eba9bd28e8 SHA512 71171ce59136b1c85764d412f9039d6252c94bb2ba44c8c6348aef6509d12219ea17a026440b0e18d26f4d7853d4ca5713eb2404d39deebb8be82886ad57bad4
 DIST xf86-input-synaptics-1.9.1.tar.bz2 503722 BLAKE2B 5ff2f792d187ff0f3fabb1ee194f4eae1397d993627ef3a74b1c838cd611fc2834c6453b57d0dc27d7a6e0bc69b717eb1cb76c87833dd1c66b1af5ac824e1d55 SHA512 978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f
-EBUILD xf86-input-synaptics-1.9.0.ebuild 818 BLAKE2B ddc270a8d1c4a813705dfefeaa5dfa65c1948667e780eef6589cd91b41334da39e360fae375610c6f0618b3c64e4c96b6b747b20098745518d62b6c215062622 SHA512 0f9da16f9ec81fe0902250884ebba5653054bc60c7f41d867d71797adc0af1fccecc02afa87e58d8761e56e271ff81df402f5d618d79cd3a551be3a47d8c4be5
-EBUILD xf86-input-synaptics-1.9.1.ebuild 824 BLAKE2B cf50f1f60d2db6f39583cb0d51ecde307b06257d4e44440a9d5bd8562a68005996ae3e0be7b67b0b6e110b114f553e746fabc4f27f8551f0de7c943d3ecf494b SHA512 47a51917484e430d7d78b97b1285db5aa9fe46ce0c8ac136b738fd4db764ed007445a0f4ee8f4dd8de2fdd922684e42b7d8d5eb5104c594ad6faab302841cf43
+EBUILD xf86-input-synaptics-1.9.1.ebuild 871 BLAKE2B c68816fdef5ae2a7bc096cc4a50baf058dd25e118ad276b81849600b7c8abbd2bf6fed518afb802d2e39c78f9974b904cb3cb8710e74dad16cc6a2cba39b80f4 SHA512 04b9a321ae06e1b20b1c907230db441a0eca5921bbafe9ed787b8ede1c9c5fbe224044e2de5b0bb192f930b40c087288b001f3cc5b73471ef53e0793dcccdf7e
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild
deleted file mode 100644
index dd5bfaf3697d..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info xorg-2
-
-DESCRIPTION="Driver for Synaptics touchpads"
-
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-IUSE="kernel_linux"
-
-RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 )
-	>=x11-base/xorg-server-1.14
-	>=x11-libs/libXi-1.2
-	>=x11-libs/libXtst-1.1.0"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.37
-	x11-base/xorg-proto"
-
-DOCS=( "README" )
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	# Just a friendly warning
-	if ! linux_config_exists \
-			|| ! linux_chkconfig_present INPUT_EVDEV; then
-		echo
-		ewarn "This driver requires event interface support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Input device support --->"
-		ewarn "      <*>     Event interface"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
index e226bf3a1265..520fd89d20bd 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
@@ -1,35 +1,44 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit linux-info xorg-2
+inherit linux-info xorg-3
 
 DESCRIPTION="Driver for Synaptics touchpads"
 
 KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="kernel_linux"
 
-RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 )
+RDEPEND="
 	>=x11-base/xorg-server-1.14
 	>=x11-libs/libXi-1.2
-	>=x11-libs/libXtst-1.1.0"
-DEPEND="${RDEPEND}
+	>=x11-libs/libXtst-1.1.0
+	kernel_linux? ( >=dev-libs/libevdev-0.4 )"
+DEPEND="
+	${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.37
 	x11-base/xorg-proto"
 
-DOCS=( "README" )
-
-pkg_pretend() {
+check_reqs() {
 	linux-info_pkg_setup
+
 	# Just a friendly warning
 	if ! linux_config_exists \
 			|| ! linux_chkconfig_present INPUT_EVDEV; then
-		echo
+		ewarn
 		ewarn "This driver requires event interface support in your kernel"
 		ewarn "  Device Drivers --->"
 		ewarn "    Input device support --->"
 		ewarn "      <*>     Event interface"
-		echo
+		ewarn
 	fi
 }
+
+pkg_pretend() {
+	check_reqs
+}
+
+pkg_setup() {
+	check_reqs
+}
diff --git a/x11-drivers/xf86-input-vmmouse/Manifest b/x11-drivers/xf86-input-vmmouse/Manifest
index 2df87de96d6d..672666f63ba2 100644
--- a/x11-drivers/xf86-input-vmmouse/Manifest
+++ b/x11-drivers/xf86-input-vmmouse/Manifest
@@ -1,4 +1,4 @@
 DIST xf86-input-vmmouse-13.1.0.tar.bz2 319188 BLAKE2B dddcee47a0d667555ba8a85a4a86c9f922a68ff716f836ac38bb0dbc643011debfbbd2d2054bb8df2f04cc94f2da95cfff7b0ccfb30879e07ca571a9b3aa840a SHA512 38e09c5d7da971eb25ed79fc2daac3b8e1f5e6ec1096424696652c975ea653ed4a49d7779e7735d81a512c12c0a30829d5443ca78a275f3181ebd1740dd2dfd4
-EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 517 BLAKE2B d96def911d53d97abc9a80eef56837e6100e870fa4b1503925af23ae1da1ac00e64f001ee8f504933bd2795bec4bbb295f7a147c946662ff47dcd573935437d3 SHA512 e178ae8060b25a4ce5593777bd360094d0850ff658bcfca464e71e2559e9ed24d831bed57e81fb39f052d32f31b3161b246982a6fcee29a78806f6333d9b437f
-EBUILD xf86-input-vmmouse-9999.ebuild 508 BLAKE2B 9c9cea76552985d31d1467e3e38b2341b18829d34c9103800ba7653bab53de176fe1fc16535a282c7546507c01496cfb66ffd7cedd1079a4a1039b5d293075d8 SHA512 4f89a2e60ec6c0862caaa0912889d07103cc45e8a291650722d87df256b014818ead6e1954292cc96974425362fc3c755fd711e44b785c42cbf3324df73cb0f4
+EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 526 BLAKE2B adb028b183206ec35c2c7a331992a5cf5de01d77db53afa71286935ae53940ba390e51da858934bf33221ac66ce49fcc339795d0ea2b1e49597543a2aed33df6 SHA512 fcb2c44bea9b51fccc7b2a8cd7376a686ccf0b7fe227200ef35eaf43ce61944d70f440fc3cac7b26b7baadc317234f23bb35dfc722f82f8fcfd0ce30d3d3da8c
+EBUILD xf86-input-vmmouse-9999.ebuild 504 BLAKE2B 1b97870364539d80eb3aa798439548ac6ed447a7b54017175d00836280010487b112498e8e82574859e31cf1ed9bf48bdf49880a559abb5ec1f380577bb764ef SHA512 71372b233d2c137099c83b6b4c36e8adbafb02820baf7aabf0f78e08c3d9b5c8d37c96b95eb49290c85ef7332d31fc760baeb7f1e0cb6aa6315213c42da23520
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
index 5729c0d5e63d..2e0a13029688 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
@@ -1,30 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit udev xorg-2
+inherit udev xorg-3
 
 DESCRIPTION="VMWare mouse input driver"
-IUSE=""
+
 KEYWORDS="amd64 x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		--with-hal-bin-dir=/punt
 		--with-hal-callouts-dir=/punt
 		--with-hal-fdi-dir=/punt
 		--with-udev-rules-dir=$(get_udevdir)/rules.d
 	)
-
-	xorg-2_pkg_setup
+	xorg-3_src_configure
 }
 
 src_install() {
-	xorg-2_src_install
-	rm -rf "${ED}"/punt
+	xorg-3_src_install
+	rm -r "${ED}"/punt || die
 }
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
index 1a242a878474..6e59ab01e3c2 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
@@ -1,30 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit udev xorg-2
+inherit udev xorg-3
 
 DESCRIPTION="VMWare mouse input driver"
-IUSE=""
-KEYWORDS=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		--with-hal-bin-dir=/punt
 		--with-hal-callouts-dir=/punt
 		--with-hal-fdi-dir=/punt
 		--with-udev-rules-dir=$(get_udevdir)/rules.d
 	)
-
-	xorg-2_pkg_setup
+	xorg-3_src_configure
 }
 
 src_install() {
-	xorg-2_src_install
-	rm -rf "${ED}"/punt
+	xorg-3_src_install
+	rm -r "${ED}"/punt || die
 }
diff --git a/x11-drivers/xf86-input-void/Manifest b/x11-drivers/xf86-input-void/Manifest
index e4b1ae390768..9b0f987212f0 100644
--- a/x11-drivers/xf86-input-void/Manifest
+++ b/x11-drivers/xf86-input-void/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-void-1.4.1.tar.bz2 271597 BLAKE2B c78d829dfc9aed788fc2e527f796c697546dfa9687189f5f36043fb017515307303d1bc419458e909107fdb30f6f534e9086e86708d4b8bf2447ed941d223011 SHA512 3cbcba9510635fc4a3b610fb940584417d4b3fcace88670b1289906a7da15614e9a286590cecd1840af4bb3bd0c62f246522b1203700067ec384c3cc11b7e94a
-EBUILD xf86-input-void-1.4.1.ebuild 328 BLAKE2B ca9c21c402fcd663cf2764b56357e83a4b849db3f4263ee3d288485ad071de442661456ef5a18eb05c86e4c28902c2c1715ccfdfb43943bffd8d876eefaec049 SHA512 1e8bd423ab96cf7966664ff6ef98c22ac32a895c34453fbab38dacd9327e75e1b18a91e823ffe275fac687d54e4cef7233fb44fbea9fe1ff8f9e7794624cb55d
+EBUILD xf86-input-void-1.4.1.ebuild 310 BLAKE2B 9092d507843f111ff7cc12bb2cf39fd0352a3705cae26d1d58592f8bb7a0661a09a241bf0c48136d575455eb55982b790410eb132b5ebb6a88d6201004f8b177 SHA512 9d81c2311ac958e5d9d8be03e4ce50db3e141ba07235eb3133c9db05e79550e3979c31caf616493381dfee03e7248ca17d40f17b1b940bbad83e1d29e8a4fab4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
index c01eaf9d4ceb..8a037ad91f84 100644
--- a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
+++ b/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="null input driver"
 
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.9.99.1"
+RDEPEND="x11-base/xorg-server"
 DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-ast/Manifest b/x11-drivers/xf86-video-ast/Manifest
index effaf67cf4d1..2f0583232e3c 100644
--- a/x11-drivers/xf86-video-ast/Manifest
+++ b/x11-drivers/xf86-video-ast/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-ast-1.1.5.tar.bz2 339848 BLAKE2B 48ebb8f54307a467eb952ff57dce4cc9da11b627354c54e11426133dee029765390c8c61f0b724bfc66c2f86aa5938ddad49707847b50648d875dccf5c4be9fd SHA512 067c2ce3e74c83fe1531213308753cb80482d177c93009c99dc49e95bfa6ff058d81cc716d6c343b9ca1e0eb7aedf3b84beb12ad08b8cd4d9f43e11f9e192e8e
-EBUILD xf86-video-ast-1.1.5.ebuild 232 BLAKE2B 2c5d387a994ee7738cc1668523840b473308fe6ecd944f39c15683e1804b2d0d95c1d86e3e3d4d023ecd7655efc5ac2d73010d985b1475d9d700b2aacf738312 SHA512 ece1fce1781510fd5aceb45d914716490e9e9d1c1ea7087250bf06b571004fe699b526622bb121f1371651e9e2999bdd1161c596cfbccc67ec995e0966c5b203
+EBUILD xf86-video-ast-1.1.5.ebuild 225 BLAKE2B f7b3489d2cfc40d6e483fc097583bcd7c265aa3069036ed092347d2f1e52cc2285c9619c58657330e44cda1d59eee87ece4aa1e538da7fb1ab1e51c9ba40b549 SHA512 4e9744a59436ab4bb9f166f92d3f23fa263f0a8efbc9b18dbac36bc8b90b766d862a23d1b18f863f0988b59542db557027658f5f742f906f8b0031752492e51a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
index cd4ac3b9a303..4093c3e7fd2a 100644
--- a/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
+++ b/x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org driver for ASpeedTech cards"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
 LICENSE="MIT"
-IUSE=""
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index a47ca718d698..14d151e756e3 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-dummy-0.3.8.tar.bz2 302353 BLAKE2B 1327db3aeec2ff7e3ff0876b25eace6fcdc7fc428967dee9f0b8ee4c22dd7904dcb47d5433bdc14ab56638225b2d33f3a26543dc9e6041c60af4135c1555f798 SHA512 f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80
-EBUILD xf86-video-dummy-0.3.8.ebuild 460 BLAKE2B fe78fda2df3a00bb2d4bca5bdf398d8678fef03b47888c8139c6a4214b905d53bd6ab93937c5f65d3eeef84eeef33b387cd02bf3e05f6568d9717ea13c6d54bb SHA512 5d90ef45ed0b5a5bf2ad1b9e716870a054708211625aeb92792eaae3edcbc154e96d590468534cab5e68d812adfd1de2de86f975d304e84acdc1f634df93e48f
+EBUILD xf86-video-dummy-0.3.8.ebuild 468 BLAKE2B af26748a2154671dc1893b62721d2cc9ecf94c79120396ac9a2b941d2e8ac67bb7be607cd863a863e9c70636a2591efe3573053b132a9c267f299b32f44a1151 SHA512 f9373e6e6cdd2bb63c15446fa2d2ea69104627515a1a0da1769b3382f96ec227c179ae151793c1a165a501af419ee2193849ac74e99b415d62c28bfcbf5173ff
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
index 436ff4aaa8a9..93c6b8a3bb46 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="X.Org driver for dummy cards"
 
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dga"
 
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
+RDEPEND="x11-base/xorg-server"
+DEPEND="
+	${RDEPEND}
 	dga? ( x11-base/xorg-proto )"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable dga)
 	)
-	xorg-2_pkg_setup
+	xorg-3_src_configure
 }
diff --git a/x11-drivers/xf86-video-glint/Manifest b/x11-drivers/xf86-video-glint/Manifest
index 398f3b25692d..8411b40c3bf0 100644
--- a/x11-drivers/xf86-video-glint/Manifest
+++ b/x11-drivers/xf86-video-glint/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-glint-1.2.9.tar.bz2 419524 BLAKE2B 3ec8b4f3187832e1f2a624e578b07c2e9e6ac6a7c48cac4a67ee59f6c479995977e7f6cf903650c52c5e49c0ea321ddec78d0be4969c27584b8e9655b6a08ec4 SHA512 29b573abc2c77992562ab72ea99dfac5fa4baee99404747c53494680fe750b9c096833cd6c8013aa85f7fb5db5bdbee2a9b26dff633a6a4fe2dc8cd9f0adff12
-EBUILD xf86-video-glint-1.2.9.ebuild 306 BLAKE2B f0fbb86c22c7785211a3df62ac90787108ae9a0404e60583e31cc57ffe6480666e2c5fea0a5d84b82b0a778243fc7c0a7a37f0120e77b24e536dd3f1e67c23cf SHA512 83ff26bd949753a9227d71d57174ad8bdf70a15b3b07c69ac7796c19132d68ef4a763ca2387f9c7565844d934b05a92b429fe98a9f76e2c40cb8e4201c31ac9d
+EBUILD xf86-video-glint-1.2.9.ebuild 291 BLAKE2B 9b9ab6fc6dd2e8ced03c7353d479b86c7939df03e68c66ca213cc81dfde8ff513b69804322c9d0fc8bfe281535405144a1c150dbcc0756f0674d452285b1cd14 SHA512 edb0566399b3a73e6805233b0c207527413f509bc1eb2dd08ab6ee473a491582a7571a617ec7c79bea816eba6f14b497bf9e19334935858102c05b76e0db4e8f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
index 33f3ddcb8b48..d4aaafdb386f 100644
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="GLINT/Permedia video driver"
 
 KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
-IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
+RDEPEND="x11-base/xorg-server"
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index 697bcbcf84cf..a62a6d2bae79 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-video-mga-1.6.5.tar.bz2 478350 BLAKE2B 6446da393214921fd35802df387f200856c0900d42a81b28bbde55dbc453752c06f3ed7abf936b5fa693833d8a5f56767e440a37cd4b7035db0abb5736cf4020 SHA512 e1a624cb5d98796e9138bfc512b62d5130885140b1751c01f29a8eff96f66a2b57cb5abe23c1fa2b55188acabd6554c5897190a4e1aee1ec09245d53b88f69d8
 DIST xf86-video-mga-2.0.0.tar.bz2 452486 BLAKE2B e3c0d3d6ee3c1651f96fa2353d94d5f9f19ebf97b121a87749fdb8ba6d8d3bf7066c39c454910a2b1ad9d7e3d44dd3c31bbd432490855df4676bd4fcdafe71c9 SHA512 b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540
-EBUILD xf86-video-mga-1.6.5.ebuild 346 BLAKE2B 8aaa92d90b991230aa4bfc944f28cfa17892a1dda0602daa0eaf4220fa2be8d517b7656bdd099b57d50edf86718b01d1f2c544b9b678fe7e0f3f9250b13b8412 SHA512 fa6d985d51e6e11615d1d3db8b225d154748e049d925b5e6d2fd2b04b9342523d4cb8428b401dee8152f5aa6698e22a71f34d8290137c4b3a8cd8c56090d8f12
-EBUILD xf86-video-mga-2.0.0.ebuild 346 BLAKE2B 8aaa92d90b991230aa4bfc944f28cfa17892a1dda0602daa0eaf4220fa2be8d517b7656bdd099b57d50edf86718b01d1f2c544b9b678fe7e0f3f9250b13b8412 SHA512 fa6d985d51e6e11615d1d3db8b225d154748e049d925b5e6d2fd2b04b9342523d4cb8428b401dee8152f5aa6698e22a71f34d8290137c4b3a8cd8c56090d8f12
+EBUILD xf86-video-mga-2.0.0.ebuild 358 BLAKE2B 35f5c82fa0bcee64c8ac20f77e817cba30cd47c697d6794926ad1c7a43c8816d09756350c43591421a84e9b40b005eb497ff36194f171c53290ed69960a92a42 SHA512 3ea4d412b272cb940048a9e704373a6d1f588c2dc9fb833ae1912cce8a5effb43894da10257ff92cae2c95e10680ad500d7de6cb71f4eafd9cb620f3ac72f61e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.5.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.5.ebuild
deleted file mode 100644
index 812b0e9f2a9f..000000000000
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_DRI=dri
-inherit xorg-2
-
-DESCRIPTION="Matrox video driver"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS="$(use_enable dri)"
-	xorg-2_src_configure
-}
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
index 812b0e9f2a9f..4e6c85afff37 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 XORG_DRI=dri
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="Matrox video driver"
 
@@ -11,6 +12,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
-	XORG_CONFIGURE_OPTIONS="$(use_enable dri)"
-	xorg-2_src_configure
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+	xorg-3_src_configure
 }
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 6e34833f5343..15c416b55812 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-nouveau-1.0.16.tar.bz2 629404 BLAKE2B 519ae2ddc6f895648274e10fc3b5052896734e40251dcaf35a948be051711c14054573a08192ccf15002f3a8d1e6079c982c32cf8c58e2a288c0f146155020e8 SHA512 41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0
 DIST xf86-video-nouveau-1.0.17.tar.bz2 632535 BLAKE2B 8f4a3e749dbf46f6723f65b7bdffdf32e40fb194a18cb9951af297d7c3bcc34cc4ee6eed4687c42a385c259f37d1438ca7c9eda7594a3426704b358e1cda36fb SHA512 adba58ba5298d1a5b3f9f8540f9ef2cb2e10e47bba8e374103ec2e1f92e915f5f4393ed0021168cd649646e12315135a1efcdf77e8fb1648e1295914d87279b2
 EBUILD xf86-video-nouveau-1.0.16.ebuild 616 BLAKE2B 3123d1d141ed0287b812f170c2a8e02e167b6f25a23c145870054e4bf4a3e35e1a0004ed66bf1c31d0a626cf5fe21a3000cd2c75cabcc417d3c6a92446303b86 SHA512 cf22557c666182ae9e8d954007b5f5eb23a7eb24deedf16fbfae1c89d98cbb4f66367fd6c2d3e8d7d6f26fce13a446ce8f6107fe2bb7f7541af184b28c282547
-EBUILD xf86-video-nouveau-1.0.17.ebuild 618 BLAKE2B 18fce987f45115101ad50303749ba9ca40a4812bdd8846c7690598de12258920fe70751a3eef9b9636867afcba9423a85cf00908d2e2ceea51408c3685042e3d SHA512 393df42f73ece27f6e5e1a8f482938d3327239001f89890e9bc61b37b0bc9a72f32f25b6861a159fb40e9b3fbe07e47665ad819b97dc75c041f9e94720a46aef
+EBUILD xf86-video-nouveau-1.0.17.ebuild 614 BLAKE2B 776d6d3895af1a6e611e3a3a20bee4e5c6500319648431d33b5e34a5f78240f7129112b1f0f8ae9896efe66dd418ebe55a9fda317589a0e75e25c9329fc9c4db SHA512 acd31548a831e3dde07c1e9e235464ac361f82341d5db4d01bf02728da7f015223e79bde3bfd62c7b5e5683bc21ce54198302de94f0b8cee57f95fa1d2ebdb16
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
index 2c1883d6e115..25caf5a71cae 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
@@ -1,20 +1,22 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 XORG_DRI="always"
-inherit xorg-2
+inherit xorg-3
 
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau.git"
 	SRC_URI=""
 fi
 
 DESCRIPTION="Accelerated Open Source driver for nVidia cards"
-HOMEPAGE="https://nouveau.freedesktop.org/wiki/ https://cgit.freedesktop.org/nouveau/xf86-video-nouveau"
+HOMEPAGE="
+	https://nouveau.freedesktop.org/wiki/
+	https://cgit.freedesktop.org/nouveau/xf86-video-nouveau"
 
 KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
 
 RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]
 	>=x11-libs/libpciaccess-0.10
diff --git a/x11-drivers/xf86-video-nv/Manifest b/x11-drivers/xf86-video-nv/Manifest
index dc59eb63b123..b073c9dd8be9 100644
--- a/x11-drivers/xf86-video-nv/Manifest
+++ b/x11-drivers/xf86-video-nv/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-nv-2.1.21.tar.bz2 424091 BLAKE2B 3ef69d23672c0d65d1117ec1c4906a47d34878ed20f7c07d044be3b9d74c848162d80fe9cc7a11797fd9f94dedcda3b5e76d8386f2b7208e432497ef50838422 SHA512 97cec43100b00609d43cf45937bafea387fd656cb5e321fcbed426973320097ba6601e4e548026618b3cf0c480f58956874a201791dc0cc39297b5fd54979ca7
-EBUILD xf86-video-nv-2.1.21.ebuild 307 BLAKE2B 80226a8ec2f34080da2452351716fb3196f02e2baf8c8f76e3ac63c21745bf6c1f09a5be79e38a9db95d9c9e9385bfa5dc8502898ccdeca1853f9a180dec732a SHA512 cf5498802ba0457267db82575d7faf8fbfce2776a17f97cb686162e1c55e019f7a911725c728ba4922a100e7ef84de1ef992fe16db7ef792bd5e5fec3fe8d697
+EBUILD xf86-video-nv-2.1.21.ebuild 302 BLAKE2B 538281e3d3ee259c3bc36bac15fabffda573ea4ec92f3bc08b3dfaaaaafb04d24df247237125a82dc66c4dfb887ba0307318ee802c748f5d241761f7d9fe1b0c SHA512 662e5cddf7fdecf984c1123745fb4b675e02aa833aae952f88d471fc4badd3f017f5ae92bf2353b24ed97a28fd6e9416e4aea9b6b5a6fab3c8a9fa4a2ea2dc9b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
index f96f675ae5ae..edac3c64b1e1 100644
--- a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
+++ b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="Nvidia 2D only video driver"
 
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 x86"
-IUSE=""
 
-RDEPEND="x11-base/xorg-server
+RDEPEND="
+	x11-base/xorg-server
 	>=x11-libs/libpciaccess-0.10.7"
 DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-omap/Manifest b/x11-drivers/xf86-video-omap/Manifest
index 2431faf353e7..25405d95a792 100644
--- a/x11-drivers/xf86-video-omap/Manifest
+++ b/x11-drivers/xf86-video-omap/Manifest
@@ -1,4 +1,4 @@
 AUX xf86-video-omap-0.4.5-null-dereference.patch 362 BLAKE2B e4ddeaedbf3ba964796529dc3638b9303e20324cc18e3ecc47022ce389f8020aa6a1abe1e9e29e45ab4f8454dd7faf9df74b4f76987ce81dacb1d3e7bba796df SHA512 092dcd4d19653d59d2409ca89bd2528de5e220cd9a88ff8e4080c4dd62adcf3e264ce5a3719571f1055cda59b7a0b6357d32916041c29b0c1c5725bf7565b42d
 DIST xf86-video-omap-0.4.5.tar.bz2 316765 BLAKE2B 981322d7e140c4948f3cc5ceb9a649f252c431b6755a0e201bde32c92a00bb2d0c0513fbd2638320100855c78e8c4897c5cbcff8527ef0ff045350a9e9ce505a SHA512 c8a21bf00d9ead73b5f66310f802d6071454132b69e20230d3b95635d8fb8351febf5c881640907eb36dd7aeec2d0823e45fb9955b1a9a32e3838ee717964ca2
-EBUILD xf86-video-omap-0.4.5.ebuild 357 BLAKE2B 063b3fd04d3568cc4ebcfd4629f985f8d97445e1eff0b3089934286f38bb410af68dfb9ad9451b46da3fd7649d91be009013c43d19fc9d21479a1e191e58c64f SHA512 bc1c0ce27c4778ee66bea1ad46efd7f0967ede49e8051976af5b07bdd481867e539101a4a806cd9db6a432ce4b97f9078938bbbef6027b93aec1f4f573d65f8a
+EBUILD xf86-video-omap-0.4.5.ebuild 359 BLAKE2B b065d49dba469e6d17653edcbab4f3053a7b5fc5bca0d79ab34305f5c8429cf9df8b4f25257a57be65e1a28648dd1fc0d97267277c9c872b9d0d802c54d4ddcd SHA512 3ed6f0b8864378cdcbb6ef86404970eb6a2bbcf09dfe33e4702e720f97db01d6ab0068c1436597c63d78e9f33af6038aec675abf1a87202c39bc7ea2797d936e
 MISC metadata.xml 346 BLAKE2B 3c0b53d970c838680c81200bb24ea623a37d98ce92009c9e9eeeea189e77db94870b9fe16715fdeb91e6bf9e2b9a7e5dff6e3525c15b40b7b9f64acce43955fe SHA512 c42c74ad99ba4bfca1c89aac3bf76ccb50ebba85130c5eb81294c45fbd5992d376f27ddc4f758eb79cf95f6406d98d27ea5c1b56f75c2723fc271dc02ce0ca58
diff --git a/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
index a28ec1b05d23..3e9d78bc3c15 100644
--- a/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
+++ b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 XORG_DRI=always
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="OMAP video driver"
 
 KEYWORDS="arm"
 
-RDEPEND=">=x11-base/xorg-server-1.3
+RDEPEND="
+	>=x11-base/xorg-server-1.3
 	>=x11-libs/libdrm-2.4.36[video_cards_omap]"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.5-null-dereference.patch"
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.4.5-null-dereference.patch )
diff --git a/x11-drivers/xf86-video-openchrome/Manifest b/x11-drivers/xf86-video-openchrome/Manifest
index ebe1182387db..6e2abbd60dd5 100644
--- a/x11-drivers/xf86-video-openchrome/Manifest
+++ b/x11-drivers/xf86-video-openchrome/Manifest
@@ -1,4 +1,4 @@
 AUX xf86-video-openchrome-0.6.0-fno-common.patch 1298 BLAKE2B 605a1b1964b5b7baabc7650164fc6e8ef444d19fd437151d6dc0697c0349810d82b70cbb803c77cbb65f604bf7edfdc42b7790270d9f795d71f931e05b893623 SHA512 119b7bb83af9c8aec01f6b0b55d77ec1081680c21a4e0d0f9a01b0f0c34e9f9cb9a7c5fb97e64387e1f3e46445d930fa1f1921c5424cfdfc547dd497f16e43a8
 DIST xf86-video-openchrome-0.6.0.tar.bz2 537619 BLAKE2B 30d8ab246646bde41b1ce0fd48c133cb7c2c3cff7c7201daf7e4fcded7a3e47bdc28d739247fce69b17a0e7697b33af35e3f771496654920b275a5aacbe8fc6f SHA512 f074e70d54c87a9d6e1b52c2c2d72d7c551dcb59a5f34c0a5f9495db1a6e45db4300d51fabf7eedfbe91f964f9422931c752a49b322715c6aa9ddb0db9dd6004
-EBUILD xf86-video-openchrome-0.6.0.ebuild 1212 BLAKE2B 7bf0313d3a7ea334cc17980076b6fcf59200167160b7c8860e91f84f2f40f7dd942e56050ac43a49144b41a523b965cbe3e3d956441926a561d6348602412540 SHA512 ae3e9967fb20bc5d8defebf670643206b74d61e1db4195d01d6440b9c57cbc5f0c2d32d660e45d75b7ab504db7aa118b247304f9cfd32a8d0e990bf93627b084
+EBUILD xf86-video-openchrome-0.6.0.ebuild 1188 BLAKE2B 81753d96af1c696f6bc74ac0e90ab8fbcd80952ec6e3c6ea7bcfb7c9b80df6fb6043e48c134f09a56f6509a4b0a371c1db50856d6562cfdcf17003b259baf560 SHA512 fdb27377ea94fb80590f44a0cf947d26397cdad6df5b76525ff6a1dda740f8572f696a9a2f56e8407abcf643b362c5d0509613fa9f1eada97036aa9628b136f8
 MISC metadata.xml 302 BLAKE2B 7a580d2b118b1768147df42d10928eeb618524c00a2865c3f4a4eaa3334c86e6d8714019553baa95a7c8cfc30aa7d685eaecf3913c856623392b2ec8e00de744 SHA512 43446377349f40ba3bf5ccd9648ea102a8cf1fa07bcf8ec1d1df3ef3dec994d11437a4cb1190901f0a7cda7fa1332de1642771be82e87b16063d69922e072754
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild
index b2f2a36914b7..1219380c354b 100644
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild
@@ -1,42 +1,41 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 XORG_DRI="always"
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="X.Org driver for VIA/S3G cards"
 HOMEPAGE="https://www.freedesktop.org/wiki/Openchrome/"
-LICENSE="MIT"
 
+LICENSE="MIT"
 KEYWORDS="amd64 x86"
 IUSE="debug viaregtool"
 
-RDEPEND=">=x11-base/xorg-server-1.9"
-DEPEND="
-	${RDEPEND}
+RDEPEND="
+	>=x11-base/xorg-server-1.9
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXv
 	x11-libs/libXvMC
-	x11-libs/libdrm
-"
-
-DOCS=( ChangeLog NEWS README )
+	x11-libs/libdrm"
+DEPEND="
+	${RDEPEND}
+	x11-libs/libXv"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable debug)
 		$(use_enable debug xv-debug)
 		$(use_enable viaregtool)
 	)
-	xorg-2_src_configure
+	xorg-3_src_configure
 }
 
 pkg_postinst() {
-	xorg-2_pkg_postinst
+	xorg-3_pkg_postinst
 
 	elog "Supported chipsets:"
 	elog "CLE266 (VT3122), KM400/P4M800 (VT3205), K8M800 (VT3204),"
diff --git a/x11-drivers/xf86-video-qxl/Manifest b/x11-drivers/xf86-video-qxl/Manifest
index 2904fa5d48f0..34bdaf83274f 100644
--- a/x11-drivers/xf86-video-qxl/Manifest
+++ b/x11-drivers/xf86-video-qxl/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-qxl-0.1.5.tar.bz2 508266 BLAKE2B ca0fd43830a393d9bb1f5a6ba306f26e07a0b90233fa44f3fbe7a5f21026f1bd6960254db9cd75d947b3c42f6cc8cd3b7cfd71afc2c0a74bd84c60eafcf7e150 SHA512 7510b2d037b3e978df6063b29e2406f3d1270695a239f29fdaec9b1dc65a30ab10cb959f15eb336f78e93aa708d41c64c5ea43803958feffc64542229605b782
 DIST xf86-video-qxl-0.1.5_p20200205.tar.xz 137452 BLAKE2B 1639a393dadcba251a8fe761d52112d51c29e70960524785343379ec088e69c5e2cbd1a9710d72c749dc8b7303b3eceb545fbaec82d5d22613f8ebb0a4e7aca8 SHA512 9a2ba4aa7ef61d3ea0043ff1e3a8f312b7fe00f707045bcb4e4fc1189786b9aba2b6e44696f47e7c215485044f6c953f831ed4da48d4098cd7b62555c74a79f8
 EBUILD xf86-video-qxl-0.1.5.ebuild 436 BLAKE2B 19560c57f7a7aa0446525affce826b10931d24fa5fc00acd947f3311940740c5cd6037be4da99d090f3acaa9e8df739cf7184713896a285e87dc118ca28ffb4e SHA512 b8b20bcd2b06b36f8ac835a551da75b93e062e9a4aca66b20d5ff95ac2c56804d7bdb0e0bef1dbfb762da2aad404c3fab496532f2f9ea3a9daf15ad7e63fc82f
-EBUILD xf86-video-qxl-0.1.5_p20200205.ebuild 777 BLAKE2B 16875c547b93eba10675ed4179d78e914ad2c630b9957960946810ff6a8dd083eab9628f8c5824b02d53e87a8f6eaae6034adbc89bdb83d37e84d5cba1db3a81 SHA512 a795025178d99c1ba218bd30f09660bc8f93eedaaf2a7ce5fca43090bf0bbea46c0524a44b1963e1dd545a4232336a3f78bece2834204b100e9aa55870ce5f10
+EBUILD xf86-video-qxl-0.1.5_p20200205.ebuild 894 BLAKE2B 1d7cb3f013081e8d345839905538222514f35da8ceebfefd151a2e76fa44fdbc34482f2e6feada4ba8a30bc4cd20303d4542f5f9ab7cbafaaea9e4a70e88553f SHA512 e7429f6dcae6400582c712bf1dff926dd58ce03c8954f5d53d8219012163024b8c4835fb8af64ba3723d4cc1cb67ad55e88f556d401ec223f9760340b6b75e6d
 MISC metadata.xml 352 BLAKE2B a2a27dbaddd9dba3c583eabdc64716ee086b679cc72a18a0f11b5ed6e7ec73069116ebb3bb0389131e65012eec56c7a213ec5bf2e6d08d211fff8e916cf524db SHA512 89c8a1813c246441cfd95098c5ca6e8e84e0e5e96e5b05bb6a30f794861b2e4660f06cd2bf45c0929e0b5425163a67e318778c502682d17b74a91f979389ac3a
diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild
index d4f5d8c3a49e..e8e8ae5dc9bf 100644
--- a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild
+++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild
@@ -3,18 +3,17 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
-inherit python-single-r1 xorg-3 autotools
+inherit autotools python-single-r1 xorg-3
 
-SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
 DESCRIPTION="QEMU QXL paravirt video driver"
-KEYWORDS="~amd64 ~x86"
+SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
+S="${WORKDIR}"
 
+KEYWORDS="~amd64 ~x86"
 IUSE="xspice"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/"
+REQUIRED_USE="xspice? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	xspice? (
@@ -23,20 +22,25 @@ RDEPEND="
 	)
 	x11-base/xorg-server[-minimal]
 	>=x11-libs/libdrm-2.4.46"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	>=app-emulation/spice-protocol-0.12.0
 	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	python_fix_shebang scripts
+pkg_setup() {
+	use xspice && python-single-r1_pkg_setup
+}
 
+src_prepare() {
+	xorg-3_src_prepare
 	eautoreconf
 
-	xorg-3_src_prepare
+	use xspice && python_fix_shebang scripts
 }
 
 src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable xspice)
 	)
 	xorg-3_src_configure
diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest
index a2fb94abd844..8bda69bc4518 100644
--- a/x11-drivers/xf86-video-r128/Manifest
+++ b/x11-drivers/xf86-video-r128/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-r128-6.12.0.tar.bz2 483999 BLAKE2B f3433ce0289a7c356b69871ad4acb9ce9b0a947c1bf6ee9bf436a5d27ad1324fc81bb2d3c9be16ddf588f286ae092091dafd161c39ce8bc1bf20b6cb36ffdb72 SHA512 0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38
-EBUILD xf86-video-r128-6.12.0.ebuild 502 BLAKE2B a49afeed66830e6ff2197ce2e393d3233a6143ea6438f24c866abac356c6fc2ac8db77dde11d2ae1459eb16411cc1d72626577af4cd7fe788bf1e5d57939bf56 SHA512 0d08e9de7d98b189134fd245eb80257c5cc663f249491cf1032d114d0835ed051b303e0e1781b818bdae7a17f551197bf2f799f5405b5a2d7f0ff02167106e13
+EBUILD xf86-video-r128-6.12.0.ebuild 492 BLAKE2B 611c5732c905f80b88fe9206c0f896fdbee53b1679c6ff5e3bb0c10fae89c46f0ba2321fad36f75d5948e5b17613bc91380fab195ca77cdea39b1741bb61c8fc SHA512 1fb1f1723bb1da87d616a65b2b364bda2f2aafa855c27d48c5037a1dae3eb1525913a9416c44ed850636df16188e6663d03956aa4b73e10c953124c07e970b60
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
index 5d59f92a1cf6..51078786ca62 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 XORG_DRI=dri
 
-inherit flag-o-matic xorg-2
+inherit flag-o-matic xorg-3
 
 DESCRIPTION="ATI Rage128 video driver"
 
@@ -14,15 +15,12 @@ IUSE="dri"
 RDEPEND=">=x11-base/xorg-server-1.2"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-	)
-}
-
 src_configure() {
 	# always use C11 semantics
 	append-cflags -std=gnu11
 
-	xorg-2_src_configure
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+	xorg-3_src_configure
 }
diff --git a/x11-drivers/xf86-video-siliconmotion/Manifest b/x11-drivers/xf86-video-siliconmotion/Manifest
index 2ab5bba7cc08..4a1bf923f0f9 100644
--- a/x11-drivers/xf86-video-siliconmotion/Manifest
+++ b/x11-drivers/xf86-video-siliconmotion/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-siliconmotion-1.7.9.tar.bz2 416351 BLAKE2B 8832c4de662871b373fdd2a1ac395454bbcf3ab3ac81416aab23c9a282a18cf46be5d98aaaa15213f394d0d7ac8b407c39aa0b9e3692495e36ef800077ec3f19 SHA512 13085945ca496f83521c28b25c394077e010031dbdc2374347a932a52650ada02f525269a81d0b0bb20b48e371d5435a7a73cb7555a07dc5a784e77152608c63
-EBUILD xf86-video-siliconmotion-1.7.9.ebuild 270 BLAKE2B 61add873071d87c2e3895812d23143671ab5e0d633287a63640fdd4d76e30190ddd491505a8bd75bcaa465a4da5e43251fb4a4f07f3290c47f1670059a735937 SHA512 426665c7c5a36c654e64c3a400cc2360c28b53dd5eb3c5e20e79aca72dbb914e84e7636e84c8d858b6bcf0916d87ca0111089c44b33a8b412640d2cfce6ca3e4
+EBUILD xf86-video-siliconmotion-1.7.9.ebuild 251 BLAKE2B 0d70653297b3adf446a69a6b25fb58cdb9d397c3527dcea77359221e003615641e8f165e48b19c95746aad7861bab4b91ba0afacc222382343b727b470b999d6 SHA512 8def3850299ae7d4f06ff46620e610a11564ed70e40c5580f05317a85a43e7e35471da2f777868b64638141053ca3d2886b608301c71b53baae239df2cd7af84
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
index 9a9a7cda10df..ab2e1341ccfa 100644
--- a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
+++ b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xorg-2
+EAPI=7
+
+inherit xorg-3
 
 DESCRIPTION="Silicon Motion video driver"
 
 KEYWORDS="amd64 ~mips x86"
-IUSE=""
 
-RDEPEND=">=x11-base/xorg-server-1.0.99"
+RDEPEND="x11-base/xorg-server"
 DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-vboxvideo/Manifest b/x11-drivers/xf86-video-vboxvideo/Manifest
index a2a9c9acda5a..9356c6ce8814 100644
--- a/x11-drivers/xf86-video-vboxvideo/Manifest
+++ b/x11-drivers/xf86-video-vboxvideo/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-vboxvideo-1.0.0.tar.bz2 353342 BLAKE2B 8088e150c8e91dd4872218773c2d57a052935926fe08c18d9f5165b112d6213bf79c80d85fd4d10c1b12bd2ac222983b3dbf241cb97c1cb087f4137314a95ead SHA512 1a9856a966495a3a291592ee3113ed5ee83e3ef530bf37d91605206a62f641726511ad48ca79b8a3e94f601f8cf15341255b0c7d14f5c8acf985b84f965d8dfc
-EBUILD xf86-video-vboxvideo-1.0.0.ebuild 417 BLAKE2B 4fadd4142eec7b2aedf457f85fdd68e8093aede1c1cdf881418f9e03f28ec8362bd9d77803b29cf206d493f4bda28ffc46870333ca8f06fc26a4726037196cbf SHA512 822b7ddab3eadb610d897a8bc6aabaf0701ded5a5e6ff5ab4812f520966afe5635829eb86898ca25d5be4d4966d9f9b5523f8048c6308fce1d751d6dd7229655
+EBUILD xf86-video-vboxvideo-1.0.0.ebuild 407 BLAKE2B 9f9d2637526583e8d896dbee2da602501e5f7f20e56ce476d73726e791f02dc560c80aae01bba847810218a8043caf6963127d256963cd49118270779e2f7a7e SHA512 8439415c8accea11eeb4170eb20a834cc526b11912381cf8e1e51cab2e5223c2ad1546d619a3bfd4eaecc9faadcea6bb3bb2e15be42d98f1f36dc56a71179fd3
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild b/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
index 53894630f774..70d157477277 100644
--- a/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
+++ b/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
@@ -1,23 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-XORG_PACKAGE_NAME=xf86-video-vbox
+EAPI=7
 
-inherit xorg-2
+XORG_PACKAGE_NAME=xf86-video-vbox
+inherit xorg-3
 
 DESCRIPTION="VirtualBox guest video driver"
 
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	!x11-drivers/xf86-video-virtualbox
 	>=x11-base/xorg-server-1.8:=[-minimal]
 	x11-libs/libXcomposite
-	x11-libs/libpciaccess
-"
+	x11-libs/libpciaccess"
 DEPEND="
 	${RDEPEND}
-	x11-base/xorg-proto
-"
+	x11-base/xorg-proto"
diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest
index 519a32e1ecda..7a0d748419d5 100644
--- a/x11-drivers/xf86-video-vmware/Manifest
+++ b/x11-drivers/xf86-video-vmware/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-vmware-13.3.0.tar.bz2 473527 BLAKE2B 8916c5d95d4347ff3e874d4131a32660777c0e3ab6808b537cbe668c30cf775ebfd2fb7900aa43f6a34d0578ceac4545614024498f6f0143e9b07035f6e99c3c SHA512 c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca
-EBUILD xf86-video-vmware-13.3.0.ebuild 345 BLAKE2B bafcf5a3d209a1eebdbccafe24a7d5bb89f9d93d92ede252a0c80a6632998ae8bd1f4d7fd4e948d9d6d7b5a363396a1b9cd33a6829c3d049e9b1f8dfe10bbb01 SHA512 1312c212e6bcd30bb746c254a88350945ebc808731e77a59168302d27685317feeeaa0736e2a430bc9ede34c262095f1d55f6f68b49957d613b51852f5f7120f
+EBUILD xf86-video-vmware-13.3.0.ebuild 345 BLAKE2B 8bc8a6804a7d9114d7732189eb9aa3d22d9e03d47a2f98c1140cdca020331d656d259006551620f31491407d3fe4a44d0967ddf2440d052ab59f9fc8e08bf6ca SHA512 a570e0831e74b08bb29ad5fd1a7c88ebd4b662daa49ce48ba24bc542f1bdecf215604b75f21771165eaada4448d73fb1d16a653f23d418b765bdc5bf627fae10
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
index cfcb0e76de79..d08ada7668f2 100644
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 XORG_DRI=always
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="VMware SVGA video driver"
+
 KEYWORDS="amd64 x86"
 IUSE="kernel_linux"
 
-RDEPEND="kernel_linux? (
+RDEPEND="
+	kernel_linux? (
 		x11-libs/libdrm[libkms,video_cards_vmware]
 		media-libs/mesa[xa]
 	)"