From 984ace971e3311468a6e9cd7674a0349861e62a0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 18 Mar 2009 16:55:43 -0500
Subject: Nvidia drivers: General cleanup of provides and conflicts.

There appears to be a bug with pacman wrt sorting out "provides dependencies" so the recommended way to switch between the nvidia and beta drivers is.
pacman -Rd nvidia nvidia-utils
pacman -S nvidia-beta nvidia-utils-beta.
---
 abs/core-testing/nvidia/PKGBUILD                       | 4 ++--
 abs/extra-testing/community/nvidia-beta/PKGBUILD       | 7 ++++---
 abs/extra-testing/community/nvidia-utils-beta/PKGBUILD | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/abs/core-testing/nvidia/PKGBUILD b/abs/core-testing/nvidia/PKGBUILD
index 9312766..5a230ba 100644
--- a/abs/core-testing/nvidia/PKGBUILD
+++ b/abs/core-testing/nvidia/PKGBUILD
@@ -4,14 +4,14 @@
 pkgname=nvidia
 pkgver=180.29
 _kernver='2.6.28-LinHES'
-pkgrel=2
+pkgrel=4
 pkgdesc="NVIDIA drivers for kernel26."
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/"
 depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-utils')
-conflicts=('nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy')
+conflicts=('nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy' 'nvidia-beta')
 license=('custom')
 install=nvidia.install
 source=(http://us.download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run)
diff --git a/abs/extra-testing/community/nvidia-beta/PKGBUILD b/abs/extra-testing/community/nvidia-beta/PKGBUILD
index 67fc0c0..a195151 100644
--- a/abs/extra-testing/community/nvidia-beta/PKGBUILD
+++ b/abs/extra-testing/community/nvidia-beta/PKGBUILD
@@ -3,16 +3,17 @@
 pkgname=nvidia-beta 
 pkgver=180.37
 _kernver=2.6.28-LinHES
-pkgrel=2
+pkgrel=5
 pkgdesc="NVIDIA beta drivers for kernel26." 
 arch=('i686' 'x86_64') 
 [ "$CARCH" = "i686" ] && ARCH=x86 && NV=0 
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64 && NV=0 
-provides=('nvidia')
+provides=('nvidia=180.22')
 url="http://www.nvidia.com/" 
-depends=('kernel26' 'nvidia-utils-beta') 
+depends=('kernel26' 'nvidia-utils-beta=180.37') 
 conflicts=('nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy') 
 license=('custom') 
+provides=("nvidia")
 install=('nvidia.install')
 source=(ftp://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg${NV}.run) 
 
diff --git a/abs/extra-testing/community/nvidia-utils-beta/PKGBUILD b/abs/extra-testing/community/nvidia-utils-beta/PKGBUILD
index 3d5989f..8b24896 100644
--- a/abs/extra-testing/community/nvidia-utils-beta/PKGBUILD
+++ b/abs/extra-testing/community/nvidia-utils-beta/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=nvidia-utils-beta
 pkgver=180.37
-pkgrel=2
+pkgrel=6
 pkgdesc="NVIDIA beta drivers utilities and libraries."
 provides=('nvidia-utils' 'libgl')
 arch=('i686' 'x86_64')
@@ -10,6 +10,7 @@ arch=('i686' 'x86_64')
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64 && NV=0
 url="http://www.nvidia.com/"
 depends=('xorg-server>=1.5')
+provides=('nvidia-utils=180.22' 'libgl')
 conflicts=('libgl' 'libgl-dri' 'ati-fglrx-utils' 'nvidia-legacy-utils' \
            'nvidia-71xx-utils' 'nvidia-96xx-utils')
 license=('custom')
-- 
cgit v0.12