[arch-commits] Commit in python-matplotlib/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, August 6, 2013 @ 01:48:08
  Author: eric
Revision: 95127

upgpkg: python-matplotlib 1.3.0-1

Upstream update, Add prepare function, Clean up PKGBUILD, Update makedepends and depends

Modified:
  python-matplotlib/trunk/PKGBUILD

----------+
 PKGBUILD |   45 +++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-05 22:29:45 UTC (rev 95126)
+++ PKGBUILD	2013-08-05 23:48:08 UTC (rev 95127)
@@ -6,59 +6,51 @@
 
 pkgbase=python-matplotlib
 pkgname=('python2-matplotlib' 'python-matplotlib')
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64')
 url='http://matplotlib.org'
 license=('custom')
-makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt' 'python-pytz' 'python-numpy' 'pyqt'
-             'tk' 'python-cairo' 'python2-cairo' 'python-dateutil' 'python2-dateutil'
-             'python-gobject' 'python2-gobject' 'python-pyparsing' 'python2-pyparsing'
-             'pygtk' 'python-six' 'ghostscript' 'texlive-bin')
+makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt4' 'python-pytz' 'python-numpy'
+             'python-pyqt4' 'tk' 'python-cairo' 'python2-cairo' 'python-dateutil'
+             'python2-dateutil' 'python-gobject' 'python2-gobject' 'python-pyparsing'
+             'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript' 'texlive-bin')
 optdepends=('pygtk: for use with the GTK or GTKAgg backend'
             'tk: used by the TkAgg backend'
             'ghostscript: usetex dependencies'
             'texlive-bin: usetex dependencies')
 source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz")
-sha1sums=('82fc44d0047a713c1b0b1b4ea2503e6a41c57f98')
+sha1sums=('4bcf177bbe2a1a576fbc0896e69c2de2cf7429ae')
 
-build() {
-   cd "${srcdir}"/matplotlib-${pkgver}
-
-   # use system python-six
-   rm lib/six.py
-
-   # remove internal copies of pyparsing
-   rm -r lib/matplotlib/pyparsing_py{2,3}.py
-   sed -i -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' lib/matplotlib/{mathtext,fontconfig_pattern}.py
-
-   cd ..
+prepare() {
    cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3
 
-   # Build python2
    cd matplotlib-${pkgver}
    for file in $(find . -name '*.py' -print); do
       sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
              -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file}
    done
 
-   python2 setup.py build
-
-   # Build python3
    cd ../matplotlib-${pkgver}-py3
    for file in $(find . -name '*.py' -print); do
       sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python3|" \
              -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python3|" ${file}
    done
+}
 
+build() {
+   cd matplotlib-${pkgver}
+   python2 setup.py build
+
+   cd ../matplotlib-${pkgver}-py3
    python3 setup.py build
 }
 
 package_python2-matplotlib() {
-   depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt' 'python2-dateutil' 'python2-pyparsing')
+   depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt4' 'python2-dateutil' 'python2-pyparsing')
 
-   cd "${srcdir}"/matplotlib-${pkgver}
+   cd matplotlib-${pkgver}
    python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
 
    install -dm755 "${pkgdir}"/usr/share/licenses/python2-matplotlib
@@ -66,8 +58,9 @@
 }
 
 package_python-matplotlib() {
-   depends=('python-pytz' 'python-numpy' 'python-cairo' 'pyqt' 'python-dateutil' 'python-pyparsing')
-   cd "${srcdir}"/matplotlib-${pkgver}-py3
+   depends=('python-pytz' 'python-numpy' 'python-cairo' 'python-pyqt4' 'python-dateutil' 'python-pyparsing')
+
+   cd matplotlib-${pkgver}-py3
    python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
 
    install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib