From 0e78decdc6fb9b5cf20a2ff1b9a4e06c4eaca9e1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 18 Jan 2012 21:23:58 +0100
Subject: [PATCH] libxklavier: update to 5.2.

---
 srcpkgs/libxklavier/depends                    |  2 +-
 srcpkgs/libxklavier/libxklavier-devel.template | 14 +++++---------
 srcpkgs/libxklavier/template                   | 10 +++++-----
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/libxklavier/depends b/srcpkgs/libxklavier/depends
index 7a7772e5ac7..f57871a1d26 100644
--- a/srcpkgs/libxklavier/depends
+++ b/srcpkgs/libxklavier/depends
@@ -1,2 +1,2 @@
 abi_depends=">=5.0"
-api_depends="${abi_depends}"
+api_depends=">=5.2"
diff --git a/srcpkgs/libxklavier/libxklavier-devel.template b/srcpkgs/libxklavier/libxklavier-devel.template
index 0a1ed14dbc7..9cbefc52eb5 100644
--- a/srcpkgs/libxklavier/libxklavier-devel.template
+++ b/srcpkgs/libxklavier/libxklavier-devel.template
@@ -5,17 +5,13 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
 Add_dependency run glib-devel
-Add_dependency run libxkbfile-devel
 Add_dependency run libxml2-devel	">=2.7.8"
-Add_dependency run libXi-devel
 Add_dependency run libxklavier
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+do_install() {
+	vmove usr/include usr
+	vmove usr/share usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/libxklavier/template b/srcpkgs/libxklavier/template
index f517b920484..0f83ba5c77f 100644
--- a/srcpkgs/libxklavier/template
+++ b/srcpkgs/libxklavier/template
@@ -1,12 +1,12 @@
 # Template build file for 'libxklavier'.
 pkgname=libxklavier
-version=5.1
-distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.bz2"
+version=5.2
+distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-revision=1
+configure_args="--disable-introspection" # currently broken
 short_desc="Library providing high-level API for X Keyboard Extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=1d7e8a6ed842d415d2f95b827e7d04ecf515ed5be2aaee262a8dd1c5cbe10ff1
+checksum=7c1f04a80035e03cec992e16b89bc708a32b3578d6e133343d2cb56385d25dfe
 long_desc="
  libxklavier is a library providing high-level API for X Keyboard Extension
  known as XKB. This library is intended to support XFree86 and other
@@ -14,11 +14,11 @@ long_desc="
  (layout indicators etc)."
 
 subpackages="$pkgname-devel"
+
 Add_dependency build pkg-config
 Add_dependency build glib-devel
 Add_dependency build libxkbfile-devel
 Add_dependency build libxml2-devel	">=2.7.8"
-Add_dependency build libX11-devel
 Add_dependency build libXi-devel
 Add_dependency full xkeyboard-config
 Add_dependency full iso-codes