From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E721A15808B for ; Sat, 12 Mar 2022 21:00:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 889A3E086E; Sat, 12 Mar 2022 21:00:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 203BAE085A for ; Sat, 12 Mar 2022 21:00:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DFAC6342E0B for ; Sat, 12 Mar 2022 21:00:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3400A318 for ; Sat, 12 Mar 2022 21:00:07 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1647118788.3c704ad609f4dcb64fd78057aad39e94097a26d8.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-drivers/xorg-drivers-21.1.ebuild x11-base/xorg-drivers/xorg-drivers-9999.ebuild X-VCS-Directories: x11-base/xorg-drivers/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 3c704ad609f4dcb64fd78057aad39e94097a26d8 X-VCS-Branch: master Date: Sat, 12 Mar 2022 21:00:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c908b95d-5c48-4f2d-95c8-0e67b1b580bd X-Archives-Hash: 254314aded2e3143e619478eb29cea83 commit: 3c704ad609f4dcb64fd78057aad39e94097a26d8 Author: Matt Turner gentoo org> AuthorDate: Sat Mar 12 20:58:23 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Mar 12 20:59:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c704ad6 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 gentoo.org> x11-base/xorg-drivers/xorg-drivers-21.1.ebuild | 4 +--- x11-base/xorg-drivers/xorg-drivers-9999.ebuild | 4 +--- 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 )