Added a patch for freebsd, thanks to Joe Peterson <joe@skyrush.com> . Removed array_protocol tests, buggy with various numeric/numpy versions. Thanks to Diego Pettenò <flameeyes@gentoo.org> for reporting.

Package-Manager: portage-2.1.2.7

4 files changed, 71 insertions, 23 deletions

diff --git a/dev-python/numarray/ChangeLog b/dev-python/numarray/ChangeLog
index 462d48303399..562640ccf6d6 100644
--- a/dev-python/numarray/ChangeLog
+++ b/dev-python/numarray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/numarray
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/ChangeLog,v 1.25 2007/05/24 16:29:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/ChangeLog,v 1.26 2007/05/29 15:33:57 bicatali Exp $
+
+  29 May 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/numarray-1.5.2-freebsd.patch, numarray-1.5.2-r1.ebuild:
+  Added a patch for freebsd, thanks to Joe Peterson <joe@skyrush.com> .
+  Removed array_protocol tests, buggy with various numeric/numpy versions.
+  Thanks to Diego Pettenò <flameeyes@gentoo.org> for reporting.
 
   24 May 2007; Diego Pettenò <flameeyes@gentoo.org>
   numarray-1.5.2-r1.ebuild:
diff --git a/dev-python/numarray/Manifest b/dev-python/numarray/Manifest
index e2315f7c2265..d3f8e31b4e47 100644
--- a/dev-python/numarray/Manifest
+++ b/dev-python/numarray/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX numarray-1.5.2-freebsd.patch 805 RMD160 48813fe9590f7dadbe808c58dcc2095fde0f63c4 SHA1 2440851910c70d368da3ebffe038e8f3dc8afaf0 SHA256 03704871fe9dfcfe7dea85814bafaacfe35524084c9233f50c7e1398202b771f
+MD5 b22c487ddb2b299b22ca70be56bc37ba files/numarray-1.5.2-freebsd.patch 805
+RMD160 48813fe9590f7dadbe808c58dcc2095fde0f63c4 files/numarray-1.5.2-freebsd.patch 805
+SHA256 03704871fe9dfcfe7dea85814bafaacfe35524084c9233f50c7e1398202b771f files/numarray-1.5.2-freebsd.patch 805
 AUX numarray-1.5.2-includes.patch 1763 RMD160 24bb7992e8e898b00ab90b7e82120eb7c7b2ba4c SHA1 f822dc2c202c36b2dcfbdbe83408b165b1aa9c13 SHA256 02016cf4b2038aff9cd8a6bc388da7dd2e461ef28b869c47f642a8a31033c6d5
 MD5 98e007f8a6b5d0805b02bd2de59b7749 files/numarray-1.5.2-includes.patch 1763
 RMD160 24bb7992e8e898b00ab90b7e82120eb7c7b2ba4c files/numarray-1.5.2-includes.patch 1763
@@ -31,14 +35,14 @@ EBUILD numarray-1.5.1.ebuild 740 RMD160 8be3e134127a45fe5571ee0908cc1d6bade49abc
 MD5 dd91203b6006c2f73c3dd3213ec54cf7 numarray-1.5.1.ebuild 740
 RMD160 8be3e134127a45fe5571ee0908cc1d6bade49abc numarray-1.5.1.ebuild 740
 SHA256 adb574deeb3da29cbab3ae2bbddb2004062247ec7bc2d705f5a2bcd6b4192428 numarray-1.5.1.ebuild 740
