From b48b454b3056202c949e2f72f5f088eb93057da1 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Wed, 6 Jan 2016 18:14:41 +0100 Subject: dev-python/numpy: Properly handle f2py stuff Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=570760 Package-Manager: portage-2.2.26 Signed-off-by: Justin Lecher --- dev-python/numpy/numpy-1.10.2-r1.ebuild | 151 -------------------------------- dev-python/numpy/numpy-1.10.2-r2.ebuild | 150 +++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 151 deletions(-) delete mode 100644 dev-python/numpy/numpy-1.10.2-r1.ebuild create mode 100644 dev-python/numpy/numpy-1.10.2-r2.ebuild (limited to 'dev-python/numpy') diff --git a/dev-python/numpy/numpy-1.10.2-r1.ebuild b/dev-python/numpy/numpy-1.10.2-r1.ebuild deleted file mode 100644 index 9dc68cdc08ff..000000000000 --- a/dev-python/numpy/numpy-1.10.2-r1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) -PYTHON_REQ_USE="threads(+)" - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator - -DOC_PV="1.10.1" -DOC_P="${PN}-${DOC_PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://www.numpy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf - )" -# It appears the docs haven't been upgraded, still @ 1.8.1 -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${P}-no-hardcode-blas.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" - fi - - # don't version f2py, we will handle it. - sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die - - # we don't have f2py-3.3 - sed \ - -e "/f2py_cmd/s:'f2py'.*:'f2py'\]:g" \ - -i numpy/tests/test_scripts.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi - - # absent in 1.9 - #docinto f2py - #dodoc numpy/f2py/docs/*.txt - #doman numpy/f2py/f2py.1 -} diff --git a/dev-python/numpy/numpy-1.10.2-r2.ebuild b/dev-python/numpy/numpy-1.10.2-r2.ebuild new file mode 100644 index 000000000000..33f693b40a1c --- /dev/null +++ b/dev-python/numpy/numpy-1.10.2-r2.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) +PYTHON_REQ_USE="threads(+)" + +FORTRAN_NEEDED=lapack + +inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator + +DOC_PV="1.10.1" +DOC_P="${PN}-${DOC_PV}" + +DESCRIPTION="Fast array and numerical python library" +HOMEPAGE="http://www.numpy.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz + doc? ( + http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip + http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf + http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf + )" +# It appears the docs haven't been upgraded, still @ 1.8.1 +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc lapack test" + +RDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + lapack? ( virtual/cblas virtual/lapack )" +DEPEND="${RDEPEND} + doc? ( app-arch/unzip ) + lapack? ( virtual/pkgconfig ) + test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )" + +# Uses distutils.command.config. +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${P}-no-hardcode-blas.patch +) + +src_unpack() { + default + if use doc; then + unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die + fi +} + +pc_incdir() { + $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ + sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libdir() { + $(tc-getPKG_CONFIG) --libs-only-L $@ | \ + sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' +} + +pc_libs() { + $(tc-getPKG_CONFIG) --libs-only-l $@ | \ + sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ + -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ + | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' +} + +python_prepare_all() { + if use lapack; then + append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" + local libdir="${EPREFIX}"/usr/$(get_libdir) + cat >> site.cfg <<-EOF + [blas] + include_dirs = $(pc_incdir cblas) + library_dirs = $(pc_libdir cblas blas):${libdir} + blas_libs = $(pc_libs cblas blas) + [lapack] + library_dirs = $(pc_libdir lapack):${libdir} + lapack_libs = $(pc_libs lapack) + EOF + else + export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None + fi + + export CC="$(tc-getCC) ${CFLAGS}" + + append-flags -fno-strict-aliasing + + # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 + # with the subtle difference that we don't want to break Darwin where + # -shared is not a valid linker argument + if [[ ${CHOST} != *-darwin* ]]; then + append-ldflags -shared + fi + + # only one fortran to link with: + # linking with cblas and lapack library will force + # autodetecting and linking to all available fortran compilers + append-fflags -fPIC + if use lapack; then + NUMPY_FCONFIG="config_fc --noopt --noarch" + # workaround bug 335908 + [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" + fi + +# # don't version f2py, we will handle it. + sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die + +# # we don't have f2py-3.3 + sed \ + -e 's:test_f2py:_&:g' \ + -i numpy/tests/test_scripts.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG} +} + +python_test() { + distutils_install_for_testing ${NUMPY_FCONFIG} + + cd "${TMPDIR}" || die + ${EPYTHON} -c " +import numpy, sys +r = numpy.test(label='full', verbose=3) +sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" +} + +python_install() { + distutils-r1_python_install ${NUMPY_FCONFIG} +} + +python_install_all() { + DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt ) + + if use doc; then + HTML_DOCS=( "${WORKDIR}"/html/. ) + DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf ) + fi + + distutils-r1_python_install_all + + docinto f2py + dodoc doc/f2py/*.txt + doman doc/f2py/f2py.1 +} -- cgit v1.2.3