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

Conflicts:
	community-staging/gambas2/PKGBUILD
	community-staging/gambas3/PKGBUILD
	community-staging/libextractor/PKGBUILD
	community-staging/pdf2djvu/PKGBUILD
	community/dante/PKGBUILD
	community/gnunet/PKGBUILD
	community/luafilesystem/PKGBUILD
	community/luajit/PKGBUILD
	community/python-mpi4py/PKGBUILD
	community/python-psutil/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/pycrypto/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/pyopenssl/PKGBUILD
	extra/python/PKGBUILD
	extra/vde2/PKGBUILD
	gnome-unstable/clutter-gtk/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/gcr/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	testing/iputils/PKGBUILD
	testing/php/PKGBUILD
	testing/php/php-fpm.conf.in.patch
	testing/php/php-fpm.service
	testing/php/rc.d.php-fpm

1 files changed, 12 insertions, 21 deletions

diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index ba1efbddd..b42ef3d73 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,31 +1,24 @@
-# $Id: PKGBUILD 163679 2012-07-17 18:11:04Z andrea $
+# $Id: PKGBUILD 169006 2012-10-17 10:19:54Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.4
+pkgver=4.9.5
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
 makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
-             'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
-        'fix-pyuic4.patch')
-md5sums=('a0b6a820633366365af5124ddbd059c7'
-         '097651aea0bafded5abdfd6d62afd2ad')
+             'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
+source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('e4cdd6619c63655f7510efb4df8462fb')
 
 build() {
-  # FS#30728
-  cd "${srcdir}"/PyQt-x11-gpl-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-pyuic4.patch
-  cd ..
-  
   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
@@ -36,7 +29,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 \
@@ -51,10 +44,9 @@ build() {
 package_pyqt-common(){
   pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
   
-  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  cd PyQt-x11-gpl-${pkgver}
   make -C pyrcc DESTDIR="${pkgdir}" install
   make -C pylupdate DESTDIR="${pkgdir}" install
-  make -C designer INSTALL_ROOT="${pkgdir}" install
   
   install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
 }
@@ -66,13 +58,12 @@ package_pyqt(){
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
 
-  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
 
   # Provided by pyqt-common
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
   rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
 }
 
@@ -80,19 +71,19 @@ package_python2-pyqt(){
   pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
   depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
   optdepends=('phonon: enable audio and video in PyQt applications'
-              'python-opengl: enable OpenGL 3D graphics 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')
 
-  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
   mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
   
-  # Provided by pyqt-common
+  # Provided by pyqt
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
   rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
   rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api