x11-base/xorg-drivers: Depend on udev support for libinput/evdev

Closes: https://bugs.gentoo.org/718686
Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
similarity index 92%
rename from x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild
rename to x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
index a015acc2828c56731984689320da9f746614a772..9d4ef15e48894dc81516b38de8db8f3ebb65eb1f 100644 (file)
--- a/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
@@ -58,10 +58,16 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
 
 PDEPEND="
        input_devices_elographics? ( x11-drivers/xf86-input-elographics )
-       input_devices_evdev?       ( >=x11-drivers/xf86-input-evdev-2.10.6 )
+       input_devices_evdev?       (
+                                                                >=x11-base/xorg-server-${PV}[udev]
+                                                                >=x11-drivers/xf86-input-evdev-2.10.6
+                                                          )
        input_devices_joystick?    ( >=x11-drivers/xf86-input-joystick-1.6.3 )
        input_devices_keyboard?    ( x11-drivers/xf86-input-keyboard )
-       input_devices_libinput?    ( >=x11-drivers/xf86-input-libinput-0.27.1 )
+       input_devices_libinput?    (
+                                                                >=x11-base/xorg-server-${PV}[udev]
+                                                                >=x11-drivers/xf86-input-libinput-0.27.1
+                                                          )
        input_devices_mouse?       ( >=x11-drivers/xf86-input-mouse-1.9.3 )
        input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
        input_devices_void?        ( x11-drivers/xf86-input-void )
@@ -94,6 +100,4 @@ PDEPEND="
        video_cards_via?           ( x11-drivers/xf86-video-openchrome )
        video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )
        video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
-
-       !<x11-drivers/xf86-input-evdev-2.10.4
 "

diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 5bf741ecf02a816e8d47785fef667ab3f4183646..f9af84eb3d2551d4ebcd94dd0021c9570a651506 100644 (file)
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -58,10 +58,16 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
 
 PDEPEND="
        input_devices_elographics? ( x11-drivers/xf86-input-elographics )
-       input_devices_evdev?       ( >=x11-drivers/xf86-input-evdev-2.10.6 )
+       input_devices_evdev?       (
+                                                                >=x11-base/xorg-server-${PV}[udev]
+                                                                >=x11-drivers/xf86-input-evdev-2.10.6
+                                                          )
        input_devices_joystick?    ( >=x11-drivers/xf86-input-joystick-1.6.3 )
        input_devices_keyboard?    ( x11-drivers/xf86-input-keyboard )
-       input_devices_libinput?    ( >=x11-drivers/xf86-input-libinput-0.27.1 )
+       input_devices_libinput?    (
+                                                                >=x11-base/xorg-server-${PV}[udev]
+                                                                >=x11-drivers/xf86-input-libinput-0.27.1
+                                                          )
        input_devices_mouse?       ( >=x11-drivers/xf86-input-mouse-1.9.3 )
        input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
        input_devices_void?        ( x11-drivers/xf86-input-void )