From 6f64fe8965a1dfd43703d008e5f052feb84fca5b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 1 Mar 2011 09:42:08 +0100
Subject: [PATCH] libgnomekbd: update to 2.91.90, bump abi_depends.

--HG--
branch : gnome3
---
 srcpkgs/gir-libgnomekbd                       |  1 +
 srcpkgs/libgnomekbd/depends                   |  2 +-
 srcpkgs/libgnomekbd/gir-libgnomekbd.template  | 13 ++++++++
 .../libgnomekbd/libgnomekbd-devel.template    | 11 ++++---
 srcpkgs/libgnomekbd/template                  | 33 ++++++++-----------
 5 files changed, 35 insertions(+), 25 deletions(-)
 create mode 120000 srcpkgs/gir-libgnomekbd
 create mode 100644 srcpkgs/libgnomekbd/gir-libgnomekbd.template

diff --git a/srcpkgs/gir-libgnomekbd b/srcpkgs/gir-libgnomekbd
new file mode 120000
index 0000000000..d8e91fad51
--- /dev/null
+++ b/srcpkgs/gir-libgnomekbd
@@ -0,0 +1 @@
+libgnomekbd
\ No newline at end of file
diff --git a/srcpkgs/libgnomekbd/depends b/srcpkgs/libgnomekbd/depends
index 071d27b792..6e8d7e9a54 100644
--- a/srcpkgs/libgnomekbd/depends
+++ b/srcpkgs/libgnomekbd/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.30.0"
+abi_depends=">=2.91.90"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/libgnomekbd/gir-libgnomekbd.template b/srcpkgs/libgnomekbd/gir-libgnomekbd.template
new file mode 100644
index 0000000000..099a9a3e52
--- /dev/null
+++ b/srcpkgs/libgnomekbd/gir-libgnomekbd.template
@@ -0,0 +1,13 @@
+# Template file for 'gir-libgnomekbd'.
+#
+short_desc="Introspection data for libgnomekbd"
+long_desc="${long_desc}
+
+ This package contains small pieces of introspection data for the GNOME's
+ gnomekbd library."
+
+do_install()
+{
+	install -d ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/libgnomekbd/libgnomekbd-devel.template b/srcpkgs/libgnomekbd/libgnomekbd-devel.template
index 701eb5a8d1..6c51fb468a 100644
--- a/srcpkgs/libgnomekbd/libgnomekbd-devel.template
+++ b/srcpkgs/libgnomekbd/libgnomekbd-devel.template
@@ -10,21 +10,22 @@ Add_dependency run intltool
 Add_dependency run glib-devel
 Add_dependency run libxml2-devel
 Add_dependency run atk-devel
-Add_dependency run pango-devel
 Add_dependency run freetype-devel
 Add_dependency run fontconfig-devel
-Add_dependency run cairo-devel
+Add_dependency run pango-devel
 Add_dependency run gdk-pixbuf-devel
 Add_dependency run libpng-devel
-Add_dependency run gtk+-devel
+Add_dependency run cairo-devel
 Add_dependency run libX11-devel
+Add_dependency run gtk+3-devel
 Add_dependency run libxklavier-devel
-Add_dependency run GConf-devel
+Add_dependency run libgnomekbd
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
+	mkdir -p ${DESTDIR}/usr/{lib,share}
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share
 }
diff --git a/srcpkgs/libgnomekbd/template b/srcpkgs/libgnomekbd/template
index 1a47873469..414526efce 100644
--- a/srcpkgs/libgnomekbd/template
+++ b/srcpkgs/libgnomekbd/template
@@ -1,50 +1,45 @@
 # Template file for 'libgnomekbd'
 pkgname=libgnomekbd
-version=2.32.0
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=2.91.90
+distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-schemas-install
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---localstatedir=/var"
+configure_args="--localstatedir=/var"
 short_desc="Gnome keyboard configuration library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256
+checksum=639222985d106a82a7b1eb7b0370f1bf359d66f24cc693ef200587fbc4ad9e2f
 long_desc="
  This packages a keyboard configuration library for the GNOME desktop."
- 
-gconf_schemas="desktop_gnome_peripherals_keyboard_xkb.schemas"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel"
+
+triggers="gsettings-schemas" 
+subpackages="gir-$pkgname $pkgname-devel"
 
 Add_dependency run glibc
 Add_dependency run glib
 Add_dependency run libxml2
 Add_dependency run atk
-Add_dependency run pango
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run cairo
+Add_dependency run pango
 Add_dependency run gdk-pixbuf
 Add_dependency run libpng
-Add_dependency run gtk+
+Add_dependency run cairo
 Add_dependency run libX11
+Add_dependency run gtk+3
 Add_dependency run libxklavier
-Add_dependency run GConf
 
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build glib-devel
 Add_dependency build libxml2-devel
 Add_dependency build atk-devel
-Add_dependency build pango-devel
 Add_dependency build freetype-devel
 Add_dependency build fontconfig-devel
-Add_dependency build cairo-devel
+Add_dependency build pango-devel
 Add_dependency build gdk-pixbuf-devel
 Add_dependency build libpng-devel
-Add_dependency build gtk+-devel
+Add_dependency build cairo-devel
 Add_dependency build libX11-devel
+Add_dependency build gtk+3-devel
 Add_dependency build libxklavier-devel
-Add_dependency build GConf-devel
 
-Add_dependency full hicolor-icon-theme
+Add_dependency full desktop-file-utils