diff --git a/srcpkgs/python-matplotlib/python3.4-matplotlib.INSTALL.msg b/srcpkgs/python-matplotlib/python3-matplotlib.INSTALL.msg similarity index 55% rename from srcpkgs/python-matplotlib/python3.4-matplotlib.INSTALL.msg rename to srcpkgs/python-matplotlib/python3-matplotlib.INSTALL.msg index fb520e4fc0b..3628d0d3f7c 100644 --- a/srcpkgs/python-matplotlib/python3.4-matplotlib.INSTALL.msg +++ b/srcpkgs/python-matplotlib/python3-matplotlib.INSTALL.msg @@ -1,19 +1,19 @@ By default, this package supports only non-interactive graphics output. For interactive graphics, install: -- gtk+3 gir-freedesktop python3.4-gobject python3.4-cairocffi +- gtk+3 gir-freedesktop python3-gobject python3-cairocffi (for GTK3Agg/GTK3Cairo backend) -- python3.4-PyQt4|python3.4-pyside (for Qt4Agg backend) -- python3.4-PyQt5 (for Qt5Agg backend) -- python3.4-tkinter (for TkAgg backend) -- python3.4-tornado (for webagg backend) +- python3-PyQt4|python3-pyside (for Qt4Agg backend) +- python3-PyQt5 (for Qt5Agg backend) +- python3-tkinter (for TkAgg backend) +- python3-tornado (for webagg backend) To change the backend, you have two ways: - /etc/matplotlibrc (system-wide) - $HOME/.config/matplotlib/matplotlibrc (per-user basis) -Natively, matplotlib only supports PNG images. Install python3.4-Pillow +Natively, matplotlib only supports PNG images. Install python3-Pillow to support more file formats. Matplotlib’s LaTeX support requires a working LaTeX installation and diff --git a/srcpkgs/python-matplotlib/template b/srcpkgs/python-matplotlib/template index e0f3e123ef6..b37b4ba7b14 100644 --- a/srcpkgs/python-matplotlib/template +++ b/srcpkgs/python-matplotlib/template @@ -1,19 +1,18 @@ # Template file for 'python-matplotlib' pkgname=python-matplotlib version=1.5.3 -revision=2 +revision=3 wrksrc="matplotlib-${version}" build_style=python-module -python_versions="2.7 3.4" -hostmakedepends="pkg-config python-setuptools python3.4-setuptools" +hostmakedepends="pkg-config python-setuptools python3-setuptools" # XXX: use internal copy of agg, highly patched makedepends=" - python-devel python3.4-devel python-numpy python3.4-numpy - python-cycler python3.4-cycler python-dateutil python3.4-dateutil python-pytz - python3.4-pytz python-tornado python3.4-tornado python-parsing - python3.4-parsing python-PyQt4-devel python-PyQt5-devel python-pyside - python3.4-pyside python-cairocffi python3.4-cairocffi python-gobject-devel - pygtk-devel gtk+3-devel tk-devel python-tkinter python3.4-tkinter wxPython-devel + python-devel python3-devel python-numpy python3-numpy + python-cycler python3-cycler python-dateutil python3-dateutil python-pytz + python3-pytz python-tornado python3-tornado python-parsing + python3-parsing python-PyQt4-devel python-PyQt5-devel python-pyside + python3-pyside python-cairocffi python3-cairocffi python-gobject-devel + pygtk-devel gtk+3-devel tk-devel python-tkinter python3-tkinter wxPython-devel freetype-devel libpng-devel libqhull-devel" depends="python-matplotlib-data>=${version}_${revision} python-numpy python-cycler python-dateutil python-parsing python-pytz" @@ -56,13 +55,18 @@ python-matplotlib-data_package() { rm -f ${PKGDESTDIR}/usr/share/matplotlib/mpl-data/matplotlibrc } } -python3.4-matplotlib_package() { - depends="python-matplotlib-data>=${version}_${revision} python3.4-numpy - python3.4-cycler python3.4-dateutil python3.4-parsing python3.4-pytz" - short_desc="${short_desc/Python2/Python3.4}" - pycompile_version="3.4" +python3-matplotlib_package() { + replaces="python3.4-matplotlib>=0" + depends="python-matplotlib-data>=${version}_${revision} python3-numpy + python3-cycler python3-dateutil python3-parsing python3-pytz" + short_desc="${short_desc/Python2/Python3}" pycompile_module="matplotlib mpl_toolkits pylab.py" pkg_install() { - vmove usr/lib/python3.4 + vmove usr/lib/python3* } } +python3.4-matplotlib_package() { + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-matplotlib>=${version}_${revision}" +} diff --git a/srcpkgs/python3-matplotlib b/srcpkgs/python3-matplotlib new file mode 120000 index 00000000000..9552ac1974c --- /dev/null +++ b/srcpkgs/python3-matplotlib @@ -0,0 +1 @@ +python-matplotlib \ No newline at end of file