summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2022-03-12 12:58:23 -0800
committerMatt Turner <mattst88@gentoo.org>2022-03-12 12:59:48 -0800
commit3c704ad609f4dcb64fd78057aad39e94097a26d8 (patch)
tree5d53778695d54f1b9be899787b10e8f4c7c8d48d /x11-base
parentx11-base/xorg-drivers: Sync ebuilds (diff)
downloadgentoo-3c704ad609f4dcb64fd78057aad39e94097a26d8.tar.gz
gentoo-3c704ad609f4dcb64fd78057aad39e94097a26d8.tar.bz2
gentoo-3c704ad609f4dcb64fd78057aad39e94097a26d8.zip
x11-base/xorg-drivers: Drop VIDEO_CARDS=i965
We don't want users using xf86-video-intel on i965-class hardware. With Mesa 22 dropping VIDEO_CARDS=i965, users may drop it from their make.conf which would then unexpectedly cause xorg-drivers to depend on xf86-video-intel. Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-drivers/xorg-drivers-21.1.ebuild4
-rw-r--r--x11-base/xorg-drivers/xorg-drivers-9999.ebuild4
2 files changed, 2 insertions, 6 deletions
diff --git a/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild b/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild
index 80cd5e7d942e..9f3f808e57bf 100644
--- a/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild
@@ -34,7 +34,6 @@ IUSE_VIDEO_CARDS="
video_cards_geode
video_cards_glint
video_cards_i915
- video_cards_i965
video_cards_intel
video_cards_mga
video_cards_nouveau
@@ -80,8 +79,7 @@ PDEPEND="
video_cards_geode? ( x11-drivers/xf86-video-geode )
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}[-minimal] )
- video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
+ video_cards_intel? ( >=x11-base/xorg-server-${PV}[-minimal] )
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 )
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 7e7423be9356..76e98afb460a 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -34,7 +34,6 @@ IUSE_VIDEO_CARDS="
video_cards_geode
video_cards_glint
video_cards_i915
- video_cards_i965
video_cards_intel
video_cards_mga
video_cards_nouveau
@@ -80,8 +79,7 @@ PDEPEND="
video_cards_geode? ( x11-drivers/xf86-video-geode )
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}[-minimal] )
- video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
+ video_cards_intel? ( >=x11-base/xorg-server-${PV}[-minimal] )
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 )