gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

x11-drivers/nvidia-drivers: update openssl dependency

Browse Source 
openssl-1.1 is masked, so extra work to allow both is no longer
necessary and we can depend on the correct subslot that the
prebuilt is built for

No real need for a revbump, := will handle this.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2023-09-09 16:58:05 -04:00
parent d33ba3865f
commit b07884ce9c
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
x11-drivers/nvidia-drivers/nvidia-drivers-535.104.05.ebuild
View File

@@ -27,13 +27,10 @@ KEYWORDS="-* amd64 ~arm64"
IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
REQUIRED_USE="kernel-open? ( modules )"
# wrt openssl, can only use exactly :0/1.1 *or* :0/3 (prebuilt) but depend on
# a simple >=1.1 given a || ( ) block confuses portage with subslot "rebuilds"
# TODO: change to a hard dependency on exactly :0/3 when :0/1.1 loses relevance
COMMON_DEPEND="
acct-group/video
sys-libs/glibc
>=dev-libs/openssl-1.1:=
dev-libs/openssl:0/3
X? ( x11-libs/libpciaccess )
persistenced? (
acct-user/nvpd
@@ -250,11 +247,8 @@ src_install() {
libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
libnvidia-pkcs11.so # using the openssl3 version instead
)
# TODO: hard-depend on openssl:0/3, drop this, and add pkcs11.so above
has_version 'dev-libs/openssl:0/3' &&
skip_files+=( libnvidia-pkcs11.so ) ||
skip_files+=( libnvidia-pkcs11-openssl3.so )
local skip_modules=(
$(usev !X "nvfbc vdpau xdriver")
$(usev !modules gsp)

10
x11-drivers/nvidia-drivers/nvidia-drivers-535.43.09.ebuild
View File

@@ -28,13 +28,10 @@ KEYWORDS="-* ~amd64"
IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
REQUIRED_USE="kernel-open? ( modules )"
# wrt openssl, can only use exactly :0/1.1 *or* :0/3 (prebuilt) but depend on
# a simple >=1.1 given a || ( ) block confuses portage with subslot "rebuilds"
# TODO: change to a hard dependency on exactly :0/3 when :0/1.1 loses relevance
COMMON_DEPEND="
acct-group/video
sys-libs/glibc
>=dev-libs/openssl-1.1:=
dev-libs/openssl:0/3
X? ( x11-libs/libpciaccess )
persistenced? (
acct-user/nvpd
@@ -251,11 +248,8 @@ src_install() {
libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
libnvidia-pkcs11.so # using the openssl3 version instead
)
# TODO: hard-depend on openssl:0/3, drop this, and add pkcs11.so above
has_version 'dev-libs/openssl:0/3' &&
skip_files+=( libnvidia-pkcs11.so ) ||
skip_files+=( libnvidia-pkcs11-openssl3.so )
local skip_modules=(
$(usev !X "nvfbc vdpau xdriver")
$(usev !modules gsp)