Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/arpack/PKGBUILD
	community/ruby-cairo/PKGBUILD
	community/smem/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/xerces-c/PKGBUILD

2 files changed, 25 insertions, 45 deletions

diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index ae6938469..6583f720d 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,24 +1,22 @@
-# $Id: PKGBUILD 178983 2013-03-01 10:23:58Z andrea $
+# $Id: PKGBUILD 179562 2013-03-07 08:19:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
-pkgver=2.7
-pkgrel=2
+pkgver=2.7.1
+pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python2-pyqt' 'pyqt' 'chrpath')
 source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
-md5sums=('a3857d75a2b332e0460131e0aa4cc4b5'
-         '8cf9c06252e2f11ab00e62848e322fd3')
+md5sums=('da8939b5679a075e30c6632e54dc5abf'
+         'eae1bd23117c5f1f7f172a1c1e11f600')
 
 build() {
-    . /etc/profile.d/qt4.sh
-
     cd "${srcdir}/QScintilla-gpl-${pkgver}"
     patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
 
@@ -26,18 +24,18 @@ build() {
     qmake qscintilla.pro
     make
     
-    cd ../designer-Qt4
+    cd ../designer-Qt4Qt5
     qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
     make
 
     cd ../
     cp -rf Python Python2
     cd Python
-    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
     make
 
     cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
     make    
 }
 
@@ -48,7 +46,7 @@ package_qscintilla() {
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4Qt5"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 }
 
diff --git a/extra/qscintilla/configure.py-objdir-support.diff b/extra/qscintilla/configure.py-objdir-support.diff
index b595de18c..8d4a7c99d 100644
--- a/extra/qscintilla/configure.py-objdir-support.diff
+++ b/extra/qscintilla/configure.py-objdir-support.diff
@@ -1,39 +1,21 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-##
-## DP: patch the configure script for the Python bindings to support object dir builds
-
-@DPATCH@
-Index: qscintilla2-2.4.2/Python/configure.py
-===================================================================
---- qscintilla2-2.4.2.orig/Python/configure.py	2010-01-20 20:56:09.000000000 +0100
-+++ qscintilla2-2.4.2/Python/configure.py	2010-01-27 22:54:35.603870417 +0100
-@@ -33,6 +33,7 @@
+--- QScintilla-gpl-2.7.1/Python/configure.py~	2013-03-07 08:09:00.678704222 +0000
++++ QScintilla-gpl-2.7.1/Python/configure.py	2013-03-07 08:11:48.860880852 +0000
+@@ -29,6 +29,8 @@
  import glob
  import optparse
  
 +src_dir = os.path.dirname(os.path.abspath(__file__))
++
+ try:
+     import sysconfig
+ except ImportError:
+@@ -455,6 +457,9 @@
  
- # Import SIP's configuration module so that we have access to the error
- # reporting.  Then try and import the configuration modules for both PyQt3 and
-@@ -162,7 +163,7 @@
-     if os.access(sciglobal, os.F_OK):
-         # Get the QScintilla version string.
-         _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
--
-+        return # Debian: do not check for the installed version, we're good this way.
-         if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
-             # Because we include the Python bindings with the C++ code we can
-             # reasonably force the same version to be used and not bother about
-@@ -232,9 +233,9 @@
-     argv.append(buildfile)
- 
-     if pyqt.pyqt_version >= 0x040000:
--        argv.append("sip/qscimod4.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
-     else:
--        argv.append("sip/qscimod3.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
- 
-     os.system(" ".join(argv))
- 
+     # Get the QScintilla version string.
+     sciversstr = read_define(sciglobal, 'QSCINTILLA_VERSION_STR')
++
++    return # Debian: do not check for the installed version, we're good this way.
++
+     if sciversstr is None:
+         error(
+                 "The QScintilla version number could not be determined by "