[arch-commits] CVS update of extra/gnome/epiphany (PKGBUILD epiphany.install)

[Jan de Groot]

    Date: Saturday, September 22, 2007 @ 08:44:05
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/epiphany

Modified: PKGBUILD (1.59 -> 1.60) epiphany.install (1.13 -> 1.14)

upgpkg: epiphany 2.20.0-1
GNOME 2.20


------------------+
 PKGBUILD         |   14 +++++++-------
 epiphany.install |   18 ++----------------
 2 files changed, 9 insertions(+), 23 deletions(-)


Index: extra/gnome/epiphany/PKGBUILD
diff -u extra/gnome/epiphany/PKGBUILD:1.59 extra/gnome/epiphany/PKGBUILD:1.60
--- extra/gnome/epiphany/PKGBUILD:1.59	Sat Jul  7 06:48:03 2007
+++ extra/gnome/epiphany/PKGBUILD	Sat Sep 22 08:44:05 2007
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD,v 1.59 2007/07/07 10:48:03 jgc Exp $
+# $Id: PKGBUILD,v 1.60 2007/09/22 12:44:05 jgc Exp $
 # Maintainer: dale <dale at archlinux.org>
 
 pkgname=epiphany
-pkgver=2.18.3
+pkgver=2.20.0
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME2 web browser based on the mozilla rendering engine."
 arch=(i686 x86_64)
 license=('GPL')
-depends=('xulrunner>=1.8.1.4' 'gnome-desktop>=2.18.1' 'iso-codes' 'scrollkeeper' 'desktop-file-utils' 'gconf>=2.18.0.1-4')
-makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'gnome-python>=2.18.0' 'pkgconfig' 'libnetworkmanager>=0.6.5')
-options=('!libtool')
+depends=('xulrunner>=1.8.1.6' 'gnome-desktop>=2.20.0' 'iso-codes' 'desktop-file-utils' 'libxslt>=1.1.22')
+makedepends=('perlxml' 'gnome-doc-utils>=0.12.0' 'gnome-python>=2.20.0' 'pkgconfig' 'libnetworkmanager>=0.6.5')
+options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2e77f3f0651a27cac29224e82c3cc793')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('651beab72c7a3c0b42b45f5087d4e9b0')
 
 build() {
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
Index: extra/gnome/epiphany/epiphany.install
diff -u extra/gnome/epiphany/epiphany.install:1.13 extra/gnome/epiphany/epiphany.install:1.14
--- extra/gnome/epiphany/epiphany.install:1.13	Sun Apr 22 11:37:19 2007
+++ extra/gnome/epiphany/epiphany.install	Sat Sep 22 08:44:05 2007
@@ -1,11 +1,8 @@
 pkgname=epiphany
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/sbin/gconfpkg --install ${pkgname}
 
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -19,21 +16,10 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }