20 files changed, 147 insertions, 129 deletions
diff --git a/community/dsniff/PKGBUILD b/community/dsniff/PKGBUILD
index a5a66f858..f7428aa09 100644
--- a/community/dsniff/PKGBUILD
+++ b/community/dsniff/PKGBUILD
@@ -1,36 +1,36 @@
-# $Id: PKGBUILD 44707 2011-04-11 12:21:58Z spupykin $
+# $Id: PKGBUILD 49679 2011-06-19 07:23:27Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ViNS <gladiator@fastwebnet.it>
 
 pkgname=dsniff
 pkgver=2.4b1
-pkgrel=19
+pkgrel=20
 pkgdesc="Collection of tools for network auditing and penetration testing"
 url="http://www.monkey.org/~dugsong/dsniff/"
 arch=('i686' 'x86_64')
 license=('BSD')
-depends=('libpcap' 'openssl' 'db' 'libxmu' 'glib2' 'libnet' 'libnids')
-source=(http://www.monkey.org/~dugsong/dsniff/beta/$pkgname-$pkgver.tar.gz \
-	http://ftp.de.debian.org/debian/pool/main/d/dsniff/dsniff_2.4b1+debian-18.diff.gz)
+depends=('libpcap' 'openssl' 'libxmu' 'glib2' 'libnet' 'libnids')
+source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz"
+        "http://ftp.de.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_2.4b1+debian-18.diff.gz")
 md5sums=('2f761fa3475682a7512b0b43568ee7d6'
          'fbc9f62f9ab2f98f24f53ad497c1ce5d')
 
 build() {
   cd $srcdir/$pkgname-2.4
-  patch -N < ../dsniff_2.4b1+debian-18.diff
+  patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff
   for i in *.dpatch; do
     patch -N < "$i"
   done
 
-  [ $NOEXTRACT -eq 1 ] || LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr
+  LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-2.4
-  make prefix=$pkgdir/usr install
-  install -D -m0644 LICENSE $pkgdir/usr/share/licenses/dsniff/LICENSE
+  cd "$srcdir"/$pkgname-2.4
+  make prefix="$pkgdir"/usr install
+  install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE
 
-  mkdir -p $pkgdir/usr/share
-  mv $pkgdir/usr/man $pkgdir/usr/share/
+  install -d "$pkgdir"/usr/share
+  mv "$pkgdir"/usr/man "$pkgdir"/usr/share/
 }
diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index 2dbf30500..d30452d45 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46614 2011-05-10 07:06:59Z angvp $
+# $Id: PKGBUILD 49455 2011-06-16 18:57:50Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=exim
 pkgver=4.76
-pkgrel=1
+pkgrel=2
 pkgdesc="A Message Transfer Agent"
 arch=(i686 x86_64)
 url="http://www.exim.org/"
diff --git a/community/exim/exim.changelog b/community/exim/exim.changelog
index 562a87b75..69182229e 100644
--- a/community/exim/exim.changelog
+++ b/community/exim/exim.changelog
@@ -1,3 +1,6 @@
+2010-06-16 Angel Velasquez <angvp@archlinux.org>
+    * Rebuilt against db 5.2.28
+
 2010-05-09 Angel Velasquez <angvp@archlinux.org>
     * Updated to 4.76
     * Removed previous patch since is no longer needed
diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD
index 4d013c6ef..03eda7afa 100644
--- a/community/gecko-mediaplayer/PKGBUILD
+++ b/community/gecko-mediaplayer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 45744 2011-04-28 09:33:53Z lfleischer $
+# $Id: PKGBUILD 51299 2011-07-06 15:48:09Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: fancris3 <fancris3 at aol.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=gecko-mediaplayer
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=1
 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=("gnome-mplayer>=${pkgver}" 'dbus-glib')
 makedepends=('xulrunner' 'pkgconfig')
 replaces=('mplayer-plugin')
 source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('4996b243ed720dc30f5dcc9bc253bf68')
+md5sums=('7bb7665f8a1e6832907d052863e8f7aa')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD
index 9c2686158..a77f142bb 100644
--- a/community/gnome-mplayer/PKGBUILD
+++ b/community/gnome-mplayer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47944 2011-05-26 08:59:17Z lfleischer $
+# $Id: PKGBUILD 51291 2011-07-06 15:32:05Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=gnome-mplayer
-pkgver=1.0.3
-pkgrel=3
+pkgver=1.0.4
+pkgrel=1
 pkgdesc='A simple MPlayer GUI.'
 arch=('i686' 'x86_64')
 url='http://gnome-mplayer.googlecode.com/'
