From 40f0b1c7106cc1fed13f14e80f083ecd69c416f5 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sun, 1 May 2011 22:33:26 +0000
Subject: Sun May  1 22:33:26 UTC 2011

---
 extra/yelp/PKGBUILD     | 30 ++++++++++++++----------------
 extra/yelp/yelp.install | 19 ++++++++-----------
 2 files changed, 22 insertions(+), 27 deletions(-)

(limited to 'extra/yelp')

diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 19379e7a8..1fb51459d 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,32 +1,30 @@
-# $Id: PKGBUILD 115826 2011-03-21 19:45:05Z ibiru $
+# $Id: PKGBUILD 120703 2011-04-26 05:18:34Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
-pkgver=2.30.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64')
-depends=('libwebkit' 'gnome-doc-utils>=0.20.2' 'startup-notification>=0.10' 'libxslt' 'hicolor-icon-theme' 'rarian>=0.8.1' 'gconf>=2.28.1')
-makedepends=('intltool' 'pkgconfig')
+depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib'
+         'xz' 'bzip2' 'desktop-file-utils' 'dconf')
+makedepends=('intltool' 'gtk-doc')
 groups=('gnome')
 license=('GPL')
-options=('!emptydirs')
+options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 install=yelp.install
-options=(force)
-#source=(http://ftp.gnome.org/pub/gnome/sources/yelp/2.30/yelp-${pkgver}.tar.bz2)
-source=(http://ftp.de.debian.org/debian/pool/main/y/yelp/yelp_${pkgver}+webkit.orig.tar.gz)
-sha256sums=('2f450ca32f3057de4a7be0f9a8408314b47ba6f157bcdb416a333fe4e5f7a44b')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('6de6c45439b21a3042236d5d836de9dd44d59c2d4c324982c316b4b6834ce0a4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --with-search=basic
+      --localstatedir=/var --disable-static
   make
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+}
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain yelp ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/yelp/yelp.install b/extra/yelp/yelp.install
index 3a893b043..f3bf19a93 100644
--- a/extra/yelp/yelp.install
+++ b/extra/yelp/yelp.install
@@ -1,22 +1,19 @@
-pkgname=yelp
-
 post_install() {
-  gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall yelp
+  fi
 }
 
 post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall ${pkgname}
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  post_install
 }
-- 
cgit v1.2.3-54-g00ecf