nvidia: adopt; tweaks

- make nvidia-libs depend on libglvnd instead.
- catalyst hasn't worked for years, get rid of this conflict.

Fixes upgrade after glvnd switch.

srcpkgs/nvidia/template

@@ -5,16 +5,16 @@ _desc="NVIDIA drivers for linux"
 pkgname=nvidia
 version=440.36
 revision=1
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Juan RP <xtraeme@gmail.com>"
 license="custom:NVIDIA Proprietary"
-homepage="http://www.nvidia.com"
+homepage="https://www.nvidia.com"
 
 archs="i686 x86_64"
 nopie=yes
 repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
-conflicts="catalyst>=0 xserver-abi-video>24_1"
+conflicts="xserver-abi-video>24_1"
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
@@ -23,13 +23,13 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs"
 	depends="nvidia-libs-${version}_${revision}
 	 nvidia-gtklibs-${version}_${revision}
-	 nvidia-dkms-${version}_${revision} pkgconf libglvnd"
+	 nvidia-dkms-${version}_${revision} pkgconf"
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
 	checksum=50086254101fc662c928194315b12d1fc773c3f21667d0091700ad1f79a36d59
 	subpackages="nvidia-libs"
-	depends="pkgconf libglvnd"
+	depends="pkgconf"
 	build_style=meta
 fi
 
@@ -246,6 +246,7 @@ nvidia-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 libglvnd-32bit>=0"
 	pkg_install() {
 		vmove usr/lib