From d0f3fa4d5a28a03ce80f52602d3ffe9104b49483 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 8 Dec 2019 11:36:05 +0100
Subject: [PATCH] nvidia390: tweaks

- sync with nvidia (use pkg-conf)
- make -libs subpkg depend on libglvnd instead
- use https in homepage
---
 srcpkgs/nvidia390/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index d40b3673ef..d06c16c99f 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -4,10 +4,10 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
 version=390.132
-revision=2
+revision=3
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
-homepage="http://www.nvidia.com"
+homepage="https://www.nvidia.com"
 
 archs="i686 x86_64"
 nopie=yes
@@ -15,8 +15,8 @@ repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
 depends="nvidia390-libs-${version}_${revision} nvidia390-gtklibs-${version}_${revision}
- nvidia390-dkms-${version}_${revision} pkg-config libglvnd"
-conflicts="catalyst>=0 xserver-abi-video>24_1"
+ nvidia390-dkms-${version}_${revision} pkg-conf"
+conflicts="xserver-abi-video>24_1"
 
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
@@ -222,6 +222,7 @@ 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"
 	pkg_install() {
 		vmove usr/lib