Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts: community-staging/gambas2/PKGBUILD community-staging/gambas3/PKGBUILD community-staging/libextractor/PKGBUILD community-staging/pdf2djvu/PKGBUILD community/dante/PKGBUILD community/gnunet/PKGBUILD community/luafilesystem/PKGBUILD community/luajit/PKGBUILD community/python-mpi4py/PKGBUILD community/python-psutil/PKGBUILD extra/gnome-python-desktop/PKGBUILD extra/pycrypto/PKGBUILD extra/pygobject/PKGBUILD extra/pygobject2/PKGBUILD extra/pyopenssl/PKGBUILD extra/python/PKGBUILD extra/vde2/PKGBUILD gnome-unstable/clutter-gtk/PKGBUILD gnome-unstable/clutter/PKGBUILD gnome-unstable/eog/PKGBUILD gnome-unstable/evolution-data-server/PKGBUILD gnome-unstable/gcr/PKGBUILD gnome-unstable/gnome-desktop/PKGBUILD gnome-unstable/gnome-keyring/PKGBUILD gnome-unstable/gnome-themes-standard/PKGBUILD gnome-unstable/gobject-introspection/PKGBUILD staging/kdebase-workspace/PKGBUILD testing/iputils/PKGBUILD testing/php/PKGBUILD testing/php/php-fpm.conf.in.patch testing/php/php-fpm.service testing/php/rc.d.php-fpm
author: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-10-18 10:38:15 -0300
committer: Nicolás Reynolds <fauno@kiwwwi.com.ar> 2012-10-18 10:38:15 -0300
commit: 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (patch)
tree: 452fb18314fb6d4393552d1ef1190a3168353f44 /extra
parent: bb3524a1ba0370174d0c586ae94cd503b562a207 (diff)
parent: 9e3985ed7c9851da65023a0ab3d0739cce1858e2 (diff)
38 files changed, 338 insertions, 221 deletions
diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD
index 7536128ff..d0f0ec89e 100644
--- a/extra/bzr/PKGBUILD
+++ b/extra/bzr/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 160247 2012-05-31 16:28:09Z eric $
+# $Id: PKGBUILD 168990 2012-10-17 10:19:13Z allan $
 # Maintainer :
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=bzr
 pkgver=2.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A decentralized revision control system (bazaar)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://bazaar.canonical.com/en/"
 license=('GPL')
 depends=('python2')
-optdepends=('python-paramiko: for sftp support')
+optdepends=('python2-paramiko: for sftp support')
 source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
 md5sums=('ac5079858364a046071000d5cdccb67b'
          'c83dd08dd2c3e27edbab873500d7d6eb')
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index 735c36bfe..ed1cb8240 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162393 2012-06-26 18:57:06Z andyrtr $
+# $Id: PKGBUILD 168991 2012-10-17 10:19:14Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=dbus-python
 pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for DBUS"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
