Version bump. Removed fortran dependencies, closing bug #186913.

Package-Manager: portage-2.1.2.12

4 files changed, 152 insertions, 8 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index e74142a523d9..2ad0f6d1b42f 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2007/07/22 15:39:58 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.35 2007/08/24 13:31:23 bicatali Exp $
+
+*numpy-1.0.3.1 (24 Aug 2007)
+
+  24 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +numpy-1.0.3.1.ebuild:
+  Version bump. Removed fortran dependencies, closing bug #186913.
+  Cleaned various configure settings.
 
   22 Jul 2007; Christian Faulhammer <opfer@gentoo.org> numpy-1.0.3.ebuild:
   stable x86, bug 180713
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 1b075229233a..1307037ae0c5 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -7,6 +7,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.2.tar.gz 1400121 RMD160 e41ade8e070357cef5ea65f56ac883e0d3a5cef3 SHA1 969145c2ac910734c261f139884ca8f3084a3ea6 SHA256 1f253c7482895f7ec95cb57f5f412eafcf3be23eaebdb7d1b7bbcc2c8a65c226
+DIST numpy-1.0.3.1.tar.gz 1500255 RMD160 ffc0ca1cc5afcdcd03b10a5537b8c702a578add9 SHA1 a1465fb4f0905568dd48510e2cb92739e483adae SHA256 15999e7c0231a5aa1cab6347c9a512cddb31e8a014c9e0232bbf6fb4849fe18d
 DIST numpy-1.0.3.tar.gz 1501279 RMD160 845e34d2d17c4dbb9cd239ab848493e3c0abd982 SHA1 1a4cf488e0549c9fda1300301ed2961f19742c8b SHA256 78519c924c0ff4ae85a005998e30c8fb02e3fc6485b1ef2e1e7610e77d1d0ffe
 EBUILD numpy-0.9.8.ebuild 1556 RMD160 aa1a91fbcc9a89e8fb7221d164ac9f4750e769aa SHA1 971b3ce16bedf05db4cb737efa47bc7499aaa953 SHA256 0fb79ea0c04a03dd0f9e2af3575ca00ff728aadd0a17f2ca2f9677c2c80fa83f
 MD5 f5fcea451b21b1ee8a4a444fd4f49a85 numpy-0.9.8.ebuild 1556
@@ -16,14 +17,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 dc41fc61041c27ae9f24532dfe6783d7eb599d92 SHA1 8c5a1fddfe75fe7393f62de9848686f50e245ae0 SHA256 d5e46d9d081f8a20dd2df4a7968b4d7f864eff243db220ed3a2680efd7a84335
+MD5 c8092d86ddf0fda69671848a83c61eaa numpy-1.0.3.1.ebuild 3245
+RMD160 dc41fc61041c27ae9f24532dfe6783d7eb599d92 numpy-1.0.3.1.ebuild 3245
+SHA256 d5e46d9d081f8a20dd2df4a7968b4d7f864eff243db220ed3a2680efd7a84335 numpy-1.0.3.1.ebuild 3245
 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 5480 RMD160 0a6e731d13fea9df8b5a637ff4087298cb388112 SHA1 032e78bd05c3a4d95fcaf42fac6e93506101cbc2 SHA256 295ae8a2ac44cccdece1e32740a8bc919cc71917e4e4b34495b06783b63a16c2
-MD5 105a9ea916e2dd3962fc135573e189a7 ChangeLog 5480
-RMD160 0a6e731d13fea9df8b5a637ff4087298cb388112 ChangeLog 5480
-SHA256 295ae8a2ac44cccdece1e32740a8bc919cc71917e4e4b34495b06783b63a16c2 ChangeLog 5480
+MISC ChangeLog 5699 RMD160 90c8ea83d4b2aac67d394486ad933831399816b1 SHA1 09212e8465276d761c50a26f3b0ef861ae4dc51e SHA256 163ce22bffad9706a63110c1e3dd0a3e3a217d70263f9276ca1662da66f3cc23
+MD5 a87db32009125bdf26f1057995ba778f ChangeLog 5699
+RMD160 90c8ea83d4b2aac67d394486ad933831399816b1 ChangeLog 5699
+SHA256 163ce22bffad9706a63110c1e3dd0a3e3a217d70263f9276ca1662da66f3cc23 ChangeLog 5699
 MISC metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 SHA1 c2580aa1116f9f96b8d7901ab95b37a653d0fc56 SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640
 MD5 d623311ce8175e55bcb5e2a9750b5cd4 metadata.xml 747
 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 metadata.xml 747
