From 1331233217948dbe15108b5a72a6e8af1a6d0d8f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 7 Mar 2014 16:14:13 +0100
Subject: [PATCH] nvidia: update to 334.21.

---
 srcpkgs/nvidia/INSTALL  | 16 ----------------
 srcpkgs/nvidia/REMOVE   | 19 -------------------
 srcpkgs/nvidia/template | 27 +++++++++++++++++----------
 3 files changed, 17 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/nvidia/REMOVE

diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 5765f6c7782..00000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,16 +0,0 @@
-# Overwrite libGL and libglx symlinks.
-case ${ACTION} in
-post)
-	rm -f usr/lib/libGL.so usr/lib/libGL.so.1
-	rm -f usr/lib/xorg/modules/extensions/libglx.so
-
-	# libGL	
-	cd usr/lib
-	ln -sf libGL-nvidia.so.${VERSION%_*} libGL.so
-	ln -sf libGL-nvidia.so.${VERSION%_*} libGL.so.1
-
-	# libglx
-	cd ../../usr/lib/xorg/modules/extensions
-	ln -sf libglx-nvidia.so.${VERSION%_*} libglx.so
-	;;
-esac
diff --git a/srcpkgs/nvidia/REMOVE b/srcpkgs/nvidia/REMOVE
deleted file mode 100644
index 83e7efc8e57..00000000000
--- a/srcpkgs/nvidia/REMOVE
+++ /dev/null
@@ -1,19 +0,0 @@
-# Restore mesa libGL and xorg-server libglx symlinks.
-case ${ACTION} in
-purge)
-	rm -f usr/lib/libGL.so usr/lib/libGL.so.1
-	rm -f usr/lib/xorg/modules/extensions/libglx.so
-
-	# libGL
-	cd usr/lib
-	if [ -f libGL-mesa.so.1.2.0 ]; then
-		ln -sf libGL-mesa.so.1.2.0 libGL.so
-		ln -sf libGL-mesa.so.1.2.0 libGL.so.1
-	fi
-	# libglx
-	if [ -f xorg/modules/extensions/libglx-xorg.so ]; then
-		cd xorg/modules/extensions
-		ln -sf libglx-xorg.so libglx.so
-	fi
-	;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index f6a92936873..1b6136c438f 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=331.38
-revision=2
+version=334.21
+revision=1
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -16,19 +16,23 @@ short_desc="${_desc} - Libraries and Utilities"
 depends="xserver-abi-video<16 nvidia-dkms-${version}_${revision} pkg-config"
 conflicts="catalyst>=0"
 
-if [ "$XBPS_MACHINE" = "i686" ]; then
+provides="libGL-${version}_${revision}"
+replaces="libGL>=0"
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
 	distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}.run"
-	checksum=396e4d8fffacd271937ef57dd90ec2dea3ff32ee9f1de73ce5370a6e29382bf4
+	checksum=ece6ac1d66b0de53b6db0ae92f72112f734c9ec4b7f1ffb1ec508d32f700df39
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}"
 	distfiles="http://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}.run"
-	checksum=1015ac65a85ba39bdbe9e6bac54ae7ce3b2441fc7512909074e991242a46cf34
+	checksum=dd35011967b815e096c267f80b36664e34d779bc33017f396dabbd1a1b86d057
 fi
 
 do_extract() {
-	install -m755 ${XBPS_SRCDISTDIR}/${_pkg}.run ${wrksrc}
-	cd ${wrksrc} && ./${_pkg}.run --extract-only
+	install -m755 ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_pkg}.run ${wrksrc}
+	cd ${wrksrc}
+	./${_pkg}.run --extract-only
 	rm -f ${_pkg}.run
 }
 
@@ -39,11 +43,14 @@ do_install() {
 	vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers
 
 	# GLX extension module for X
-	vinstall libglx.so.${version} 755 usr/lib/xorg/modules/extensions \
-		libglx-nvidia.so.${version}
+	vinstall libglx.so.${version} 755 usr/lib/xorg/modules/extensions
+	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so
+	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so.1
 
 	# OpenGL library
-	vinstall libGL.so.${version} 755 usr/lib libGL-nvidia.so.${version}
+	vinstall libGL.so.${version} 755 usr/lib
+	ln -sf libGL.so.${version} ${DESTDIR}/usr/lib/libGL.so
+	ln -sf libGL.so.${version} ${DESTDIR}/usr/lib/libGL.so.1
 
 	# OpenGL core library
 	vinstall libnvidia-glcore.so.${version} 755 usr/lib