From 7979b48f1a13a925d6a2a6f5166c224f7f208359 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 27 Jun 2013 17:57:46 +0200
Subject: [PATCH] nvidia304: explicitly depend on xserver-abi-video<14 (up to
 1.13.x).

---
 srcpkgs/nvidia304/template | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template
index 8d336e52381..08d8acd9caa 100644
--- a/srcpkgs/nvidia304/template
+++ b/srcpkgs/nvidia304/template
@@ -1,8 +1,8 @@
 # Template file for 'nvidia304'
 pkgname=nvidia304
 version=304.84
-revision=2
-short_desc="NVIDIA drivers for linux (304.xx series) -- libraries and utilities"
+revision=3
+short_desc="NVIDIA drivers for linux (304.xx series)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -136,13 +136,13 @@ do_install() {
 }
 
 nvidia304-dkms_package() {
-	short_desc="NVIDIA drivers for linux (304.xx series) -- DKMS kernel module"
-	nonfree=yes
+	short_desc+=" - DKMS kernel module"
 	depends="dkms"
 	triggers="dkms"
 	dkms_modules="nvidia ${version}"
 	provides="nvidia-dkms-${version}"
 	replaces="nvidia-dkms>=0"
+	nonfree=yes
 	pkg_install() {
 		vmove usr/src
 		vmove usr/lib/modules-load.d
@@ -151,10 +151,10 @@ nvidia304-dkms_package() {
 }
 
 nvidia304-opencl_package() {
-	short_desc="NVIDIA drivers for linux (304.xx series) -- OpenCL implementation"
-	nonfree=yes
+	short_desc+=" - OpenCL implementation"
 	provides="nvidia-opencl-${version} libOpenCL-${version}"
 	replaces="nvidia-openctl>=0 libOpenCL>=0"
+	nonfree=yes
 	pkg_install() {
 		vmove "usr/lib/libOpenCL*"
 		vmove "usr/lib/libnvidia-compiler*"
@@ -164,12 +164,13 @@ nvidia304-opencl_package() {
 }
 
 nvidia304_package() {
-	nonfree=yes
+	short_desc+=" - Libraries and Utilities"
+	depends="xserver-abi-video<14 ${pkgname}-dkms-${version}_${revision} pkg-config"
 	provides="nvidia-${version}"
 	replaces="nvidia>=0"
-	depends="${pkgname}-dkms-${version}_${revision} pkg-config"
 	conflicts="catalyst>=0"
+	nonfree=yes
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }