diff --git a/x11-libs/vte/vte-0.76.3.ebuild b/x11-libs/vte/vte-0.76.3-r1.ebuild
similarity index 92%
rename from x11-libs/vte/vte-0.76.3.ebuild
rename to x11-libs/vte/vte-0.76.3-r1.ebuild
index 958a6c7d3782d..558a59004af9e 100644
--- a/x11-libs/vte/vte-0.76.3.ebuild
+++ b/x11-libs/vte/vte-0.76.3-r1.ebuild
@@ -21,25 +21,25 @@ LICENSE="LGPL-3+ GPL-3+"
 
 SLOT="2.91"      # vte_api_version in meson.build
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+IUSE="X +crypt debug gtk-doc +icu +introspection systemd +vala vanilla wayland"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
 	vala? ( introspection )
 "
 
 DEPEND="
-	>=x11-libs/gtk+-3.24.22:3[introspection?]
+	>=x11-libs/gtk+-3.24.22:3[X?,introspection?,wayland?]
 	>=x11-libs/cairo-1.0
 	>=dev-libs/fribidi-1.0.0
 	>=dev-libs/glib-2.72:2
 	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
 	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
+	>=x11-libs/pango-1.22.0[introspection?]
+
 	>=dev-libs/libpcre2-10.21:=
 	systemd? ( >=sys-apps/systemd-220:= )
 	>=app-arch/lz4-1.9
 	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	x11-libs/pango[introspection?]
 "
 RDEPEND="${DEPEND}
 	~gui-libs/vte-common-${PV}[systemd?]
@@ -81,6 +81,9 @@ src_configure() {
 	# Upstream don't support LTO & error out on it in meson.build
 	filter-lto
 
+	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+
 	local emesonargs=(
 		-Da11y=true
 		$(meson_use debug)
diff --git a/x11-libs/vte/vte-0.78.5.ebuild b/x11-libs/vte/vte-0.78.5-r1.ebuild
similarity index 90%
rename from x11-libs/vte/vte-0.78.5.ebuild
rename to x11-libs/vte/vte-0.78.5-r1.ebuild
index 9a0184275c514..3f7050ad11a67 100644
--- a/x11-libs/vte/vte-0.78.5.ebuild
+++ b/x11-libs/vte/vte-0.78.5-r1.ebuild
@@ -14,25 +14,24 @@ LICENSE="LGPL-3+ GPL-3+"
 
 SLOT="2.91"      # vte_api_version in meson.build
 KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala"
+IUSE="X +crypt debug gtk-doc +icu +introspection systemd +vala wayland"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
 	vala? ( introspection )
 "
 
 DEPEND="
-	>=x11-libs/gtk+-3.24.22:3[introspection?]
+	>=x11-libs/gtk+-3.24.22:3[X?,introspection?,wayland?]
 	>=x11-libs/cairo-1.0
 	>=dev-libs/fribidi-1.0.0
 	>=dev-libs/glib-2.72:2
 	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
 	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
+	>=x11-libs/pango-1.22.0[introspection?]
 	>=dev-libs/libpcre2-10.21:=
 	systemd? ( >=sys-apps/systemd-220:= )
 	>=app-arch/lz4-1.9
 	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	x11-libs/pango[introspection?]
 "
 RDEPEND="${DEPEND}
 	~gui-libs/vte-common-${PV}[systemd?]
@@ -63,6 +62,9 @@ src_configure() {
 	# Upstream don't support LTO & error out on it in meson.build
 	filter-lto
 
+	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+
 	local emesonargs=(
 		-Da11y=true
 		$(meson_use debug)
diff --git a/x11-libs/vte/vte-0.80.3.ebuild b/x11-libs/vte/vte-0.80.3-r1.ebuild
similarity index 90%
rename from x11-libs/vte/vte-0.80.3.ebuild
rename to x11-libs/vte/vte-0.80.3-r1.ebuild
index 42fd5cbbfeaf8..5539d99b75dc4 100644
--- a/x11-libs/vte/vte-0.80.3.ebuild
+++ b/x11-libs/vte/vte-0.80.3-r1.ebuild
@@ -14,26 +14,25 @@ LICENSE="LGPL-3+ GPL-3+"
 
 SLOT="2.91"      # vte_api_version in meson.build
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala"
+IUSE="X +crypt debug gtk-doc +icu +introspection systemd +vala wayland"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
 	vala? ( introspection )
 "
 
 DEPEND="
-	>=x11-libs/gtk+-3.24.22:3[introspection?]
+	>=x11-libs/gtk+-3.24.22:3[X?,introspection?,wayland?]
 	>=x11-libs/cairo-1.0
 	dev-cpp/fast_float
 	>=dev-libs/fribidi-1.0.0
 	>=dev-libs/glib-2.72:2
 	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
 	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
+	>=x11-libs/pango-1.22.0[introspection?]
 	>=dev-libs/libpcre2-10.21:=
 	systemd? ( >=sys-apps/systemd-220:= )
 	>=app-arch/lz4-1.9
 	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	x11-libs/pango[introspection?]
 "
 RDEPEND="${DEPEND}
 	~gui-libs/vte-common-${PV}[systemd?]
@@ -64,6 +63,9 @@ src_configure() {
 	# Upstream don't support LTO & error out on it in meson.build
 	filter-lto
 
+	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+
 	local emesonargs=(
 		-Da11y=true
 		$(meson_use debug)