From 30117c7a892354dee583c5cc4c3f9e43a0d54968 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 21 Mar 2015 11:46:17 +0100
Subject: [PATCH] catalyst, nvidia: do not depend on the xserver-abi-video
 vpkg.

This introduces an unresolved circular dependency that cannot be
resolved easily:

nvidia -> xorg-server -> libGL -> nvidia

Rather add a conflict with the unsupported xserver-abi-video pkgs.
---
 srcpkgs/catalyst/template      | 6 +++---
 srcpkgs/nvidia-stable/template | 6 +++---
 srcpkgs/nvidia/template        | 6 +++---
 srcpkgs/nvidia304/template     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template
index e582664407..947b6938e2 100644
--- a/srcpkgs/catalyst/template
+++ b/srcpkgs/catalyst/template
@@ -4,15 +4,15 @@ _distver="14.12"
 
 pkgname=catalyst
 version=14.501.1003
-revision=3
+revision=4
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary AMD license"
 homepage="http://www.amd.com"
 
 only_for_archs="i686 x86_64"
 hostmakedepends="unzip wget"
-depends="virtual?xserver-abi-video<19_1 ${pkgname}-dkms-${version}_${revision}"
-conflicts="nvidia>=0"
+depends="${pkgname}-dkms-${version}_${revision}"
+conflicts="nvidia>=0 xserver-abi-video>19"
 provides="libGL-${version}_${revision}"
 replaces="libGL>=0"
 short_desc="${_desc} - Libraries and Utilities"
diff --git a/srcpkgs/nvidia-stable/template b/srcpkgs/nvidia-stable/template
index bbabcb37aa..1000ee76e2 100644
--- a/srcpkgs/nvidia-stable/template
+++ b/srcpkgs/nvidia-stable/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux (long-lived series)"
 
 pkgname=nvidia-stable
 version=340.76
-revision=3
+revision=4
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -13,8 +13,8 @@ only_for_archs="i686 x86_64"
 repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
-depends="virtual?xserver-abi-video<20 nvidia-stable-dkms-${version}_${revision} pkg-config"
-conflicts="catalyst>=0"
+depends="nvidia-stable-dkms-${version}_${revision} pkg-config"
+conflicts="catalyst>=0 xserver-abi-video>20"
 
 provides="nvidia-${version}_${revision} libGL-${version}_${revision}"
 replaces="nvidia>=0 libGL>=0"
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 6e4969a94d..a6cdaa6737 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=346.47
-revision=2
+revision=3
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -13,8 +13,8 @@ only_for_archs="i686 x86_64"
 repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
-depends="virtual?xserver-abi-video<20 nvidia-dkms-${version}_${revision} pkg-config"
-conflicts="catalyst>=0"
+depends="nvidia-dkms-${version}_${revision} pkg-config"
+conflicts="xserver-abi-video>20"
 
 provides="libGL-${version}_${revision}"
 replaces="libGL>=0"
diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template
index 315afecfd0..80404a2749 100644
--- a/srcpkgs/nvidia304/template
+++ b/srcpkgs/nvidia304/template
@@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)"
 
 pkgname=nvidia304
 version=304.125
-revision=4
+revision=5
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -12,10 +12,10 @@ repository="nonfree"
 create_wrksrc=yes
 only_for_archs="i686 x86_64"
 short_desc="${_desc} - Libraries and Utilities"
-depends="virtual?xserver-abi-video<20 ${pkgname}-dkms-${version}_${revision} pkg-config"
+depends="${pkgname}-dkms-${version}_${revision} pkg-config"
 provides="nvidia-${version}_${revision} libGL-${version}_${revision}"
 replaces="nvidia>=0 libGL>=0"
-conflicts="catalyst>=0"
+conflicts="catalyst>=0 xserver-abi-video>20"
 
 if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"