From 12d49319f7d56e725fdcac1ea9341789da6b2ece Mon Sep 17 00:00:00 2001 From: bicatali Date: Tue, 10 Oct 2006 10:25:42 +0000 Subject: numarray-1.5.2-r1: fixed lapack stuff git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@346 32389bae-6d03-0410-99cf-db05cde120eb --- dev-python/numarray/ChangeLog | 14 ++++- dev-python/numarray/Manifest | 22 +++---- dev-python/numarray/files/digest-numarray-1.5.2 | 6 -- dev-python/numarray/files/digest-numarray-1.5.2-r1 | 6 ++ dev-python/numarray/numarray-1.5.2-r1.ebuild | 62 +++++++++++++++++++ dev-python/numarray/numarray-1.5.2.ebuild | 70 ---------------------- 6 files changed, 92 insertions(+), 88 deletions(-) delete mode 100644 dev-python/numarray/files/digest-numarray-1.5.2 create mode 100644 dev-python/numarray/files/digest-numarray-1.5.2-r1 create mode 100644 dev-python/numarray/numarray-1.5.2-r1.ebuild delete mode 100644 dev-python/numarray/numarray-1.5.2.ebuild (limited to 'dev-python/numarray') diff --git a/dev-python/numarray/ChangeLog b/dev-python/numarray/ChangeLog index c96e90d98..59ac74852 100644 --- a/dev-python/numarray/ChangeLog +++ b/dev-python/numarray/ChangeLog @@ -1,7 +1,19 @@ # ChangeLog for dev-python/numarray -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*numarray-1.5.2-r1 (12 Oct 2006) + + 12 Oct 2006; Sebastien Fabbro ; + +numarray-1.5.2-r1.ebuild + -numarray-1.5.2.ebuild + Better lapack handling, no more atlas specific. + +*numarray-1.5.2 (10 Sep 2006) + + 10 Sep 2006; Sebastien Fabbro +numarray-1.5.2.ebuild, + Version bump + *numarray-1.5.1-r2 (24 May 2006) 24 May 2006; Sebastien Fabbro +numarray-1.5.1-r2.ebuild, diff --git a/dev-python/numarray/Manifest b/dev-python/numarray/Manifest index 550c3ded8..8daf4fc61 100644 --- a/dev-python/numarray/Manifest +++ b/dev-python/numarray/Manifest @@ -12,18 +12,18 @@ RMD160 3759c9d5ac115cdb6f2084b56a08f879c7d27462 files/numarray-1.5.2-numinclude. SHA256 603356a9e1ab6772baf72dc089f519a8d7fb37bed1993687e6be6fc3040dfb68 files/numarray-1.5.2-numinclude.patch 404 DIST numarray-1.5.2.tar.gz 1196014 RMD160 51cc7681958cada32c515872e8def6fc0ff296ca SHA1 17f6c4bb5f0d97e93923b8ca4f55fccc1ee985e9 SHA256 6f6dc1a348c2fa32b2179717f3b3af4ddf60e9a3417739d325f344eb8f243174 DIST numarray-1.5.html.tar.gz 203409 RMD160 361850242a04efea59befe7e05dd9cb6fa1cb457 SHA1 dd88e63e19d51dcc4ff092dff47048bf37bf674c SHA256 55d6322e83d78d6f0961ae563bf81602214fb44d47929a212f0342fb579346a6 -EBUILD numarray-1.5.2.ebuild 1830 RMD160 f7140f939e48a6be5b53eaff2f573ef4bbf2235d SHA1 a67d7cb6324caf1bc687051e4df2d9063289e35f SHA256 8d09ea7acf4ce639e1e4ea8831775c32067397c637634de96882232a2a81c937 -MD5 31f2e3feaa6cec0026b94238c5977543 numarray-1.5.2.ebuild 1830 -RMD160 f7140f939e48a6be5b53eaff2f573ef4bbf2235d numarray-1.5.2.ebuild 1830 -SHA256 8d09ea7acf4ce639e1e4ea8831775c32067397c637634de96882232a2a81c937 numarray-1.5.2.ebuild 1830 -MISC ChangeLog 2650 RMD160 118421f10adb3609abd448e29eac2ef0142e8e2d SHA1 6751b8ac70bde841f6f442506700fb3f565d189d SHA256 1612313308c3e235f384cba69f9b5cd6419a1c5ce57bc58fffeac8fac470cef2 -MD5 3e0700df75a48ebda06597d7613108cd ChangeLog 2650 -RMD160 118421f10adb3609abd448e29eac2ef0142e8e2d ChangeLog 2650 -SHA256 1612313308c3e235f384cba69f9b5cd6419a1c5ce57bc58fffeac8fac470cef2 ChangeLog 2650 +EBUILD numarray-1.5.2-r1.ebuild 1518 RMD160 ebb6e854d25be47d9b97bda2a1b57ccb05233cac SHA1 27d911354e970a8c66045b5ab78fc9e2b0c259eb SHA256 5f9e18e605443224eb32634cb5f091f6de2a279d4ff9e7d2d0d31d9b12236698 +MD5 0229f8077fcda1cbcff5e9707406c05e numarray-1.5.2-r1.ebuild 1518 +RMD160 ebb6e854d25be47d9b97bda2a1b57ccb05233cac numarray-1.5.2-r1.ebuild 1518 +SHA256 5f9e18e605443224eb32634cb5f091f6de2a279d4ff9e7d2d0d31d9b12236698 numarray-1.5.2-r1.ebuild 1518 +MISC ChangeLog 2960 RMD160 383562d5684257e52a9803406bd51dc063455b6c SHA1 14f4492534975e38d7036ef5070cd256e029548a SHA256 3dadbb1fa5aeca8500ffc749b6cdf3ebe5cd206f9cc070ba53e55255992be400 +MD5 267ea6333f893dacd7d77d7be48b297b ChangeLog 2960 +RMD160 383562d5684257e52a9803406bd51dc063455b6c ChangeLog 2960 +SHA256 3dadbb1fa5aeca8500ffc749b6cdf3ebe5cd206f9cc070ba53e55255992be400 ChangeLog 2960 MISC metadata.xml 923 RMD160 cdf7e5a16211111d2c317056d5d41ddc1b6a30e1 SHA1 8b392f68114b8524269f2508d74b7d65eac6dbb3 SHA256 36b17aa66e3e4356e4d44cd7f5d5a4a5ff5f8813c6ccef3eb118905bb6e8c7c2 MD5 1ffa32cfa3e5c763b32594feb8047497 metadata.xml 923 RMD160 cdf7e5a16211111d2c317056d5d41ddc1b6a30e1 metadata.xml 923 SHA256 36b17aa66e3e4356e4d44cd7f5d5a4a5ff5f8813c6ccef3eb118905bb6e8c7c2 metadata.xml 923 -MD5 8156150213bcbcb20722f62a1981476e files/digest-numarray-1.5.2 500 -RMD160 08839452392d78160290d8ce7baffbd114f7d18e files/digest-numarray-1.5.2 500 -SHA256 4527949b921e98437b3d48fec263d3180b6a2ff67b4f9da18082310d07a3a312 files/digest-numarray-1.5.2 500 +MD5 8156150213bcbcb20722f62a1981476e files/digest-numarray-1.5.2-r1 500 +RMD160 08839452392d78160290d8ce7baffbd114f7d18e files/digest-numarray-1.5.2-r1 500 +SHA256 4527949b921e98437b3d48fec263d3180b6a2ff67b4f9da18082310d07a3a312 files/digest-numarray-1.5.2-r1 500 diff --git a/dev-python/numarray/files/digest-numarray-1.5.2 b/dev-python/numarray/files/digest-numarray-1.5.2 deleted file mode 100644 index 882e2bded..000000000 --- a/dev-python/numarray/files/digest-numarray-1.5.2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 d2ecfc60fe4869c328b872540d04e0f7 numarray-1.5.2.tar.gz 1196014 -RMD160 51cc7681958cada32c515872e8def6fc0ff296ca numarray-1.5.2.tar.gz 1196014 -SHA256 6f6dc1a348c2fa32b2179717f3b3af4ddf60e9a3417739d325f344eb8f243174 numarray-1.5.2.tar.gz 1196014 -MD5 c7b23442b8ead6aa7521f27049c41deb numarray-1.5.html.tar.gz 203409 -RMD160 361850242a04efea59befe7e05dd9cb6fa1cb457 numarray-1.5.html.tar.gz 203409 -SHA256 55d6322e83d78d6f0961ae563bf81602214fb44d47929a212f0342fb579346a6 numarray-1.5.html.tar.gz 203409 diff --git a/dev-python/numarray/files/digest-numarray-1.5.2-r1 b/dev-python/numarray/files/digest-numarray-1.5.2-r1 new file mode 100644 index 000000000..882e2bded --- /dev/null +++ b/dev-python/numarray/files/digest-numarray-1.5.2-r1 @@ -0,0 +1,6 @@ +MD5 d2ecfc60fe4869c328b872540d04e0f7 numarray-1.5.2.tar.gz 1196014 +RMD160 51cc7681958cada32c515872e8def6fc0ff296ca numarray-1.5.2.tar.gz 1196014 +SHA256 6f6dc1a348c2fa32b2179717f3b3af4ddf60e9a3417739d325f344eb8f243174 numarray-1.5.2.tar.gz 1196014 +MD5 c7b23442b8ead6aa7521f27049c41deb numarray-1.5.html.tar.gz 203409 +RMD160 361850242a04efea59befe7e05dd9cb6fa1cb457 numarray-1.5.html.tar.gz 203409 +SHA256 55d6322e83d78d6f0961ae563bf81602214fb44d47929a212f0342fb579346a6 numarray-1.5.html.tar.gz 203409 diff --git a/dev-python/numarray/numarray-1.5.2-r1.ebuild b/dev-python/numarray/numarray-1.5.2-r1.ebuild new file mode 100644 index 000000000..277ca7ae4 --- /dev/null +++ b/dev-python/numarray/numarray-1.5.2-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit distutils fortran + +DESCRIPTION="Large array processing extension module for Python" +SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz +doc? mirror://sourceforge/numpy/${PN}-1.5.html.tar.gz" +HOMEPAGE="http://www.stsci.edu/resources/software_hardware/numarray" +DEPEND=">=dev-lang/python-2.3 + lapack? ( virtual/lapack )" +IUSE="doc lapack" +SLOT="0" +KEYWORDS="~amd64 ~x86" +LICENSE="BSD" + +FORTRAN="gfortran g77" + +pkg_setup() { + use lapack && fortran_pkg_setup +} + +src_unpack() { + unpack ${A} + use doc && mv ${PN}-1.5 html + # include Python.h from header files using the PyObject_HEAD macro. + epatch "${FILESDIR}"/${P}-includes.patch + + # fix Makefile for html docs + epatch "${FILESDIR}"/${P}-html.patch + + # fix hard-coded path in numinclude + epatch "${FILESDIR}"/${P}-numinclude.patch + + cd "${S}" + if use lapack; then + fortran_src_unpack + sed -i \ + -e '/^if USE_LAPACK:/iUSE_LAPACK=True' \ + -e "s:/usr/local/lib/atlas:/usr/$(get_libdir):g" \ + -e 's:/usr/local/include/atlas:/usr/include/atlas:g' \ + -e 's:f77blas:blas:g' \ + cfg_packages.py + # fix gfortran for > gcc-4 + if [[ ${FORTRANC} == gfortran ]]; then + sed -i \ + -e "s:g2c:gfortran:g" \ + cfg_packages.py + fi + fi +} + +src_install() { + distutils_src_install + dodoc Doc/*.txt LICENSE.txt Doc/release_notes/ANNOUNCE-${PV:0:3} + if use doc; then + insinto /usr/share/doc/${PF} + doins -r Examples + dohtml ${WORKDIR}/html + fi +} diff --git a/dev-python/numarray/numarray-1.5.2.ebuild b/dev-python/numarray/numarray-1.5.2.ebuild deleted file mode 100644 index 4b4d64ce7..000000000 --- a/dev-python/numarray/numarray-1.5.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit distutils fortran - -DESCRIPTION="Large array processing extension module for Python" -SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz -doc? mirror://sourceforge/numpy/${PN}-1.5.html.tar.gz" -HOMEPAGE="http://www.stsci.edu/resources/software_hardware/numarray" -DEPEND=">=dev-lang/python-2.3 - lapack? ( sci-libs/blas-atlas virtual/lapack )" -IUSE="doc lapack" -SLOT="0" -KEYWORDS="~amd64 ~x86" -LICENSE="BSD" - -FORTRAN="gfortran g77" - -# USE_LAPACK does not get exported to distutils_src_compile -# if not outside subroutines -use lapack && export USE_LAPACK=1 - -pkg_setup() { - use lapack && fortran_pkg_setup -} - -src_unpack() { - unpack ${A} - use doc && mv ${PN}-1.5 html - # various patches inspired from Debian packaging. - # include Python.h from header files using the PyObject_HEAD macro. - epatch "${FILESDIR}"/${P}-includes.patch - - # fix Makefile for html docs - epatch "${FILESDIR}"/${P}-html.patch - - # fix hard-coded path in numinclude - epatch "${FILESDIR}"/${P}-numinclude.patch - - cd ${S} - if use lapack; then - fortran_src_unpack - local myblas="/usr/$(get_libdir)/blas/atlas" - [ -d "/usr/$(get_libdir)/blas/threaded-atlas" ] && \ - myblas=${myblas/threaded-/} - # fix default location and lib names - sed -i \ - -e 's:/usr/local/lib/atlas:${myblas}:g' \ - -e 's:/usr/local/include/atlas:/usr/include/atlas:g' \ - -e 's:f77blas:blas:g' \ - cfg_packages.py - # fix gfortran for > gcc-4 - if [[ ${FORTRANC} == gfortran ]]; then - sed -i \ - -e "s:g2c:gfortran:g" \ - cfg_packages.py - fi - fi -} - -src_install() { - distutils_src_install - dodoc Doc/*.txt LICENSE.txt Doc/release_notes/ANNOUNCE-${PV:0:3} - if use doc; then - insinto /usr/share/doc/${PF} - doins -r Examples - dohtml ${WORKDIR}/html - fi -} -- cgit v1.2.3-18-g5258