Version bump.

Package-Manager: portage-2.1.2.2

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 5b23dc2267fe7baab17b99c5e58ff229a5a0d190..b7a0b2b5a5db2a9dcced90a8f9251ab2effe3a90 100644 (file)
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.21 2007/03/06 10:06:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.22 2007/04/05 10:32:11 bicatali Exp $
+
+*numpy-1.0.2 (05 Apr 2007)
+
+  05 Apr 2007; Sébastien Fabbro <bicatali@gentoo.org> +numpy-1.0.2.ebuild:
+  Version bump. Closing #173359.
 
   06 Mar 2007; Sébastien Fabbro <bicatali@gentoo.org>
   numpy-1.0.1-r1.ebuild:

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index f1ce4a2164e33e1de7bd522c4e9a689c5813536d..634bf81a379f589b2bf41ed50ed8eccbdf303c52 100644 (file)
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -11,6 +11,7 @@ RMD160 4a02205910231c3b08ae919a45facc21dd2818ae files/numpy-1.0.1-f2py.patch 140
 SHA256 746b437aff172764a238bb75d6a5b7b0547113c8a256721cf4bec2b1819bcf51 files/numpy-1.0.1-f2py.patch 1403
 DIST numpy-0.9.8.tar.gz 985088 RMD160 6059d103ae0c89f946da906f0cddcb9cd1f6b59b SHA1 d468f66849f8672a611004a64726fc6ea7195c83 SHA256 1cac3bb08d5a64b9877eb458b7235bf33bdb591136cb08e4561b6210756750c1
 DIST numpy-1.0.1.tar.gz 1249684 RMD160 f3a0c55aa5add8c93f91eee1bb05ff555c0f2485 SHA1 d6d20a32d2386ea32582d497d123211a98441c4e SHA256 c90d6f0ced132ef5bcd0b2791e0697bef6d92de45c2c591ea472d9f795757067
+DIST numpy-1.0.2.tar.gz 1400121 RMD160 e41ade8e070357cef5ea65f56ac883e0d3a5cef3 SHA1 969145c2ac910734c261f139884ca8f3084a3ea6 SHA256 1f253c7482895f7ec95cb57f5f412eafcf3be23eaebdb7d1b7bbcc2c8a65c226
 EBUILD numpy-0.9.8.ebuild 1557 RMD160 536add2de5a6c0fe7ac2a1ef39788b074bfb0b0b SHA1 2e7e3d8e0160fba6f6bdf273a0a990069559f4dc SHA256 6149347b0833687ffc279ac04eb163ac004363308e047f27fbd10b4a718a4458
 MD5 77c55bc35c89e312fd945a4ffdbfaaa0 numpy-0.9.8.ebuild 1557
 RMD160 536add2de5a6c0fe7ac2a1ef39788b074bfb0b0b numpy-0.9.8.ebuild 1557
@@ -23,10 +24,14 @@ EBUILD numpy-1.0.1.ebuild 2271 RMD160 fd436cc29e0389f1d2246a9340c23024246f0ecb S
 MD5 62f4ec838aed7d95ba701c229ef98964 numpy-1.0.1.ebuild 2271
 RMD160 fd436cc29e0389f1d2246a9340c23024246f0ecb numpy-1.0.1.ebuild 2271
 SHA256 067aff264eccb0d9465715a91960c9f070ea04c1b1f1bd4500800aaec56a6af1 numpy-1.0.1.ebuild 2271
