From 0205d22afa2efeff5aeb9a3c1d3df73c6403df78 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 17 Oct 2016 18:56:09 +0200 Subject: [PATCH] python-scipy: rebuild for Python 3.5 Switch to python3-* pkgs. Convert python3.4-* pkg into dummy pkg. --- srcpkgs/python-pandas/template | 4 ++++ srcpkgs/python-scipy/template | 22 +++++++++++++--------- srcpkgs/python3-scipy | 1 + 3 files changed, 18 insertions(+), 9 deletions(-) create mode 120000 srcpkgs/python3-scipy diff --git a/srcpkgs/python-pandas/template b/srcpkgs/python-pandas/template index 33031ccb43d..f070b1f05c8 100644 --- a/srcpkgs/python-pandas/template +++ b/srcpkgs/python-pandas/template @@ -17,6 +17,10 @@ license="3-clause-BSD" distfiles="${PYPI_SITE}/p/pandas/pandas-${version}.tar.gz" checksum=4697606cdf023c6b7fcb74e48aaf25cf282a1a00e339d2d274cf1b663748805b +pre_build() { + # strip shebangs + find pandas -type f -name '*.py' -exec sed -i '/^#!.*python$/d' {} + +} post_install() { vlicense LICENSE } diff --git a/srcpkgs/python-scipy/template b/srcpkgs/python-scipy/template index ba775485526..6048bd9dfd4 100644 --- a/srcpkgs/python-scipy/template +++ b/srcpkgs/python-scipy/template @@ -1,12 +1,11 @@ # Template file for 'python-scipy' pkgname=python-scipy version=0.18.1 -revision=1 +revision=2 wrksrc="scipy-${version}" build_style=python-module -python_versions="2.7 3.4" -hostmakedepends="python-setuptools python3.4-setuptools gcc-fortran" -makedepends="python-devel python3.4-devel python-numpy python3.4-numpy lapack-devel" +hostmakedepends="python-setuptools python3-setuptools gcc-fortran" +makedepends="python-devel python3-devel python-numpy python3-numpy lapack-devel" depends="python-numpy" pycompile_module="scipy" short_desc="Scientific library for Python2" @@ -23,13 +22,18 @@ post_install() { vlicense LICENSE.txt LICENSE } -python3.4-scipy_package() { - pycompile_version="3.4" +python3-scipy_package() { + replaces="python3.4-scipy>=0" pycompile_module="scipy" - depends="python3.4-numpy" - short_desc="${short_desc/Python2/Python3.4}" + depends="python3-numpy" + short_desc="${short_desc/Python2/Python3}" pkg_install() { - vmove usr/lib/python3.4 + vmove usr/lib/python3* vlicense LICENSE.txt LICENSE } } +python3.4-scipy_package() { + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-scipy>=${version}_${revision}" +} diff --git a/srcpkgs/python3-scipy b/srcpkgs/python3-scipy new file mode 120000 index 00000000000..5107676dd24 --- /dev/null +++ b/srcpkgs/python3-scipy @@ -0,0 +1 @@ +python-scipy \ No newline at end of file