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

Conflicts:
	extra/libdvdnav/PKGBUILD
	extra/libguess/PKGBUILD
	extra/libmowgli/PKGBUILD
	extra/xchm/PKGBUILD
	libre/linux-libre/PKGBUILD

2 files changed, 26 insertions, 12 deletions

diff --git a/community/gnome-do/PKGBUILD b/community/gnome-do/PKGBUILD
index 45fa60629..6014591fd 100644
--- a/community/gnome-do/PKGBUILD
+++ b/community/gnome-do/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 51990 2011-07-18 20:45:07Z spupykin $
+# $Id: PKGBUILD 59852 2011-12-01 10:45:29Z spupykin $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Doehni <dohny@gmx.de>
 
 pkgname=gnome-do
 pkgver=0.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A launcher application for gnome (like Launchy or Katapult)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://do.davebsd.com/"
 license=('GPL3')
-depends=('ndesk-dbus-glib' 'gnome-desktop-sharp' 'mono-addins' 'gtk2' 'gnome-vfs-sharp'
-	 'gnome-keyring-sharp' 'notify-sharp-svn' 'xdg-utils' 'desktop-file-utils'
-	 'gconf-sharp' 'libgnome-sharp')
-makedepends=('intltool' 'ca-certificates')
+depends=('gconf-sharp' 'libgnome-desktop-sharp' 'gnome-keyring-sharp' 'libgnome-sharp'
+         'mono-addins' 'notify-sharp-svn' 'hicolor-icon-theme')
+makedepends=('intltool' 'ca-certificates' 'rsvg2-sharp' 'wnck-sharp')
 options=('!libtool')
 install=$pkgname.install
 source=("http://edge.launchpad.net/do/trunk/$pkgver/+download/gnome-do-$pkgver.tar.gz")
 md5sums=('71e0e653021f895f151a6f46a97f75ba')
 
 build() {
-  export MONO_SHARED_DIR="${srcdir}/.wabi"
-  mkdir -p "${MONO_SHARED_DIR}"
-  cd "${srcdir}/${pkgname}-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
+  export MONO_SHARED_DIR="$srcdir/.wabi"
+  mkdir -p "$MONO_SHARED_DIR"
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/gnome-do/gnome-do.install b/community/gnome-do/gnome-do.install
index b69cc3275..407103128 100644
--- a/community/gnome-do/gnome-do.install
+++ b/community/gnome-do/gnome-do.install
@@ -1,16 +1,25 @@
+pkgname=gnome-do
+
 post_install() {
-  update-desktop-database -q
+  usr/sbin/gconfpkg --install $pkgname
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 
   echo "==> To use docky, make sure your compoisiting manager is"
   echo "==> running before launching gnome-do."
 }
 
+pre_upgrade() {
+  pre_remove $1
+}
+
 post_upgrade() {
   post_install $1
 }
 
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall $pkgname
+}
+
 post_remove() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }