From 588e13c6f1a111d697baf551db664317e13ca537 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 10 Nov 2015 17:36:36 +0100
Subject: [PATCH] catalyst, nvidia*: fix pattern in conflicts.

---
 srcpkgs/catalyst/template      | 4 ++--
 srcpkgs/nvidia-stable/template | 4 ++--
 srcpkgs/nvidia/template        | 4 ++--
 srcpkgs/nvidia304/template     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template
index 5f7c41deea..6a1b9524f6 100644
--- a/srcpkgs/catalyst/template
+++ b/srcpkgs/catalyst/template
@@ -4,7 +4,7 @@ _release="15.9"
 
 pkgname=catalyst
 version=15.201.1151
-revision=3
+revision=4
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Proprietary AMD license"
 homepage="http://www.amd.com"
@@ -13,7 +13,7 @@ only_for_archs="i686 x86_64"
 hostmakedepends="unzip wget"
 subpackages="${pkgname}-opencl ${pkgname}-dkms ${pkgname}-libs"
 depends="${pkgname}-dkms-${version}_${revision}"
-conflicts="nvidia>=0 xserver-abi-video>19"
+conflicts="nvidia>=0 xserver-abi-video>19_1"
 short_desc="${_desc} - Utilities"
 repository="nonfree"
 create_wrksrc=yes
diff --git a/srcpkgs/nvidia-stable/template b/srcpkgs/nvidia-stable/template
index e0e3f07331..ff3bba179c 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.93
-revision=2
+revision=3
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -14,7 +14,7 @@ repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
 depends="${pkgname}-dkms-${version}_${revision} pkg-config"
-conflicts="catalyst>=0 xserver-abi-video>19"
+conflicts="catalyst>=0 xserver-abi-video>19_1"
 
 provides="nvidia-${version}_${revision}"
 replaces="nvidia>=0"
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index d9144f8159..cf3a015b52 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=352.55
-revision=2
+revision=3
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Proprietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -14,7 +14,7 @@ repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
 depends="nvidia-gtklibs-${version}_${revision} nvidia-dkms-${version}_${revision} pkg-config"
-conflicts="xserver-abi-video>19"
+conflicts="xserver-abi-video>19_1"
 
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template
index 121c3080b0..a1070999bb 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.128
-revision=2
+revision=3
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -15,7 +15,7 @@ short_desc="${_desc} - Libraries and Utilities"
 depends="${pkgname}-dkms-${version}_${revision} pkg-config"
 provides="nvidia-${version}_${revision}"
 replaces="nvidia>=0"
-conflicts="catalyst>=0 xserver-abi-video>19"
+conflicts="catalyst>=0 xserver-abi-video>19_1"
 subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs"
 
 if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then