-EBUILD numarray-1.5.2-r1.ebuild 2966 RMD160 4053a0996a8a91a0ada570a0bbd6618c9b16d2db SHA1 477ca353372bcabb45dee8dd0475cf80444e52d0 SHA256 8f9f5b2c02ab43d000adcf4a1a35176390325735605c073f6a9669b22df37eb4
-MD5 6c4166928ea66935c667563cf79ae265 numarray-1.5.2-r1.ebuild 2966
-RMD160 4053a0996a8a91a0ada570a0bbd6618c9b16d2db numarray-1.5.2-r1.ebuild 2966
-SHA256 8f9f5b2c02ab43d000adcf4a1a35176390325735605c073f6a9669b22df37eb4 numarray-1.5.2-r1.ebuild 2966
-MISC ChangeLog 3772 RMD160 88cd919c98b237197b653be4470383e8f20253f1 SHA1 0225ca59d613d9bbd9469c1d930aac9b757dd08e SHA256 468308f579444ac20e8b348183f27ce7882e31321c290bbf69e4fa95ce8f6d60
-MD5 4d9c5d4c1ad889a6cf82af757670afa7 ChangeLog 3772
-RMD160 88cd919c98b237197b653be4470383e8f20253f1 ChangeLog 3772
-SHA256 468308f579444ac20e8b348183f27ce7882e31321c290bbf69e4fa95ce8f6d60 ChangeLog 3772
+EBUILD numarray-1.5.2-r1.ebuild 3594 RMD160 6134e3f90224dd8bb0f825f78dde463f7e138a96 SHA1 abc4429e51601f83f7c6ba12a2813a988ad5ff3f SHA256 7d4860137e75dd299f97446c291f6ff4da0b6adfe02e825f9a9b5208bda7c5b4
+MD5 8b92f58b164dd7562928d836e727e05a numarray-1.5.2-r1.ebuild 3594
+RMD160 6134e3f90224dd8bb0f825f78dde463f7e138a96 numarray-1.5.2-r1.ebuild 3594
+SHA256 7d4860137e75dd299f97446c291f6ff4da0b6adfe02e825f9a9b5208bda7c5b4 numarray-1.5.2-r1.ebuild 3594
+MISC ChangeLog 4104 RMD160 16d0f215de26412455f6a56ad0f3183282cef1ae SHA1 b05d98a63673fc7f448c1253a646eb3a3206b2a7 SHA256 30f452d7db71aa868c8aeef3f1d51a1b7eb485445fdbfa8ad65eadb0fa44c977
+MD5 3589aafbe3169219e30d3a440b69b8d4 ChangeLog 4104
+RMD160 16d0f215de26412455f6a56ad0f3183282cef1ae ChangeLog 4104
+SHA256 30f452d7db71aa868c8aeef3f1d51a1b7eb485445fdbfa8ad65eadb0fa44c977 ChangeLog 4104
 MISC metadata.xml 950 RMD160 678f238a25e95981f6668360be4f564a84eafba8 SHA1 5b2721eab57bd7bb4946400354edd4d162930fc3 SHA256 1e4851dd9530a0ee08781b710b138653904b195fdb4d2e62152ad4f2534acaf8
 MD5 a97691f0d19210f3741485b1ca4dcf37 metadata.xml 950
 RMD160 678f238a25e95981f6668360be4f564a84eafba8 metadata.xml 950