@@ -37,10 +42,13 @@ SHA256 fdf8dbbba130187c2cc9809822827c4bf407b48b9bd0006f1170ada3c399ca28 files/di
 MD5 b87e2c07e6c3c3bb706d0433b76fd13f files/digest-numpy-1.0.3 238
 RMD160 e23003195decf499f3b41226e7c03f2ddb94a5d5 files/digest-numpy-1.0.3 238
 SHA256 45949e967e8c46c03368bfb7ad3315ed6f3886ffaf298d1e64685f02c4dc5077 files/digest-numpy-1.0.3 238
+MD5 4a0084fb979743b199c94cdf50972477 files/digest-numpy-1.0.3.1 244
+RMD160 a77368b1aba15952896697b8d489deadb2251580 files/digest-numpy-1.0.3.1 244
+SHA256 7aa02605315e8fed189f8e433a66095c108e97e9b1c1641571f08233bea5484d files/digest-numpy-1.0.3.1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGo3pMNQqtfCuFneMRArfUAJ4nLlTdnEDNqQkNPsCVP7b/slEjEgCfXo80
-5xgQn3RagfgsfNVlLRhqdc4=
-=fcw4
+iD8DBQFGzt2y1ycZbhPLE2ARAhG2AJ4i94LwowDiv0Oo98RXqoaAOEGsvwCggfHf
+6vuRUjUFmzOT6iZsu1k8e4c=
+=L1GU
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/digest-numpy-1.0.3.1 b/dev-python/numpy/files/digest-numpy-1.0.3.1
new file mode 100644
index 000000000000..8522c6fef31c
--- /dev/null
+++ b/dev-python/numpy/files/digest-numpy-1.0.3.1
@@ -0,0 +1,3 @@
+MD5 3358c772f0d51dcfd78c5ee23126aff9 numpy-1.0.3.1.tar.gz 1500255
+RMD160 ffc0ca1cc5afcdcd03b10a5537b8c702a578add9 numpy-1.0.3.1.tar.gz 1500255
+SHA256 15999e7c0231a5aa1cab6347c9a512cddb31e8a014c9e0232bbf6fb4849fe18d numpy-1.0.3.1.tar.gz 1500255
diff --git a/dev-python/numpy/numpy-1.0.3.1.ebuild b/dev-python/numpy/numpy-1.0.3.1.ebuild
new file mode 100644
index 000000000000..7bfb7e9f35a0
--- /dev/null
+++ b/dev-python/numpy/numpy-1.0.3.1.ebuild
@@ -0,0 +1,126 @@
+# 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.1 2007/08/24 13:31:23 bicatali Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils eutils
+
+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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="BSD"
+
+S="${WORKDIR}/${MY_P}"
+
+# whatever LDFLAGS set will break linking
+# as reported in many tickets in http://projects.scipy.org/scipy/numpy
+LDFLAGS_sav="${LDFLAGS}"
+unset LDFLAGS
+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
+}
+
+src_unpack() {
+	unpack ${A}
+	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 \
+		|| die "sed system_info.py failed"
+
+	export BLAS=None
+	export LAPACK=None
+	export ATLAS=None
+	export PTATLAS=None
+	export MKL=None
+	use lapack && numpy_lapack_setup
+}
+
+src_test() {
+	"${python}" setup.py install \
+		--home="${S}"/test \
+		--no-compile \
+		|| die "install test failed"
+
+	pushd "${S}"/test/lib*/python
+	PYTHONPATH=. "${python}" -c "import numpy; numpy.test(10,3)" 2>&1 \
+		| tee test.log
+	grep -q '^OK$' test.log || die "test failed"
+	popd
+
+_	rm -rf test
+}
+
+
+src_install() {
+	distutils_src_install
+
+	docinto numpy
+	dodoc numpy/doc/*txt || die "dodoc failed"
+
+	docinto f2py
+	dodoc numpy/f2py/docs/*txt || die "dodoc f2py failed"
+	doman numpy/f2py/f2py.1 || die "doman failed"
+}
+
+pkg_postinst() {
+	if ! built_with_use sys-devel/gcc fortran && ! has_version dev-lang/ifc; then
+		ewarn "To use numpy's f2py you need a fortran compiler."
+		ewarn "You can either set USE=fortran flag and re-emerge gcc,"
+		ewarn "or emerge dev-lang/ifc"
+	fi
+}