Merge branch 'master' of gparabola:abslibre-mips64el

1 files changed, 36 insertions, 18 deletions

diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 4f3326b31..a0127b51c 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 174642 2013-01-05 13:01:57Z andrea $
+# $Id: PKGBUILD 177634 2013-02-08 08:55:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
-         'kdebindings-python2')
-pkgver=4.9.5
+         'kdebindings-python2'
+         'kdebindings-python-common')
+pkgver=4.10.0
 pkgrel=1
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +13,8 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
              'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
-sha1sums=('8a0cf08aa4747df05edae833139e5eea739adf45')
+             source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
+sha1sums=('d587d16363d2184320faf3636ac92f9b50ef5720')
 
 build() {
   export PYTHONDONTWRITEBYTECODE="TRUE"
@@ -22,9 +23,11 @@ build() {
   cd build
   cmake ../pykde4-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
+    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0 \
+    -DPYKDEUIC4_ALTINSTALL=TRUE
   make
   cd ..
 
@@ -32,38 +35,53 @@ build() {
   cd build-python2
   cmake ../pykde4-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DPYKDEUIC4_ALTINSTALL=TRUE
   make
 }
 
 package_kdebindings-python() {
   pkgdesc="A set of Python 3.x bindings for KDE"
-  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
+  depends=('kdepim-runtime' 'pyqt' 'kdebindings-python-common')
 
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
+  
+  # Provided by kdebindings-python-common
+  rm -r "${pkgdir}"/usr/share/apps/pykde4/examples
+  rm -r "${pkgdir}"/usr/share/sip/PyKDE4
+
+  ln -s /usr/bin/pykdeuic4-3.3 "${pkgdir}"/usr/bin/pykdeuic4
 }
 
 package_kdebindings-python2() {
   pkgdesc="A set of Python 2.x bindings for KDE"
-  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+  depends=('kdepim-runtime' 'python2-pyqt' 'kdebindings-python-common')
   conflicts=('kdebindings-python<4.8.1-2')
  
   cd "${srcdir}"/build-python2
   make DESTDIR="${pkgdir}" install
 
-  # Fix conflicts
-  rm "${pkgdir}"/usr/bin/pykdeuic4
-  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
-    "${pkgdir}"/usr/bin/python2-pykdeuic4
-
-  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
-    "${pkgdir}"/usr/share/apps/pykde4/python2-examples
+  # Provided by kdebindings-python-common
+  rm -r "${pkgdir}"/usr/share/apps/pykde4/examples
+  rm -r "${pkgdir}"/usr/share/sip/PyKDE4
 
-  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
-    "${pkgdir}"/usr/share/sip/python2-PyKDE4
+  # pykdeuic4 should point to the python3 version
+  #rm "${pkgdir}"/usr/bin/pykdeuic4
 
   # Use the python2 executable
   find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
 }
+
+package_kdebindings-python-common() {
+  pkgdesc="Common files shared between python2 and python3 kdebindings"
+  depends=('qscintilla')
+  conflicts=('kdebindings-python<4.8.1-2')
+
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}"/usr/{bin,lib}
+}