commit: 828f87ff41a1925423df18974ad8f9ac89210a7b Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri Jun 8 04:48:50 2018 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Jun 8 04:53:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=828f87ff
x11-base/xorg-drivers: Remove unnecessary blockers Closes: https://bugs.gentoo.org/577292 x11-base/xorg-drivers/xorg-drivers-1.20.ebuild | 57 +++++++++----------------- x11-base/xorg-drivers/xorg-drivers-9999.ebuild | 57 +++++++++----------------- 2 files changed, 40 insertions(+), 74 deletions(-) diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild index 5f7f3bdc325..33b13355384 100644 --- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="Meta package containing deps on all xorg drivers" HOMEPAGE="https://www.gentoo.org/"; @@ -59,47 +59,47 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" PDEPEND=" input_devices_elographics? ( x11-drivers/xf86-input-elographics ) - input_devices_evdev? ( x11-drivers/xf86-input-evdev ) - input_devices_joystick? ( x11-drivers/xf86-input-joystick ) + input_devices_evdev? ( >=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 ) + input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) - input_devices_wacom? ( x11-drivers/xf86-input-wacom ) + input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) - video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) + video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) - video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) + video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) - video_cards_glint? ( x11-drivers/xf86-video-glint ) + video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-${PV}[glamor] ) - video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) - video_cards_mga? ( x11-drivers/xf86-video-mga ) - video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) - video_cards_nv? ( x11-drivers/xf86-video-nv ) - video_cards_omap? ( x11-drivers/xf86-video-omap ) + video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) + video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) + video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) + video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) + video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) - video_cards_r128? ( x11-drivers/xf86-video-r128 ) - video_cards_radeon? ( x11-drivers/xf86-video-ati ) - video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) - video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) - video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) + video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) + video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) + video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] ) + video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) + video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.7 ) video_cards_tegra? ( >=x11-base/xorg-server-${PV}[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-${PV}[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( || ( x11-drivers/xf86-video-vboxvideo - x11-drivers/xf86-video-virtualbox + >=x11-drivers/xf86-video-virtualbox-5.1.14 ) ) - video_cards_vmware? ( x11-drivers/xf86-video-vmware ) + video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron @@ -133,21 +133,4 @@ PDEPEND=" !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4 - !<x11-drivers/xf86-input-joystick-1.6.3 - !<x11-drivers/xf86-input-libinput-0.20.0 - !<x11-drivers/xf86-input-wacom-0.34.0 - !<x11-drivers/xf86-video-amdgpu-1.2.0 - !<x11-drivers/xf86-video-ati-7.8.0 - !<x11-drivers/xf86-video-fbdev-0.5.0 - !<x11-drivers/xf86-video-glint-1.2.9 - !<x11-drivers/xf86-video-intel-2.99.917_p20160122 - !<x11-drivers/xf86-video-mga-1.6.5 - !<x11-drivers/xf86-video-nouveau-1.0.13 - !<x11-drivers/xf86-video-nv-2.1.21 - !<x11-drivers/xf86-video-omap-0.4.5 - !<x11-drivers/xf86-video-r128-6.10.2 - !<x11-drivers/xf86-video-siliconmotion-1.7.9 - !<x11-drivers/xf86-video-tdfx-1.4.7 - !<x11-drivers/xf86-video-virtualbox-5.1.14 - !<x11-drivers/xf86-video-vmware-13.3.0 " diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild index c5588e0206b..a64c5928679 100644 --- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="Meta package containing deps on all xorg drivers" HOMEPAGE="https://www.gentoo.org/"; @@ -59,47 +59,47 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" PDEPEND=" input_devices_elographics? ( x11-drivers/xf86-input-elographics ) - input_devices_evdev? ( x11-drivers/xf86-input-evdev ) - input_devices_joystick? ( x11-drivers/xf86-input-joystick ) + input_devices_evdev? ( >=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 ) + input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) - input_devices_wacom? ( x11-drivers/xf86-input-wacom ) + input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) - video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) + video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) - video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) + video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[glamor] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) - video_cards_glint? ( x11-drivers/xf86-video-glint ) + video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-${PV}[glamor] ) - video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) - video_cards_mga? ( x11-drivers/xf86-video-mga ) - video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) - video_cards_nv? ( x11-drivers/xf86-video-nv ) - video_cards_omap? ( x11-drivers/xf86-video-omap ) + video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) + video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) + video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) + video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) + video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) - video_cards_r128? ( x11-drivers/xf86-video-r128 ) - video_cards_radeon? ( x11-drivers/xf86-video-ati ) - video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) - video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) - video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) + video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) + video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) + video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] ) + video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) + video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.7 ) video_cards_tegra? ( >=x11-base/xorg-server-${PV}[glamor] ) video_cards_vc4? ( >=x11-base/xorg-server-${PV}[glamor] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( || ( x11-drivers/xf86-video-vboxvideo - x11-drivers/xf86-video-virtualbox + >=x11-drivers/xf86-video-virtualbox-5.1.14 ) ) - video_cards_vmware? ( x11-drivers/xf86-video-vmware ) + video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron @@ -133,21 +133,4 @@ PDEPEND=" !x11-drivers/xf86-video-tseng !<x11-drivers/xf86-input-evdev-2.10.4 - !<x11-drivers/xf86-input-joystick-1.6.3 - !<x11-drivers/xf86-input-libinput-0.20.0 - !<x11-drivers/xf86-input-wacom-0.34.0 - !<x11-drivers/xf86-video-amdgpu-1.2.0 - !<x11-drivers/xf86-video-ati-7.8.0 - !<x11-drivers/xf86-video-fbdev-0.5.0 - !<x11-drivers/xf86-video-glint-1.2.9 - !<x11-drivers/xf86-video-intel-2.99.917_p20160122 - !<x11-drivers/xf86-video-mga-1.6.5 - !<x11-drivers/xf86-video-nouveau-1.0.13 - !<x11-drivers/xf86-video-nv-2.1.21 - !<x11-drivers/xf86-video-omap-0.4.5 - !<x11-drivers/xf86-video-r128-6.10.2 - !<x11-drivers/xf86-video-siliconmotion-1.7.9 - !<x11-drivers/xf86-video-tdfx-1.4.7 - !<x11-drivers/xf86-video-virtualbox-5.1.14 - !<x11-drivers/xf86-video-vmware-13.3.0 "
