From 6645bf4764e146666485c8c50efdbebff833de8b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 11 Apr 2010 14:01:32 +0200
Subject: [PATCH] libxklavier: update to 5.0, bump abi_depends.

--HG--
extra : convert_revision : b463637dfe25bc18276e2821128052dcf5b750ef
---
 srcpkgs/libxklavier/depends                   |  2 +-
 .../libxklavier/libxklavier-devel.template    | 12 ++++++-----
 srcpkgs/libxklavier/template                  | 20 ++++++++++++-------
 xbps-src/common/mapping_shlib_binpkg.txt      |  4 ++--
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/libxklavier/depends b/srcpkgs/libxklavier/depends
index 99afd8797d1..7a7772e5ac7 100644
--- a/srcpkgs/libxklavier/depends
+++ b/srcpkgs/libxklavier/depends
@@ -1,2 +1,2 @@
-abi_depends=">=3.9"
+abi_depends=">=5.0"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/libxklavier/libxklavier-devel.template b/srcpkgs/libxklavier/libxklavier-devel.template
index 9f904a7ca35..ae40f27319f 100644
--- a/srcpkgs/libxklavier/libxklavier-devel.template
+++ b/srcpkgs/libxklavier/libxklavier-devel.template
@@ -5,15 +5,17 @@ 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
+Add_dependency run libXi-devel
 Add_dependency run libxklavier
 
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.{a,so} ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
 }
diff --git a/srcpkgs/libxklavier/template b/srcpkgs/libxklavier/template
index dcc37032fae..48a3d820a15 100644
--- a/srcpkgs/libxklavier/template
+++ b/srcpkgs/libxklavier/template
@@ -1,12 +1,12 @@
 # Template build file for 'libxklavier'.
 pkgname=libxklavier
-version=3.9
+version=5.0
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var"
 short_desc="Library providing high-level API for X Keyboard Extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=462a4e427f201a23de194f824dce70c84867464956f2f6c8dd4a5e07f1f4a554
+checksum=dfd94b17a752b2839281764f0a16af2b338024c8867c10fba7015f276dec4db0
 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,17 @@ long_desc="
  (layout indicators etc)."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run libxkbfile
+Add_dependency run libxml2
+Add_dependency run libX11
+Add_dependency run libXi
 Add_dependency build pkg-config
-Add_dependency full glibc
-Add_dependency full libxkbfile
-Add_dependency full libxml2
-Add_dependency full glib
+Add_dependency build glib-devel
+Add_dependency build libxkbfile-devel
+Add_dependency build libxml2-devel
+Add_dependency build libX11-devel
+Add_dependency build libXi-devel
 Add_dependency full xkeyboard-config
-Add_dependency full libXi
 Add_dependency full iso-codes
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index cc81442dbe9..8c0f2a0ed47 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -272,7 +272,7 @@ libgamin-1.so			gamin			gamin-devel
 libfam.so			gamin			gamin-devel
 libglade-2.0.so			libglade		libglade-devel
 libthunarx-1.so			Thunar			Thunar-devel
-libthunar-vfs-1.s		Thunar			Thunar-devel
+libthunar-vfs-1.so		Thunar			Thunar-devel
 libexif.so.12			libexif			libexif-devel
 liboil-0.3.so			liboil			liboil-devel
 libogg.so			libogg			libogg-devel
@@ -287,7 +287,7 @@ libcdda_paranoia.so		cdparanoia		cdparanoia-devel
 libasound.so			alsa-lib		alsa-lib-devel
 libvisual-0.4.so		libvisual		libvisual-devel
 libxfsm-4.6.so			xfce4-session		xfce4-session-devel
-libxklavier.so.12		libxklavier		libxklavier-devel
+libxklavier.so.16		libxklavier		libxklavier-devel
 libsexy.so			libsexy			libsexy-devel
 liblcms.so			lcms			lcms-devel
 libgd.so			gd			gd-devel