Sat Jun 25 23:07:08 UTC 2011

27 files changed, 424 insertions, 126 deletions

diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index cb05d8e31..49bc53644 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49493 2011-06-17 22:21:07Z giovanni $
+# $Id: PKGBUILD 50108 2011-06-24 19:28:04Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.6
+pkgver=0.8.7
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         desktop_integration.patch)
-md5sums=('859d856bdcbd12189ffb91c581928ed9'
+md5sums=('d7132ec75f5e742e04e196fc8e2c0884'
          '253ce4fe5d01f8ff76b63cd3825755ea')
 
 build() {
diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD
index 503cac629..c09ef110a 100644
--- a/community/cgit/PKGBUILD
+++ b/community/cgit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 43711 2011-03-29 10:19:12Z spupykin $
+# $Id: PKGBUILD 50113 2011-06-24 20:01:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Current Maintainer:  Patrick Palka <patrick@parcs.ath.cx>
 # Previous Maintainer:  Loui Chang <louipc.ist at gmail com>
@@ -6,8 +6,8 @@
 # Development: http://closure.ath.cx/aur-dev
 
 pkgname=cgit
-pkgver=0.9
-pkgrel=2
+pkgver=0.9.0.1
+pkgrel=1
 pkgdesc="A web interface for git written in plain C"
 arch=('i686' 'x86_64')
 url="http://hjemli.net/git/cgit"
@@ -16,11 +16,10 @@ depends=('openssl')
 makedepends=('git' 'zlib' 'curl' 'asciidoc')
 install=cgit.install
 source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2")
-md5sums=('b55f953c5c8a418bca72b3de3c297270')
+md5sums=('dddae5bcfc1eeb469fc2b95531a75c1c')
 
 build() {
   cd "$pkgname-$pkgver"
-
   make get-git
   make
   make doc-man
@@ -28,10 +27,7 @@ build() {
 
 package() {
   cd "$pkgname-$pkgver"
-
   make CGIT_SCRIPT_PATH=/srv/http/cgit DESTDIR="$pkgdir" install install-man
   install -vDm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
   install -vd "$pkgdir/var/cache/$pkgname"
 }
-
-md5sums=('b55f953c5c8a418bca72b3de3c297270')
diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD
index d243c8c33..fb8242bad 100644
--- a/community/fotoxx/PKGBUILD
+++ b/community/fotoxx/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 pkgname=fotoxx
-pkgver=11.06.1
+pkgver=11.06.2
 pkgrel=1
 pkgdesc="A program for improving image files made with a digital camera"
 url="http://kornelix.squarespace.com/fotoxx"
@@ -9,7 +9,7 @@ license=('GPL3')
 depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils')
 optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning')
 source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('d485750bd0d808e5df41bddeae8de00c')
+md5sums=('03fac30ee3239f379d5a9fcdc8ba3933')
 install=fotoxx.install
 
 build() {
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index 55008944c..7e222b301 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 49923 2011-06-22 14:26:41Z giovanni $
+# $Id: PKGBUILD 50103 2011-06-24 19:11:00Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64')
@@ -12,9 +12,9 @@ license=('BSD')
 depends=('udev')
 makedepends=('pkgconfig')
 options=('!libtool' '!docs')
-source=(https://alioth.debian.org/frs/download.php/3591/pcsc-lite-${pkgver}.tar.bz2
+source=(https://alioth.debian.org/frs/download.php/3598/pcsc-lite-${pkgver}.tar.bz2
         pcscd)
-md5sums=('0dfc1639e4020fb3c04ab37425abbb12'
+md5sums=('1caf0b8ca2ecbf82fe3b035b3fff22dd'
          '80d90388e4d2a551cb7aefe3bd5147bd')
 
 build() {
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 6e3619898..866bff343 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49861 2011-06-21 12:55:45Z svenstaro $
+# $Id: PKGBUILD 50079 2011-06-24 08:49:19Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -11,34 +11,33 @@ pkgbase=qtcreator
 #pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin')
 pkgname=('qtcreator' 'qtcreator-todo-plugin')
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/products/developer-tools'
 license=('LGPL')
 depends=('qt>=4.7.3')
-makedepends=('qt-private-headers>=4.7.3')
+makedepends=('qt-private-headers>=4.7.3' 'git')
 options=('docs')
 source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
 	    'http://download.berlios.de/astyleplugin/ArtisticStylePlugin-0.6-src.zip'
-	    "https://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin/archive-tarball/88f8fc50"
         'qtcreator.desktop')
 md5sums=('35d74837e48b12ee58379e1c029a9a6c'
          '4dab1bb07ba5c39ae4c975a333d32ec1'
-         '734a6f375e595de796f9802087845dfe'
          '2c3ffbd66845b37be9804f2966815a10')
 
 build() {
   cd ${srcdir}
-  mkdir build
-  cd build
+  [[ -d build ]] && rm -r build
+  mkdir build && cd build
 
   qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro
   make --quiet
   
   # Building TODO plugin
+  git clone git://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin.git $srcdir/qt-creator-todo-plugin
   msg "Starting TODO plugin build...."
-  cd $srcdir/qt-creator-todo-plugin-qt-creator-todo-plugin
+  cd $srcdir/qt-creator-todo-plugin
   sed -i "s|QTC_BUILD_DIR = .*|QTC_BUILD_DIR = ${srcdir}/build|g" todoplugin.pro
   sed -i "s|QTC_SOURCE_DIR = .*|QTC_SOURCE_DIR  = $srcdir/qt-creator-${pkgver}-src/|g" todoplugin.pro
   sed -i "s|\"2.1.81\"|\"${pkgver}\"|g" todo.pluginspec
@@ -66,12 +65,21 @@ package_qtcreator() {
 
   # qt already fixed this
   if [[ -f "$pkgdir/usr/bin/qmlpuppet" ]]; then
-      echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.2.1)"
+      echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)"
       return 1
   fi
   install -Dm755 bin/qmlpuppet "$pkgdir/usr/bin/qmlpuppet"
   # remove it soon
 
+  # qt already fixed this as well
+  if [[ -f "$pkgdir/usr/lib/qmldesigner/libqtquickplugin.so" ]]; then
+      echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)"
+      return 1
+  fi
+  mkdir "$pkgdir/usr/lib/qmldesigner"
+  cp lib/qmldesigner/*.so "$pkgdir/usr/lib/qmldesigner/"
+  # remove it soon
+
   install -Dm644 ${srcdir}/qtcreator.desktop \
     ${pkgdir}/usr/share/applications/qtcreator.desktop
   install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
@@ -88,7 +96,7 @@ package_qtcreator-todo-plugin() {
   install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
  o-plugin'
   
-  cd $srcdir/qt-creator-todo-plugin-qt-creator-todo-plugin
+  cd $srcdir/qt-creator-todo-plugin
   make INSTALL_ROOT=$pkgdir/usr/ install
 
   install -Dm644 LICENSE.BSD \
diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD
index 3d1d7b6cc..cd6c2363a 100644
--- a/community/scrotwm/PKGBUILD
+++ b/community/scrotwm/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=scrotwm
 pkgver=0.9.32
-pkgrel=1
+pkgrel=2
 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way."
 arch=('i686' 'x86_64')
 url="http://www.scrotwm.org"
@@ -45,4 +45,11 @@ package() {
 
   ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0"
   ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so"
+
+  # fix this for real in the makefile
+  mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/
+  mv "$pkgdir/usr/share/man/man1/scrotwm_es.1" "$pkgdir/usr/share/man/es/man1/"
+  mv "$pkgdir/usr/share/man/man1/scrotwm_it.1" "$pkgdir/usr/share/man/it/man1/"
+  mv "$pkgdir/usr/share/man/man1/scrotwm_pt.1" "$pkgdir/usr/share/man/pt/man1/"
+  mv "$pkgdir/usr/share/man/man1/scrotwm_ru.1" "$pkgdir/usr/share/man/ru/man1/"
 }
diff --git a/extra/catdoc/PKGBUILD b/extra/catdoc/PKGBUILD
index 2b46013c6..cf8523bff 100644
--- a/extra/catdoc/PKGBUILD
+++ b/extra/catdoc/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 31735 2009-03-28 03:50:45Z eric $
+# $Id: PKGBUILD 128489 2011-06-24 04:50:44Z eric $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Paulius Palevicius <paulius@birzai.com>
 
 pkgname=catdoc
 pkgver=0.94.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.wagner.pp.ru/~vitus/software/catdoc/"
 license=('GPL')
 depends=('glibc')
@@ -16,9 +16,12 @@ source=(http://ftp.wagner.pp.ru/pub/catdoc/$pkgname-$pkgver.tar.gz)
 md5sums=('243e1680bb3e703616f5adecfee24491')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --with-wish=/usr/bin/wish || return 1
-  make || return 1
-  make installroot=$pkgdir mandir=/usr/share/man/man1 install || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr  --with-wish=/usr/bin/wish
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make installroot="$pkgdir" mandir=/usr/share/man/man1 install
 }
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/fortune-mod/PKGBUILD b/extra/fortune-mod/PKGBUILD
index 0737c5ab2..9cc9b6ac7 100644
--- a/extra/fortune-mod/PKGBUILD
+++ b/extra/fortune-mod/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 30775 2009-03-21 22:49:21Z eric $
+# $Id: PKGBUILD 128484 2011-06-24 04:37:24Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Dale Blount <archlinux@dale.us>
 
 pkgname=fortune-mod
 pkgver=1.99.1
-pkgrel=4
+pkgrel=5
 pkgdesc="The Fortune Cookie Program from BSD games"
 arch=('i686' 'x86_64')
 url="http://www.redellipse.net/code/fortune"
 license=('BSD')
 depends=('recode')
 source=(ftp://ftp.archlinux.org/other/fortune-mod/$pkgname-$pkgver.tar.gz LICENSE 01_all_fortune_all-fix.patch)
-md5sums=('f208805b3b712e32997d7667e0ec52d8' '0217481ae93971296cfb7872157cabb7'\
+md5sums=('f208805b3b712e32997d7667e0ec52d8'
+         '0217481ae93971296cfb7872157cabb7'
          'e85b073f16dc6f0e8f0ed90044797aa3')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p0 < ../01_all_fortune_all-fix.patch  || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p0 < ../01_all_fortune_all-fix.patch
   make REGEXDEFS='-DHAVE_REGEX_H -DPOSIX_REGEX -DHAVE_STDBOOL'  \
        COOKIEDIR=/usr/share/fortune  \
-       LOCALDIR=/usr/local/share/fortune || return 1
-  make COOKIEDIR=/usr/share/fortune fortune/fortune.man || return 1
-  make FORTDIR=$pkgdir/usr/bin  \
-       COOKIEDIR=$pkgdir/usr/share/fortune  \
-       BINDIR=$pkgdir/usr/sbin  \
-       BINMANDIR=$pkgdir/usr/share/man/man1  \
-       FORTMANDIR=$pkgdir/usr/share/man/man6 install || return 1
-  rm $pkgdir/usr/share/fortune/*.u8
-  rm $pkgdir/usr/share/fortune/off/*.u8
-  install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+       LOCALDIR=/usr/local/share/fortune all fortune/fortune.man
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make FORTDIR="$pkgdir"/usr/bin \
+       COOKIEDIR="$pkgdir"/usr/share/fortune \
+       BINDIR="$pkgdir"/usr/sbin \
+       BINMANDIR="$pkgdir"/usr/share/man/man1 \
+       FORTMANDIR="$pkgdir"/usr/share/man/man6 install
+  rm "$pkgdir"/usr/share/fortune/*.u8
+  rm "$pkgdir"/usr/share/fortune/off/*.u8
+  install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/extra/gimp-dbp/PKGBUILD b/extra/gimp-dbp/PKGBUILD
index 9cec2e706..f09db2f20 100644
--- a/extra/gimp-dbp/PKGBUILD
+++ b/extra/gimp-dbp/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 37038 2009-04-30 05:11:53Z eric $
+# $Id: PKGBUILD 128499 2011-06-24 05:56:11Z eric $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gimp-dbp
-_srcname=dbp
 pkgver=1.1.9
-pkgrel=1
+pkgrel=2
 pkgdesc="David's batch processor for the GIMP"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gimp>=2.4')
+arch=('i686' 'x86_64')
 url="http://members.ozemail.com.au/~hodsond/dbp.html"
-source=(http://www.ozemail.com.au/~hodsond/${_srcname}Src-${pkgver//./-}.tgz)
+license=('GPL')
+depends=('gimp')
+source=(http://www.ozemail.com.au/~hodsond/dbpSrc-${pkgver//./-}.tgz)
 md5sums=('1106625707798ab8ea1317ac6bece1c5')
 
 build() {
-  cd ${srcdir}/${_srcname}-${pkgver}
- # Tweak Makefile -- remove auto-install
-  sed -i 's|^\tgimptool.*$||' Makefile || return 1
-  sed -i "s|<string>|<cstring>|" op.h || return 1
- #sed -i '/DISABLE_DEPRECATED/d' Makefile
- # create gimp-2.0 plugin and install it
-  make ${_srcname} || return 1
-  install -Dsm755 ${_srcname} ${pkgdir}/usr/lib/gimp/2.0/plug-ins/${_srcname} || return 1
+  cd "${srcdir}/dbp-${pkgver}"
+  sed -i "s|<string>|<cstring>|" op.h
+  make
+}
+
+package() {
+  cd "${srcdir}/dbp-${pkgver}"
+  install -D -m755 dbp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/dbp"
 }
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 9ade982c2..1e814b88a 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 126447 2011-06-05 13:11:49Z andyrtr $
+# $Id: PKGBUILD 128504 2011-06-24 07:05:04Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=2.12.6.1
+pkgver=2.12.7
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ install=gnutls.install
 options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'libgcrypt')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e724e37f96984f3b0a215c11f03729bd')
+md5sums=(4b48aa3119f549d30d550bf4162c721b'')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD
index fb95cc7b9..339906704 100644
--- a/extra/grantlee/PKGBUILD
+++ b/extra/grantlee/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 128623 2011-06-24 16:39:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=grantlee
-pkgver=0.1.8
+pkgver=0.1.9
 pkgrel=1
 pkgdesc="A string template engine based on the Django template system and written in Qt"
 arch=('i686' 'x86_64')
@@ -11,10 +11,10 @@ license=('LGPL3')
 depends=('qt')
 makedepends=('cmake')
 source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz")
-md5sums=('67c24d9eb6be66997ac5d0803bde06de')
+md5sums=('3d93b5312814ebee373fba5509d88bdb')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +24,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 } 
diff --git a/extra/hexedit/PKGBUILD b/extra/hexedit/PKGBUILD
index cbf963d64..bc2a5bfd0 100644
--- a/extra/hexedit/PKGBUILD
+++ b/extra/hexedit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 128432 2011-06-23 23:29:54Z dan $
+# $Id: PKGBUILD 128628 2011-06-24 17:38:13Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <pjmattal@elys.com>
 
 pkgname=hexedit
 pkgver=1.2.12
-pkgrel=3
+pkgrel=4
 pkgdesc="Hex Editor for Linux"
 arch=('i686' 'x86_64')
 url="http://merd.net/pixel/hexedit.html"
@@ -19,5 +19,9 @@ build() {
 
   ./configure
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
   make prefix="${pkgdir}/usr" install
 }
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index d7930f9f7..0d939ffd2 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126832 2011-06-07 15:43:55Z foutrelis $
+# $Id: PKGBUILD 128509 2011-06-24 07:30:26Z foutrelis $
 # Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.8.0
+pkgver=2.9.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
@@ -18,7 +18,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
         nm09-more.patch)
-md5sums=('d1656c443a5d91f4aa0d95915f1f50c3'
+md5sums=('2cd285c7a40f93b7a51bfe733971d3a6'
          'a673659d86c7a65aa710f7c8c7feda82')
 
 build() {
diff --git a/extra/x2x/PKGBUILD b/extra/x2x/PKGBUILD
index bccbba6a4..8389e2ef8 100644
--- a/extra/x2x/PKGBUILD
+++ b/extra/x2x/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 36334 2009-04-21 02:04:21Z eric $
+# $Id: PKGBUILD 128494 2011-06-24 05:31:20Z eric $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
+
 pkgname=x2x
 pkgver=1.27
-pkgrel=5
+pkgrel=6
 pkgdesc="Control one X display from another"
-arch=(i686 x86_64)
-url="http://x2x.dottedmag.net/"
+arch=('i686' 'x86_64')
+url="https://github.com/dottedmag/x2x"
 license=('custom')
 depends=('libxtst')
 makedepends=('imake')
-source=(http://x2x.dottedmag.net/releases/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('3d1bc863f3209ec37caf7f57bde7e8f0' '7ebc35f66a8ded9b8d8d7ca4131c7ae8')
+source=(https://github.com/downloads/dottedmag/x2x/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('3d1bc863f3209ec37caf7f57bde7e8f0'
+         '7ebc35f66a8ded9b8d8d7ca4131c7ae8')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   mv x2x.1 x2x.man 
-  xmkmf || return 1
-  make || return 1
-  make DESTDIR=$pkgdir MANPATH=/usr/share/man install install.man || return 1
-  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  xmkmf 
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" MANPATH=/usr/share/man install install.man
+  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 7f859fa3f..a7024228a 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -23,7 +23,7 @@ build() {
  ## Git checkout
   if [ -d $srcdir/${_gitname} ] ; then
     msg "Git checkout:  Updating existing tree"
-    cd ${_gitname} && git pull origin
+    cd ${_gitname} && git pull ${_gitroot}
     msg "Git checkout:  Tree has been updated"
   else
     msg "Git checkout:  Retrieving sources"
@@ -34,12 +34,14 @@ build() {
 }
 
 package() {
-  install -d ${pkgdir}/usr/bin
-  install -d ${pkgdir}/usr/sbin
-  install -d ${pkgdir}/etc
 
+  install -d ${pkgdir}/etc
   install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/
 
+  install -d ${pkgdir}/etc/libretools.d
+  install -m644 ${_gitname}/cleansystem ${pkgdir}/etc/libretools.d
+
+  install -d ${pkgdir}/usr/bin
   install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin
   install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin
   install -m755 ${_gitname}/aur ${pkgdir}/usr/bin
@@ -59,6 +61,7 @@ package() {
   install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
   install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin
 
+  install -d ${pkgdir}/usr/sbin
   install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/
   
 } 
\ No newline at end of file
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index 8eea37689..f8f447e2f 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,4 +1,3 @@
-
 # arg 1:  the new package version
 post_install() {
   cat <<EOF
@@ -13,7 +12,9 @@ post_upgrade() {
   cat <<EOF
 Check your /etc/libretools.conf
 
-Make sure LIBREDESTDIR finish with "repo" instead of "free"
+Your REPOS array if using fullpkg should be:
+'core' 'extra' 'community' 'libre'
+
 EOF
 }
 
diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD
index b71a1557d..3130209de 100644
--- a/multilib/wine/PKGBUILD
+++ b/multilib/wine/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 49102 2011-06-11 03:15:30Z svenstaro $
+# $Id: PKGBUILD 50118 2011-06-24 23:27:03Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=wine
-pkgver=1.3.22
+pkgver=1.3.23
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('46f313013644d31ad37b8fc5c2c16467')
+md5sums=('71f05bf37c25648f8dbc793dda3da45c')
 
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD
new file mode 100644
index 000000000..360802755
--- /dev/null
+++ b/testing/dbus-core/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 128605 2011-06-24 14:03:41Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Link Dupont <link@subpop.net>
+#
+pkgname=dbus-core
+pkgver=1.4.12
+pkgrel=1
+pkgdesc="Freedesktop.org message bus system"
+url="http://www.freedesktop.org/Software/dbus"
+arch=(i686 x86_64)
+license=('GPL' 'custom')
+depends=('expat>=2.0.1' 'coreutils' 'filesystem')
+makedepends=('libx11')
+conflicts=('dbus<1.2.3-2')
+options=(!libtool)
+install=dbus.install
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
+        dbus)
+md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
+         '08f93dd19cffd1b45ab05c1fd4efb560')
+
+build() {
+  cd "${srcdir}/dbus-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
+      --with-system-pid-file=/var/run/dbus.pid \
+      --enable-inotify --disable-dnotify \
+      --disable-verbose-mode --disable-static \
+      --disable-tests --disable-asserts \
+      --with-systemdsystemunitdir=/lib/systemd/system
+  make
+}
+
+package(){
+  cd "${srcdir}/dbus-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  rm -f "${pkgdir}/usr/bin/dbus-launch"
+  rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1"
+
+  chown 81:81 "${pkgdir}/var/run/dbus"
+
+  install -m755 -d "${pkgdir}/etc/rc.d"
+  install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/"
+
+  #Fix configuration file
+  sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf"
+
+  #install .keep files so pacman doesn't delete empty dirs
+  touch "${pkgdir}/usr/share/dbus-1/services/.keep"
+  touch "${pkgdir}/usr/share/dbus-1/system-services/.keep"
+  touch "${pkgdir}/etc/dbus-1/session.d/.keep"
+  touch "${pkgdir}/etc/dbus-1/system.d/.keep"
+
+  install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
+}
diff --git a/testing/dbus-core/dbus b/testing/dbus-core/dbus
new file mode 100644
index 000000000..66b84cae0
--- /dev/null
+++ b/testing/dbus-core/dbus
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+    start)
+        stat_busy "Starting D-BUS system messagebus"
+	if [ ! -x /var/run/dbus ] ; then
+	    install -m755 -g 81 -o 81 -d /var/run/dbus
+	fi
+        if [ -x /usr/bin/dbus-uuidgen ] ; then
+            /usr/bin/dbus-uuidgen --ensure
+        fi
+
+        /usr/bin/dbus-daemon --system
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon dbus
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping D-BUS system messagebus"
+	[ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+	    rm -f /var/run/dbus.pid
+            rm_daemon dbus
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    reload)
+        stat_busy "Reloading D-BUS configuration"
+        [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \
+                --system --type=method_call \
+                --dest=org.freedesktop.DBus \
+                / org.freedesktop.DBus.ReloadConfig
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            stat_done
+        fi
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart|reload}"
+	;;
+esac
+exit 0
diff --git a/testing/dbus-core/dbus.install b/testing/dbus-core/dbus.install
new file mode 100644
index 000000000..44f4475ee
--- /dev/null
+++ b/testing/dbus-core/dbus.install
@@ -0,0 +1,24 @@
+post_install() {
+  getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus
+  getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
+  usr/bin/passwd -l dbus &>/dev/null
+  dbus-uuidgen --ensure
+}
+
+post_upgrade() {
+  post_install
+
+  #Make sure new rc script can shutdown running dbus
+  if [ -f var/run/dbus/pid ]; then
+    mv var/run/dbus/pid var/run/dbus.pid
+  fi
+}
+
+post_remove() {
+  if getent passwd dbus >/dev/null; then
+    usr/sbin/userdel dbus
+  fi
+  if getent group dbus >/dev/null; then
+    usr/sbin/groupdel dbus
+  fi
+}
diff --git a/testing/dbus-glib/PKGBUILD b/testing/dbus-glib/PKGBUILD
new file mode 100644
index 000000000..fa15a7b85
--- /dev/null
+++ b/testing/dbus-glib/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 128599 2011-06-24 13:51:01Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=dbus-glib
+pkgver=0.94
+pkgrel=1
+pkgdesc="GLib bindings for DBUS"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://www.freedesktop.org/wiki/Software/DBusBindings"
+depends=('dbus-core' 'glib2')
+makedepends=('pkgconfig')
+options=('!libtool' '!emptydirs')
+source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('e1f1506a6f4941e67bffd614b1ad5af6')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --enable-static=no --enable-bash-completion=no
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/dbus-python/PKGBUILD b/testing/dbus-python/PKGBUILD
new file mode 100644
index 000000000..8cfacff43
--- /dev/null
+++ b/testing/dbus-python/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 128602 2011-06-24 13:59:34Z ibiru $
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=dbus-python
+pkgver=0.84.0
+pkgrel=1
+pkgdesc="Python bindings for DBUS"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+url="http://www.freedesktop.org/wiki/Software/DBusBindings"
+depends=('dbus-glib' 'python2')
+makedepends=('pkg-config' 'docutils')
+options=('!libtool')
+source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('fe69a2613e824463e74f10913708c88a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  PYTHON=python2 ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/dbus/30-dbus b/testing/dbus/30-dbus
new file mode 100644
index 000000000..603e92d3e
--- /dev/null
+++ b/testing/dbus/30-dbus
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# launches a session dbus instance
+
+dbuslaunch="`which dbus-launch 2>/dev/null`"
+if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+  eval `$dbuslaunch --sh-syntax --exit-with-session`
+fi
+
diff --git a/testing/dbus/PKGBUILD b/testing/dbus/PKGBUILD
new file mode 100644
index 000000000..bcac66a7a
--- /dev/null
+++ b/testing/dbus/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 128609 2011-06-24 14:05:28Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Link Dupont <link@subpop.net>
+#
+pkgname=dbus
+pkgver=1.4.12
+pkgrel=1
+pkgdesc="Freedesktop.org message bus system"
+url="http://www.freedesktop.org/Software/dbus"
+arch=(i686 x86_64)
+license=('GPL' 'custom')
+depends=("dbus-core>=${pkgver}" 'libx11')
+source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        30-dbus)
+md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
+         'd14e59575f04e55d21a04907b6fd9f3c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
+      --with-system-pid-file=/var/run/dbus.pid \
+      --disable-verbose-mode --disable-static \
+      --enable-inotify --disable-dnotify \
+      --disable-tests --disable-asserts
+  make -C tools dbus-launch
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -m755 -d "${pkgdir}/usr/bin"
+  install -m755 -d "${pkgdir}/usr/share/man/man1"
+  install -m755 tools/dbus-launch "${pkgdir}/usr/bin/"
+  install -m644 doc/dbus-launch.1 "${pkgdir}/usr/share/man/man1/"
+
+  install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
+  install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/"
+
+  install -d -m755 "${pkgdir}/usr/share/licenses/dbus"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus/"
+}
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
index 646192a73..2410ee992 100644
--- a/testing/libreoffice/PKGBUILD
+++ b/testing/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128395 2011-06-23 18:37:12Z andyrtr $
+# $Id: PKGBUILD 128633 2011-06-24 19:50:33Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -24,8 +24,8 @@ pkgname=('libreoffice' 'libreoffice-sdk'
 	'libreoffice-extension-validator'
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.1.2
-pkgver=3.4.1rc2
+_LOver=3.4.1.3
+pkgver=3.4.1rc3
 pkgrel=1
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
@@ -132,25 +132,25 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
 	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
-md5sums=('f38317f991b1c253c416c67be7c3754d'
-         'aa0d333b2eeca843c55cd4fafb77cda4'
-         '571a1d550c7d2d0ae80d712611447f71'
-         '30794ddc83d1c2e79564f0788f09186a'
-         '6887bf7d9badf0f0822a0c85261b4679'
-         '5b9891c11e79a6131763c0131a5c442e'
-         '3b91cbeaa68f22b5c017cd5f3919c070'
-         '5578f0dc49d092c57285e3bf3a311702'
-         '117fc2edb8c0765d0d39dba2ed910ea7'
-         '6e7b4efe196c44519d0d438c5a65bd92'
-         '44eddc7cd60a61a347694aa9a1988c28'
-         '361d32db4b08954fd210219e2fcc45d8'
-         '793ceaf4c7af5bbcfd0b8feb369d1f54'
-         '58177e2ff875c494f08490b061171669'
-         '43d7f4910b01a826ea97f63af4bdb36c'
-         '852c34e284cddf499d80957e7c994da5'
-         '281fe1792a84129e33853ba3fea4d378'
-         'cc2553bf6be74f818f2e9ad7178bef92'
-         'fe8fb18f2d4e4a37a4c23bc59f7a730c'
+md5sums=('10b3212002688e7ce49a276c68352b50'
+         'c6547ec8f971284ea1e58bb39375c500'
+         '26328364a0804dedab94818c15e76871'
+         'd26c6ab53c9404e82e04ea366d4db261'
+         '132aa87f2f3e7fff62d7211a86b769f3'
+         '801c254c28402df0c5fb5e2615817a6d'
+         'b94208fdae537f0b026ee26cede9a946'
+         '096e3071949d1eedf73faa13a2cf7b7e'
+         'e27e715b08cc6a35988aaa6efab6cc7f'
+         'e94d7adb79f38d3fd8119b712b04cc6e'
+         '1d2e7ca24b9fffafeaf236817fc8cbe9'
+         '69a9af6536607340a57b54b5562077f7'
+         '3b4e819497ba695f5c64a0107c2aac8d'
+         '5a7370a79e563f649f6bf506bc71928c'
+         'c480ed571703e68d851fbbcd4aa520be'
+         '222cec135152c108068baa4e370a3f68'
+         '93524298efb472503b12ae47c95de399'
+         '5420c40473f8bf8e5b400dd8a1e54f02'
+         '1516196f023bb1ae55fd1773a8db9d16'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
diff --git a/testing/pidgin/PKGBUILD b/testing/pidgin/PKGBUILD
index e0c7170bd..91e94bb66 100644
--- a/testing/pidgin/PKGBUILD
+++ b/testing/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126958 2011-06-08 23:47:29Z foutrelis $
+# $Id: PKGBUILD 128517 2011-06-24 07:46:40Z foutrelis $
 # Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.8.0
-pkgrel=3
+pkgver=2.9.0
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
 license=('GPL')
@@ -18,7 +18,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
         nm09-more.patch)
-md5sums=('d1656c443a5d91f4aa0d95915f1f50c3'
+md5sums=('2cd285c7a40f93b7a51bfe733971d3a6'
          'a673659d86c7a65aa710f7c8c7feda82')
 
 build() {
diff --git a/testing/psmisc/PKGBUILD b/testing/psmisc/PKGBUILD
new file mode 100644
index 000000000..1783c528a
--- /dev/null
+++ b/testing/psmisc/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 128514 2011-06-24 07:34:22Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=psmisc
+pkgver=22.14
+pkgrel=1
+pkgdesc="Miscellaneous procfs tools"
+arch=('i686' 'x86_64')
+url="http://psmisc.sourceforge.net/index.html"
+license=('GPL')
+groups=('base')
+depends=('glibc' 'ncurses')
+source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
+md5sums=('ba3f4e971895c92bba7770d81c981503')
+sha1sums=('dc6fc0ec131c11796d01512bbd80089719b04a66')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}