Date: Wednesday, March 27, 2013 @ 02:38:02 Author: stephane Revision: 87092
archrelease: copy trunk to community-i686, community-x86_64 Added: python-matplotlib/repos/community-i686/PKGBUILD (from rev 87091, python-matplotlib/trunk/PKGBUILD) python-matplotlib/repos/community-x86_64/PKGBUILD (from rev 87091, python-matplotlib/trunk/PKGBUILD) Deleted: python-matplotlib/repos/community-i686/PKGBUILD python-matplotlib/repos/community-i686/python-matplotlib-tk.patch python-matplotlib/repos/community-x86_64/PKGBUILD python-matplotlib/repos/community-x86_64/python-matplotlib-tk.patch ---------------------------------------------+ /PKGBUILD | 150 ++++++++++++++++++++++++++ community-i686/PKGBUILD | 83 -------------- community-i686/python-matplotlib-tk.patch | 35 ------ community-x86_64/PKGBUILD | 83 -------------- community-x86_64/python-matplotlib-tk.patch | 35 ------ 5 files changed, 150 insertions(+), 236 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-03-27 01:37:30 UTC (rev 87091) +++ community-i686/PKGBUILD 2013-03-27 01:38:02 UTC (rev 87092) @@ -1,83 +0,0 @@ -# $Id$ -# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Stefan Husmann <stefan-husm...@t-online.de> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> - -pkgbase=python-matplotlib -pkgname=('python2-matplotlib' 'python-matplotlib') -pkgver=1.2.0 -pkgrel=8 -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') -optdepends=('pygtk: for use with the GTK or GTKAgg backend' - 'tk: used by the TkAgg backend' - 'ghostscript: usetex dependencies' - 'texlive-bin: usetex dependencies') -source=("https://github.com/downloads/matplotlib/matplotlib/matplotlib-${pkgver}.tar.gz" - python-matplotlib-tk.patch) -sha1sums=('1d0c319b2bc545f1a7002f56768e5730fe573518' - '6f27ff74a7752700758d081d3235a61a89b8ea95') - -build() { - cd "${srcdir}"/matplotlib-${pkgver} - - patch -Np1 -i ../python-matplotlib-tk.patch - - # 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 - - # For numpy 1.7 - sed -i '/include/s/numpy\/arrayobject.h/numpy\/oldnumeric.h/g' \ - src/*.{c,cpp,h} lib/matplotlib/delaunay/*.{cpp,h} lib/matplotlib/tri/*.h - - cd .. - 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 - - python3 setup.py build -} - -package_python2-matplotlib() { - depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt' 'python2-dateutil' 'python2-pyparsing') - - cd "${srcdir}"/matplotlib-${pkgver} - python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr - - install -dm755 "${pkgdir}"/usr/share/licenses/python2-matplotlib - install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python2-matplotlib -} - -package_python-matplotlib() { - depends=('python-pytz' 'python-numpy' 'python-cairo' 'pyqt' 'python-dateutil' 'python-pyparsing') - cd "${srcdir}"/matplotlib-${pkgver}-py3 - python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr - - install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib - install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib -} Copied: python-matplotlib/repos/community-i686/PKGBUILD (from rev 87091, python-matplotlib/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-03-27 01:38:02 UTC (rev 87092) @@ -0,0 +1,75 @@ +# $Id$ +# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Stefan Husmann <stefan-husm...@t-online.de> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> + +pkgbase=python-matplotlib +pkgname=('python2-matplotlib' 'python-matplotlib') +pkgver=1.2.1 +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') +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') + +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 .. + 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 + + python3 setup.py build +} + +package_python2-matplotlib() { + depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt' 'python2-dateutil' 'python2-pyparsing') + + cd "${srcdir}"/matplotlib-${pkgver} + python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr + + install -dm755 "${pkgdir}"/usr/share/licenses/python2-matplotlib + install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python2-matplotlib +} + +package_python-matplotlib() { + depends=('python-pytz' 'python-numpy' 'python-cairo' 'pyqt' 'python-dateutil' 'python-pyparsing') + cd "${srcdir}"/matplotlib-${pkgver}-py3 + python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr + + install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib + install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib +} Deleted: community-i686/python-matplotlib-tk.patch =================================================================== --- community-i686/python-matplotlib-tk.patch 2013-03-27 01:37:30 UTC (rev 87091) +++ community-i686/python-matplotlib-tk.patch 2013-03-27 01:38:02 UTC (rev 87092) @@ -1,35 +0,0 @@ -diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py ---- matplotlib-1.2.0/setupext.py.orig 2012-11-23 14:50:48.954715965 -0200 -+++ matplotlib-1.2.0/setupext.py 2012-11-23 14:55:53.731727636 -0200 -@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib - - tcl_poss = [tcl_lib_dir, - os.path.normpath(os.path.join(tcl_lib_dir, '..')), -- "/usr/lib/tcl"+str(Tkinter.TclVersion), -- "/usr/lib"] -+ "@@libdir@@/tcl"+str(Tkinter.TclVersion), -+ "@@lib@@"] - tk_poss = [tk_lib_dir, - os.path.normpath(os.path.join(tk_lib_dir, '..')), -- "/usr/lib/tk"+str(Tkinter.TkVersion), -- "/usr/lib"] -+ "@@libdir@@/tk"+str(Tkinter.TkVersion), -+ "@@libdir@@"] - for ptcl, ptk in zip(tcl_poss, tk_poss): - tcl_config = os.path.join(ptcl, "tclConfig.sh") - tk_config = os.path.join(ptk, "tkConfig.sh") -@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib - return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver - - def hardcoded_tcl_config(): -- tcl_inc = "/usr/local/include" -- tk_inc = "/usr/local/include" -- tcl_lib = "/usr/local/lib" -- tk_lib = "/usr/local/lib" -+ tcl_inc = "/usr/include" -+ tk_inc = "/usr/include" -+ tcl_lib = "@@libdir@@" -+ tk_lib = "@@libdir@@" - return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk' - - def add_tk_flags(module): Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-03-27 01:37:30 UTC (rev 87091) +++ community-x86_64/PKGBUILD 2013-03-27 01:38:02 UTC (rev 87092) @@ -1,83 +0,0 @@ -# $Id$ -# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Stefan Husmann <stefan-husm...@t-online.de> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> - -pkgbase=python-matplotlib -pkgname=('python2-matplotlib' 'python-matplotlib') -pkgver=1.2.0 -pkgrel=8 -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') -optdepends=('pygtk: for use with the GTK or GTKAgg backend' - 'tk: used by the TkAgg backend' - 'ghostscript: usetex dependencies' - 'texlive-bin: usetex dependencies') -source=("https://github.com/downloads/matplotlib/matplotlib/matplotlib-${pkgver}.tar.gz" - python-matplotlib-tk.patch) -sha1sums=('1d0c319b2bc545f1a7002f56768e5730fe573518' - '6f27ff74a7752700758d081d3235a61a89b8ea95') - -build() { - cd "${srcdir}"/matplotlib-${pkgver} - - patch -Np1 -i ../python-matplotlib-tk.patch - - # 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 - - # For numpy 1.7 - sed -i '/include/s/numpy\/arrayobject.h/numpy\/oldnumeric.h/g' \ - src/*.{c,cpp,h} lib/matplotlib/delaunay/*.{cpp,h} lib/matplotlib/tri/*.h - - cd .. - 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 - - python3 setup.py build -} - -package_python2-matplotlib() { - depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt' 'python2-dateutil' 'python2-pyparsing') - - cd "${srcdir}"/matplotlib-${pkgver} - python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr - - install -dm755 "${pkgdir}"/usr/share/licenses/python2-matplotlib - install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python2-matplotlib -} - -package_python-matplotlib() { - depends=('python-pytz' 'python-numpy' 'python-cairo' 'pyqt' 'python-dateutil' 'python-pyparsing') - cd "${srcdir}"/matplotlib-${pkgver}-py3 - python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr - - install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib - install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib -} Copied: python-matplotlib/repos/community-x86_64/PKGBUILD (from rev 87091, python-matplotlib/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-03-27 01:38:02 UTC (rev 87092) @@ -0,0 +1,75 @@ +# $Id$ +# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Stefan Husmann <stefan-husm...@t-online.de> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> + +pkgbase=python-matplotlib +pkgname=('python2-matplotlib' 'python-matplotlib') +pkgver=1.2.1 +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') +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') + +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 .. + 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 + + python3 setup.py build +} + +package_python2-matplotlib() { + depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt' 'python2-dateutil' 'python2-pyparsing') + + cd "${srcdir}"/matplotlib-${pkgver} + python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr + + install -dm755 "${pkgdir}"/usr/share/licenses/python2-matplotlib + install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python2-matplotlib +} + +package_python-matplotlib() { + depends=('python-pytz' 'python-numpy' 'python-cairo' 'pyqt' 'python-dateutil' 'python-pyparsing') + cd "${srcdir}"/matplotlib-${pkgver}-py3 + python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr + + install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib + install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib +} Deleted: community-x86_64/python-matplotlib-tk.patch =================================================================== --- community-x86_64/python-matplotlib-tk.patch 2013-03-27 01:37:30 UTC (rev 87091) +++ community-x86_64/python-matplotlib-tk.patch 2013-03-27 01:38:02 UTC (rev 87092) @@ -1,35 +0,0 @@ -diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py ---- matplotlib-1.2.0/setupext.py.orig 2012-11-23 14:50:48.954715965 -0200 -+++ matplotlib-1.2.0/setupext.py 2012-11-23 14:55:53.731727636 -0200 -@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib - - tcl_poss = [tcl_lib_dir, - os.path.normpath(os.path.join(tcl_lib_dir, '..')), -- "/usr/lib/tcl"+str(Tkinter.TclVersion), -- "/usr/lib"] -+ "@@libdir@@/tcl"+str(Tkinter.TclVersion), -+ "@@lib@@"] - tk_poss = [tk_lib_dir, - os.path.normpath(os.path.join(tk_lib_dir, '..')), -- "/usr/lib/tk"+str(Tkinter.TkVersion), -- "/usr/lib"] -+ "@@libdir@@/tk"+str(Tkinter.TkVersion), -+ "@@libdir@@"] - for ptcl, ptk in zip(tcl_poss, tk_poss): - tcl_config = os.path.join(ptcl, "tclConfig.sh") - tk_config = os.path.join(ptk, "tkConfig.sh") -@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib - return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver - - def hardcoded_tcl_config(): -- tcl_inc = "/usr/local/include" -- tk_inc = "/usr/local/include" -- tcl_lib = "/usr/local/lib" -- tk_lib = "/usr/local/lib" -+ tcl_inc = "/usr/include" -+ tk_inc = "/usr/include" -+ tcl_lib = "@@libdir@@" -+ tk_lib = "@@libdir@@" - return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk' - - def add_tk_flags(module):