From 7a2579dcac27985cc9c8826721de4d6679b88062 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 23 Sep 2020 12:59:06 -0400 Subject: [PATCH] python3-matplotlib: update to 3.3.2, drop python3-matplotlib-data --- srcpkgs/python3-matplotlib-data | 1 - srcpkgs/python3-matplotlib/template | 19 +++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) delete mode 120000 srcpkgs/python3-matplotlib-data diff --git a/srcpkgs/python3-matplotlib-data b/srcpkgs/python3-matplotlib-data deleted file mode 120000 index 3144788bb3d..00000000000 --- a/srcpkgs/python3-matplotlib-data +++ /dev/null @@ -1 +0,0 @@ -python3-matplotlib \ No newline at end of file diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template index 25e008c920a..586562eeb73 100644 --- a/srcpkgs/python3-matplotlib/template +++ b/srcpkgs/python3-matplotlib/template @@ -1,22 +1,21 @@ # Template file for 'python3-matplotlib' pkgname=python3-matplotlib -version=3.3.1 +version=3.3.2 revision=1 wrksrc="matplotlib-${version}" build_style=python3-module build_helper="numpy" hostmakedepends="pkg-config python3-setuptools python3-certifi python3-numpy" -# XXX use internal copy of agg, highly patched makedepends="python3-devel freetype-devel libpng-devel libqhull-devel" -depends="python3-matplotlib-data>=${version}_${revision} python3-certifi - python3-cycler python3-kiwisolver python3-numpy python3-Pillow - python3-parsing python3-dateutil" +depends="python3-certifi python3-cycler python3-kiwisolver + python3-numpy python3-Pillow python3-parsing python3-dateutil" short_desc="Python3 2D/3D plotting library" maintainer="Alessio Sergi " license="custom:matplotlib, BSD-3-Clause, MIT" homepage="https://matplotlib.org/" distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz" -checksum=672faf2c79aaae2250f322bd1d11226b41e09d4c91cbbe50951dd33e01845a44 +checksum=a17664009de73849906de076c1de60d2854d26325d012cdd0b5e75edb8bd8edb +replaces="python3-matplotlib-data>=0" pre_build() { cat <<-EOF > setup.cfg @@ -30,11 +29,3 @@ post_install() { vdoc "${FILESDIR}/README.voidlinux" vlicense LICENSE/LICENSE } - -python3-matplotlib-data_package() { - archs=noarch - short_desc+=" - data files" - pkg_install() { - vmove "${py3_sitelib}/matplotlib/mpl-data" - } -}