3 files changed, 10 insertions, 28 deletions
diff --git a/abs/extra/libbonobo/PKGBUILD b/abs/extra/libbonobo/PKGBUILD
index de48e25..c061ba4 100644
--- a/abs/extra/libbonobo/PKGBUILD
+++ b/abs/extra/libbonobo/PKGBUILD
@@ -1,30 +1,29 @@
-# $Id: PKGBUILD 29425 2009-03-08 17:32:56Z jgc $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libbonobo
-pkgver=2.24.3
+pkgver=2.32.1
 pkgrel=1
 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('orbit2>=2.14.17' 'libxml2>=2.7.3' 'dbus-glib>=0.78')
+depends=('orbit2' 'libxml2' 'glib2')
 makedepends=('intltool' 'pkgconfig' 'flex')
 options=('!libtool')
 backup=('etc/bonobo-activation/bonobo-activation-config.xml')
-replaces=('bonobo-activation')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.24/libbonobo-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.32/libbonobo-${pkgver}.tar.bz2
 	bonobo-activation-config.xml)
 install=libbonobo.install
+sha256sums=('9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b'
+            '081de245c42de10ebeea3cbcd819c5ce5d0a15b9bdde9c2098302b1e14965af2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
-	      --libexecdir=/usr/lib/bonobo || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m644 "${srcdir}/bonobo-activation-config.xml" "${pkgdir}/etc/bonobo-activation/" || return 1
+	      --libexecdir=/usr/lib/bonobo
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m644 "${srcdir}/bonobo-activation-config.xml" "${pkgdir}/etc/bonobo-activation/"
 }
-md5sums=('b217cef6a187505290c66c5bf8225d38'
-         '6392efaca30a26f826eafc4b8ccbc01f')
diff --git a/abs/extra/libbonobo/bonobo-activation-config.xml b/abs/extra/libbonobo/bonobo-activation-config.xml
index 65ee75f..3db19f7 100644
--- a/abs/extra/libbonobo/bonobo-activation-config.xml
+++ b/abs/extra/libbonobo/bonobo-activation-config.xml
@@ -5,7 +5,6 @@
 <searchpath>
     <!-- Examples: -->
     <item>/usr/lib/bonobo/servers</item>
-    <item>/opt/gnome/lib/bonobo/servers</item>
     <!-- <item>/usr/local/gnome2/lib/bonobo/servers</item> -->
     <!-- <item>/usr/local/lib/bonobo/servers</item> -->
     <!-- <item>/opt/gnome2/bonobo-activation/lib/bonobo/servers</item> -->
diff --git a/abs/extra/libbonobo/libbonobo.install b/abs/extra/libbonobo/libbonobo.install
index 1794e4a..5cc04eb 100644
--- a/abs/extra/libbonobo/libbonobo.install
+++ b/abs/extra/libbonobo/libbonobo.install
@@ -1,7 +1,3 @@
-post_install() {
-  /bin/true
-}
-
 post_upgrade() {
   ldconfig -r .
   PID=`pidof bonobo-activation-server`
@@ -9,15 +5,3 @@ post_upgrade() {
     killall -HUP bonobo-activation-server 2>&1
   fi
 }
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*