@@ -59,9 +63,9 @@ 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGVb1oAiZjviIA2XgRAmCZAKCjO1xHL4Oqnla2L/4mZvLYgRoxJACgiq99
-xzFIM2K7yEtKFqd0vD5U91M=
-=XYxT
+iD8DBQFGXEfs1ycZbhPLE2ARAhX3AJ0VJeEZ3ZKbebfjQZJjF2fCQWybRQCfeEd0
+wq7fl+1Rjsd3pqcQ6P+yxHU=
+=evhH
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numarray/files/numarray-1.5.2-freebsd.patch b/dev-python/numarray/files/numarray-1.5.2-freebsd.patch
new file mode 100644
index 000000000000..a9cec5527bb4
--- /dev/null
+++ b/dev-python/numarray/files/numarray-1.5.2-freebsd.patch
@@ -0,0 +1,23 @@
+--- numarray-1.5.2/Src/libnumarray.ch~	2007-05-24 14:21:43 -0600
++++ numarray-1.5.2/Src/libnumarray.ch	2007-05-24 14:22:58 -0600
+@@ -1920,9 +1920,9 @@
+ 	return retstatus;
+ }
+ 
+-#elif defined(linux) || defined(darwin) || defined(__CYGWIN__)
++#elif defined(linux) || defined(__FreeBSD__) || defined(darwin) || defined(__CYGWIN__)
+ 
+-#if defined(__GLIBC__) || defined(darwin) || defined(__MINGW32__)
++#if defined(__GLIBC__) || defined(__FreeBSD__) || defined(darwin) || defined(__MINGW32__)
+ #include <fenv.h>
+ #elif defined(__CYGWIN__)
+ #include <mingw/fenv.h>
+@@ -3886,7 +3886,7 @@
+ }
+ 
+ /* Likewise for Integer overflows */
+-#if defined(linux)
++#if defined(linux) || defined(__FreeBSD__)
+ static int int_overflow_error(Float64 value) { /* For x86_64 */
+ 	feraiseexcept(FE_OVERFLOW);
+ 	return (int) value;
diff --git a/dev-python/numarray/numarray-1.5.2-r1.ebuild b/dev-python/numarray/numarray-1.5.2-r1.ebuild
index f5f3f22d9ce1..2f75633ed684 100644
--- a/dev-python/numarray/numarray-1.5.2-r1.ebuild
+++ b/dev-python/numarray/numarray-1.5.2-r1.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/numarray/numarray-1.5.2-r1.ebuild,v 1.5 2007/05/24 16:29:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/numarray-1.5.2-r1.ebuild,v 1.6 2007/05/29 15:33:57 bicatali Exp $
 
 NEED_PYTHON=2.3
 
@@ -27,8 +27,8 @@ LICENSE="BSD"
 
 DOCS="LICENSE.txt Doc/*.txt Doc/release_notes/ANNOUNCE-${PV:0:3}"
 
-# test with lapack buggy
-RESTRICT="lapack? ( test )"
+# test with lapack buggy on amd64 (at least)
+RESTRICT="amd64? ( lapack? ( test ) )"
 
 pkg_setup() {
 	if use lapack; then
@@ -58,10 +58,24 @@ src_unpack() {
 	# fix refcount problem from a debian bug
 	epatch "${FILESDIR}"/${P}-refcount.patch
 
+	# Fix missing exceptions (e.g. divide by zero, overflow) in FreeBSD
+	# (i.e. need to include "__FreeBSD__" in pre-processor conditionals)
+	epatch "${FILESDIR}"/${P}-freebsd.patch
+
+	# fix array_protocol tests with numpy
+	#sed -i \
+	#	-e 's/True/ True/g' \
+	#	Lib/array_protocol.py || die "sed array_protocol failed"
+
+	# array_protocol tests are buggy with various numeric/numpy versions
+	sed -i \
+		-e '/array_protocol/d' \
+		Lib/testall.py || die "sed testall failed"
+
 	# fix hard-coded path in numinclude
 	sed -i \
 		-e "s:/home/jmiller/work/debug/include/python2.5:/usr/include/python${PYVER}:" \
-		Lib/numinclude.py || die "sed failed"
+		Lib/numinclude.py || die "sed numinclude failed"
 
 	# configure cfg_packages.py for lapack
 	if use lapack; then
@@ -70,18 +84,19 @@ src_unpack() {
 			-e 's:/usr/local/include/atlas:/usr/include/atlas:g' \
 			-e "s:/usr/local/lib/atlas:/usr/$(get_libdir):g" \
 			-e 's:f77blas:blas:g' \
-			cfg_packages.py
+			cfg_packages.py || die "sed for lapack failed"
 		# fix gfortran for > gcc-4
 		if  [[ "${FORTRANC}" == gfortran ]]; then
 			sed -i \
 				-e "s:g2c:gfortran:g" \
-				cfg_packages.py
+				cfg_packages.py || die "sed for gfortran failed"
 		fi
-		[[ "${mycblas}" == reference ]] && \
+		if [[ "${mycblas}" == reference ]]; then
 			sed -i \
-			-e "s:'atlas',::g" \
-			-e "s:include/atlas:include/cblas:g" \
-			cfg_packages.py
+				-e "s:'atlas',::g" \
+				-e "s:include/atlas:include/cblas:g" \
+				cfg_packages.py || die "sed for reference lapack failed"
+		fi
 	fi
 	${python} setup.py config --gencode || die "API code generation failed"
 }