Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing

4 files changed, 12 insertions, 11 deletions

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 4a4748d..389ca0d 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.2
-pkgrel=28
+pkgrel=30
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -110,7 +110,7 @@ md5sums=('c737f8538aea20fcb5f3903957e80837'
          'c20f73d4da5d7e15e1f3eb85c7dcb49a'
          '8ac1cfd2eca0f641737da0d0aca416a7'
          '9ae8d79f620c6d19973c55c32a921874'
-         '266d48cc336c70e8967c5bb9f5e1787d'
+         'ad2ba000decfc1e50533692f1793e620'
          'ecf9e5df20683a769c4a8a8f2d65de85'
          'e459ed069317bccb20351f037a9df3d2'
          '83be9a3bc72179909773479c74d13b38'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index d684c21..11aedf5 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -196,7 +196,12 @@ function setupAdvancedX {
 }
 
 function nvidia_prepare {
-    pacman --noconfirm  -Rdd libgl > /dev/null 2>&1
+    for i in libgl nvidia nvidia-utils nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils
+    do
+        echo "Removing $i"
+        pacman --noconfirm -Rdd $i > /dev/null 2>&1    
+    done
+
     for i in `echo ${NVPKGS}`
     do
          echo $i
diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD
index faf12c9..4099d9f 100644
--- a/abs/core/nvidia-utils/PKGBUILD
+++ b/abs/core/nvidia-utils/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: James Rayner <iphitus@gmail.com>
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'opencl-nvidia')
-pkgver=275.21
+pkgver=280.13
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -15,12 +15,10 @@ if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
     source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('8c0b4392c9222023d0827e2743c42d40')
 elif [ "$CARCH" = "x86_64" ]; then
     _arch='x86_64'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
     source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('7568cd7a34634506bdfef9d9887de7ec')
 fi
 
 create_links() {
@@ -106,4 +104,4 @@ package_nvidia-utils() {
 
     create_links
 }
-md5sums=('8c0b4392c9222023d0827e2743c42d40')
+md5sums=('c3992c8cef02b7773a398640d8830e77')
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index 688bc55..4d8dcb1 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer : Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia
-pkgver=275.21
+pkgver=280.13
 _kernver='2.6.39-LinHES'
 pkgrel=1
 pkgdesc="NVIDIA drivers for kernel26."
@@ -19,12 +19,10 @@ if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
     source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('8c0b4392c9222023d0827e2743c42d40')
 elif [ "$CARCH" = "x86_64" ]; then
     _arch='x86_64'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
     source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('7568cd7a34634506bdfef9d9887de7ec')
 fi
 
 build() {
@@ -42,4 +40,4 @@ package() {
     sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/nvidia.install
     gzip "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko"
 }
-md5sums=('8c0b4392c9222023d0827e2743c42d40')
+md5sums=('c3992c8cef02b7773a398640d8830e77')