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

Conflicts:
	community/allegro/PKGBUILD
	community/erlang/PKGBUILD
	community/python-openbabel/PKGBUILD
	core/vi/PKGBUILD
	extra/accountsservice/PKGBUILD
	extra/calligra/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase-workspace/kde-np.pam
	kde-unstable/kdebase-workspace/kde.pam
	kde-unstable/kdebase-workspace/kdebase-workspace.install
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-korundum/PKGBUILD
	kde-unstable/kdebindings-korundum/ruby19.patch
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-marble/kdeedu-marble.install
	kde-unstable/kdeedu-pairs/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
	kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	kde-unstable/kdemultimedia-juk/PKGBUILD
	kde-unstable/kdemultimedia-kmix/PKGBUILD
	kde-unstable/kdemultimedia-kscd/PKGBUILD
	kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepim/fix-build.patch
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkcddb/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	kde-unstable/nepomuk-core/PKGBUILD

1 files changed, 36 insertions, 16 deletions

diff --git a/community/python-openbabel/PKGBUILD b/community/python-openbabel/PKGBUILD
index af13b32f7..a685daf6f 100644
--- a/community/python-openbabel/PKGBUILD
+++ b/community/python-openbabel/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 78233 2012-10-17 10:26:13Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 80457 2012-11-22 01:42:13Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Michal Bozon <bozonm@vscht.cz>
 
-pkgname=python-openbabel
-pkgver=2.3.1
-pkgrel=3
-pkgdesc="Python bindings of openbabel library"
+pkgname=('python-openbabel' 'python2-openbabel')
+pkgver=2.3.2
+pkgrel=1
+pkgdesc='Python bindings for the openbabel library'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://openbabel.org/wiki/Python"
+url='http://openbabel.org/wiki/Python'
 license=('GPL')
-depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen2')
-makedepends=('swig' 'cmake')
+depends=('gcc-libs' "openbabel=${pkgver}" 'eigen2')
+makedepends=('swig' 'cmake' 'python-distribute' 'python2-distribute')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz)
-md5sums=('1f029b0add12a3b55582dc2c832b04f8')
+source=("http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz")
+sha256sums=('4eaca26679aa6cc85ebf96af19191472ac63ca442c36b0427b369c3a25705188')
 
 build() {
-  cd "${srcdir}/openbabel-$pkgver"
+  cp -r openbabel-$pkgver python2-openbabel-$pkgver
+
+  cd $srcdir/openbabel-$pkgver
   
   # Create babelconfig.h
   cmake .
@@ -29,10 +32,27 @@ build() {
 
   cd python
   sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py
-  sed -i '20i os.path.join("/usr/include/eigen2"),'        setup.py
+  sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py
+
+  cd $srcdir/python2-openbabel-$pkgver/scripts/python
+  sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py
+  sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py
+}
+
+package_python-openbabel() {
+  depends+=('python')
+
+  cd "$srcdir/openbabel-$pkgver/scripts/python"
+
+  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 }
 
-package() {
-  cd "${srcdir}/openbabel-$pkgver/scripts/python"
-  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+package_python2-openbabel() {
+  depends+=('python2')
+
+  cd "$srcdir/python2-openbabel-$pkgver/scripts/python"
+
+  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 }
+
+# vim:set ts=2 sw=2 et: