extra/pyqt -> pyqt4

extra/pyqt4/PKGBUILD

@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162740 2012-06-29 11:34:16Z andrea $
+# $Id$
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
@@ -6,18 +6,18 @@
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - Fix for QReal on ARM, for both python versions
 
-pkgbase=pyqt
-pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.10.1
-pkgrel=1
+pkgbase=pyqt4
+pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4')
+pkgver=4.10.2
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
-makedepends=('qt4' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
+makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
              'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz"
+source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz"
         "PyQt4-4.7.3-qreal_float_support.patch")
-md5sums=('e5973c4ec0b0469f329bc00209d2ad9c'
+md5sums=('9257e12fec9b1b21e5a0d76d455d1691'
          'c493d8ea8e3199d649b60eeb45e07aec')
 
 build() {
@@ -27,7 +27,7 @@ build() {
   cd "${srcdir}"
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
 
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  cd PyQt-x11-gpl-${pkgver}
   python configure.py \
     --confirm-license \
     --qsci-api \
@@ -39,7 +39,7 @@ build() {
   make
 
   ### Python2 version ###
-  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
+  cd ../Py2Qt-x11-gpl-${pkgver}
   python2 configure.py \
     --confirm-license \
     -v /usr/share/sip \
@@ -48,29 +48,35 @@ build() {
 
   # Thanks Gerardo for the rpath fix
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
+  
   make
 }
 
-package_pyqt-common(){
-  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
+package_pyqt4-common(){
+  pkgdesc="Common PyQt files shared between python-pyqt4 and python2-pyqt4"
   depends=('qt4')
+  replaces=('pyqt-common')
+  conflicts=('pyqt-common')
+  provides=("pyqt-common=${pkgver}")
   
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  cd PyQt-x11-gpl-${pkgver}
   make -C pyrcc DESTDIR="${pkgdir}" install
   make -C pylupdate DESTDIR="${pkgdir}" install
   
   install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
 
-package_pyqt(){
+package_python-pyqt4(){
   pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
+  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt4-common')
   optdepends=('phonon: enable audio and video in PyQt applications'
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  replaces=('pyqt')
+  conflicts=('pyqt')
+  provides=("pyqt=${pkgver}")
 
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  cd PyQt-x11-gpl-${pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
@@ -79,24 +85,26 @@ package_pyqt(){
   rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
 
-package_python2-pyqt(){
+package_python2-pyqt4(){
   pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
+  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt4-common')
   optdepends=('phonon: enable audio and video in PyQt applications'
               'python2-opengl: enable OpenGL 3D graphics in PyQt applications'
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  provides=('python2-qt')
+  replaces=('python2-pyqt')
+  conflicts=('python2-pyqt')
+  provides=("python2-pyqt=${pkgver}")
 
-  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
+  cd Py2Qt-x11-gpl-${pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
-  # Fix conflicts with pyqt
+  # Fix conflicts with python-pyqt4
   mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
   
-  # Provided by pyqt
+  # Provided by python-pyqt4
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpyqt4.so
   rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }