From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1340983-garchives=archives.gentoo.org@lists.gentoo.org>
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 59EB9158086
	for <garchives@archives.gentoo.org>; Thu, 18 Nov 2021 23:28:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2D183E0801;
	Thu, 18 Nov 2021 23:28:38 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id DD5C6E0801
	for <gentoo-commits@lists.gentoo.org>; Thu, 18 Nov 2021 23:28:35 +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 BC665342EEC
	for <gentoo-commits@lists.gentoo.org>; Thu, 18 Nov 2021 23:28:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id E02251A0
	for <gentoo-commits@lists.gentoo.org>; Thu, 18 Nov 2021 23:28:32 +0000 (UTC)
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" <ionen@gentoo.org>
Message-ID: <1637278030.2829d3baa58bd990a99151aaac6f8e91dcbb3811.ionen@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-390.144-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
X-VCS-Directories: x11-drivers/nvidia-drivers/
X-VCS-Committer: ionen
X-VCS-Committer-Name: Ionen Wolkens
X-VCS-Revision: 2829d3baa58bd990a99151aaac6f8e91dcbb3811
X-VCS-Branch: master
Date: Thu, 18 Nov 2021 23:28:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 553db935-0040-48c2-a943-da08d3509947
X-Archives-Hash: f43fa27a5bb9742f7d7688d8710cd7b8

commit:     2829d3baa58bd990a99151aaac6f8e91dcbb3811
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 19:50:25 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 23:27:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2829d3ba

x11-drivers/nvidia-drivers: require <xorg-server-1.21 for 390+460

xorg-server-21+ isn't in tree yet, but done preemptively given
there will ABI version mismatch for xorg module preventing loading.

Probably simpler to check this from the nvidia ebuild than xorg.

390 - Still officially supported by NVIDIA for another year, but
no telling if/when NVIDIA will push an update for new Xorg. While
plans are to keep 0/390 for as long as possible, not planning to
let this block old xorg removal forever if NVIDIA does nothing
within the next year.

460 - This branch has little worth and is due for removal sooner
than later, only kept due to some leftover regressions in >=470.xx
affecting a few users.

--ignoreABI has not yet been tested, but would rather this route
be a last resort even if it works.

>=470 has no (known) problems with current xorg-server-9999.

PDEPEND used just in case given xorg meta and blockers involving
on nvidia-drivers could potentially get circular/messy.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../{nvidia-drivers-390.144.ebuild => nvidia-drivers-390.144-r1.ebuild}  | 1 +
 ...vidia-drivers-460.91.03.ebuild => nvidia-drivers-460.91.03-r1.ebuild} | 1 +
 2 files changed, 2 insertions(+)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144-r1.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-390.144-r1.ebuild
index 118b158ca051..3ed81570f991 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144-r1.ebuild
@@ -69,6 +69,7 @@ BDEPEND="
 	app-misc/pax-utils
 	sys-devel/m4
 	virtual/pkgconfig"
+PDEPEND="X? ( <x11-base/xorg-server-1.21 )"
 
 QA_PREBUILT="opt/* usr/lib*"
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r1.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r1.ebuild
index 8929d0efa1ec..6627bca8a59c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r1.ebuild
@@ -69,6 +69,7 @@ BDEPEND="
 	app-misc/pax-utils
 	sys-devel/m4
 	virtual/pkgconfig"
+PDEPEND="X? ( <x11-base/xorg-server-1.21 )"
 
 QA_PREBUILT="opt/* usr/lib*"