diff options
| -rw-r--r-- | dev-python/numeric/Manifest | 30 | ||||
| -rw-r--r-- | dev-python/numpy/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/numpy/Manifest | 22 | ||||
| -rw-r--r-- | dev-python/numpy/numpy-1.0.3.1.ebuild | 62 |
4 files changed, 54 insertions, 65 deletions
diff --git a/dev-python/numeric/Manifest b/dev-python/numeric/Manifest index d141eda2a0d5..219fd9c06b17 100644 --- a/dev-python/numeric/Manifest +++ b/dev-python/numeric/Manifest @@ -45,22 +45,22 @@ EBUILD numeric-23.8.ebuild 866 RMD160 2e135c4fc62dcd8c7962a75ccc61c840c8438b39 S MD5 c641bcf12a746279a3247e8a1840e65a numeric-23.8.ebuild 866 RMD160 2e135c4fc62dcd8c7962a75ccc61c840c8438b39 numeric-23.8.ebuild 866 SHA256 27c3dc03b21c2ffc151f119968f89161558169926aa54be03124248644ebd56c numeric-23.8.ebuild 866 -EBUILD numeric-24.2-r5.ebuild 1554 RMD160 f2d9fa8a4680ac21a2062afead64a686f8360537 SHA1 c603393fc2a5cc4aef9cb77332ce5dc9dd405ce4 SHA256 e991aa6e001ef9de14319c6c87f1a206309d8fbb28df6790b55d6bf22c5f313d -MD5 a416ee0d041cbee92dc7bfa622ee05f3 numeric-24.2-r5.ebuild 1554 -RMD160 f2d9fa8a4680ac21a2062afead64a686f8360537 numeric-24.2-r5.ebuild 1554 -SHA256 e991aa6e001ef9de14319c6c87f1a206309d8fbb28df6790b55d6bf22c5f313d numeric-24.2-r5.ebuild 1554 -EBUILD numeric-24.2-r6.ebuild 3389 RMD160 f5495405ab877f9dab1307a4d7687d693c9c204a SHA1 1048d2bf0c59c2fa9f83fc7d1f65ee89cb79531f SHA256 480be896fc24b3448b25f8bfd44c378450a7d6fd0d2fae7ab7f630d54713bc61 -MD5 c9af087451c44ff8fcc238ba6326fe05 numeric-24.2-r6.ebuild 3389 -RMD160 f5495405ab877f9dab1307a4d7687d693c9c204a numeric-24.2-r6.ebuild 3389 -SHA256 480be896fc24b3448b25f8bfd44c378450a7d6fd0d2fae7ab7f630d54713bc61 numeric-24.2-r6.ebuild 3389 +EBUILD numeric-24.2-r5.ebuild 1574 RMD160 43e44d5d97026a444a69d042e281bdac2c4e21f9 SHA1 77d35f6b8d99b876d1dfbe9e460da23ba27daed3 SHA256 15dfe3dca2449cfdf7c10df68c1054c482fd8d08fff5fa07e111f5d2409a7cef +MD5 f33eae73427da6340c686e444eb5df28 numeric-24.2-r5.ebuild 1574 +RMD160 43e44d5d97026a444a69d042e281bdac2c4e21f9 numeric-24.2-r5.ebuild 1574 +SHA256 15dfe3dca2449cfdf7c10df68c1054c482fd8d08fff5fa07e111f5d2409a7cef numeric-24.2-r5.ebuild 1574 +EBUILD numeric-24.2-r6.ebuild 2592 RMD160 d42bab642852c8c1e4187f413b4360c0b0561793 SHA1 a6599e436c46388bdcc19f91c55211cd9c7a1af3 SHA256 86497a79dfa7d331366d44ae5249759e0f58da669e50f3e754652348603ba370 +MD5 0f1b9e51ac5bd4894a3abe20a3d8659d numeric-24.2-r6.ebuild 2592 +RMD160 d42bab642852c8c1e4187f413b4360c0b0561793 numeric-24.2-r6.ebuild 2592 +SHA256 86497a79dfa7d331366d44ae5249759e0f58da669e50f3e754652348603ba370 numeric-24.2-r6.ebuild 2592 EBUILD numeric-24.2.ebuild 848 RMD160 a60967fc80d1900e57d198356494b2db25a413ae SHA1 f28d3654a80bc3c437a21d581f7ea7ec142cbcfd SHA256 93e209fb19b862bc914fc9b04e45bcfd0ca40c4aed2e34d41b82d15e85ba770e MD5 be3fad4c9fdf2ed413ea4fcfb24caa43 numeric-24.2.ebuild 848 RMD160 a60967fc80d1900e57d198356494b2db25a413ae numeric-24.2.ebuild 848 SHA256 93e209fb19b862bc914fc9b04e45bcfd0ca40c4aed2e34d41b82d15e85ba770e numeric-24.2.ebuild 848 -MISC ChangeLog 6902 RMD160 fc22106976b1a976890112c43c3fba411fc4ffc4 SHA1 dac3cf9fff160b474c3bf89bcc135057a8b04190 SHA256 e008aef0364184c2d61cce05e8067d4216e049c5b6a385acbe108dd14736c998 -MD5 acf8df132f063fec16b569d0cbfb61a0 ChangeLog 6902 -RMD160 fc22106976b1a976890112c43c3fba411fc4ffc4 ChangeLog 6902 -SHA256 e008aef0364184c2d61cce05e8067d4216e049c5b6a385acbe108dd14736c998 ChangeLog 6902 +MISC ChangeLog 7070 RMD160 277434a4126d2f1bbf3dadd4f0a3825d0392063c SHA1 ea5fc8c885d0bc1c60b7f7ef5577e025e50242fe SHA256 15e4da026b7deb4b8970d6a5cc8f0b152e8cab7ecc54a32b7c1cb89c84fcd18e +MD5 493f2dd4a37dad8bce4f2bf3b6d85dac ChangeLog 7070 +RMD160 277434a4126d2f1bbf3dadd4f0a3825d0392063c ChangeLog 7070 +SHA256 15e4da026b7deb4b8970d6a5cc8f0b152e8cab7ecc54a32b7c1cb89c84fcd18e ChangeLog 7070 MISC metadata.xml 541 RMD160 72132dabcdb4bf092f51e9fe632c4fa3e75bf83c SHA1 e1f11e89405fa3bf2da1b1dcee2a86f8ad7f1d43 SHA256 e2629c5f0ce5f03b5666f9169b04cc699eac40e11179c4c45aa93f32f6c9dbb7 MD5 188a2dc88446ced4e627340d892803bc metadata.xml 541 RMD160 72132dabcdb4bf092f51e9fe632c4fa3e75bf83c metadata.xml 541 @@ -83,7 +83,7 @@ SHA256 9b7f723450199e5eb5d4816af0d7504bee35ae64f9219f5b939a0cbf07470cff files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFG3ZOH1ycZbhPLE2ARAkF4AKCpQrovBUHDrCDjRgZALY4QNhVxdgCeKiDh -hLfopGOlPwNnSq1C8QQTDA8= -=c0HX +iD8DBQFHE3bm1ycZbhPLE2ARAmfXAKCCYq6ItMxkgbEeIwQ2ZmkeRgwb5ACgn393 +qSHJdxW0ADOFhiAr9Ef8YdY= +=ybnA -----END PGP SIGNATURE----- diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog index d18951c94f79..ac08451babba 100644 --- a/dev-python/numpy/ChangeLog +++ b/dev-python/numpy/ChangeLog @@ -1,6 +1,9 @@ # 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.36 2007/08/26 21:27:50 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.37 2007/10/15 14:18:26 bicatali Exp $ + + 15 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> numpy-1.0.3.1.ebuild: + Use the new virtual/cblas. 26 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> -numpy-0.9.8.ebuild: Removed old version diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index ad9d99984806..fdd51da29c4a 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -12,18 +12,18 @@ EBUILD numpy-1.0.2.ebuild 3827 RMD160 5a01d822b8b9a8b7800274419d5fd09103a057ee S MD5 d7a4bab5fceaf101c9ee91125eb45b5b numpy-1.0.2.ebuild 3827 RMD160 5a01d822b8b9a8b7800274419d5fd09103a057ee numpy-1.0.2.ebuild 3827 SHA256 cedecaac27ee87f2d27b0254d2309a265d9d6a33b3ddfdb909f234b29056650d numpy-1.0.2.ebuild 3827 -EBUILD numpy-1.0.3.1.ebuild 3245 RMD160 632db197a7bb14bad0d2f51a4a2d7ba6d9cd998d SHA1 d4bb53e0a45b13a5706fcc4489dee5aab36b3be2 SHA256 f7b3ce74520f1ca4535f876c054c6ec7df186871b73ea438100c70b97c9fda07 -MD5 f7b43e958c616d25ddc21bc06f11b9ec numpy-1.0.3.1.ebuild 3245 -RMD160 632db197a7bb14bad0d2f51a4a2d7ba6d9cd998d numpy-1.0.3.1.ebuild 3245 -SHA256 f7b3ce74520f1ca4535f876c054c6ec7df186871b73ea438100c70b97c9fda07 numpy-1.0.3.1.ebuild 3245 +EBUILD numpy-1.0.3.1.ebuild 2688 RMD160 2b91627d9bc6c9d4d92bd490b70d254072ca470d SHA1 361459c93d31a143e0eda2099cd2a021ab46a343 SHA256 f34b065976770f8dcd4a3dbb5d0ee4f7b5b028f8e1460b1f1b93bbee16440f48 +MD5 1ef9967e4fa5dd5749e22e3fbbd6efa9 numpy-1.0.3.1.ebuild 2688 +RMD160 2b91627d9bc6c9d4d92bd490b70d254072ca470d numpy-1.0.3.1.ebuild 2688 +SHA256 f34b065976770f8dcd4a3dbb5d0ee4f7b5b028f8e1460b1f1b93bbee16440f48 numpy-1.0.3.1.ebuild 2688 EBUILD numpy-1.0.3.ebuild 3863 RMD160 c27adaeef05bbb862df4677c6c3c7257200a0d79 SHA1 cbe703f9c0dca6843d86d22f0f6b09563f94f01b SHA256 1f7033c9699adc1d6b9123de534b4dded9d71c8a17c321de510169c5caa32864 MD5 32e1f3cf2e2a58fd3f80dfeda11f155f numpy-1.0.3.ebuild 3863 RMD160 c27adaeef05bbb862df4677c6c3c7257200a0d79 numpy-1.0.3.ebuild 3863 SHA256 1f7033c9699adc1d6b9123de534b4dded9d71c8a17c321de510169c5caa32864 numpy-1.0.3.ebuild 3863 -MISC ChangeLog 5834 RMD160 fa76a88b41da940a51d1d566aa745c5b611da841 SHA1 792f69e48b092dd37f8947fee5bba4d2e32b9905 SHA256 50fe260f81bc00bc601ec8621bf0c527c96f916fbce48d1b7577fb5636547f85 -MD5 7e08209122bb6359f89fc89dfee4d4fe ChangeLog 5834 -RMD160 fa76a88b41da940a51d1d566aa745c5b611da841 ChangeLog 5834 -SHA256 50fe260f81bc00bc601ec8621bf0c527c96f916fbce48d1b7577fb5636547f85 ChangeLog 5834 +MISC ChangeLog 5941 RMD160 8b5a424a5217e5fcec6a9a27fab23ef88025618b SHA1 71f21031b8cfba85c471488530458499e11c9fb7 SHA256 d2cb5ed70b276747d4be80731f1903fbb7f813f9a2b6c89929d595012f450729 +MD5 fbfb7f471721c54a9bffb628c24dcc1d ChangeLog 5941 +RMD160 8b5a424a5217e5fcec6a9a27fab23ef88025618b ChangeLog 5941 +SHA256 d2cb5ed70b276747d4be80731f1903fbb7f813f9a2b6c89929d595012f450729 ChangeLog 5941 MISC metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 SHA1 c2580aa1116f9f96b8d7901ab95b37a653d0fc56 SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640 MD5 d623311ce8175e55bcb5e2a9750b5cd4 metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 metadata.xml 747 @@ -40,7 +40,7 @@ SHA256 7aa02605315e8fed189f8e433a66095c108e97e9b1c1641571f08233bea5484d files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFG0fBb1ycZbhPLE2ARAqdyAKCI8rwF4O8c37lY5XVb5ZNr7UbM8QCfRGe4 -xRfkuwv7ckhRHSiWYbqTBzY= -=00FA +iD8DBQFHE3a41ycZbhPLE2ARAhYIAKCq6zHdEeonJR1vhEazk84Pnaq8vwCgjz94 +bfR5wb/7GZlnh+iumKuA2Hs= +=66Kg -----END PGP SIGNATURE----- diff --git a/dev-python/numpy/numpy-1.0.3.1.ebuild b/dev-python/numpy/numpy-1.0.3.1.ebuild index 3420b256d866..f93798e2803b 100644 --- a/dev-python/numpy/numpy-1.0.3.1.ebuild +++ b/dev-python/numpy/numpy-1.0.3.1.ebuild @@ -1,6 +1,6 @@ # 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.3.1.ebuild,v 1.2 2007/08/24 19:22:47 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.3.1.ebuild,v 1.3 2007/10/15 14:18:26 bicatali Exp $ NEED_PYTHON=2.3 @@ -14,11 +14,9 @@ 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 )" + lapack? ( virtual/cblas virtual/lapack )" DEPEND="${RDEPEND} - lapack? ( app-admin/eselect-cblas )" + lapack? ( dev-util/pkgconfig )" IUSE="lapack" SLOT="0" @@ -35,37 +33,13 @@ pkg_setup() { [[ -n "${LDFLAGS_sav}" ]] && einfo "Ignoring LDFLAGS=${LDFLAGS_sav}" } -numpy_lapack_setup() { - local mycblas - 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 "numpy_lapack_setup failed" - fi - - # Remove default values - 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 - ;; - *) - eerror "Invalid cblas implementation: ${cblas}" - die "numpy_lapack_setup failed" - ;; - esac - echo "[lapack_opt]" >> site.cfg - echo "libraries = lapack" >> site.cfg - unset LAPACK +# ex usage: pkgconf_cfg --libs-only-l cblas: ['cblas','atlas'] +pkgconf_cfg() { + local cfg="[" + for i in $(pkg-config "$1" "$2"); do + cfg="${cfg}'${i:2}'" + done + echo "${cfg//\'\'/','}]" } src_unpack() { @@ -87,7 +61,19 @@ src_unpack() { export ATLAS=None export PTATLAS=None export MKL=None - use lapack && numpy_lapack_setup + + if use lapack; then + unset BLAS LAPACK + cat > setup.cfg << EOF +[blas_opt] +libraries = $(pkgconf_cfg --libs-only-l cblas) +library_dirs = $(pkgconf_cfg --libs-only-L cblas) + +[lapack_opt] +libraries = $(pkgconf_cfg --libs-only-l lapack) +library_dirs = $(pkgconf_cfg --libs-only-L lapack) +EOF + fi } src_test() { @@ -102,7 +88,7 @@ src_test() { grep -q '^OK$' test.log || die "test failed" popd -_ rm -rf test + rm -rf test } src_install() { |