x11-base/xwayland : break conflict with x11-drivers/nvidia-drivers we ship

2 files changed, 6 insertions, 7 deletions

diff --git a/metadata/md5-cache/x11-base/xwayland-21.1.2-r100 b/metadata/md5-cache/x11-base/xwayland-21.1.2-r100
index 1e760862..d2b454ac 100644
--- a/metadata/md5-cache/x11-base/xwayland-21.1.2-r100
+++ b/metadata/md5-cache/x11-base/xwayland-21.1.2-r100
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install test
-DEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl,gbm] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3
+DEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3
 DESCRIPTION=Standalone X server running under Wayland
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-IUSE=rpc unwind ipv6 xcsecurity selinux video_cards_nvidia
+IUSE=rpc unwind ipv6 xcsecurity selinux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl,gbm] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3 !<=x11-base/xorg-server-1.20.12 selinux? ( sec-policy/selinux-xserver )
+RDEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3 !<=x11-base/xorg-server-1.20.12 selinux? ( sec-policy/selinux-xserver )
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-21.1.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb89a25ea69c575b644a5485896e034c
+_md5_=51b881677e06000af87fd72fe5995c0c
diff --git a/x11-base/xwayland/xwayland-21.1.2-r100.ebuild b/x11-base/xwayland/xwayland-21.1.2-r100.ebuild
index cbe10fc6..c6b1bd90 100644
--- a/x11-base/xwayland/xwayland-21.1.2-r100.ebuild
+++ b/x11-base/xwayland/xwayland-21.1.2-r100.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Standalone X server running under Wayland"
 HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
 SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
 
-IUSE="rpc unwind ipv6 xcsecurity selinux video_cards_nvidia"
+IUSE="rpc unwind ipv6 xcsecurity selinux"
 
 LICENSE="MIT"
 SLOT="0"
@@ -21,11 +21,10 @@ DEPEND="
 	>=x11-libs/libXfont2-2.0.1
 	dev-libs/openssl:=
 	dev-libs/wayland
-	video_cards_nvidia? ( gui-libs/egl-wayland )
 	>=x11-libs/libXdmcp-1.0.2
 	>=x11-libs/libdrm-2.4.89
 	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	>=media-libs/mesa-18[X(+),egl,gbm]
+	>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
 	>=x11-libs/libxshmfence-1.1
 	rpc? ( net-libs/libtirpc )
 	>=x11-libs/libXau-1.0.4