From 8d7106da9f67f010de759354dabdc6c088f837af Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 01:06:51 +0000 Subject: don't allow nvidia && nvidia-legacy to coexist --- sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.44.ebuild | 3 ++- x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild | 1 + x11-misc/nvidia-settings/nvidia-settings-440.44.ebuild | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.44.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.44.ebuild index 7e929ecd..ecaa18a6 100644 --- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.44.ebuild +++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-440.44.ebuild @@ -19,7 +19,8 @@ KEYWORDS="amd64" IUSE="" DEPEND="sys-kernel/dkms" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !!sys-kernel/nvidia-legacy-drivers-dkms" PATCHES=( "${FILESDIR}"/fs62142.patch diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild index b2ab0ff5..6423c0b4 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild @@ -34,6 +34,7 @@ PDEPEND=" tools? ( x11-misc/nvidia-settings:${SLOT} )" RDEPEND=" ${COMMON} + !!x11-drivers/nvidia-legacy-drivers acpi? ( sys-power/acpid ) dkms? ( sys-kernel/${PN}-dkms:${SLOT} ) wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) diff --git a/x11-misc/nvidia-settings/nvidia-settings-440.44.ebuild b/x11-misc/nvidia-settings/nvidia-settings-440.44.ebuild index a634d144..4abfb69a 100644 --- a/x11-misc/nvidia-settings/nvidia-settings-440.44.ebuild +++ b/x11-misc/nvidia-settings/nvidia-settings-440.44.ebuild @@ -33,6 +33,7 @@ COMMON_DEPEND=" >=x11-libs/libvdpau-1.0" RDEPEND="${COMMON_DEPEND} + !!x11-misc/nvidia-legacy-settings x11-drivers/nvidia-drivers:${SLOT}" DEPEND="${RDEPEND} virtual/pkgconfig -- cgit v1.2.3