From c899f28cd12fd140367c68a00e372f34da43ff4e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 28 Sep 2011 13:38:34 +0200
Subject: [PATCH] glib: update to 2.30.0.

---
 srcpkgs/glib/glib-devel.template | 18 +++++++++++-------
 srcpkgs/glib/template            | 12 +++++++++---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template
index 8be853c65ab..3826e029a37 100644
--- a/srcpkgs/glib/glib-devel.template
+++ b/srcpkgs/glib/glib-devel.template
@@ -5,19 +5,21 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=2
+revision=1
 
 Add_dependency run glibc
 Add_dependency run zlib-devel
 Add_dependency run pcre-devel
+Add_dependency run libffi-devel
 Add_dependency run coreutils  # required by glib-mkenums /usr/bin/env
 Add_dependency run perl ">=0" # required by glib-mkenums
 Add_dependency run glib
 
 do_install()
 {
-	install -d ${DESTDIR}/usr/{lib,bin,share} ${DESTDIR}/usr/share/man/man1
-	
+	vmkdir usr/bin
+	vmkdir usr/share/man/man1
+
 	for f in $(find ${SRCPKGDESTDIR}/usr/bin -type f); do
 		[ "$(basename ${f})" = "gio-querymodules" ] && continue
 		[ "$(basename ${f})" = "gdbus" ] && continue
@@ -25,11 +27,13 @@ do_install()
 		[ "$(basename ${f})" = "glib-compile-schemas" ] && continue
 		mv ${f} ${DESTDIR}/usr/bin
 	done
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/glib-2.0 ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	vmove usr/include usr
+	vmove usr/lib/glib-2.0 usr/lib
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/lib/gdbus-2.0 usr/lib
+
 	for f in gtk-doc aclocal glib-2.0 gdb; do
-		mv ${SRCPKGDESTDIR}/usr/share/${f} ${DESTDIR}/usr/share
+		vmove usr/share/${f} usr/share
 	done
 	for f in $(find ${SRCPKGDESTDIR}/usr/share/man/man1 -type f); do
 		[ "$(basename ${f})" = "gio-querymodules.1" ] && continue
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 8bc952df629..1336f6f2571 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,14 +1,15 @@
 # Template build file for 'glib'
 pkgname=glib
-version=2.28.8
-distfiles="${GNOME_SITE}/glib/2.28/glib-$version.tar.bz2"
+version=2.30.0
+revision=1
+distfiles="${GNOME_SITE}/glib/2.30/glib-$version.tar.xz"
 configure_args="--disable-fam --with-pcre=system"
 build_style=gnu_configure
 short_desc="The GNU library of C routines"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 license="LGPL-2.1"
-checksum=222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f
+checksum=d64c00b43409eabb89aad78501fcb1a992b002b314a4414a9bd069585cb7cdc1
 long_desc="
  GLib is a library containing many useful C routines for things such
  as trees, hashes, lists and strings. It is a useful general purpose
@@ -18,7 +19,12 @@ subpackages="glib-devel"
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run libpcre
+Add_dependency run libffi
+
+Add_dependency build python	">=0"
+Add_dependency build coreutils
 Add_dependency build gettext
 Add_dependency build pkg-config
 Add_dependency build zlib-devel
 Add_dependency build pcre-devel
+Add_dependency build libffi-devel