From 966c78fdcaeee5a112bbc7de5cabc8561078384f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 25 Sep 2012 14:23:20 +0200
Subject: [PATCH] gobject-introspection: update to 1.34.0.

---
 .../gir-freedesktop.template                    |  6 ++----
 .../libgirepository-devel.template              | 15 ++++++---------
 srcpkgs/gobject-introspection/template          | 17 +++++++----------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/gobject-introspection/gir-freedesktop.template b/srcpkgs/gobject-introspection/gir-freedesktop.template
index f8040e92fdf..e4014ab7345 100644
--- a/srcpkgs/gobject-introspection/gir-freedesktop.template
+++ b/srcpkgs/gobject-introspection/gir-freedesktop.template
@@ -9,8 +9,6 @@ long_desc="${long_desc}
  for GObject Introspection. They are far from complete and only include what
  is necessary for other introspection packages to work properly."
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
+do_install() {
+	vmove usr/lib/girepository-1.0 usr/lib
 }
diff --git a/srcpkgs/gobject-introspection/libgirepository-devel.template b/srcpkgs/gobject-introspection/libgirepository-devel.template
index 8d722ae4e0b..71551f0d0c3 100644
--- a/srcpkgs/gobject-introspection/libgirepository-devel.template
+++ b/srcpkgs/gobject-introspection/libgirepository-devel.template
@@ -1,17 +1,14 @@
 # Template file for 'libgirepository-devel'.
 #
-depends="cairo-devel libffi-devel glib-devel libgirepository"
+noarch=yes
+depends="cairo-devel libffi-devel glib-devel libgirepository>=${version}"
 short_desc="Library for handling GObject introspection data (development files)"
 long_desc="${long_desc}
 
  This package contains C libraries for handling the introspection data."
 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/{lib,share}
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/gir-1.0 ${DESTDIR}/usr/share
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gir-1.0 usr/share
 }
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 5ebf86192a1..0b93ed74260 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,24 +1,21 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
-version=1.32.1
-distfiles="${GNOME_SITE}/$pkgname/1.32/$pkgname-$version.tar.xz"
+version=1.34.0
+revision=1
 build_style=gnu-configure
-configure_args="--disable-tests"
+configure_args="--disable-tests --disable-static"
 depends="python libgirepository-devel"
 makedepends="pkg-config flex libffi-devel glib-devel python-devel libxml2-devel cairo-devel"
 fulldepends="libtool"
-revision=2
 short_desc="Introspection system for GObject-based libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/GObjectInstrospection"
-license="GPL-2, LGPL-2"
-checksum=44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858
+license="GPL-2, LGPL-2.1"
+distfiles="${GNOME_SITE}/${pkgname}/1.34/${pkgname}-${version}.tar.xz"
+checksum=80e211ea95404fc7c5fa3b04ba69ee0b29af70847af315155ab06b8cff832c85
 long_desc="
  The goal of the project is to describe the APIs and collect them in
  a uniform, machine readable format."
 
 subpackages="gir-freedesktop libgirepository libgirepository-devel"
-pycompile_dirs="usr/lib/$pkgname/giscanner"
-
-
-
+pycompile_dirs="usr/lib/${pkgname}/giscanner"