Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

1 files changed, 31 insertions, 11 deletions

diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index a0ce16552..a7eb125c8 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,32 +1,52 @@
-# $Id: PKGBUILD 132112 2011-07-20 12:08:11Z ibiru $
+# $Id: PKGBUILD 139202 2011-10-01 17:02:00Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Silvio Knizek (killermoehre)
 
-pkgname=gnome-disk-utility
+pkgbase=gnome-disk-utility
+pkgname=(gnome-disk-utility libgdu)
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME libraries and applications for dealing with storage devices"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org"
-depends=('dbus-glib' 'libgnome-keyring' 'libunique3' 'udisks' 'libnotify' 'hicolor-icon-theme' 'avahi')
-makedepends=('gtk-doc' 'intltool')
+makedepends=('dbus-glib' 'libgnome-keyring' 'udisks' 'libunique3' 'libnotify' 'avahi'
+             'hicolor-icon-theme' 'gtk-doc' 'intltool')
 options=('!libtool' '!emptydirs')
-install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz
        fix-freeze.patch)
 sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5'
             '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   patch -Np1 -i "${srcdir}/fix-freeze.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-disk-utility \
-      --disable-scrollkeeper --disable-nautilus --disable-gtk-doc
+      --disable-scrollkeeper --disable-nautilus --disable-static
   make
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package_gnome-disk-utility() {
+  depends=("libgdu=$pkgver-$pkgrel" 'libunique3' 'libnotify' 'hicolor-icon-theme' 'avahi')
+  groups=('gnome-extra')
+  install=gnome-disk-utility.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+
+### Split libgdu
+
+  mkdir -p "$srcdir"/libgdu/usr/{include/gnome-disk-utility,lib/pkgconfig}
+
+  mv "$pkgdir"/usr/lib/libgdu.so* "$srcdir/libgdu/usr/lib"
+  mv {"$pkgdir","$srcdir/libgdu"}/usr/include/gnome-disk-utility/gdu
+  mv {"$pkgdir","$srcdir/libgdu"}/usr/lib/pkgconfig/gdu.pc
+}
+
+package_libgdu() {
+  pkgdesc="$pkgdesc (library)"
+  depends=('dbus-glib' 'libgnome-keyring' 'udisks')
+
+  mv "$srcdir"/libgdu/* "$pkgdir"
 }