upstream has dropped python2 support

2 files changed, 13 insertions, 105 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c887e83a7b72..df5a3e91ba4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,13 @@
-# Generated by mksrcinfo v8
-# Thu Aug 11 13:23:16 UTC 2016
 pkgbase = python-matplotlib-git
 	pkgdesc = A python plotting library for making publication quality plots, master git branch
-	pkgver = r18741.9f0d770
+	pkgver = r26679.b9b02f189
 	pkgrel = 1
 	url = http://matplotlib.org
 	arch = i686
 	arch = x86_64
 	license = custom
 	checkdepends = python-nose
-	checkdepends = python2-nose
 	checkdepends = python-mock
-	checkdepends = python2-mock
 	checkdepends = xorg-server-xvfb
 	checkdepends = texlive-core
 	checkdepends = texlive-latexextra
@@ -20,72 +16,33 @@ pkgbase = python-matplotlib-git
 	checkdepends = mencoder
 	checkdepends = inkscape
 	checkdepends = python-pycodestyle
-	checkdepends = python2-pycodestyle
 	checkdepends = python-pandas
-	checkdepends = python2-pandas
 	makedepends = rsync
 	makedepends = git
-	makedepends = python2-pytz
-	makedepends = python2-numpy
-	makedepends = python2-pyqt4
 	makedepends = python-pytz
 	makedepends = python-numpy
-	makedepends = python-pyqt4
 	makedepends = tk
 	makedepends = python-cairocffi
-	makedepends = python2-cairocffi
 	makedepends = python-dateutil
-	makedepends = python2-dateutil
 	makedepends = python-gobject
-	makedepends = python2-gobject
 	makedepends = python-pyparsing
-	makedepends = python2-pyparsing
 	makedepends = pygtk
 	makedepends = python-six
 	makedepends = ghostscript
 	makedepends = texlive-bin
 	makedepends = python-tornado
-	makedepends = python2-tornado
 	makedepends = gtk3
 	makedepends = wxpython
 	makedepends = python-pyqt5
-	makedepends = python2-pyqt5
 	makedepends = libxkbcommon-x11
 	makedepends = python-pillow
-	makedepends = python2-pillow
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
 	makedepends = python-cycler
-	makedepends = python2-cycler
-	makedepends = python2-functools32
 	source = git+git://github.com/matplotlib/matplotlib.git#branch=master
 	source = setup.cfg
 	md5sums = SKIP
 	md5sums = 5fa7d3c374ec049e3ed592ddff0111be
 
-pkgname = python2-matplotlib-git
-	depends = python2-pytz
-	depends = python2-numpy
-	depends = python2-pyqt5
-	depends = python2-dateutil
-	depends = python2-pyparsing
-	depends = python2-cycler
-	depends = libxkbcommon-x11
-	optdepends = pygtk: for GTK/GTKAgg/GTKCairo backend
-	optdepends = python2-cairo: for GTKCairo/GTK3Cairo backend
-	optdepends = python2-cairocffi: for GTKCairo/GTK3Cairo backend (alternative to python2-cairo)
-	optdepends = python2-pyqt4: for Qt4Agg backend
-	optdepends = tk: used by the TkAgg backend
-	optdepends = ghostscript: usetex dependencies
-	optdepends = texlive-bin: usetex dependencies
-	optdepends = python2-tornado: for webagg backend
-	optdepends = python2-gobject: for GTK3Agg/GTK3Cairo backend
-	optdepends = wxpython: for WX/WXAgg backend
-	optdepends = python2-pillow: for reading/saving .jpg/bmp/tiff files
-	provides = python2-matplotlib
-	conflicts = python2-matplotlib
-	conflicts = python2-matplotlib2
-
 pkgname = python-matplotlib-git
 	depends = python-pytz
 	depends = python-numpy
diff --git a/PKGBUILD b/PKGBUILD
index 8c196a41ce7b..242d0cb05b63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,24 @@
 # $Id$
 # Maintainer: Grey Christoforo <first name [at] last name [dot] net>
 
-pkgbase=python-matplotlib-git
-pkgname=('python2-matplotlib-git' 'python-matplotlib-git')
+pkgname=python-matplotlib-git
 
-pkgver=r18741.9f0d770
+pkgver=r26679.b9b02f189
 pkgrel=1
 pkgdesc="A python plotting library for making publication quality plots, master git branch"
 arch=('i686' 'x86_64')
 url='http://matplotlib.org'
 license=('custom')
-checkdepends=('python-nose' 'python2-nose' 'python-mock' 'python2-mock' 'xorg-server-xvfb'
+checkdepends=('python-nose' 'python-mock' 'xorg-server-xvfb'
               'texlive-core' 'texlive-latexextra' 'imagemagick' 'ffmpeg' 'mencoder' 'inkscape'
-              'python-pycodestyle' 'python2-pycodestyle' 'python-pandas' 'python2-pandas')
-makedepends=('rsync' 'git' 'python2-pytz' 'python2-numpy' 'python2-pyqt4' 'python-pytz' 'python-numpy'
-             'python-pyqt4' 'tk' 'python-cairocffi' 'python2-cairocffi' 'python-dateutil'
-             'python2-dateutil' 'python-gobject' 'python2-gobject' 'python-pyparsing'
-             'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript' 'texlive-bin'
-             'python-tornado' 'python2-tornado' 'gtk3' 'wxpython' 'python-pyqt5' 'python2-pyqt5'
-             'libxkbcommon-x11' 'python-pillow' 'python2-pillow' 'python-setuptools'
-             'python2-setuptools' 'python-cycler' 'python2-cycler' 'python2-functools32')
+              'python-pycodestyle' 'python-pandas' )
+makedepends=('rsync' 'git' 'python-pytz' 'python-numpy'
+             'tk' 'python-cairocffi' 'python-dateutil'
+             'python-gobject' 'python-pyparsing'
+             'pygtk' 'python-six' 'ghostscript' 'texlive-bin'
+             'python-tornado' 'gtk3' 'wxpython' 'python-pyqt5' 
+             'libxkbcommon-x11' 'python-pillow'  'python-setuptools'
+             'python-cycler')
 source=("git+git://github.com/matplotlib/matplotlib.git#branch=master" setup.cfg)
 md5sums=('SKIP'
          '5fa7d3c374ec049e3ed592ddff0111be')
@@ -30,26 +29,16 @@ pkgver() {
 }
 
 prepare() {
-   rsync -a "$srcdir"/matplotlib/ "$srcdir"/matplotlib-py2 --exclude '.git'
-
    cd "$srcdir"/matplotlib
    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
 
-   cd "$srcdir"/matplotlib-py2
-   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
-
    rsync -a "$srcdir"/matplotlib/  "$srcdir"/matplotlib-test --exclude '.git'
-   cp -a "$srcdir"/matplotlib-py2{,-test}
 
    # Remove tests (FS#48175)
    cp "$srcdir/setup.cfg" "$srcdir"/matplotlib/
-   cp "$srcdir/setup.cfg" "$srcdir"/matplotlib-py2/
 }
 
 build() {
@@ -59,18 +48,12 @@ build() {
 
    cd "$srcdir"/matplotlib
    python3 setup.py build
-
-   cd "$srcdir"/matplotlib-py2
-   python2 setup.py build
 }
 
 check() {
    cd "$srcdir"/matplotlib-test
    python3 setup.py build
 
-   cd "$srcdir"/matplotlib-py2-test
-   python2 setup.py build
-
    cd "$srcdir"/matplotlib-test
    (
      export PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.5:$PYTHONPATH"
@@ -79,41 +62,9 @@ check() {
      xvfb-run -a -s "+extension GLX +extension RANDR +render -screen 0 1280x1024x24" \
        python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300 || warning "Tests failed"
    )
-
-   cd "$srcdir"/matplotlib-py2-test
-   (
-     export PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH"
-     python2 -c "from matplotlib import font_manager"
-     rm -rf ../tmp_test_dir && mkdir ../tmp_test_dir && cd ../tmp_test_dir
-     xvfb-run -a -s "+extension GLX +extension RANDR +render -screen 0 1280x1024x24" \
-       python2 ../matplotlib-py2/tests.py -sv --processes=8 --process-timeout=300 || warning "Tests failed"
-   )
-}
-
-package_python2-matplotlib-git() {
-   depends=('python2-pytz' 'python2-numpy' 'python2-pyqt5' 'python2-dateutil' 'python2-pyparsing' 'python2-cycler' 'libxkbcommon-x11')
-   optdepends=('pygtk: for GTK/GTKAgg/GTKCairo backend'
-               'python2-cairo: for GTKCairo/GTK3Cairo backend'
-               'python2-cairocffi: for GTKCairo/GTK3Cairo backend (alternative to python2-cairo)'
-               'python2-pyqt4: for Qt4Agg backend'
-               'tk: used by the TkAgg backend'
-               'ghostscript: usetex dependencies'
-               'texlive-bin: usetex dependencies'
-               'python2-tornado: for webagg backend'
-               'python2-gobject: for GTK3Agg/GTK3Cairo backend'
-               'wxpython: for WX/WXAgg backend'
-               'python2-pillow: for reading/saving .jpg/bmp/tiff files')
-   provides=('python2-matplotlib')
-   conflicts=('python2-matplotlib' 'python2-matplotlib2')
-
-   cd matplotlib-py2
-   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-git() {
+package() {
    depends=('python-pytz' 'python-numpy' 'python-pyqt5' 'python-dateutil' 'python-pyparsing' 'python-cycler' 'libxkbcommon-x11')
    optdepends=('python-gobject: for GTK3Agg/GTK3Cairo backend'
                'python-cairocffi: for GTK3Agg/GTK3Cairo backend'