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

1 files changed, 26 insertions, 12 deletions

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}"