@@ -39,7 +39,7 @@ package_python-dbus-common() {
 package_python-dbus() {
   depends=('python-dbus-common' 'python' 'dbus-core')
   optdepends=('dbus-glib: glib mainloop support')
-  pkgdesc="Python 3.2 bindings for DBUS"
+  pkgdesc="Python 3.3 bindings for DBUS"
 
   cd "${srcdir}/build-python3"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD
index 520d48e83..939de0ee0 100644
--- a/extra/gnome-python-desktop/PKGBUILD
+++ b/extra/gnome-python-desktop/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 157924 2012-04-30 06:08:46Z eric $
+# $Id: PKGBUILD 169097 2012-10-17 22:51:16Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 
 pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck')
+pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
 pkgver=2.32.0
-pkgrel=10
+pkgrel=12
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 options=('!libtool')
@@ -25,48 +25,58 @@ build() {
 }
 
 package_gnome-python-desktop() {
-  depends=('python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'gnome-python')
+  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python')
   pkgdesc="Python bindings for the GNOME desktop environment"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make install-pkgconfigDATA DESTDIR="${pkgdir}"
 }
 
-package_python-gnomedesktop() {
+package_python2-gnomedesktop() {
   depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
   pkgdesc="Python bindings for gnome-desktop 2.x"
-
+  conflicts=('python-gnomedesktop<=2.32.0-10')
+  replaces=('python-gnomedesktop<=2.32.0-10')
+  
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C gnomedesktop install DESTDIR="${pkgdir}"
 }
 
-package_python-gnomekeyring() {
+package_python2-gnomekeyring() {
   depends=('pygtk' 'libgnome-keyring')
   pkgdesc="Python bindings for libgnome-keyring"
+  conflicts=('python-gnomekeyring<=2.32.0-10')
+  replaces=('python-gnomekeyring<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C gnomekeyring install DESTDIR="${pkgdir}"
 }
 
-package_python-gtop() {
+package_python2-gtop() {
   depends=('pygtk' 'libgtop')
   pkgdesc="Python bindings for libgtop"
+  conflicts=('python-gtop<=2.32.0-10')
+  replaces=('python-gtop<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C gtop install DESTDIR="${pkgdir}"
 }
 
-package_python-metacity() {
+package_python2-metacity() {
   depends=('pygtk' 'metacity')
   pkgdesc="Python bindings for metacity"
+  conflicts=('python-metacity<=2.32.0-10')
+  replaces=('python-metacity<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C metacity install DESTDIR="${pkgdir}"
 }
 
-package_python-rsvg() {
+package_python2-rsvg() {
   depends=('pygtk' 'librsvg')
   pkgdesc="Python bindings for librsvg"
+  conflicts=('python-rsvg<=2.32.0-10')
+  replaces=('python-rsvg<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C rsvg install DESTDIR="${pkgdir}"
@@ -74,9 +84,11 @@ package_python-rsvg() {
   install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
 }
 
-package_python-totem-plparser() {
+package_python2-totem-plparser() {
   depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
   pkgdesc="Python bindings for totem-plparser"
+  conflicts=('python-totem-plparser<=2.32.0-10')
+  replaces=('python-totem-plparser<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C totem install DESTDIR="${pkgdir}"
@@ -84,9 +96,11 @@ package_python-totem-plparser() {
   install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
 }
 
-package_python-wnck() {
+package_python2-wnck() {
   depends=('pygtk' 'libwnck')
   pkgdesc="Python bindings for libwnck"
+  conflicts=('python-wnck<=2.32.0-10')
+  replaces=('python-wnck<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C wnck install DESTDIR="${pkgdir}"
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 1ed8f30c8..c2619bd68 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168439 2012-10-11 21:49:14Z andrea $
+# $Id: PKGBUILD 168996 2012-10-17 10:19:28Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD
index 543cfd671..4ccc6a798 100644
--- a/extra/konversation/PKGBUILD
+++ b/extra/konversation/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144356 2011-12-05 01:48:51Z stephane $
+# $Id: PKGBUILD 168997 2012-10-17 10:19:30Z allan $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
@@ -6,12 +6,13 @@
 
 pkgname=konversation
 pkgver=1.4
-pkgrel=1
+pkgrel=3
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://konversation.kde.org"
-depends=('kdebase-runtime' 'kdepimlibs' 'python')
+depends=('kdebase-runtime' 'kdepimlibs')
 makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
+optdepends=('python: python scripting support')
 license=('GPL2' 'FDL')
 install=${pkgname}.install
 options=('!makeflags')
@@ -34,7 +35,7 @@ package() {
   make DESTDIR="${pkgdir}" install
   
   # Remove a bunch of symlinks pointing to non-existant files
-  for lang in pt_BR uk sv et de en nl; do
-     rm  "${pkgdir}"/usr/share/doc/kde/html/${lang}/konversation/common
+  for _lang in pt_BR uk sv et de en nl; do
+     rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common
   done
 }
diff --git a/extra/konversation/konversation.install b/extra/konversation/konversation.install
index 5a3809d3f..8834e059a 100644
--- a/extra/konversation/konversation.install
+++ b/extra/konversation/konversation.install
@@ -1,12 +1,12 @@
 post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
    update-desktop-database -q
 }
 
 post_upgrade() {
-	post_install
+   post_install
 }
 
 post_remove() {
-	post_install
+   post_install
 }
diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD
index aee11f9d4..beb0da687 100644
--- a/extra/link-grammar/PKGBUILD
+++ b/extra/link-grammar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158026 2012-05-01 10:12:56Z giovanni $
+# $Id: PKGBUILD 169082 2012-10-17 18:53:40Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=link-grammar
-pkgver=4.7.6
+pkgver=4.7.8
 pkgrel=1
 pkgdesc="A Grammar Checking library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('glibc')
 options=('!libtool' '!makeflags')
 source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1213bc22b2239b1abe0edee25ef38823')
+md5sums=('27de0300841a6e8cbd607d5cb43d4eda')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 74056ffc9..86d18e87e 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167982 2012-10-04 16:26:08Z giovanni $
+# $Id: PKGBUILD 169079 2012-10-17 18:31:25Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.10.04
+pkgver=2012.10.17
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('6188132efc675f2f6b298b8f5fae6b2f')
+md5sums=('c9319c87a768c01f8007965db5453ca1')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index 7a5ac9480..94defebce 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 168768 2012-10-15 19:27:04Z ronald $
+# $Id: PKGBUILD 168998 2012-10-17 10:19:32Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
 pkgver=5.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.getmiro.com"
 license=('GPL2')
-depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
-         'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
+depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
+         'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info'
          'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
-         'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
-         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' 
+         'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar'
+         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' 
          'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
 makedepends=('pkg-config' 'boost')
 install=miro.install
@@ -34,16 +34,16 @@ build() {
   sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
 
   # fix python scripts for python2
-  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" ${pkgdir}/usr/share/miro/resources/searchengines/update-icons.py
+  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}"/usr/share/miro/resources/searchengines/update-icons.py
   for i in usr/share/miro/resources/testdata/echonest-replies/generate.py usr/share/miro/resources/searchengines/update-icons.py \
     usr/share/miro/resources/testdata/7digital-replies/generate.py; do
-    sed -i "s|/usr/bin/python|/usr/bin/python2|" ${pkgdir}/${i} 
+    sed -i "s|/usr/bin/python|/usr/bin/python2|" "${pkgdir}"/${i} 
   done
 
   # Fakeroot segfaults on these; remove
-  if [ ${arch} == "i686" ]; then
-    rm -f ${pkgdir}/usr/bin/codegen.Linux-x86_64 || true
+  if [ ${CARCH} == "i686" ]; then
+    rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true
   else
-    rm -f ${pkgdir}/usr/bin/codegen.Linux-i686 || true
+    rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true
   fi
 }
diff --git a/extra/mod_wsgi/PKGBUILD b/extra/mod_wsgi/PKGBUILD
index 5e03a9070..43e6fa266 100644
--- a/extra/mod_wsgi/PKGBUILD
+++ b/extra/mod_wsgi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150577 2012-02-18 15:19:06Z pierre $
+# $Id: PKGBUILD 169100 2012-10-18 01:08:10Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Ryan Coyner <rcoyner@gmail.com>
 
 pkgname=mod_wsgi
-pkgver=3.3
-pkgrel=3
+pkgver=3.4
+pkgrel=1
 pkgdesc="Python WSGI adapter module for Apache"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.modwsgi.org/"
@@ -12,7 +12,7 @@ license=('APACHE')
 depends=('apache' 'python2')
 install=mod_wsgi.install
 source=("http://modwsgi.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6172bb2bbabcd0c25867c2bc06f99dbb')
+md5sums=('f42d69190ea0c337ef259cbe8d94d985')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pyalpm/PKGBUILD b/extra/pyalpm/PKGBUILD
index deabdd2d3..c8d64320c 100644
--- a/extra/pyalpm/PKGBUILD
+++ b/extra/pyalpm/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=pyalpm
 pkgver=0.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Libalpm bindings for Python 3"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.archlinux.org/users/remy/pyalpm.git/"
diff --git a/extra/pycrypto/PKGBUILD b/extra/pycrypto/PKGBUILD
index b011e10d1..17f58e616 100644
--- a/extra/pycrypto/PKGBUILD
+++ b/extra/pycrypto/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165053 2012-08-09 19:15:19Z jgc $
+# $Id: PKGBUILD 169001 2012-10-17 10:19:44Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
 
 pkgbase=pycrypto
 pkgname=('python2-crypto' 'python-crypto')
 pkgver=2.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'python')
 url="http://www.dlitz.net/software/pycrypto/"
@@ -41,7 +41,7 @@ package_python2-crypto() {
 }
 
 package_python-crypto() {
-  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Pythoni 3."
+  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3."
   depends=('python')
 
   cd "${srcdir}/${pkgbase}-${pkgver}-py3"
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 16420af96..48c5691d2 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159046 2012-05-15 11:01:15Z heftig $
+# $Id: PKGBUILD 169002 2012-10-17 10:19:46Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="https://live.gnome.org/PyGObject"
 license=('LGPL')
diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD
index b8a3ed497..6df4b19cc 100644
--- a/extra/pygobject2/PKGBUILD
+++ b/extra/pygobject2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158678 2012-05-06 22:44:32Z bisson $
+# $Id: PKGBUILD 169003 2012-10-17 10:19:49Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pygtk.org/"
 license=('LGPL')
diff --git a/extra/pyopenssl/PKGBUILD b/extra/pyopenssl/PKGBUILD
index b24f162b7..7056b53f7 100644
--- a/extra/pyopenssl/PKGBUILD
+++ b/extra/pyopenssl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 138458 2011-09-23 18:52:47Z ibiru $
+# $Id: PKGBUILD 169005 2012-10-17 10:19:52Z allan $
 # Maintainer : Ionut Biru<ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgbase=pyopenssl
-pkgname=('pyopenssl' 'python2-pyopenssl')
+pkgname=('python-pyopenssl' 'python2-pyopenssl')
 pkgver=0.13
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/pyOpenSSL"
 license=('LGPL2.1')
@@ -26,9 +26,12 @@ build() {
     python2 setup.py build
 }
 
-package_pyopenssl(){
+package_python-pyopenssl(){
     pkgdesc="Python3 wrapper module around the OpenSSL library"
-    depends=('python>=3.2' 'openssl')
+    depends=('python>=3.3' 'openssl')
+    replaces=('pyopenssl')
+    provides=('pyopenssl')
+    conflicts=('pyopenssl')
 
     cd "${srcdir}/pyOpenSSL-${pkgver}"
     python setup.py install --root "${pkgdir}" --optimize=1
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index ba1efbddd..b42ef3d73 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,31 +1,24 @@
-# $Id: PKGBUILD 163679 2012-07-17 18:11:04Z andrea $
+# $Id: PKGBUILD 169006 2012-10-17 10:19:54Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.4
+pkgver=4.9.5
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
 makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
-             'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
-        'fix-pyuic4.patch')
-md5sums=('a0b6a820633366365af5124ddbd059c7'
-         '097651aea0bafded5abdfd6d62afd2ad')
+             'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
+source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('e4cdd6619c63655f7510efb4df8462fb')
 
 build() {
-  # FS#30728
-  cd "${srcdir}"/PyQt-x11-gpl-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-pyuic4.patch
-  cd ..
-  
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
 
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  cd PyQt-x11-gpl-${pkgver}
   python configure.py \
     --confirm-license \
     --qsci-api
@@ -36,7 +29,7 @@ build() {
   make
 
   ### Python2 version ###
-  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
+  cd ../Py2Qt-x11-gpl-${pkgver}
   python2 configure.py \
     --confirm-license \
     -v /usr/share/sip \
@@ -51,10 +44,9 @@ build() {
 package_pyqt-common(){
   pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
   
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  cd PyQt-x11-gpl-${pkgver}
   make -C pyrcc DESTDIR="${pkgdir}" install
   make -C pylupdate DESTDIR="${pkgdir}" install
-  make -C designer INSTALL_ROOT="${pkgdir}" install
   
   install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
 }
@@ -66,13 +58,12 @@ package_pyqt(){
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
 
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  cd PyQt-x11-gpl-${pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
   # Provided by pyqt-common
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
   rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
 }
 
@@ -80,19 +71,19 @@ package_python2-pyqt(){
   pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
   depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
   optdepends=('phonon: enable audio and video in PyQt applications'
-              'python-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'python2-opengl: enable OpenGL 3D graphics in PyQt applications'
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
   provides=('python2-qt')
 
-  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
+  cd Py2Qt-x11-gpl-${pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
   # Fix conflicts with pyqt
   mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
   
-  # Provided by pyqt-common
+  # Provided by pyqt
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
   rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
   rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
diff --git a/extra/python-cairo/PKGBUILD b/extra/python-cairo/PKGBUILD
index 116763cc8..8034ee1b0 100644
--- a/extra/python-cairo/PKGBUILD
+++ b/extra/python-cairo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 121116 2011-04-29 03:02:02Z angvp $
+# $Id: PKGBUILD 169010 2012-10-17 10:20:01Z allan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>  
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=python-cairo
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for the cairo graphics library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL3')
@@ -18,19 +18,11 @@ md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5')
 build() {
   cd "${srcdir}/pycairo-${pkgver}"
 
-  # We patch the embedded copy of waf to fix compiling against python 3.2
-  # (due to PEP-3149), by using the appropriate python-config tool, rather
-  # than trying to find the libraries by directly using PYTHON_VERSION
-
   # Ensure that ./waf has created the cached unpacked version
   # of the wafadmin source tree.
   # This will be created to a subdirectory like
   #    .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
-  python ./waf --version
-
-  # Patch the unpacked version of waf:
-  pushd .waf3*
-  popd
+  python3 ./waf --version
 
   ./waf configure --prefix=/usr
   ./waf build
diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD
index a1f63c3b5..47a144f6a 100644
--- a/extra/python-egenix-mx-base/PKGBUILD
+++ b/extra/python-egenix-mx-base/PKGBUILD
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD 159295 2012-05-21 01:39:56Z stephane $
+# $Id: PKGBUILD 169013 2012-10-17 10:20:08Z allan $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
-pkgname=python-egenix-mx-base
+pkgbase=python-egenix-mx-base
+pkgname=('python2-egenix-mx-base')
 _origname=egenix-mx-base
 pkgver=3.2.4
-pkgrel=1
+pkgrel=3
 pkgdesc="A collection of Python tools"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.egenix.com/products/python/mxBase/"
-depends=('python2')
-replaces=('egenix-mx-base')
-provides=('egenix-mx-base')
+makedepends=('python2')
+conflicts=('python-egenix-mx-base<=3.2.4-1')
+replaces=('python-egenix-mx-base<=3.2.4-1')
 source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
 sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7')
 
 build() {
   cd "${srcdir}/${_origname}-${pkgver}"
 
-  find . -name \*.py -exec sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" \
-                                  -e "s|#!/usr/local/.*python.*|#!/usr/bin/env python2|" {} \;
+  find . -name \*.py -exec sed -i -e "s|^#!.*python|#!/usr/bin/python2|" {} \;
 
   python2 setup.py build
 }
 
-package() {
+package_python2-egenix-mx-base() {
+  depends=('python2>=2.7')
   cd "${srcdir}/${_origname}-${pkgver}"
   python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1
   install -D -m644 COPYRIGHT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/extra/python-iwscan/PKGBUILD b/extra/python-iwscan/PKGBUILD
index 603675f82..0bbb8118b 100644
--- a/extra/python-iwscan/PKGBUILD
+++ b/extra/python-iwscan/PKGBUILD
@@ -1,18 +1,26 @@
+# $Id: PKGBUILD 169016 2012-10-17 10:20:21Z allan $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
-pkgname=python-iwscan
+pkgbase=python-iwscan
+pkgname=python2-iwscan
 pkgver=20090609
-pkgrel=3
+pkgrel=4
 pkgdesc="A Python interface to iwlist, using the iwlib library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.otaku42.de/browser/python-iwscan"
 license=('LGPL')
 depends=('python2' 'wireless_tools')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-20090609.tar.gz)
+conflicts=('python-iwscan<=20090609-3')
+replaces=('python-iwscan<=20090609-3')
+source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz)
 md5sums=('30fbe8ad3b07e67c1c35db2de16077d8')
 
 build() {
-	cd ${srcdir}/${pkgname}
+	cd "${srcdir}/${pkgbase}"
 	python2 setup.py build
-	python2 setup.py install --root=${pkgdir}	
+}
+
+package_python2-iwscan() {
+	cd "${srcdir}/${pkgbase}"
+	python2 setup.py install --root="${pkgdir}"
 }
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index 0701a5435..c8f808edd 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 164350 2012-07-31 09:59:25Z eric $
+# $Id: PKGBUILD 169019 2012-10-17 10:20:31Z allan $
 # Maintainer:
 
 pkgname=('python-lxml' 'python2-lxml')
-pkgver=2.3.5
+pkgver=3.0
 pkgrel=1
 pkgdesc="Python binding for the libxml2 and libxslt libraries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,8 +10,8 @@ license=('BSD' 'custom')
 url="http://lxml.de/"
 makedepends=('python2' 'python' 'libxslt')
 source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-sha1sums=('4fec0ca5054a8d6220d3dc7230a5066850192848'
-          'd74ad6509a0048ea0e979985e12869f2e1126b78')
+sha1sums=('8dbbd03a637bb563113cf07049a4d5a109369441'
+          'b38447fd3f9cfb30b4d56ffe3bec42739afb2947')
 
 check() {
   cd "${srcdir}"/lxml-$pkgver
diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD
index ca5cfcea0..b18890417 100644
--- a/extra/python-markupsafe/PKGBUILD
+++ b/extra/python-markupsafe/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145461 2011-12-22 18:14:12Z ibiru $
+# $Id: PKGBUILD 169021 2012-10-17 10:20:38Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alex Anthony <alex.anthony28991@gmail.com>
 
 pkgname=('python-markupsafe' 'python2-markupsafe')
 pkgver=0.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/MarkupSafe"
@@ -15,27 +15,27 @@ md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186')
 
 build() {
   cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
-  cd ${srcdir}/MarkupSafe-${pkgver}
+  cd "${srcdir}/MarkupSafe-${pkgver}"
   python setup.py build
 
-  cd ${srcdir}/python2-MarkupSafe-${pkgver}
+  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
   python2 setup.py build
 }
 
 package_python-markupsafe() {
   depends=('python')
 
-  cd ${srcdir}/MarkupSafe-${pkgver}
-  python setup.py install --root=${pkgdir} --optimize=1
+  cd "${srcdir}/MarkupSafe-${pkgver}"
+  python setup.py install --root="${pkgdir}" --optimize=1
 
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE"
 }
 
 package_python2-markupsafe() {
   depends=('python2')
 
-  cd ${srcdir}/python2-MarkupSafe-${pkgver}
-  python2 setup.py install --root=${pkgdir} --optimize=1
+  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
+  python2 setup.py install --root="${pkgdir}" --optimize=1
 
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE"
 }
diff --git a/extra/python-notify/PKGBUILD b/extra/python-notify/PKGBUILD
index 8ac31fc04..adf4ea36f 100644
--- a/extra/python-notify/PKGBUILD
+++ b/extra/python-notify/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 148890 2012-02-05 11:54:24Z ibiru $
+# $Id: PKGBUILD 169024 2012-10-17 10:20:48Z allan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Mario Danic <mario.danic@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-pkgname=python-notify
+
+pkgbase=python-notify
+pkgname=python2-notify
 pkgver=0.1.1
-pkgrel=11
+pkgrel=12
 pkgdesc="Python bindings for libnotify"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.galago-project.org/"
 license=('GPL')
 depends=('pygtk>=2.22.0' 'libnotify>=0.7.1')
-makedepends=('pkgconfig' 'python2')
+makedepends=('python2')
+conflicts=('python-notify<=0.1.1-11')
+replaces=('python-notify<=0.1.1-11')
 options=(!libtool)
 source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz
         libnotify07.patch
@@ -22,10 +22,10 @@ md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4'
          'c6922028da5951e69a6a0167bdb4461c')
 
 build() {
-    cd ${srcdir}/notify-python-${pkgver}
+    cd "${srcdir}/notify-python-${pkgver}"
 
-    patch -Np1 -i ${srcdir}/libnotify07.patch
-    patch -Np1 -i ${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch
+    patch -Np1 -i "${srcdir}/libnotify07.patch"
+    patch -Np1 -i "${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch"
 
     ./configure --prefix=/usr
 
@@ -37,7 +37,7 @@ build() {
     make
 }
 
-package() {
-    cd ${srcdir}/notify-python-${pkgver}
-    make DESTDIR=${pkgdir} install
+package_python2-notify() {
+    cd "${srcdir}/notify-python-${pkgver}"
+    make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index d6c41b055..4ba4575da 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -1,33 +1,34 @@
-# $Id: PKGBUILD 164237 2012-07-28 03:14:33Z stephane $
+# $Id: PKGBUILD 169025 2012-10-17 10:20:51Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
 
 pkgbase=python-numpy
 pkgname=('python2-numpy' 'python-numpy')
-pkgver=1.6.2
+pkgver=1.7.0
+_pkgver=1.7.0b2
 pkgrel=1
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://numpy.scipy.org/"
 makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
-source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
-md5sums=('95ed6c9dcc94af1fc1642ea2a33c1bba')
+source=(http://downloads.sourceforge.net/numpy/numpy-${_pkgver}.tar.gz)
+md5sums=('1b62cf0e34e2db58b0241b00d603df24')
 
 build() {
   cd "${srcdir}"
-  cp -a numpy-${pkgver} numpy-py2-${pkgver}
+  cp -a numpy-${_pkgver} numpy-py2-${_pkgver}
 
   export Atlas=None
   export LDFLAGS="$LDFLAGS -shared"
 
   echo "Building Python2"
-  cd "${srcdir}/numpy-py2-${pkgver}"
+  cd "${srcdir}/numpy-py2-${_pkgver}"
   python2 setup.py config_fc --fcompiler=gnu95 build
 
   echo "Building Python3"
-  cd "${srcdir}/numpy-${pkgver}"
+  cd "${srcdir}/numpy-${_pkgver}"
   python setup.py config_fc --fcompiler=gnu95 build
 }
 
@@ -35,7 +36,7 @@ package_python2-numpy() {
   depends=('lapack' 'python2')
   optdepends=('python-nose: testsuite')
 
-  cd "${srcdir}/numpy-py2-${pkgver}"
+  cd "${srcdir}/numpy-py2-${_pkgver}"
   python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
 
   install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
@@ -53,7 +54,7 @@ package_python-numpy() {
   replaces=('python3-numpy')
   conflicts=('python3-numpy')
 
-  cd "${srcdir}/numpy-${pkgver}"
+  cd "${srcdir}/numpy-${_pkgver}"
   python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
 
   install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy"
diff --git a/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch b/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch
new file mode 100644
index 000000000..072afbc0e
--- /dev/null
+++ b/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch
@@ -0,0 +1,92 @@
+diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c
+index 00c71f9..0afdc17 100644
+--- a/numpy/core/src/multiarray/scalarapi.c
++++ b/numpy/core/src/multiarray/scalarapi.c
+@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
+             itemsize = (((itemsize - 1) >> 2) + 1) << 2;
+         }
+     }
++#if PY_VERSION_HEX >= 0x03030000
++    if (type_num == NPY_UNICODE) {
++        PyObject *u, *args;
++        char *buffer;
++        if (swap) {
++            buffer = malloc(itemsize);
++            if (buffer == NULL) {
++                PyErr_NoMemory();
++                return NULL;
++            }
++            memcpy(buffer, data, itemsize);
++            byte_swap_vector(buffer, itemsize >> 2, 4);
++        } else {
++            buffer = data;
++        }
++        u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer,
++                itemsize >> 2);
++        if (swap) {
++            free(buffer);
++        }
++        if (u == NULL) {
++            return NULL;
++        }
++        args = Py_BuildValue("(O)", u);
++        if (args == NULL) {
++            Py_DECREF(u);
++            return NULL;
++        }
++        obj = type->tp_new(type, args, NULL);
++        Py_DECREF(u);
++        Py_DECREF(args);
++        return obj;
++    }
++#endif
+     if (type->tp_itemsize != 0) {
+         /* String type */
+         obj = type->tp_alloc(type, itemsize);
+@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
+             memcpy(destptr, data, itemsize);
+             return obj;
+         }
++#if PY_VERSION_HEX < 0x03030000
+         else if (type_num == PyArray_UNICODE) {
+             /* tp_alloc inherited from Python PyBaseObject_Type */
+             PyUnicodeObject *uni = (PyUnicodeObject*)obj;
+@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
+ #endif
+             return obj;
+         }
++#endif // PY_VERSION_HEX < 0x03030000
+         else {
+             PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj;
+             vobj->base = NULL;
+diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
+index e547071..12745d7 100644
+--- a/numpy/core/src/multiarray/scalartypes.c.src
++++ b/numpy/core/src/multiarray/scalartypes.c.src
+@@ -2592,7 +2592,11 @@ finish:
+     *((npy_@name@ *)dest) = *((npy_@name@ *)src);
+ #elif @default@ == 1 /* unicode and strings */
+     if (itemsize == 0) { /* unicode */
++#if PY_VERSION_HEX >= 0x03030000
++        itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj);
++#else
+         itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE);
++#endif
+     }
+     memcpy(dest, src, itemsize);
+     /* @default@ == 2 won't get here */
+diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
+index c4147ef..119056c 100644
+--- a/numpy/core/src/multiarray/methods.c
++++ b/numpy/core/src/multiarray/methods.c
+@@ -1587,7 +1587,7 @@ array_setstate(PyArrayObject *self, PyObject *args)
+     if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) {
+         int swap=!PyArray_ISNOTSWAPPED(self);
+         self->data = datastr;
+-        if (!_IsAligned(self) || swap) {
++        if (!_IsAligned(self) || swap || (len <= 1000)) {
+             intp num = PyArray_NBYTES(self);
+             self->data = PyDataMem_NEW(num);
+             if (self->data == NULL) {
+-- 
+1.7.12.3
diff --git a/extra/python-pyspi/PKGBUILD b/extra/python-pyspi/PKGBUILD
index 9a7e2ab45..f995971a1 100644
--- a/extra/python-pyspi/PKGBUILD
+++ b/extra/python-pyspi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 151344 2012-02-25 14:53:09Z pierre $
+# $Id: PKGBUILD 169029 2012-10-17 10:20:57Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
-pkgname=python-pyspi
+pkgbase=python-pyspi
+pkgname=python2-pyspi
 pkgver=0.6.1
-pkgrel=5
+pkgrel=1
 pkgdesc="Python AT-SPI bindings"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://people.redhat.com/zcerza/dogtail"
 license=('LGPL')
 depends=('python2' 'at-spi')
 makedepends=('pyrex')
-conflicts=('pyspi')
-provides=('pyspi')
-replaces=('pyspi')
+conflicts=('python-pyspi<=0.6.1-5')
+conflicts=('python-pyspi<=0.6.1-5')
 source=("http://dlc.sun.com/osol/jds/downloads/sources/pyspi-${pkgver}.tar.gz"
         'pyspi-build.patch')
 md5sums=('def336bd566ea688a06ec03db7ccf1f4'
@@ -24,5 +24,9 @@ build() {
   patch -Np1 -i ${srcdir}/pyspi-build.patch
   # Pyrex tells us to use __cinit__ instead of __new__
   sed -i 's/__new__/__cinit__/' pyspi.pyx
+}
+
+package_python2-pyspi() {
+  cd ${srcdir}/pyspi-${pkgver}
   python2 setup.py install --root=${pkgdir}
 }
diff --git a/extra/python-pysqlite/PKGBUILD b/extra/python-pysqlite/PKGBUILD
index 3c01803a8..c7f2acb08 100644
--- a/extra/python-pysqlite/PKGBUILD
+++ b/extra/python-pysqlite/PKGBUILD
@@ -1,34 +1,38 @@
-# $Id: PKGBUILD 155872 2012-04-08 07:25:46Z remy $
+# $Id: PKGBUILD 169030 2012-10-17 10:21:00Z allan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-pkgname=python-pysqlite
+
+pkgbase=python-pysqlite
+pkgname=python2-pysqlite
 pkgver=2.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/pysqlite/"
 depends=('python2' 'sqlite')
-replaces=('pysqlite2')
+conflicts=('python-pysqlite<=2.6.3-2')
+replaces=('python-pysqlite<=2.6.3-2')
 source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \
         setup.cfg)
 md5sums=('711afa1062a1d2c4a67acdf02a33d86e'
          '86dd356c65afd14a22f2f8f64a26441e')
 
 check() {
-    cd ${pkgdir}/usr/lib/python2.7/site-packages
+    cd "${srcdir}"/pysqlite-${pkgver}/build/lib.*/
     python2 -c "from pysqlite2 import test; test.test()"
 }
 
 build() {
-	cd ${srcdir}/pysqlite-${pkgver}
-	cp ${srcdir}/setup.cfg .
-	python2 setup.py install --root=${pkgdir}
+	cd "${srcdir}/pysqlite-${pkgver}"
+	cp "${srcdir}/setup.cfg" .
+	python2 setup.py build
 }
 
-package() {
-	cd ${srcdir}/pysqlite-${pkgver}
-	install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-	rm -r ${pkgdir}/usr/pysqlite2-doc
+package_python2-pysqlite() {
+	cd "${srcdir}/pysqlite-${pkgver}"
+	python2 setup.py install --root="${pkgdir}"
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	rm -r "${pkgdir}/usr/pysqlite2-doc"
 }
diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD
index cfb2eb890..a17f52206 100644
--- a/extra/python-urwid/PKGBUILD
+++ b/extra/python-urwid/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=('python-urwid' 'python2-urwid')
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Urwid is a curses-based user interface library."
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/python-wpactrl/PKGBUILD b/extra/python-wpactrl/PKGBUILD
index 39f9ee1fc..49b4d0221 100644
--- a/extra/python-wpactrl/PKGBUILD
+++ b/extra/python-wpactrl/PKGBUILD
@@ -1,18 +1,26 @@
+# $Id: PKGBUILD 169034 2012-10-17 10:21:07Z allan $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
-pkgname=python-wpactrl
+pkgbase=python-wpactrl
+pkgname=python2-wpactrl
 pkgver=20090609
-pkgrel=3
+pkgrel=4
 pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.otaku42.de/wiki/PythonWpaCtrl"
 license=('GPL2')
 depends=('python2')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/python-wpactrl-20090609.tar.gz)
+conflicts=('python-wpactrl<=20090609-3')
+replaces=('python-wpactrl<=20090609-3')
+source=(ftp://ftp.archlinux.org/other/${pkgbase}/python-wpactrl-20090609.tar.gz)
 md5sums=('8d45739aa9bfa1110a4570bb5ceda768')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgbase}-${pkgver}"
 	python2 setup.py build
-	python2 setup.py install --root=${pkgdir}	
+}
+
+package_python2-wpactrl() {
+	cd "${srcdir}/${pkgbase}-${pkgver}"
+	python2 setup.py install --root="${pkgdir}"
 }
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index aefd1ba8e..8aea684a2 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 157411 2012-04-28 09:27:08Z allan $
+# $Id: PKGBUILD 169007 2012-10-17 10:19:56Z allan $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
-pkgver=3.2.3
-pkgrel=3
-_pybasever=3.2
+pkgver=3.3.0
+pkgrel=1
+_pybasever=3.3
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -19,7 +19,7 @@ provides=('python3')
 replaces=('python3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('3d607dbcfdf100dd659978195ccf3ade9d221823')
+sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
@@ -44,7 +44,6 @@ build() {
               --with-threads \
               --with-computed-gotos \
               --enable-ipv6 \
-              --with-wide-unicode \
               --with-system-expat \
               --with-dbmliborder=gdbm:ndbm \
               --with-system-ffi \
@@ -72,11 +71,11 @@ package() {
   ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1"
 
   # Fix FS#22552
-  ln -sf ../../libpython${_pybasever}mu.so \
-    "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so"
+  ln -sf ../../libpython${_pybasever}m.so \
+    "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so"
 
   # Clean-up reference to build directory
-  sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile"
+  sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile"
 
   # License
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD
index db22ad69a..4c73ea48f 100644
--- a/extra/qrencode/PKGBUILD
+++ b/extra/qrencode/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168742 2012-10-15 07:00:19Z bluewind $
+# $Id: PKGBUILD 169087 2012-10-17 20:07:22Z bluewind $
 # Maintainer: Florian Pritz< flo@xinu.at>
 # Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
 
 pkgname=qrencode
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="C library for encoding data in a QR Code symbol."
 arch=(i686 x86_64 mips64el)
@@ -13,7 +13,7 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
 license=('GPL')
 options=(!libtool)
 source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5af7879ab5b300663f2076c287c09030')
+md5sums=('219b146d3b365a56a0f4ef58a718f295')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index d0464cec0..ca14576a1 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166361 2012-09-06 21:54:10Z andrea $
+# $Id: PKGBUILD 169036 2012-10-17 10:21:11Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
@@ -6,12 +6,12 @@ pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
 pkgver=2.6.2
-pkgrel=2
+pkgrel=3
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python2-pyqt' 'pyqt' 'chrpath')
-source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
 md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
          '8cf9c06252e2f11ab00e62848e322fd3')
@@ -31,7 +31,7 @@ build() {
     cd ../
     cp -rf Python Python2
     cd Python
-    python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
     make
 
     cd ../Python2
@@ -58,7 +58,7 @@ package_python-qscintilla-common() {
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
       
     # Provided by python-qscintilla
-    rm "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
+    rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
 }
 
 package_python-qscintilla() {
@@ -67,7 +67,7 @@ package_python-qscintilla() {
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
     install -Dm755 Qsci.so \
-      "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
+      "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
 }
 
 package_python2-qscintilla() {
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 14123a53b..a67aed93d 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 162739 2012-06-29 11:34:13Z andrea $
+# $Id: PKGBUILD 169038 2012-10-17 10:21:15Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.13.3
+pkgver=4.14
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
-source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('76192829cc42ec558db46e4f9e1d8ba9')
+source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
+md5sums=('9a48ad975e04ac824188840ea498ac32')
 
 build() {
-  cd "${srcdir}"
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
   make
   
   ### Python2 version ###
-  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+  cd ../python2-${pkgbase}-${pkgver}
   python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
   make
 }
@@ -32,7 +31,7 @@ package_sip() {
   pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
   depends=('glibc')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install -C sipgen
 
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
@@ -42,11 +41,11 @@ package_python-sip() {
   pkgdesc="Python 3.x SIP bindings for C and C++ libraries"
   depends=('sip' 'python')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install -C siplib
   
-  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.2/site-packages/sipconfig.py
-  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.2/site-packages/sipdistutils.py
+  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py
+  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py
   
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
@@ -55,7 +54,7 @@ package_python2-sip() {
   pkgdesc="Python 2.x SIP bindings for C and C++ libraries"
   depends=('sip' 'python2')
 
-  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+  cd python2-${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install -C siplib
   
   install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py
diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD
index f997734ef..705869118 100644
--- a/extra/smartmontools/PKGBUILD
+++ b/extra/smartmontools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163539 2012-07-15 05:04:36Z giovanni $
+# $Id: PKGBUILD 169084 2012-10-17 19:11:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Jani Talikka <jani.talikka@gmail.com>
 # Contributor: Ralf Barth <archlinux.org@haggy.org>
 
 pkgname=smartmontools
-pkgver=5.43
+pkgver=6.0
 pkgrel=1
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
 url="http://smartmontools.sourceforge.net"
@@ -17,7 +17,7 @@ backup=('etc/smartd.conf'
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'smartd.conf'
         'smartd.rc')
-md5sums=('a1cb2c3d8cc2de377037fe9e7cef40a9'
+md5sums=('5646a07f5f4bee8e2e649de8c6b7ae87'
          '28c1b80c41dac52d433961dcfb4f70e0'
          'fb30e07f87f2c1d99532e018291ad3e8')
 
diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD
index 00fff2cbe..fd3434969 100644
--- a/extra/sonata/PKGBUILD
+++ b/extra/sonata/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 132792 2011-07-26 09:02:50Z angvp $
+# $Id: PKGBUILD 169044 2012-10-17 10:21:28Z allan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=sonata
 pkgver=1.6.2.1
-pkgrel=7
+pkgrel=8
 pkgdesc="Elegant GTK+ music client for MPD"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sonata.berlios.de/"
 license=('GPL3')
-depends=('pygtk' 'python-mpd')
+depends=('pygtk' 'python2-mpd')
 optdepends=('gnome-python-extras: Enhanced system tray support'
             'tagpy: Metadata editing support'
-            'dbus-python: Various extra functionality (e.g. multimedia keys support)')
+            'python2-dbus: Various extra functionality (e.g. multimedia keys support)')
 source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
         info.py.patch)
-changelog=ChangeLog
 md5sums=('0b912325e7175abad3bf6c0edc071e05'
          '595fcf7615035829b264afecb5a1beeb')
 
 build() {
   cd "$srcdir/${pkgname}-$pkgver"
-  patch -Np0 -i $srcdir/info.py.patch
+  patch -Np0 -i "$srcdir/info.py.patch"
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py
 }
 
 package() {
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 202e1e42c..0c5bfaece 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 167929 2012-10-03 20:43:11Z andrea $
+# $Id: PKGBUILD 169045 2012-10-17 10:21:29Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
          'system-config-printer-gnome')
 pkgver=1.3.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -37,7 +37,7 @@ build() {
 
 package_system-config-printer-common() {
   pkgdesc='Pygtk CUPS Configuration'
-  depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python2-pycurl' 'libusb-compat')
+  depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat')
   optdepends=('system-config-printer-gnome: for the GTK frontend'
 	'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings')
   replaces=('system-config-printer')
@@ -82,7 +82,7 @@ package_system-config-printer-common() {
 
 package_system-config-printer-gnome() {
   pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend'
-  depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify')
+  depends=('system-config-printer-common' 'gnome-icon-theme' 'python2-notify')
   optdependence=('gnome-keyring: password management')
 
   cd "${srcdir}"/${pkgbase}-${pkgver}
diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD
index fcf2ccd1b..483ca44d9 100644
--- a/extra/twisted/PKGBUILD
+++ b/extra/twisted/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 168259 2012-10-07 03:32:14Z eric $
+# $Id: PKGBUILD 169039 2012-10-17 10:21:17Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=twisted
 pkgver=12.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Asynchronous networking framework written in Python."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://twistedmatrix.com/"
 license=('MIT')
 depends=('python2-crypto' 'python2-zope-interface')
 optdepends=('python2-pyopenssl'
-            'python-soappy: for twisted.web.soap'
+            'python2-soappy: for twisted.web.soap'
 	    'python2-pyasn1: for using conch'
 	    'pygtk: for using manhole'
 	    'tk: for using tkconch')
diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD
index 76a887654..05785b36e 100644
--- a/extra/vde2/PKGBUILD
+++ b/extra/vde2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 145068 2011-12-16 10:55:34Z tpowa $
+# $Id: PKGBUILD 169040 2012-10-17 10:21:21Z allan $
 # Contributor: Sergej Pupykin
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=vde2
 pkgver=2.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
 url="http://sourceforge.net/projects/vde/"
 license=("GPL" "LGPL" "CUSTOM")
 arch=('i686' 'x86_64' 'mips64el')
 depends=('bash' 'libpcap' 'openssl')
-makedepends=('python2')
+makedepends=('python')
 backup=(etc/conf.d/vde)
 source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
         dhcpd.conf.sample
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index d06fb07c6..d71166bac 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 167285 2012-09-30 02:21:52Z giovanni $
+# $Id: PKGBUILD 169077 2012-10-17 18:09:33Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=2.0.3
-pkgrel=4
+pkgver=2.0.4
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
@@ -57,7 +57,7 @@ backup=('usr/share/vlc/lua/http/.hosts'
 options=('!libtool' '!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('a7e79565e3df07dcf9abc6cad3ac26bb')
+md5sums=('f36dab8f126922c56b372388b7fade47')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
author	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-10-18 10:38:15 -0300
committer	Nicolás Reynolds <fauno@kiwwwi.com.ar>	2012-10-18 10:38:15 -0300
commit	59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (patch)
tree	452fb18314fb6d4393552d1ef1190a3168353f44 /extra
parent	bb3524a1ba0370174d0c586ae94cd503b562a207 (diff)
parent	9e3985ed7c9851da65023a0ab3d0739cce1858e2 (diff)