@@ -14,7 +14,7 @@ depends=('mplayer' 'dbus-glib' 'libnotify' 'gtk2' 'hicolor-icon-theme' 'dconf')
 makedepends=('gnome-power-manager' 'nautilus')
 install="${pkgname}.install"
 source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('72a1c7d640a67eb2d60f2671108919c2')
+md5sums=('c97dcf12d6a6b5543d701944f95e850e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/libgda3/PKGBUILD b/community/libgda3/PKGBUILD
index ca2cc50b5..07313f713 100644
--- a/community/libgda3/PKGBUILD
+++ b/community/libgda3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 42498 2011-03-17 10:53:49Z jelle $
+# $Id: PKGBUILD 49363 2011-06-15 09:20:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgda3
 pkgver=3.1.5
-pkgrel=8
+pkgrel=9
 pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers"
 arch=('i686' 'x86_64')
 url="http://www.gnome-db.org/Download"
diff --git a/community/librcc/PKGBUILD b/community/librcc/PKGBUILD
index 1043c9432..ca2eb950c 100644
--- a/community/librcc/PKGBUILD
+++ b/community/librcc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 30655 2010-10-19 14:04:46Z spupykin $
+# $Id: PKGBUILD 49369 2011-06-15 09:26:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=librcc
 pkgver=0.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Charset Conversion Library"
 arch=(i686 x86_64)
 url="http://rusxmms.sourceforge.net/"
@@ -20,11 +20,12 @@ md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1'
 build() {
   cd ${startdir}/src/$pkgname-${pkgver}
   ./configure --prefix=/usr
-
   patch -p1 <$srcdir/librcc-strnlen.patch
+  make
+}
 
-  make || return 1
-
+package() {
+  cd ${startdir}/src/$pkgname-${pkgver}
   mkdir -p $startdir/pkg/etc/rcc
   mkdir -p $startdir/pkg/usr/lib/rcc/engines
   mkdir -p $startdir/pkg/usr/bin
diff --git a/community/librcc/librcc.install b/community/librcc/librcc.install
index 8d2ccce98..53b1d7ce7 100644
--- a/community/librcc/librcc.install
+++ b/community/librcc/librcc.install
@@ -1,28 +1,6 @@
-pre_install() {
-  /bin/true
-}
-
 post_install() {
   echo "-- Don't forget to install gtk or/and gtk2 packages to enable librcc"
   echo "   gui features"
   echo "-- Also you may change /usr/bin/rcc-config symlink to switch between"
   echo "   gtk and gtk2 (rcc-gtk-config and rcc-gtk2-config)"
-  /bin/true
-}
-
-pre_upgrade() {
-  /bin/true
-}
-
-post_upgrade() {
-  /bin/true
-}
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  /bin/true
 }
-
diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD
index 2476eaf71..f586d53b0 100644
--- a/community/perl-berkeleydb/PKGBUILD
+++ b/community/perl-berkeleydb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47458 2011-05-23 15:36:16Z tdziedzic $
+# $Id: PKGBUILD 49372 2011-06-15 09:28:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 # Contributor: Francois Charette <firmicus@gmx.net>
 
 pkgname=perl-berkeleydb
 pkgver=0.43
-pkgrel=5
+pkgrel=6
 pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/BerkeleyDB/"
@@ -16,12 +16,16 @@ source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.
 md5sums=('3d0cf0651ed8cd3fc36e328d5924a1e9')
 
 build() {
-_dbver=`pacman -Q db | cut -d\  -f2 | cut -d- -f1`
-depends=('perl' "db=$_dbver")
-
   cd  $srcdir/BerkeleyDB-$pkgver
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+package() {
+  _dbver=`pacman -Q db | cut -d\  -f2 | cut -d- -f1`
+  depends=('perl' "db=$_dbver")
+
+  cd  $srcdir/BerkeleyDB-$pkgver
   make pure_install doc_install DESTDIR=$pkgdir
   find $pkgdir -name '.packlist' -delete
   find $pkgdir -name '*.pod' -delete
diff --git a/community/perl-libapreq2/PKGBUILD b/community/perl-libapreq2/PKGBUILD
index 21d49f90f..b9526091a 100644
--- a/community/perl-libapreq2/PKGBUILD
+++ b/community/perl-libapreq2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 47519 2011-05-23 18:19:22Z jelle $
+# $Id: PKGBUILD 49380 2011-06-15 09:32:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 
 pkgname=perl-libapreq2
 pkgver=2.12
-pkgrel=8
+pkgrel=9
 pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data."
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/libapreq2"
@@ -17,12 +17,9 @@ md5sums=('76e2acde0d82246dea6f2565f3746eec')
 
 build() {
   cd  $srcdir/libapreq2-$pkgver
-
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/sbin/apxs
-
-  find . -type f -name Makefile -exec sed -i 's#-ldb-4.8#-ldb-5.1#' {} \;
-  sed -i 's#-ldb-4.8#-ldb-5.1#' apreq2-config
-
+  find . -type f -name Makefile -exec sed -i 's#-ldb-5.1#-ldb-5.2#' {} \;
+  sed -i 's#-ldb-5.1#-ldb-5.2#' apreq2-config
   make
 }
 package(){
diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD
index de58675ec..708898b9e 100644
--- a/community/perl-xml-libxslt/PKGBUILD
+++ b/community/perl-xml-libxslt/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=perl-xml-libxslt
 pkgver=1.70
-pkgrel=5
+pkgrel=6
 pkgdesc="Interface to the gnome libxslt library "
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/XML-LibXSLT"
diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD
index 4ee76514e..8c606f322 100644
--- a/community/poedit/PKGBUILD
+++ b/community/poedit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 34005 2010-11-30 20:55:18Z lcarlier $
+# $Id: PKGBUILD 49387 2011-06-15 09:36:08Z spupykin $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=poedit
 pkgver=1.4.6.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Cross-platform gettext catalogs (.po files) editor"
 arch=('i686' 'x86_64')
 url="http://www.poedit.net/"
diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD
index 84b7c181a..578d0921d 100644
--- a/community/python-bsddb/PKGBUILD
+++ b/community/python-bsddb/PKGBUILD
@@ -1,29 +1,62 @@
-# $Id: PKGBUILD 40159 2011-02-21 14:49:30Z stephane $
+# $Id: PKGBUILD 50695 2011-06-29 15:25:25Z stephane $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
-pkgname=python-bsddb
-pkgver=5.1.0
-pkgrel=3
+pkgbase=python-bsddb
+pkgname=('python2-bsddb' 'python-bsddb')
+_hgrel=600
+pkgver=5.1.2.${_hgrel}
+pkgrel=1
 pkgdesc="Python interface for BerkeleyDB"
 license=('MIT')
 arch=('i686' 'x86_64')
 url="http://www.jcea.es/programacion/pybsddb.htm"
-depends=('db' 'python')
-source=("http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz"
+makedepends=('python2-distribute' 'python-distribute' 'mercurial')
+source=("ftp://ftp.archlinux.org/other/community/${pkgbase}/${pkgbase}-${pkgver}.src.tar.xz"
         'LICENSE')
-md5sums=('6d72d2533f0f3a4bb4b1207598624d6a'
-         'f412b3fb37739f1c4be64c1e7a5dee67')
+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}
+}
 
 build () {
-  cd ${srcdir}/bsddb3-${pkgver}
+  cd "${srcdir}"
+  
+  cp -r ${pkgbase}-${pkgver}{,-python2}
+
+  # Build python 3 module
+  cd ${pkgbase}-${pkgver}
   python setup.py --berkeley-db=/usr build
+
+  # Build python 2 module
+  cd ../${pkgbase}-${pkgver}-python2
+  python2 setup.py --berkeley-db=/usr build
+}
+
+package_python2-bsddb() {
+  depends=('db' 'python2>=2.7')
+  cd "${srcdir}/${pkgbase}-${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
 }
 
-package() {
-  cd ${srcdir}/bsddb3-${pkgver}
-  python setup.py --berkeley-db=/usr install --root=${pkgdir} --optimize=1
+package_python-bsddb() {
+  depends=('db' 'python>=3.2')
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  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/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 3fd2d6c40..f7580492a 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49856 2011-06-21 12:25:02Z spupykin $
+# $Id: PKGBUILD 51232 2011-07-06 10:22:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.2.10
+pkgver=2.2.11
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ backup=("etc/redis.conf"
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.logrotate")
-md5sums=('5b08ea64334b7a59df2c25ad7e42de7e'
+md5sums=('5501c90ca02ae7ea93c34f067b3e0619'
          'bf61968d18d0e42529880f5c488ea9ed'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index cf4f92432..643c7b379 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=root
 pkgver=5.30.00
-pkgrel=1
+pkgrel=2
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64')
 url='http://root.cern.ch'
@@ -16,16 +16,22 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
         'root.sh'
         'rootd'
         'root.desktop'
-        'root.xml')
+        'root.xml'
+        'reorder-lzma-search-r40128.diff')
 md5sums=('b4e00f419f63d5ec6b7f1aace33c0c6f'
          '0e883ad44f99da9bc7c23bc102800b62'
          'efd06bfa230cc2194b38e0c8939e72af'
          'ac61b17395d75a2705fefa2ef841a6bf'
-         'e2cf69b204192b5889ceb5b4dedc66f7')
+         'e2cf69b204192b5889ceb5b4dedc66f7'
+         '6b5d5b875913d8468940b9fbb1ceeb60')
 
 build() {
   cd ${pkgname}
 
+  # causes an error because it includes lzma/lzma.h directly
+  # http://root.cern.ch/phpBB3/viewtopic.php?f=3&t=13013&p=55971
+  patch -Np2 -i ${srcdir}/reorder-lzma-search-r40128.diff
+
   if [ ${CARCH} == 'i686' ]; then
     TARGET=linux;
   else
@@ -44,7 +50,7 @@ build() {
     --disable-builtin-glew \
     --disable-builtin-pcre \
     --disable-builtin-zlib \
-    --enable-builtin-lzma \
+    --disable-builtin-lzma \
     --enable-gdml \
     --enable-gsl-shared \
     --enable-minuit2 \
@@ -57,10 +63,6 @@ build() {
     # move from aur
     #--disable-builtin-afterimage \
 
-    # causes an error because it includes lzma/lzma.h directly.. need to file a BR for this
-    # http://root.cern.ch/phpBB3/viewtopic.php?f=3&t=13013&p=55971
-    #--disable-builtin-lzma \
-
   make
 }
 
diff --git a/community/root/reorder-lzma-search-r40128.diff b/community/root/reorder-lzma-search-r40128.diff
new file mode 100644
index 000000000..1dd0fc56e
--- /dev/null
+++ b/community/root/reorder-lzma-search-r40128.diff
@@ -0,0 +1,14 @@
+--- branches/v5-30-00-patches/configure	2011/06/27 13:38:32	39993
++++ branches/v5-30-00-patches/configure	2011/07/04 15:43:59	40128
+@@ -2430,8 +2430,9 @@
+     check_header "lzma.h" "" \
+         $LZMA ${LZMA:+$LZMA/include} \
+         ${finkdir:+$finkdir/include} \
+-        /usr/local/include /usr/include/lzma /usr/local/include/lzma \
+-        /opt/lzma/include /usr/include
++        /usr/local/include /usr/include \
++        /usr/local/include/lzma /usr/include/lzma \
++        /opt/lzma/include
+     if test "x$found_dir" = "x" ; then
+         enable_builtin_lzma=yes
+     else
diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD
index b8e3ccf85..05cd3340e 100644
--- a/community/tracker/PKGBUILD
+++ b/community/tracker/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49818 2011-06-21 09:19:30Z spupykin $
+# $Id: PKGBUILD 51237 2011-07-06 10:22:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=tracker
-pkgver=0.10.18
+pkgver=0.10.19
 pkgrel=1
 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer"
 arch=('i686' 'x86_64')
@@ -25,7 +25,7 @@ conflicts=('libtracker')
 provides=("libtracker")
 install=tracker.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2)
-md5sums=('571b915d0173d9d5f2e3310ffd02e8e6')
+md5sums=('59f105fbe7248749aee7ae8d9432b6a9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/wml/PKGBUILD b/community/wml/PKGBUILD
index 2f7a3781f..33c34b025 100644
--- a/community/wml/PKGBUILD
+++ b/community/wml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 47762 2011-05-25 13:41:49Z tdziedzic $
+# $Id: PKGBUILD 50698 2011-06-29 15:35:12Z stephane $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=wml
 pkgver=2.0.11
-pkgrel=6
+pkgrel=7
 pkgdesc="The Website Meta Language"
 arch=('i686' 'x86_64')
 url="http://thewml.org/"
diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD
index 2dcde06ee..8e7d3fe69 100644
--- a/community/xemacs/PKGBUILD
+++ b/community/xemacs/PKGBUILD
@@ -1,48 +1,37 @@
-# $Id: PKGBUILD 96361 2010-10-19 23:18:53Z stephane $
+# $Id: PKGBUILD 49690 2011-06-19 10:01:11Z ebelanger $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor : Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=xemacs
-pkgver=21.5.29
-pkgrel=3
-pkgdesc="highly customizable open source text editor and application development system forked from GNU Emacs"
-arch=(i686 x86_64)
+pkgver=21.5.31
+pkgrel=2
+pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs"
+arch=('i686' 'x86_64')
 url="http://www.xemacs.org/"
 license=('GPL')
-depends=('db' 'libpng' 'libtiff' 'gpm>=1.20.4' 'bash' 'ncurses>=5.6-7' 'desktop-file-utils' 'libxaw' 'libjpeg')
+depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib')
 optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface'
             'xorg-fonts-100dpi: X bitmap fonts needed for the interface')
-makedepends=('giflib' 'xbitmaps')
+makedepends=('xbitmaps')
 install=xemacs.install
 source=(http://ftp.xemacs.org/pub/xemacs/beta/$pkgname-$pkgver.tar.gz
         xemacs.desktop
-        xemacs-21.5.29-large-images.patch
-        xemacs-21.5.29-optimization-bug.patch
-        xemacs-21.5.29-vcdiff.patch)
-md5sums=('5364192ae0d3de23d9f4ce197e6493b5'
+        xemacs-21.5.29-optimization-bug.patch)
+md5sums=('0185fe905d0b8d8d094d9b60cf262d4a'
          'a4d3d5c0aa2c7ce7bec491f809ca3694'
-         '23ca5a7c50fe7ebebd9fc4525882cdf1'
-         'eb061b10ea3bbe1026df5326ae1618e3'
-         '4ada657a351b226cdd557f9faaeab075')
+         'eb061b10ea3bbe1026df5326ae1618e3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Fix security issue in vcdiff script
-  patch -Np0 -i ../xemacs-21.5.29-vcdiff.patch
-
-	# Fix problem caused by improper optimization with GCC>=4.1.2 on i686
- 	# (and possibly other arches). See
- 	# http://tracker.xemacs.org/XEmacs/its/issue354
-  # for the upstream bug report.
+# Fix problem caused by improper optimization with GCC>=4.1.2 on i686
+# (and possibly other arches). See
+# http://tracker.xemacs.org/XEmacs/its/issue354
+# for the upstream bug report.
   patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch
  	
- 	# Fix for security bug
-  # See http://bugs.gentoo.org/show_bug.cgi?id=275397
-  patch -Np1 -i ../xemacs-21.5.29-large-images.patch
-
   ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \
-      --with-x11 --without-postgresql --with-athena=xaw \
+      --without-postgresql --with-athena=xaw \
       --enable-database=berkdb --without-ldap \
       --enable-menubars=lucid --enable-scrollbars=lucid \
       --enable-widgets=athena --enable-dialogs=athena \
@@ -60,20 +49,17 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man1" infodir="${pkgdir}/usr/share/info" install gzip-el
 
-  rm ${pkgdir}/usr/bin/{b2m,ctags,etags,rcs-checkin}
-  rm ${pkgdir}/usr/share/man/man1/{ctags.1,etags.1}
+  rm "${pkgdir}"/usr/bin/{b2m,ctags,etags}
+  rm "${pkgdir}"/usr/share/man/man1/{ctags.1,etags.1}
 
   # fix  FS#7927
   install -d -m755 "${pkgdir}/usr/share/pixmaps"
-  install -d -m755 "${pkgdir}/usr/share/applications"
-  install -m644 "${srcdir}/${pkgname}.desktop" ${pkgdir}/usr/share/applications/ || return 1
-  ln -sf /usr/lib/xemacs-21.5-b28/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/" || return 1
+  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  ln -sf /usr/share/xemacs-${pkgver%.*}-b${pkgver##*.}/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/xemacs-icon.xpm"
 
   # correct permissions
   chown -R root:root "${pkgdir}"
 
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
-  rm ${pkgdir}/usr/share/info/{info.info.gz,texinfo.info-2.gz,cl.info.gz,texinfo.info-1.gz,texinfo.info.gz,standards.info.gz,widget.info.gz}
+  rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info}
 }
 # vim: ts=2 sw=2 et ft=sh
diff --git a/community/xemacs/xemacs.install b/community/xemacs/xemacs.install
index 2cdf5e488..a04ee187f 100644
--- a/community/xemacs/xemacs.install
+++ b/community/xemacs/xemacs.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(beta.info.gz custom.info.gz 
 	  emodules.info.gz external-widget.info.gz 
 	  internals.info-1.gz internals.info-2.gz