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

Conflicts:
	extra/bind/PKGBUILD
	extra/gc/PKGBUILD

1 files changed, 51 insertions, 13 deletions

diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index 9e5382388..44cd86f23 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' 'mips64el')
 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"
 }