From 7fbbf27bc2f29b67a4ffa23981a3e1a143c4250b Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Wed, 8 Dec 2010 03:02:25 +0000
Subject: xkeyboard-config: upgrade

---
 abs/core/xkeyboard-config/PKGBUILD | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/abs/core/xkeyboard-config/PKGBUILD b/abs/core/xkeyboard-config/PKGBUILD
index 740c544..b9a9fb2 100644
--- a/abs/core/xkeyboard-config/PKGBUILD
+++ b/abs/core/xkeyboard-config/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 65515 2010-01-30 15:59:03Z jgc $
+# $Id: PKGBUILD 94925 2010-10-12 14:48:05Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=xkeyboard-config
-pkgver=1.8
+pkgver=2.0
 pkgrel=1
 pkgdesc="X keyboard configuration files"
 arch=(any)
@@ -12,19 +12,23 @@ makedepends=('intltool' 'pkgconfig')
 provides=('xkbdata')
 replaces=('xkbdata')
 conflicts=('xkbdata')
-source=(http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${pkgver}.tar.bz2)
-md5sums=('37ae41628cd2ce35d202d30b1820c8ba')
+source=(http://people.freedesktop.org/~svu/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('bb8a98ee61cdc4bd835fdfd2b5cee3e6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
       --with-xkb-base=/usr/share/X11/xkb \
       --with-xkb-rules-symlink=xorg \
-      --enable-compat-rules=yes || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  rm -f "${pkgdir}/usr/share/X11/xkb/compiled" || return 1
+      --enable-compat-rules=yes
+  make
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}/usr/share/X11/xkb/compiled"
   install -m755 -d "${pkgdir}/var/lib/xkb"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
+
-- 
cgit v0.12

