Mon Sep 19 23:14:46 UTC 2011

24 files changed, 241 insertions, 124 deletions

diff --git a/community-staging/ruby-glib2/PKGBUILD b/community-staging/ruby-glib2/PKGBUILD
new file mode 100644
index 000000000..bcb4b284a
--- /dev/null
+++ b/community-staging/ruby-glib2/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 55742 2011-09-18 19:59:34Z bfanella $
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
+# Contributor: kritoke <kritoke@nospam.gmail.com>
+
+pkgname=ruby-glib2
+pkgver=1.0.2
+pkgrel=1
+pkgdesc="Ruby bindings for glib2."
+arch=('i686' 'x86_64')
+url="http://ruby-gnome2.sourceforge.jp"
+license=('LGPL')
+depends=('ruby')
+makedepends=('ruby-pkgconfig')
+source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz)
+md5sums=('231a8a8995c10faacc2fc43d450b6295')
+
+build() {
+	cd "$srcdir/ruby-gtk2-$pkgver"
+	ruby extconf.rb glib2 --topdir=$pkgdir
+	make
+}
+package() {
+	cd "$srcdir/ruby-gtk2-$pkgver"
+	make DESTDIR="$pkgdir" install
+}
diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD
index f6a188c92..292183a79 100755
--- a/community/emesene/PKGBUILD
+++ b/community/emesene/PKGBUILD
@@ -1,23 +1,21 @@
-# $Id: PKGBUILD 53195 2011-07-31 21:48:19Z rvanharen $
+# $Id: PKGBUILD 55723 2011-09-18 07:15:35Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Claudio Riva <firetux83@gmail.com>
 
 pkgname=emesene
 pkgver=2.11.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A pygtk MSN Messenger client"
 url="http://www.emesene.org/"
 license=('custom:PSF' 'GPL' 'LGPL2.1')
 arch=('i686' 'x86_64') # libmimic is hardcoded, so no 'any' package
-#depends=('python2' 'pygtk' 'hicolor-icon-theme' 'xdg-utils')
 depends=('python2' 'pygtk' 'python-dnspython' 'pylint' 'python-notify' 'openssl' \
-'papyon' 'python-imaging' 'dbus-python' 'xdg-utils' 'hicolor-icon-theme')
+'papyon' 'python-imaging' 'dbus-python' 'xdg-utils' 'hicolor-icon-theme' \
+'gstreamer0.10-python' 'gstreamer0.10-good')
 makedepends=('python2-distribute')
 optdepends=('gnome-python-extras: spell-check plugin'
 	'gtkspell: spell-check plugin'
-	'aspell: spell-check plugin (also need aspell dictionary)'
-	'gstreamer0.10-python: webcam support'
-	'gstreamer0.10-good-plugins: webcam support'
+	'farsight2: webcam support'
 	'pywebkitgtk: for alternative conversation window' 
         'xmpppy: for gtalk and facebook chat support'
 	'pyqt: alternative qt4 interface (emesene -e main:qt4_main')
diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD
new file mode 100644
index 000000000..2ee9c0cb4
--- /dev/null
+++ b/community/haskell-bytestring-show/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=haskell-bytestring-show
+pkgver=0.3.5
+pkgrel=1
+pkgdesc="Efficient conversion of values into readable byte strings."
+url="http://code.haskell.org/~dolio/"
+license=("BSD3")
+arch=('i686' 'x86_64')
+makedepends=()
+depends=("ghc=7.0.3"
+         "haskell-array=0.3.0.2"
+         "haskell-binary=0.5.0.2"
+         "haskell-bytestring=0.9.1.10"
+         "haskell-containers=0.4.0.0")
+options=('strip')
+install="${pkgname}.install"
+source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
+md5sums=('934edba94aeceef6e9fc1b174d4f94ea')
+
+build() {
+  cd ${srcdir}/bytestring-show-${pkgver}
+
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+	--prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+	--libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${srcdir}/bytestring-show-${pkgver}
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/bytestring-show
+  runhaskell Setup copy --destdir=${pkgdir}
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}
diff --git a/community/haskell-bytestring-show/haskell-bytestring-show.install b/community/haskell-bytestring-show/haskell-bytestring-show.install
new file mode 100644
index 000000000..335fc37cd
--- /dev/null
+++ b/community/haskell-bytestring-show/haskell-bytestring-show.install
@@ -0,0 +1,24 @@
+pkgname=haskell-bytestring-show
+HS_DIR=usr/share/haskell/${pkgname}
+
+post_install() {
+    ${HS_DIR}/register.sh
+    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_upgrade() {
+    ${HS_DIR}/unregister.sh
+}
+
+post_upgrade() {
+    ${HS_DIR}/register.sh
+    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+
+pre_remove() {
+    ${HS_DIR}/unregister.sh
+}
+
+post_remove() {
+    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index 69e8e34ca..05ae00236 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 36219 2010-12-28 10:43:33Z spupykin $
+# $Id: PKGBUILD 55746 2011-09-18 23:20:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hedgewars
-pkgver=0.9.15
-pkgrel=1
+pkgver=0.9.16
+pkgrel=2
 pkgdesc="Free Worms-like turn based strategy game"
 arch=('i686' 'x86_64')
 url="http://hedgewars.org"
@@ -11,23 +11,28 @@ license=('GPL' 'custom')
 depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
 makedepends=('fpc' 'cmake' 'ghc'
 	     'haskell-utf8-string' 'haskell-dataenc' 'haskell-network'
-	     'haskell-hslogger')
+	     'haskell-hslogger' 'haskell-bytestring-show' 'haskell-deepseq')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
 	hedgewars.desktop
 	hedgewars.png)
-md5sums=('a7d5e9082d3377dba573b7fee4bc833d'
+md5sums=('04f28f454e370a101cbf0d82c6d39bce'
          '48c66a3204d4fa0a69e9aa46f7c31e0c'
          'eeb14d50df39063549ac5eca9dbc65d1')
 
 build() {
   cd $srcdir/$pkgname-src-$pkgver
+#  sed -i 's|.*misc/liblua.*||' CMakeLists.txt
   cmake \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATA_INSTALL_DIR=/usr/share \
 	-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
 	-DQT_MOC_EXECUTABLE=/usr/bin/moc \
-	-DWITH_SERVER=1
+	-DWITH_SERVER=1 .
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-src-$pkgver
   make DESTDIR=$pkgdir install
   install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt
   install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png
diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD
index 73661a48b..62a22ddf2 100644
--- a/community/libraw/PKGBUILD
+++ b/community/libraw/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 52082 2011-07-20 03:04:09Z bfanella $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+# $Id: PKGBUILD 55740 2011-09-18 19:52:04Z bfanella $
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=libraw
 _pkgbasename=LibRaw
-pkgver=0.13.7
+pkgver=0.13.8
 pkgrel=1
 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ license=('CDDL' 'LGPL' 'custom')
 depends=('lcms')
 options=('!makeflags')
 source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('5c189e16d61f423162da57333b7c8873')
+md5sums=('62cd5fee94915add0c43a97ec6909bbb')
 
 build() {
   	cd ${srcdir}/${_pkgbasename}-${pkgver}
diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD
index 578d0921d..d0a61cb60 100644
--- a/community/python-bsddb/PKGBUILD
+++ b/community/python-bsddb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50695 2011-06-29 15:25:25Z stephane $
+# $Id: PKGBUILD 55744 2011-09-18 22:24:47Z stephane $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
@@ -6,48 +6,35 @@
 
 pkgbase=python-bsddb
 pkgname=('python2-bsddb' 'python-bsddb')
-_hgrel=600
-pkgver=5.1.2.${_hgrel}
+pkgver=5.2.0
 pkgrel=1
 pkgdesc="Python interface for BerkeleyDB"
 license=('MIT')
 arch=('i686' 'x86_64')
 url="http://www.jcea.es/programacion/pybsddb.htm"
-makedepends=('python2-distribute' 'python-distribute' 'mercurial')
-source=("ftp://ftp.archlinux.org/other/community/${pkgbase}/${pkgbase}-${pkgver}.src.tar.xz"
-        'LICENSE')
-sha1sums=('50e7b4c9c11b06c6d871dd93af1cc228687a0227'
-         'ef4e4caf618781104dbf5824279ed39d127b4713')
-
-# source PKGBUILD && mksource
-mksource() {
-   _hgroot="http://hg.jcea.es/pybsddb/"
-   _hgrepo=pybsddb
-   [ -d "${_hgrepo}" ] && hg pull -u -r ${_hgrel} || hg clone ${_hgroot} -r ${_hgrel}
-
-  _dirname=${pkgbase}-${pkgver}
-  mv ${_hgrepo} ${_dirname}
-  tar -cJvf ${_dirname}.src.tar.xz ${_dirname}
-  rm -fr ${_dirname}
-}
+makedepends=('python2-distribute' 'python-distribute')
+source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz
+        LICENSE)
+sha1sums=('4395c125807fc8c4bac4d367f4556e623605c7a8'
+          'ef4e4caf618781104dbf5824279ed39d127b4713')
 
 build () {
   cd "${srcdir}"
   
-  cp -r ${pkgbase}-${pkgver}{,-python2}
+  cp -r bsddb3-${pkgver}{,-python2}
 
   # Build python 3 module
-  cd ${pkgbase}-${pkgver}
+  cd bsddb3-${pkgver}
   python setup.py --berkeley-db=/usr build
 
   # Build python 2 module
-  cd ../${pkgbase}-${pkgver}-python2
+  cd ../bsddb3-${pkgver}-python2
   python2 setup.py --berkeley-db=/usr build
 }
 
 package_python2-bsddb() {
   depends=('db' 'python2>=2.7')
-  cd "${srcdir}/${pkgbase}-${pkgver}-python2"
+  cd "${srcdir}/bsddb3-${pkgver}-python2"
 
   python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
   install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
@@ -55,7 +42,7 @@ package_python2-bsddb() {
 
 package_python-bsddb() {
   depends=('db' 'python>=3.2')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/bsddb3-${pkgver}"
 
   python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
   install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index c380932b8..e12295d43 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136183 2011-08-23 19:33:20Z bisson $
+# $Id: PKGBUILD 138192 2011-09-18 13:23:24Z bisson $
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
@@ -7,12 +7,12 @@
 
 pkgname=bitlbee
 pkgver=3.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 arch=('i686' 'x86_64')
 url='http://www.bitlbee.org/'
 license=('GPL')
-depends=('gnutls' 'glib2' 'libotr')
+depends=('openssl' 'glib2' 'libotr')
 optdepends=('xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
 	'xinetd'
@@ -32,7 +32,7 @@ build() {
 		--pidfile=/var/run/bitlbee/bitlbee.pid \
 		--ipcsocket=/var/run/bitlbee/bitlbee.sock \
 		--systemdsystemunitdir=/lib/systemd/system \
-		--ssl=gnutls \
+		--ssl=openssl \
 		--strip=0 \
 		--otr=1 \
 
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 96cd9e138..de9dfa97b 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 136453 2011-08-29 14:56:34Z andyrtr $
+# $Id: PKGBUILD 138194 2011-09-18 13:49:40Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 
 pkgname=dovecot
-pkgver=2.0.14
+pkgver=2.0.15
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
@@ -25,7 +25,7 @@ backup=(etc/dovecot/dovecot.conf
 	etc/ssl/dovecot-openssl.cnf)
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh)
-md5sums=('92a10a6ca341921db9e35c6753e8de0b'
+md5sums=('16a08dfd24422d482440a8b03d6f7f6c'
          '587159e84e2da6f83d70b3c706ba87cc')
 
 build() {
diff --git a/extra/gimp-gap/PKGBUILD b/extra/gimp-gap/PKGBUILD
index 997bb3fe2..cb6c612e4 100644
--- a/extra/gimp-gap/PKGBUILD
+++ b/extra/gimp-gap/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 64731 2010-01-22 02:05:13Z eric $
+# $Id: PKGBUILD 138172 2011-09-18 06:56:19Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gimp-gap
 pkgver=2.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A Plug-In collection to edit and create animations for the Gimp"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gimp.org/downloads/"
-depends=('gimp>=2.6.0' 'xvidcore' 'bash' 'libjpeg')
+depends=('gimp' 'xvidcore' 'bash' 'libjpeg')
 makedepends=('intltool')
 options=('!makeflags')
 source=(ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/$pkgname-$pkgver.tar.bz2)
@@ -17,13 +17,12 @@ md5sums=('249ed829de8b78675c0fe4ef4212089f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-    #Arch64 fix
-  if [ "$CARCH" = "x86_64" ]; then 
-    ./configure --prefix=/usr CFLAGS="$CFLAGS -fPIC" || return 1
-  else
-    ./configure --prefix=/usr || return 1
-  fi
+  [ "$CARCH" = "x86_64" ] && CFLAGS+="-fPIC"
+  ./configure --prefix=/usr 
+  make
+}
 
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 8072d5fa4..45e6987be 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136760 2011-09-01 10:56:36Z andyrtr $
+# $Id: PKGBUILD 138216 2011-09-19 03:13:19Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -10,10 +10,11 @@ license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/gnutls/"
 install=gnutls.install
 options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2' 'p11-kit')
 makedepends=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('1f8c3b74b2c6faa9b08f84a422f93863')
+md5sums=('7b45b99cb6d314c452f8c0f1c7a736dd')
+sha1sums=('0e6c325ae12cf1a4bd7d25125b8d58d51472fc14')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -21,7 +22,6 @@ build() {
 	--with-zlib \
 	--disable-static \
 	--disable-guile \
-	--without-p11-kit \
 	--disable-valgrind-tests # breaks make check. errors have been reported upstream
   make
 }
diff --git a/extra/gqview/PKGBUILD b/extra/gqview/PKGBUILD
index 2d61ae442..de023d067 100644
--- a/extra/gqview/PKGBUILD
+++ b/extra/gqview/PKGBUILD
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD 68535 2010-02-13 03:58:08Z dgriffiths $
+# $Id: PKGBUILD 138174 2011-09-18 07:14:08Z eric $
 # Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
+
 pkgname=gqview
 pkgver=2.0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="An image browser and viewer"
 arch=('i686' 'x86_64')
 url="http://gqview.sourceforge.net/"
 license=('GPL')
-depends=('gtk2')
+depends=('gtk2' 'desktop-file-utils')
+install=gqview.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('7196deab04db94cec2167637cddc02f9')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gqview/gqview.install b/extra/gqview/gqview.install
new file mode 100644
index 000000000..2eaa60550
--- /dev/null
+++ b/extra/gqview/gqview.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD
index bdf87e2cb..293f8604a 100644
--- a/extra/gtk-xfce-engine/PKGBUILD
+++ b/extra/gtk-xfce-engine/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 112937 2011-03-07 19:48:01Z andyrtr $
+# $Id: PKGBUILD 138198 2011-09-18 14:40:18Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=gtk-xfce-engine
-pkgver=2.8.1
+pkgver=2.9.0
 pkgrel=1
 pkgdesc="A port of Xfce engine to GTK+-2.0"
 arch=('i686' 'x86_64')
@@ -13,8 +13,9 @@ groups=('xfce4')
 depends=("gtk2>=2.14.7")
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/$pkgname/2.8/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8a6527b61b0554cda11d06f66a567314')
+source=(http://archive.xfce.org/src/xfce/$pkgname/2.9/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('e2bc76ab5093ff8472e728e6d6ad5da2')
+sha1sums=('ce0ef1220c98dddabaf7917f8d98579dd65f5009')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index d11672b26..75ca002cd 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 137295 2011-09-06 22:08:52Z heftig $
+# $Id: PKGBUILD 138210 2011-09-18 16:29:47Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=librsvg
 pkgver=2.34.1
-pkgrel=1
+pkgrel=2
 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('gdk-pixbuf2' 'pango' 'libcroco')
-makedepends=('intltool')
+makedepends=('intltool' 'gtk2')
+optdepends=('gtk2: for rsvg-view support')
 options=('!libtool' '!emptydirs')
 url="http://librsvg.sourceforge.net/"
 install=librsvg.install
@@ -20,7 +21,7 @@ build() {
   sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in
   ./configure --prefix=/usr --libexecdir=/usr/lib/${pkgname} \
       --with-croco --disable-static \
-      --with-svgz --disable-gtk-theme
+      --with-svgz
   make
 }
 
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index 5f0a24b79..97decbd24 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 131871 2011-07-16 10:36:29Z tpowa $
+# $Id: PKGBUILD 138196 2011-09-18 13:56:45Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
-pkgname=ocaml	
+pkgbase='ocaml'
+pkgname=('ocaml' 'ocaml-compiler-libs')
 pkgver=3.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A functional language with OO extensions"
 arch=('i686' 'x86_64')
 license=('LGPL2' 'custom: QPL-1.0')
@@ -12,12 +13,17 @@ depends=('gdbm')
 makedepends=('tk' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
 source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz)
+md5sums=('814a047085f0f901ab7d8e3a4b7a9e65')
 options=('!makeflags' '!emptydirs')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure -prefix /usr 
   make world.opt
+}
+
+package_ocaml() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install
    
   # Save >10MB with this one, makepkg only strips debug symbols.
@@ -27,4 +33,21 @@ build() {
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-md5sums=('814a047085f0f901ab7d8e3a4b7a9e65')
+
+package_ocaml-compiler-libs() {
+pkgdesc="Several modules used internally by the OCaml compiler"
+license=('custom: QPL-1.0')
+depends=('ocaml')
+optdepends=()
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  # Install compiler libraries
+  local compiler_libs="${pkgdir}/usr/lib/ocaml/compiler-libs"
+  mkdir -p "$compiler_libs"/{parsing,typing,utils}
+  cp parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "$compiler_libs"/parsing
+  cp typing/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/typing
+  cp utils/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/utils
+  # duplicated by installation
+  rm -f "$compiler_libs"/typing/outcometree.{cmi,mli}
+}
diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD
index 3201d2df2..a5914f3d1 100644
--- a/extra/orage/PKGBUILD
+++ b/extra/orage/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 127986 2011-06-20 15:42:51Z andyrtr $
+# $Id: PKGBUILD 138200 2011-09-18 14:48:57Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=orage
-pkgver=4.8.1
-pkgrel=3
+pkgver=4.8.2
+pkgrel=1
 pkgdesc="A simple calendar application with reminders for Xfce"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -15,14 +15,11 @@ makedepends=('intltool' 'xfce4-dev-tools' 'popt')
 options=('!libtool')
 replaces=('xfcalendar')
 install=${pkgname}.install
-source=(http://archive.xfce.org/src/apps/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2
-	fix-infinite-reminder.patch)
-md5sums=('9c1139ce03e9f309240e712cf31b6a49'
-         '162a6b2c97b8dff9ed180a2796aa35af')
+source=(http://archive.xfce.org/src/apps/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('950397c716c31e1aa5db83d35ddf6047')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/fix-infinite-reminder.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
diff --git a/extra/orage/orage.install b/extra/orage/orage.install
index 236856c64..bce670aff 100644
--- a/extra/orage/orage.install
+++ b/extra/orage/orage.install
@@ -8,5 +8,5 @@ post_upgrade() {
 }
 
 post_remove() {
-  post:install
+  post_install
 }
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
index 802db0d91..9b94d6247 100644
--- a/extra/p11-kit/PKGBUILD
+++ b/extra/p11-kit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136806 2011-09-01 17:14:51Z ibiru $
+# $Id: PKGBUILD 138186 2011-09-18 09:16:04Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=p11-kit
-pkgver=0.5
-pkgrel=1
+pkgver=0.6
+pkgrel=2
 pkgdesc="Library to work with PKCS#11 modules"
 arch=(i686 x86_64)
 url="http://p11-glue.freedesktop.org"
@@ -11,11 +11,12 @@ license=('BSD')
 depends=(glibc)
 options=(!libtool)
 source=($url/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('1b4886ed4e6d25ab0b69e6350a804082')
+md5sums=('c1ff3e52f172fda8bf3b426f7fb63c92')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --with-module-path=/usr/lib/pkcs11
   make
 }
 
diff --git a/gnome-unstable/folks/PKGBUILD b/gnome-unstable/folks/PKGBUILD
index b4e164e5c..ae4686864 100644
--- a/gnome-unstable/folks/PKGBUILD
+++ b/gnome-unstable/folks/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 138001 2011-09-13 21:34:06Z heftig $
+# $Id: PKGBUILD 138212 2011-09-18 20:34:33Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+
 pkgname=folks
-pkgver=0.6.2.1
-pkgrel=2
+pkgver=0.6.3
+pkgrel=1
 pkgdesc="Library to aggregates people into metacontacts "
 arch=(i686 x86_64)
 url="http://telepathy.freedesktop.org/wiki/Folks"
@@ -10,18 +11,12 @@ license=('LGPL2.1')
 depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb')
 makedepends=('gobject-introspection' 'vala' 'intltool' 'libtracker-sparql')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz
-        Bug_658631_crash_at_empathy_startup.patch)
-sha256sums=('3eda79a71890b51b6f723067b61c32ef25e9041a9e188b483d7f23e3dcd328ee'
-            '4ef4caaab73e799fe31e7a93ba1f3f088e99f66600e644828bbcc4fb966c1196')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('e21810966f300b31e8cd51cca9851606213345eb933584997b49326c43b46e1b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix a crash
-  patch -Np1 -i "$srcdir/Bug_658631_crash_at_empathy_startup.patch"
-  find . -name '*.stamp' -delete
-
   # Change tracker version
   grep -lr sparql-0.10 . | xargs sed -i 's/sparql-0.10/sparql-0.12/g'
 
diff --git a/gnome-unstable/glib2/PKGBUILD b/gnome-unstable/glib2/PKGBUILD
index e3580a03a..3967cd0be 100644
--- a/gnome-unstable/glib2/PKGBUILD
+++ b/gnome-unstable/glib2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 137199 2011-09-06 17:00:14Z ibiru $
+# $Id: PKGBUILD 138206 2011-09-18 15:57:03Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glib2
-pkgver=2.29.90
+pkgver=2.29.92
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
@@ -15,7 +15,7 @@ options=('!libtool' '!docs' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.29/glib-${pkgver}.tar.xz
         glib2.sh
         glib2.csh)
-sha256sums=('95af3f46a40ad1a3ecfe75db59b27956b256c4ad02f000be2aa13c7abd32fba3'
+sha256sums=('1f68d7990d03a52cf81284f039de94b041c3f5eb3d53663166b31e477557e8b1'
             '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
             '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
 
diff --git a/gnome-unstable/gnome-keyring/PKGBUILD b/gnome-unstable/gnome-keyring/PKGBUILD
index b9a8bc95b..a9a015938 100644
--- a/gnome-unstable/gnome-keyring/PKGBUILD
+++ b/gnome-unstable/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 137013 2011-09-05 08:31:24Z ibiru $
+#$Id: PKGBUILD 138180 2011-09-18 08:59:37Z heftig $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.1.91
+pkgver=3.1.92
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6a5b448b33804e86375f61325e5037efbc84d56f35f44976c0cb0e107b252f62')
+sha256sums=('5bb63e1f8c368efa313fc0d72909d122cf7ed387001015665f5b1cdc25551c0d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/gnome-unstable/libgnome-keyring/PKGBUILD b/gnome-unstable/libgnome-keyring/PKGBUILD
index b69fefae2..a40849ddd 100644
--- a/gnome-unstable/libgnome-keyring/PKGBUILD
+++ b/gnome-unstable/libgnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 136653 2011-08-31 11:15:05Z ibiru $
+#$Id: PKGBUILD 138176 2011-09-18 08:48:06Z heftig $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=3.1.90
+pkgver=3.1.92
 pkgrel=1
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ makedepends=('intltool' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('805f3100ae75741a86f9090f8bbfffeec4424c7629a35cd71e1c128420cf8840')
+sha256sums=('8ea2fe57d6ee32ca590537ea30589d6dd310891ce581581d8f9e653f682dcfc1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/gnome-unstable/seahorse/PKGBUILD b/gnome-unstable/seahorse/PKGBUILD
index d09b0f0eb..f9efddf44 100644
--- a/gnome-unstable/seahorse/PKGBUILD
+++ b/gnome-unstable/seahorse/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137015 2011-09-05 08:37:59Z ibiru $
+# $Id: PKGBUILD 138182 2011-09-18 09:01:54Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.1.91
+pkgver=3.1.92
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 install=seahorse.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7b253f62641fd1adb7d949f4f9ce9623590a5552c14056ddc9f1786822f837e2')
+sha256sums=('d853966b0166aeb2657d964dff46f6ceb3c9b3202c45650765f4bf6957c3fec5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"