9 files changed, 80 insertions, 42 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 84dc54e39..993423a43 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160642 2012-06-02 23:03:27Z giovanni $
+# $Id: PKGBUILD 161344 2012-06-10 05:51:02Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10790
+pkgver=10792
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('a76b0536f0b13fa278bd65287c443ad0')
+md5sums=('ff828df9561e4964e439539189a891f7')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 58008f21c..05c4fe8d8 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159348 2012-05-22 02:25:46Z bisson $
+# $Id: PKGBUILD 161358 2012-06-10 08:42:53Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -6,8 +6,8 @@
 pkgname=bind
 
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.1
-_pkgver=9.9.1
+pkgver=9.9.1.P1
+_pkgver=9.9.1-P1
 pkgrel=1
 
 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
@@ -25,7 +25,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('c963de85ba6f55d7615471b29b356efe6c844e9c'
+sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8'
           'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
           '18f477f510df31e6c6f547ee2d5fc46e973479bf'
           '46232e9db243c6c05e170a1781d7a7f413be5d03'
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index 0a47e14ff..e1db5c4c6 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -1,27 +1,65 @@
-# $Id: PKGBUILD 156109 2012-04-14 07:40:13Z andyrtr $
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 161366 2012-06-10 10:37:10Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=dbus-python
-pkgver=1.0.0
+pkgbase=dbus-python
+pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
+pkgver=1.1.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-core' 'python2')
-makedepends=('docutils' 'dbus-glib')
-optdepends=('dbus-glib: glib mainloop support')
+makedepends=('docutils' 'dbus-glib' 'python' 'python2')
 options=('!libtool')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('775a8235736bf760cdd96e2d76546469')
+source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz)
+md5sums=('41a459bbbb5fd92eeebd632623af0bd7')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=python2 ./configure --prefix=/usr
+  cd "${srcdir}"
+  mkdir build-python2 build-python3
+  cd "${srcdir}/build-python2"
+  PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr
+  make
+
+
+  cd "${srcdir}/build-python3"
+  ../${pkgbase}-${pkgver}/configure --prefix=/usr
   make
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package_python-dbus-common() {
+  pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus"
+
+  cd "${srcdir}/build-python3"
+  make DESTDIR="${pkgdir}" install-data
+  rm -rf "${pkgdir}"/usr/lib/python*
+}
+
+package_python-dbus() {
+  depends=('python-dbus-common' 'python' 'dbus-core')
+  optdepends=('dbus-glib: glib mainloop support')
+  pkgdesc="Python 3.2 bindings for DBUS"
+
+  cd "${srcdir}/build-python3"
   make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}/usr/share"
+  rm -rf "${pkgdir}/usr/include"
+  rm -rf "${pkgdir}/usr/lib/pkgconfig"
+}
+
+package_python2-dbus() {
+  depends=('python-dbus-common' 'python2' 'dbus-core')
+  optdepends=('dbus-glib: glib mainloop support')
+  pkgdesc="Python 2.7 bindings for DBUS"
+  replaces=('dbus-python')
+  conflicts=('dbus-python')
+  provides=("dbus-python=$pkgver")
+
+  cd "${srcdir}/build-python2"
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}/usr/share"
+  rm -rf "${pkgdir}/usr/include"
+  rm -rf "${pkgdir}/usr/lib/pkgconfig"
 }
diff --git a/extra/desktop-file-utils/PKGBUILD b/extra/desktop-file-utils/PKGBUILD
index 90a3cddd4..1588bfc27 100644
--- a/extra/desktop-file-utils/PKGBUILD
+++ b/extra/desktop-file-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145704 2011-12-28 10:22:56Z jgc $
+# $Id: PKGBUILD 161386 2012-06-10 16:51:40Z jgc $
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=desktop-file-utils
-pkgver=0.19
+pkgver=0.20
 pkgrel=1
 pkgdesc="Command line utilities for working with desktop entries"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
 license=('GPL')
 depends=('glib2')
 source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz)
-md5sums=('cbb2427593b7f6d36e52e9d221fce82f')
+md5sums=('8c85cbc13632ba69077c6bc41ce4d0ac')
 
 build() {
   cd "${srcdir}/desktop-file-utils-${pkgver}"
diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD
index 4a057f4bb..e120ef571 100644
--- a/extra/gc/PKGBUILD
+++ b/extra/gc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151400 2012-02-26 10:21:51Z pierre $
+# $Id: PKGBUILD 161367 2012-06-10 10:38:24Z jgc $
 # Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
 
 pkgname=gc
-pkgver=7.1
-pkgrel=4
+pkgver=7.2
+pkgrel=1
 pkgdesc="A garbage collector for C and C++"
 arch=('i686' 'x86_64')
 url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
@@ -12,7 +12,7 @@ license=('GPL')
 source=("http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-${pkgver}.tar.gz")
 depends=('gcc-libs')
 options=('!libtool')
-md5sums=('2ff9924c7249ef7f736ecfe6f08f3f9b')
+md5sums=('d17aecedef3d73e75387fb63558fa4eb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index c9d8cb147..2734729de 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157391 2012-04-28 09:26:29Z allan $
+# $Id: PKGBUILD 161369 2012-06-10 10:47:54Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.4.1
-pkgrel=2
+pkgver=3.4.2
+pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9b1f0164d6c6bc08e391efde7e6a2aa9290a65bda543fe3a7adc6ef73b722a64')
+sha256sums=('4bd81156de3da433d93eaf3df9cae4aa28356c2bda23fd88ca68ba6e184a9e6d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index edecb9cff..b07ef9cc9 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156955 2012-04-23 09:09:56Z ibiru $ 
+# $Id: PKGBUILD 161372 2012-06-10 10:55:15Z jgc $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango
-pkgver=1.30.0
+pkgver=1.30.1
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ options=('!libtool' '!emptydirs')
 install=pango.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
-sha256sums=('7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff')
+sha256sums=('3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 5001efed8..0392e3bec 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158723 2012-05-08 10:41:26Z tpowa $
+# $Id: PKGBUILD 161390 2012-06-10 20:21:44Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=1.0.1
-pkgrel=3
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
@@ -11,7 +11,7 @@ makedepends=('texi2html' 'perl' 'python2')
 depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
+source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}-1.tar.bz2
         65-kvm.rules)
 options=(!strip)
 
@@ -42,5 +42,5 @@ package() {
     done
 
 }
-md5sums=('5efd1091f01e3bc31bfdec27b8edeb00'
+md5sums=('f5c85c229b780bc39268845b6f365fc1'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/rcs/PKGBUILD b/extra/rcs/PKGBUILD
index 814bd760d..425d73d28 100644
--- a/extra/rcs/PKGBUILD
+++ b/extra/rcs/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 137009 2011-09-05 07:46:17Z bisson $
+# $Id: PKGBUILD 161362 2012-06-10 09:11:36Z bisson $
 # Contributor: dorphell <dorphell@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=rcs
-pkgver=5.8
+pkgver=5.8.1
 pkgrel=1
 pkgdesc='Revision Control System: manages multiple revisions of files'
 url='http://www.gnu.org/software/rcs/'
 license=('GPL3')
 arch=('i686' 'x86_64')
 source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('6ba0c3ea2d170990214a26b323feaadb89bb4206')
+sha1sums=('3317a9e0f324a094e48584831e1b23852f907af9')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"