-MISC ChangeLog 3994 RMD160 e3476acbfc5fc0d98693c7280696039a88549623 SHA1 366e8a95ceed4dbed25031d88cf33fa935f4d654 SHA256 b1a667becce2e678dc3e14f90fa1551a0ab0e08acbec54cd848ad789fe62fec5
-MD5 c0ef9177b3991f99953867ace74affe5 ChangeLog 3994
-RMD160 e3476acbfc5fc0d98693c7280696039a88549623 ChangeLog 3994
-SHA256 b1a667becce2e678dc3e14f90fa1551a0ab0e08acbec54cd848ad789fe62fec5 ChangeLog 3994
+EBUILD numpy-1.0.2.ebuild 3827 RMD160 5a01d822b8b9a8b7800274419d5fd09103a057ee SHA1 13600590172c8728c92cb8c4b30dbfd88da7215e SHA256 cedecaac27ee87f2d27b0254d2309a265d9d6a33b3ddfdb909f234b29056650d
+MD5 d7a4bab5fceaf101c9ee91125eb45b5b numpy-1.0.2.ebuild 3827
+RMD160 5a01d822b8b9a8b7800274419d5fd09103a057ee numpy-1.0.2.ebuild 3827
+SHA256 cedecaac27ee87f2d27b0254d2309a265d9d6a33b3ddfdb909f234b29056650d numpy-1.0.2.ebuild 3827
+MISC ChangeLog 4132 RMD160 2f74fee9e93e69d56e6378f4cf6b3a6ad062d10a SHA1 657dfe48ffa618b4943bf051aad9391faaa8f3dc SHA256 32cd7678a68e77c8a38821fc090ae2f4a7b9a37fd57bd046f0b12382b942b590
+MD5 c090dc45c7ec9bb9f2cc9a92fd32b00b ChangeLog 4132
+RMD160 2f74fee9e93e69d56e6378f4cf6b3a6ad062d10a ChangeLog 4132
+SHA256 32cd7678a68e77c8a38821fc090ae2f4a7b9a37fd57bd046f0b12382b942b590 ChangeLog 4132
 MISC metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 SHA1 c2580aa1116f9f96b8d7901ab95b37a653d0fc56 SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640
 MD5 d623311ce8175e55bcb5e2a9750b5cd4 metadata.xml 747
 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 metadata.xml 747
@@ -40,10 +45,13 @@ SHA256 683c8162153610de363d0aa90c583e5e83f4bb8fc815d6e0310c43f76cc19faa files/di
 MD5 03507ab77c28afe5e3f47d2f3e5ee2f7 files/digest-numpy-1.0.1-r1 238
 RMD160 ea629f31974cb85325a558a41a3c5f8500cf636e files/digest-numpy-1.0.1-r1 238
 SHA256 683c8162153610de363d0aa90c583e5e83f4bb8fc815d6e0310c43f76cc19faa files/digest-numpy-1.0.1-r1 238
+MD5 535d302508710304443438f779827095 files/digest-numpy-1.0.2 238
+RMD160 4349071c6a482a9f909bfafd78e67f70a2267461 files/digest-numpy-1.0.2 238
+SHA256 fdf8dbbba130187c2cc9809822827c4bf407b48b9bd0006f1170ada3c399ca28 files/digest-numpy-1.0.2 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF7T0VWc/Ciu+QQGkRAs3WAJ9v2/H66jVRda0y9fzXnhWoXVe5hgCfZU0H
-cdJf130wiOvubFR0EECTe1o=
-=GFeP
+iD8DBQFGFNA01ycZbhPLE2ARAo6IAKCQNlEDv32FfsoIjn1Tf7JJ17+8+wCeKD5c
+tn5yb0jVxre8Qo5QfgISISk=
+=AmXp
 -----END PGP SIGNATURE-----

diff --git a/dev-python/numpy/files/digest-numpy-1.0.2 b/dev-python/numpy/files/digest-numpy-1.0.2
new file mode 100644 (file)
index 0000000..192a3b6
--- /dev/null
+++ b/dev-python/numpy/files/digest-numpy-1.0.2
@@ -0,0 +1,3 @@
+MD5 8be83678056ae31bfe641d35bbc181f4 numpy-1.0.2.tar.gz 1400121
+RMD160 e41ade8e070357cef5ea65f56ac883e0d3a5cef3 numpy-1.0.2.tar.gz 1400121
+SHA256 1f253c7482895f7ec95cb57f5f412eafcf3be23eaebdb7d1b7bbcc2c8a65c226 numpy-1.0.2.tar.gz 1400121

