[arch-commits] Commit in python2-qt/trunk (PKGBUILD)

[Andrea Scarpino]

    Date: Thursday, January 20, 2011 @ 19:29:34
  Author: andrea
Revision: 107065

upgpkg: python2-qt 4.8.2-4
merge the pyqt package here to avoid python-qt dependence

Modified:
  python2-qt/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-21 00:28:53 UTC (rev 107064)
+++ PKGBUILD	2011-01-21 00:29:34 UTC (rev 107065)
@@ -5,27 +5,28 @@
 
 pkgname=python2-qt
 pkgver=4.8.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A set of Python 2 bindings for the Qt toolkit"
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
-depends=('pyqt' 'python2-sip' 'dbus-python')
+depends=('qt' 'python2-sip' 'dbus-python')
 makedepends=('phonon' 'python-opengl' 'qt-assistant-compat')
 optdepends=('phonon: enable audio and video in PyQt applications'
-	'python-opengl: enable OpenGL 3D graphics in PyQt applications'
-	'python2-qscintilla: QScintilla API'
+	'python-pengl: enable OpenGL 3D graphics in PyQt applications'
+	'qscintilla: QScintilla API'
 	'qt-assistant-compat: add PyQt online help in Qt Assistant')
+replaces=('pyqt')
 source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
         'fix-stackedwidget-bug.patch')
 md5sums=('142a32f126f205a2bd77f6a9910f5333'
         '42cfd44a8ec063cce3e328ddb9892565')
 
 build() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
 
   # Already fixed upstream
-  patch -Np1 -i ${srcdir}/fix-stackedwidget-bug.patch
+  patch -Np1 -i "${srcdir}/fix-stackedwidget-bug.patch"
 
   python2 configure.py \
     --confirm-license \
@@ -39,12 +40,7 @@
 }
 
 package(){
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  cd "${srcdir}/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
-  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
-  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
 }