From 2d97ea767bfe41ebe3f183a6e09631c6f7cd58e2 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 25 Dec 2019 11:29:10 +0100
Subject: [PATCH] nvidia390: the conflicts in -libs are unnecessary.

libglvnd should replace the affected pkgs instead.
---
 srcpkgs/nvidia390/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index d3409a29e7e..b8121862510 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.132
-revision=4
+revision=5
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -220,7 +220,6 @@ nvidia390-gtklibs_package() {
 }
 nvidia390-libs_package() {
 	short_desc="${_desc} - common libraries"
-	conflicts="libGL>10_1<19.2.5_2 libEGL>10_1<19.2.5_2 libGLES>10_1<19.2.5_2"
 	# manually set 32bit depends for libglvnd
 	depends="libglvnd"
 	lib32depends="glibc-32bit>=0 libX11-32bit>=0 libXext-32bit>=0 wayland-32bit>=0 libglvnd-32bit>=0"