diff --git a/dev-python/numpy/numpy-1.0.2.ebuild b/dev-python/numpy/numpy-1.0.2.ebuild
new file mode 100644 (file)
index 0000000..08ee50e
--- /dev/null
+++ b/dev-python/numpy/numpy-1.0.2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.2.ebuild,v 1.1 2007/04/05 10:32:11 bicatali Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils eutils fortran
+
+MY_P=${P/_beta/b}
+MY_P=${MY_P/_}
+DESCRIPTION="Python array processing for numbers, strings, records, and objects"
+SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
+HOMEPAGE="http://numeric.scipy.org/"
+
+RDEPEND="!dev-python/f2py
+       lapack? ( || ( >=sci-libs/blas-atlas-3.7.11-r1
+                                  >=sci-libs/cblas-reference-20030223-r3 )
+                                 virtual/lapack )"
+DEPEND="${RDEPEND}
+       lapack? ( app-admin/eselect-cblas )"
+
+IUSE="lapack"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LICENSE="BSD"
+
+S="${WORKDIR}/${MY_P}"
+
+FORTRAN="g77 gfortran"
+
+numpy_configure() {
+       local mycblas
+       if use lapack; then
+               for d in $(eselect cblas show); do mycblas=${d}; done
+               if [[ -z "${mycblas/reference/}" ]] && [[ -z "${mycblas/atlas/}" ]]; then
+                       ewarn "You need to set cblas to atlas or reference. Do:"
+                       ewarn "   eselect cblas set <impl>"
+                       ewarn "where <impl> is atlas, threaded-atlas or reference"
+                       die "setup failed"
+               fi
+       fi
+       [[ -z "${F77FLAGS}" ]] && F77FLAGS="${CFLAGS}"
+       [[ -z "${FFLAGS}" ]] && FFLAGS="${F77FLAGS}"
+
+       # remove default values
+       echo "# gentoo config" > site.cfg
+
+       export BLAS=None
+       export LAPACK=None
+       export ATLAS=None
+       export PTATLAS=None
+       export MKL=None
+
+       if use lapack; then
+               echo "[blas_opt]"  >> site.cfg
+               case "${mycblas}" in
+                       reference)
+                               echo "include_dirs = /usr/include/cblas" >> site.cfg
+                               echo "libraries = blas, cblas" >> site.cfg
+                               unset BLAS
+                               ;;
+                       atlas|threaded-atlas)
+                               echo "include_dirs = /usr/include/atlas" >> site.cfg
+                               echo "libraries = blas, cblas, atlas" >> site.cfg
+                               unset ATLAS
+                               ;;
+                       *)
+                               local msg="Invalid cblas implementation: ${cblas}"
+                               eerror "${msg}"
+                               die "${msg}"
+                               ;;
+               esac
+               echo "[lapack_opt]"  >> site.cfg
+               echo "libraries = lapack" >> site.cfg
+               unset LAPACK
+       fi
+       # Map compilers to what numpy calls them (same as scipy)
+       case "${FORTRANC}" in
+               gfortran)
+                       NUMPY_FC="gnu95"
+                       ;;
+               g77)
+                       NUMPY_FC="gnu"
+                       ;;
+               g95)
+                       NUMPY_FC="g95"
+                       ;;
+               ifc|ifort)
+                       if use ia64; then
+                               NUMPY_FC="intele"
+                       elif use amd64; then
+                               NUMPY_FC="intelem"
+                       else
+                               NUMPY_FC="intel"
+                       fi
+                       ;;
+               *)
+                       local msg="Invalid Fortran compiler \'${FORTRANC}\'"
+                       eerror "${msg}"
+                       die "${msg}"
+                       ;;
+       esac
+       export NUMPY_FC
+       # http://projects.scipy.org/scipy/numpy/ticket/182
+       # Can't set LDFLAGS
+       unset LDFLAGS
+}
+
+src_unpack() {
+       fortran_src_unpack
+       cd "${S}"
+       # fix some paths and docs in f2py
+       epatch "${FILESDIR}"/${PN}-1.0.1-f2py.patch
+
+       # gentoo patch for ATLAS library names
+       sed -i \
+               -e "s:'f77blas':'blas':g" \
+               -e "s:'ptblas':'blas':g" \
+               -e "s:'ptcblas':'cblas':g" \
+               -e "s:'lapack_atlas':'lapack':g" \
+               numpy/distutils/system_info.py
+}
+
+src_compile() {
+       numpy_configure
+       distutils_src_compile \
+           config_fc \
+           --fcompiler=${NUMPY_FC} \
+           --opt="${FFLAGS}"
+}
+
+src_test() {
+       # see comment before the distutils_src_install
+       numpy_configure
+       ${python} setup.py install \
+               --home="${S}"/test \
+               --no-compile \
+           config_fc \
+           --fcompiler=${NUMPY_FC} \
+           --opt="${FFLAGS}" || die "install test failed"
+       pushd "${S}"/test/lib*/python
+       PYTHONPATH=. "${python}" -c \
+               "import numpy as n;import sys;sys.exit(n.test(10,3))"  \
+               > test.log 2>&1
+       grep -q OK test.log || die "test failed"
+       popd
+       rm -rf test
+}
+
+src_install() {
+       # we need to do the configuring again, for some reason, the
+       # variables are not kept within setup.py functions
+       numpy_configure
+       distutils_src_install \
+           config_fc \
+           --fcompiler=${NUMPY_FC} \
+           --opt="${FFLAGS}"
+
+       docinto numpy
+       dodoc numpy/doc/*txt
+       docinto f2py
+       dodoc numpy/f2py/docs/*txt
+       doman numpy/f2py/f2py.1
+}