From: Steve Arnold Date: Wed, 31 Jan 2007 08:36:28 +0000 (+0000) Subject: bumped to latest full release and cleaned up rc and beta ebuilds X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c7aff600676cde08b0be4e5647943dc2397c5f6;p=gentoo.git bumped to latest full release and cleaned up rc and beta ebuilds Package-Manager: portage-2.1.2-r4 --- diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog index 72840dc9b85b..1a81736725b4 100644 --- a/dev-python/numpy/ChangeLog +++ b/dev-python/numpy/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/numpy -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.16 2006/09/26 07:52:55 dberkholz Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.17 2007/01/31 08:36:28 nerdboy Exp $ + +*numpy-1.0.1 (31 Jan 2007) + + 31 Jan 2007; Steve Arnold -numpy-1.0_beta2.ebuild, + -numpy-1.0_rc1.ebuild, +numpy-1.0.1.ebuild: + Bumped to latest full release and cleaned up rc and beta ebuilds (bug + 154275). 26 Sep 2006; Donnie Berkholz ; numpy-0.9.8.ebuild: Stable on ppc. diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index ed802f4b7bd9..2afef3ebfbe5 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -1,22 +1,17 @@ DIST numpy-0.9.8.tar.gz 985088 RMD160 6059d103ae0c89f946da906f0cddcb9cd1f6b59b SHA1 d468f66849f8672a611004a64726fc6ea7195c83 SHA256 1cac3bb08d5a64b9877eb458b7235bf33bdb591136cb08e4561b6210756750c1 -DIST numpy-1.0b2.tar.gz 1094555 RMD160 1d0e90d87af7711ff7d7bea3e4270a41738d7dd4 SHA1 79592226424abd670dda1a0a69a24b5a1f256f33 SHA256 8f7ee8b75349102170169c1ca6c652341708d9137a35196d6505dd47ea608f49 -DIST numpy-1.0rc1.tar.gz 1120453 RMD160 2a08da4e7f9ea9c5ff8f43d3af63bd2af1218704 SHA1 3a046507eaee5c75c2808c8b726e089196efea35 SHA256 af994dacc3e58beb51876b6d465fe5ca7435d945475ce382388453070102bb5c +DIST numpy-1.0.1.tar.gz 1249684 RMD160 f3a0c55aa5add8c93f91eee1bb05ff555c0f2485 SHA1 d6d20a32d2386ea32582d497d123211a98441c4e SHA256 c90d6f0ced132ef5bcd0b2791e0697bef6d92de45c2c591ea472d9f795757067 EBUILD numpy-0.9.8.ebuild 1558 RMD160 572d8e2a877058ddbe6d7122b63fb9eda54395bb SHA1 6aba9d2b0a9b5366371f21c0b17dbe0254e24c4d SHA256 28094a1c7f8c998f24f69989fd2975ae877bdcfb09e41958ae69473c208f9e54 MD5 5baea7516f0bd9858c2ffa8adb123f9a numpy-0.9.8.ebuild 1558 RMD160 572d8e2a877058ddbe6d7122b63fb9eda54395bb numpy-0.9.8.ebuild 1558 SHA256 28094a1c7f8c998f24f69989fd2975ae877bdcfb09e41958ae69473c208f9e54 numpy-0.9.8.ebuild 1558 -EBUILD numpy-1.0_beta2.ebuild 1480 RMD160 70b8981e0349ec31a8b1ed688b62282fb1302059 SHA1 f55df5efaf347eb0036977f32c54908521e7b4f2 SHA256 ff3473cadc168ac1ba4eecf63d676304a2857f1e32aa776c20a3eec2d04c70a3 -MD5 020102f39ee36fa80fa7dbe85fcceb3f numpy-1.0_beta2.ebuild 1480 -RMD160 70b8981e0349ec31a8b1ed688b62282fb1302059 numpy-1.0_beta2.ebuild 1480 -SHA256 ff3473cadc168ac1ba4eecf63d676304a2857f1e32aa776c20a3eec2d04c70a3 numpy-1.0_beta2.ebuild 1480 -EBUILD numpy-1.0_rc1.ebuild 1493 RMD160 efaf3384ce910c4d5c8aaa11c7c1bf719d46e02e SHA1 7a61591a0b41d4b0813662bfcd2ae4b71ce1d660 SHA256 b032a1448447f58dcde200d626d6a52488a04428e80557c7e76550373d9d3be9 -MD5 d6a4a39100c02f44101f2d6d3750f14c numpy-1.0_rc1.ebuild 1493 -RMD160 efaf3384ce910c4d5c8aaa11c7c1bf719d46e02e numpy-1.0_rc1.ebuild 1493 -SHA256 b032a1448447f58dcde200d626d6a52488a04428e80557c7e76550373d9d3be9 numpy-1.0_rc1.ebuild 1493 -MISC ChangeLog 2876 RMD160 dfaace8951364e3420644c3a62153c0cb8a25d1e SHA1 6bcbcd22a4086f09a2fb4aa89f8be4a8e35db303 SHA256 e4fa28adb2d19094788cb7e28b6050c02f454849ca55d86a52546828d9ea41a3 -MD5 30adb3359edddd5aebf46fa40e2fbfd6 ChangeLog 2876 -RMD160 dfaace8951364e3420644c3a62153c0cb8a25d1e ChangeLog 2876 -SHA256 e4fa28adb2d19094788cb7e28b6050c02f454849ca55d86a52546828d9ea41a3 ChangeLog 2876 +EBUILD numpy-1.0.1.ebuild 2271 RMD160 b436411a245ca0f3dca4483151ad445a205968f5 SHA1 709d73c1894a351ee8c0d99bae78d9e8273fdee3 SHA256 75bfc0bcdc2bc9a71e9c060cbbdeb3bc7a04d745fa15c4749ed204307e9416f5 +MD5 5426724393ecc4634d021313901903a0 numpy-1.0.1.ebuild 2271 +RMD160 b436411a245ca0f3dca4483151ad445a205968f5 numpy-1.0.1.ebuild 2271 +SHA256 75bfc0bcdc2bc9a71e9c060cbbdeb3bc7a04d745fa15c4749ed204307e9416f5 numpy-1.0.1.ebuild 2271 +MISC ChangeLog 3106 RMD160 479bbdbad5bb2b6779e8b2f4d78032912ebbf1a5 SHA1 67ce4f8db20f16335feabaf3cb9aca8dd4248348 SHA256 6ff2f4b7ccb96ac698c667588f422c36d3fd168bb1175d45167c5eaeea65c194 +MD5 a606f01f6a0be7251dd5b7f71707bbb9 ChangeLog 3106 +RMD160 479bbdbad5bb2b6779e8b2f4d78032912ebbf1a5 ChangeLog 3106 +SHA256 6ff2f4b7ccb96ac698c667588f422c36d3fd168bb1175d45167c5eaeea65c194 ChangeLog 3106 MISC metadata.xml 617 RMD160 fcb64d876af5dffc1a1cc308f6e76a3ff3525244 SHA1 5e056fcc834226a96a9a7197ba2f2c0c076634d5 SHA256 eda38840db709ec1460753d542150351bcd8eaf235fcd58252e45712d64cad6a MD5 9251edbaa605d72f2c04cc0a5b4f9a84 metadata.xml 617 RMD160 fcb64d876af5dffc1a1cc308f6e76a3ff3525244 metadata.xml 617 @@ -24,9 +19,6 @@ SHA256 eda38840db709ec1460753d542150351bcd8eaf235fcd58252e45712d64cad6a metadata MD5 a69679bccfb83100a3547c07b19bd72d files/digest-numpy-0.9.8 235 RMD160 8a348d126eee1dffdfcda72fe0e898faeb633801 files/digest-numpy-0.9.8 235 SHA256 5b8e9c649439c0084103ace433c75d26c1e2aa05fefddc972d8716240db48da3 files/digest-numpy-0.9.8 235 -MD5 4b8e3bcc315818ad632e5fcd2798ba07 files/digest-numpy-1.0_beta2 238 -RMD160 829d985c78e7f827b7adffad467b6330dd0430fb files/digest-numpy-1.0_beta2 238 -SHA256 35784bdf6522a90d13fde72e9b275c6a2c9267009e747a0fa6688312420974eb files/digest-numpy-1.0_beta2 238 -MD5 363ee21807073a4c1856406d9329da06 files/digest-numpy-1.0_rc1 241 -RMD160 837662dd5186dd43661e80cffc2483c53a576078 files/digest-numpy-1.0_rc1 241 -SHA256 316e9d16de5ef3a1630514cba947a652f78d66cec040ad153e76ae67c1bdc9c8 files/digest-numpy-1.0_rc1 241 +MD5 03507ab77c28afe5e3f47d2f3e5ee2f7 files/digest-numpy-1.0.1 238 +RMD160 ea629f31974cb85325a558a41a3c5f8500cf636e files/digest-numpy-1.0.1 238 +SHA256 683c8162153610de363d0aa90c583e5e83f4bb8fc815d6e0310c43f76cc19faa files/digest-numpy-1.0.1 238 diff --git a/dev-python/numpy/files/digest-numpy-1.0.1 b/dev-python/numpy/files/digest-numpy-1.0.1 new file mode 100644 index 000000000000..6bfc0c7d6798 --- /dev/null +++ b/dev-python/numpy/files/digest-numpy-1.0.1 @@ -0,0 +1,3 @@ +MD5 13a29244cbe03e0d45e56d8d90ecb55d numpy-1.0.1.tar.gz 1249684 +RMD160 f3a0c55aa5add8c93f91eee1bb05ff555c0f2485 numpy-1.0.1.tar.gz 1249684 +SHA256 c90d6f0ced132ef5bcd0b2791e0697bef6d92de45c2c591ea472d9f795757067 numpy-1.0.1.tar.gz 1249684 diff --git a/dev-python/numpy/files/digest-numpy-1.0_beta2 b/dev-python/numpy/files/digest-numpy-1.0_beta2 deleted file mode 100644 index 9643ac5b3567..000000000000 --- a/dev-python/numpy/files/digest-numpy-1.0_beta2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6aa929f8156b3fa2fc230a10ccef3353 numpy-1.0b2.tar.gz 1094555 -RMD160 1d0e90d87af7711ff7d7bea3e4270a41738d7dd4 numpy-1.0b2.tar.gz 1094555 -SHA256 8f7ee8b75349102170169c1ca6c652341708d9137a35196d6505dd47ea608f49 numpy-1.0b2.tar.gz 1094555 diff --git a/dev-python/numpy/files/digest-numpy-1.0_rc1 b/dev-python/numpy/files/digest-numpy-1.0_rc1 deleted file mode 100644 index cfd1544248e5..000000000000 --- a/dev-python/numpy/files/digest-numpy-1.0_rc1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b8cd486ee334520047f9a35454dad94a numpy-1.0rc1.tar.gz 1120453 -RMD160 2a08da4e7f9ea9c5ff8f43d3af63bd2af1218704 numpy-1.0rc1.tar.gz 1120453 -SHA256 af994dacc3e58beb51876b6d465fe5ca7435d945475ce382388453070102bb5c numpy-1.0rc1.tar.gz 1120453 diff --git a/dev-python/numpy/numpy-1.0_rc1.ebuild b/dev-python/numpy/numpy-1.0.1.ebuild similarity index 52% rename from dev-python/numpy/numpy-1.0_rc1.ebuild rename to dev-python/numpy/numpy-1.0.1.ebuild index b91c92ac92b5..b230cfb2ba2a 100644 --- a/dev-python/numpy/numpy-1.0_rc1.ebuild +++ b/dev-python/numpy/numpy-1.0.1.ebuild @@ -1,55 +1,99 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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_rc1.ebuild,v 1.3 2006/09/24 01:03:17 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.1.ebuild,v 1.1 2007/01/31 08:36:28 nerdboy Exp $ -inherit distutils +inherit distutils fortran MY_P=${P/_beta/b} MY_P=${MY_P/_} DESCRIPTION="Multi-dimensional array object and processing for Python." SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz" HOMEPAGE="http://numeric.scipy.org/" + # numpy provides the latest version of dev-python/f2py DEPEND=">=dev-lang/python-2.3 !dev-python/f2py lapack? ( virtual/blas virtual/lapack )" + IUSE="lapack" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" LICENSE="BSD" RESTRICT="test" S="${WORKDIR}/${MY_P}" +FORTRAN="g77 gfortran" + src_unpack() { unpack ${A} cd "${S}" # sed to patch ATLAS libraries names (gentoo specific) 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 if use lapack; then echo "[atlas]" > site.cfg echo "include_dirs = /usr/include/atlas" >> site.cfg echo "atlas_libs = lapack, blas, cblas, atlas" >> site.cfg - echo -n "library_dirs = /usr/$(get_libdir)/lapack:" >> site.cfg + echo -n "library_dirs = /usr/$(get_libdir)/lapack::/usr/$(get_libdir):" \ + >> site.cfg if [ -d "/usr/$(get_libdir)/blas/threaded-atlas" ]; then echo "/usr/$(get_libdir)/blas/threaded-atlas" >> site.cfg else echo "/usr/$(get_libdir)/blas/atlas" >> site.cfg fi - else - export ATLAS=None fi } src_compile() { + # Map compilers to what numpy calls them (same as scipy) + local NUMPY_FC + case "${FORTRANC}" in + gfortran) + NUMPY_FC="gnu95" + ;; + g77) + NUMPY_FC="gnu" + ;; + g95) + NUMPY_FC="g95" + ;; + ifc|ifort) + if use ia64; then + NUMPY_FC="intele" + else + NUMPY_FC="intel" + fi + ;; + *) + local msg="Invalid Fortran compiler \'${FORTRANC}\'" + eerror "${msg}" + die "${msg}" + ;; + esac + + if !(use lapack); then + rm -f site.cfg + export BLAS=None + export LAPACK=None + export ATLAS=None + fi + # http://projects.scipy.org/scipy/numpy/ticket/182 # Can't set LDFLAGS unset LDFLAGS + export F77LFLAGS="${F77LFLAGS} -fPIC" - distutils_src_compile + distutils_src_compile \ + config_fc \ + --fcompiler=${NUMPY_FC} \ + --opt="${CFLAGS}" \ + || die "compilation failed" } src_install() { diff --git a/dev-python/numpy/numpy-1.0_beta2.ebuild b/dev-python/numpy/numpy-1.0_beta2.ebuild deleted file mode 100644 index 975f92081d4a..000000000000 --- a/dev-python/numpy/numpy-1.0_beta2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0_beta2.ebuild,v 1.4 2006/09/24 01:03:17 dberkholz Exp $ - -inherit distutils - -MY_P=${P/_beta/b} -DESCRIPTION="Multi-dimensional array object and processing for Python." -SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz" -HOMEPAGE="http://numeric.scipy.org/" -# numpy provides the latest version of dev-python/f2py -DEPEND=">=dev-lang/python-2.3 - !dev-python/f2py - lapack? ( virtual/blas - virtual/lapack )" -IUSE="lapack" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -LICENSE="BSD" -RESTRICT="test" -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - # sed to patch ATLAS libraries names (gentoo specific) - sed -i \ - -e "s:f77blas:blas:g" \ - numpy/distutils/system_info.py - - if use lapack; then - echo "[atlas]" > site.cfg - echo "include_dirs = /usr/include/atlas" >> site.cfg - echo "atlas_libs = lapack, blas, cblas, atlas" >> site.cfg - echo -n "library_dirs = /usr/$(get_libdir)/lapack:" >> site.cfg - if [ -d "/usr/$(get_libdir)/blas/threaded-atlas" ]; then - echo "/usr/$(get_libdir)/blas/threaded-atlas" >> site.cfg - else - echo "/usr/$(get_libdir)/blas/atlas" >> site.cfg - fi - else - export ATLAS=None - fi -} - -src_compile() { - # http://projects.scipy.org/scipy/numpy/ticket/182 - # Can't set LDFLAGS - unset LDFLAGS - - distutils_src_compile -} - -src_install() { - distutils_src_install - dodoc numpy/doc/* -}