[arch-commits] Commit in pyqt/repos (5 files)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:57:37
  Author: andrea
Revision: 150176

db-move: moved pyqt from [staging] to [extra] (x86_64)

Added:
  pyqt/repos/extra-x86_64/PKGBUILD
(from rev 150172, pyqt/repos/staging-x86_64/PKGBUILD)
  pyqt/repos/extra-x86_64/fix-qthelp-build.patch
(from rev 150172, pyqt/repos/staging-x86_64/fix-qthelp-build.patch)
Deleted:
  pyqt/repos/extra-x86_64/PKGBUILD
  pyqt/repos/extra-x86_64/fix-qthelp-build.patch
  pyqt/repos/staging-x86_64/

+
 PKGBUILD   |  168 +++
 fix-qthelp-build.patch |   22 +++---
 2 files changed, 95 insertions(+), 95 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-02-14 07:57:36 UTC (rev 150175)
+++ extra-x86_64/PKGBUILD   2012-02-14 07:57:37 UTC (rev 150176)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino and...@archlinux.org
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-# Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
-
-pkgbase=pyqt
-pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.9
-pkgrel=2
-arch=('i686' 'x86_64')
-url=http://riverbankcomputing.co.uk/software/pyqt/intro;
-license=('GPL')
-makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
- 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
-source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
-'fix-qthelp-build.patch')
-md5sums=('61619500d09d87b6c2a25bd3ea994504'
- '356a453331a33c507b1baba4a9771764')
-
-build() {
-  cd ${srcdir}
-
-  patch -p0 -i ${srcdir}/fix-qthelp-build.patch
-
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  python configure.py \
---confirm-license \
---qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 
's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  ### Python2 version ###
-  cd ${srcdir}/Py2Qt-x11-gpl-${pkgver}
-  python2 configure.py \
---confirm-license \
--v /usr/share/sip \
---qsci-api
-
-  # 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(){
-  pkgdesc=A set of Python 3.x bindings for the Qt toolkit
-  depends=('qtwebkit' 'python-sip')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python-qt')
-  provides=('python-qt')
-
-  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
-}
-
-package_python2-pyqt(){
-  pkgdesc=A set of Python 2.x bindings for the Qt toolkit
-  depends=('pyqt' 'python2-sip' 'dbus-python')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'python-opengl: enable OpenGL 3D graphics in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python2-qt')
-  provides=('python2-qt')
-  options=('!emptydirs')
-
-  cd ${srcdir}/Py2Qt-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
-}

Copied: pyqt/repos/extra-x86_64/PKGBUILD (from rev 150172, 
pyqt/repos/staging-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-02-14 07:57:37 UTC (rev 150176)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
+
+pkgbase=pyqt
+pkgname=('pyqt' 'python2-pyqt')
+pkgver=4.9.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://riverbankcomputing.co.uk/software/pyqt/intro;
+license=('GPL')
+makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
+ 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
+source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
+'fix-qthelp-build.patch')
+md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c'
+ '6acfe0a5a00779f946c29d5fac647ce1')
+
+build() {
+  # Build QtHelp (FS#27665)
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  patch -p1 -i ${srcdir}/fix-qthelp-build.patch
+
+  cd ${srcdir}
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
+
+  cd 

[arch-commits] Commit in pyqt/repos (5 files)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:57:36
  Author: andrea
Revision: 150175

db-move: moved pyqt from [staging] to [extra] (i686)

Added:
  pyqt/repos/extra-i686/PKGBUILD
(from rev 150172, pyqt/repos/staging-i686/PKGBUILD)
  pyqt/repos/extra-i686/fix-qthelp-build.patch
(from rev 150172, pyqt/repos/staging-i686/fix-qthelp-build.patch)
Deleted:
  pyqt/repos/extra-i686/PKGBUILD
  pyqt/repos/extra-i686/fix-qthelp-build.patch
  pyqt/repos/staging-i686/

+
 PKGBUILD   |  168 +++
 fix-qthelp-build.patch |   22 +++---
 2 files changed, 95 insertions(+), 95 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-14 07:57:34 UTC (rev 150174)
+++ extra-i686/PKGBUILD 2012-02-14 07:57:36 UTC (rev 150175)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino and...@archlinux.org
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-# Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
-
-pkgbase=pyqt
-pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.9
-pkgrel=2
-arch=('i686' 'x86_64')
-url=http://riverbankcomputing.co.uk/software/pyqt/intro;
-license=('GPL')
-makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
- 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
-source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
-'fix-qthelp-build.patch')
-md5sums=('61619500d09d87b6c2a25bd3ea994504'
- '356a453331a33c507b1baba4a9771764')
-
-build() {
-  cd ${srcdir}
-
-  patch -p0 -i ${srcdir}/fix-qthelp-build.patch
-
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  python configure.py \
---confirm-license \
---qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 
's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  ### Python2 version ###
-  cd ${srcdir}/Py2Qt-x11-gpl-${pkgver}
-  python2 configure.py \
---confirm-license \
--v /usr/share/sip \
---qsci-api
-
-  # 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(){
-  pkgdesc=A set of Python 3.x bindings for the Qt toolkit
-  depends=('qtwebkit' 'python-sip')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python-qt')
-  provides=('python-qt')
-
-  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
-}
-
-package_python2-pyqt(){
-  pkgdesc=A set of Python 2.x bindings for the Qt toolkit
-  depends=('pyqt' 'python2-sip' 'dbus-python')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'python-opengl: enable OpenGL 3D graphics in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python2-qt')
-  provides=('python2-qt')
-  options=('!emptydirs')
-
-  cd ${srcdir}/Py2Qt-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
-}

Copied: pyqt/repos/extra-i686/PKGBUILD (from rev 150172, 
pyqt/repos/staging-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-14 07:57:36 UTC (rev 150175)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
+
+pkgbase=pyqt
+pkgname=('pyqt' 'python2-pyqt')
+pkgver=4.9.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://riverbankcomputing.co.uk/software/pyqt/intro;
+license=('GPL')
+makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
+ 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
+source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
+'fix-qthelp-build.patch')
+md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c'
+ '6acfe0a5a00779f946c29d5fac647ce1')
+
+build() {
+  # Build QtHelp (FS#27665)
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  patch -p1 -i ${srcdir}/fix-qthelp-build.patch
+
+  cd ${srcdir}
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
+
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  python configure.py \
+