Fix cpuinfo to correctly detect nocona-based hardware. Bug 183236.

Package-Manager: portage-2.1.3.19

5 files changed, 166 insertions, 15 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index b58be917ce22..a7e76b8b2fe0 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.48 2008/01/04 14:16:44 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.49 2008/01/11 17:06:18 jsbronder Exp $
+
+*numpy-1.0.4-r1 (11 Jan 2008)
+
+  11 Jan 2008; Justin Bronder <jsbronder@gentoo.org>
+  +files/numpy-1.0.4-nocona-cpuinfo.patch, +numpy-1.0.4-r1.ebuild:
+  Fix cpuinfo to correctly detect nocona-based hardware.  Bug 183236.
 
   04 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> -numpy-1.0.3.ebuild,
   -numpy-1.0.3.1.ebuild:
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 13e2f98fd693..59bc9f17f680 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX numpy-1.0.1-f2py.patch 1403 RMD160 4a02205910231c3b08ae919a45facc21dd2818ae SHA1 148118c4ee9d8a754a0891621ece9b5774e76016 SHA256 746b437aff172764a238bb75d6a5b7b0547113c8a256721cf4bec2b1819bcf51
 MD5 69e8b3f89762b836594a61414942aa78 files/numpy-1.0.1-f2py.patch 1403
 RMD160 4a02205910231c3b08ae919a45facc21dd2818ae files/numpy-1.0.1-f2py.patch 1403
@@ -9,15 +6,23 @@ AUX numpy-1.0.4-freebsd.patch 3084 RMD160 9ec6841d9b8205d584f33356fcafc30047134d
 MD5 58cf898f747f19650c14985697641129 files/numpy-1.0.4-freebsd.patch 3084
 RMD160 9ec6841d9b8205d584f33356fcafc30047134d63 files/numpy-1.0.4-freebsd.patch 3084
 SHA256 514f00a761ceb40f4380962f36035816fdd2ca7cde8d6c5aab74aab7fd11b073 files/numpy-1.0.4-freebsd.patch 3084
+AUX numpy-1.0.4-nocona-cpuinfo.patch 1149 RMD160 e1f315be9b94e5e826325380b9265257cd61dd2a SHA1 9b55dec66115563b6b43184b832bad0a517e233e SHA256 fc55d99132d6d3fdedde39174dd1599bcdcc152447127497953b7dce8f691bc0
+MD5 40058b69c7a5bc20a47be2d50c4e0056 files/numpy-1.0.4-nocona-cpuinfo.patch 1149
+RMD160 e1f315be9b94e5e826325380b9265257cd61dd2a files/numpy-1.0.4-nocona-cpuinfo.patch 1149
+SHA256 fc55d99132d6d3fdedde39174dd1599bcdcc152447127497953b7dce8f691bc0 files/numpy-1.0.4-nocona-cpuinfo.patch 1149
 DIST numpy-1.0.4.tar.gz 1547541 RMD160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5 SHA1 9a1f09358c3310cf990eecd06dc2eb54aec78321 SHA256 b993ecc060aa2bdca9a45a552f4ea77d96959ce0f429d5f9019e05738d68c9bd
+EBUILD numpy-1.0.4-r1.ebuild 2870 RMD160 2efcb1f27656f8ec92d6b08bb239c4735cb4208a SHA1 1ebe63b51b9b43144bfbdceeec7908e655cffb79 SHA256 f7e65e646eecfab408b56c0338abdf6cd9b8bf4273915649af46996baafe0593
+MD5 906af09371a573ebc711792a49514751 numpy-1.0.4-r1.ebuild 2870
+RMD160 2efcb1f27656f8ec92d6b08bb239c4735cb4208a numpy-1.0.4-r1.ebuild 2870
+SHA256 f7e65e646eecfab408b56c0338abdf6cd9b8bf4273915649af46996baafe0593 numpy-1.0.4-r1.ebuild 2870
 EBUILD numpy-1.0.4.ebuild 2747 RMD160 318972a12fe979a05a5cf75b628587f5f9d13c61 SHA1 8316a212cae03a2b414e32f02856c732f21c53b8 SHA256 37ddd98580e94d2917666d91bddf83480e884d488da1c6050e0c005b6ec0914d
 MD5 c206d3579a096f40a922535ed1759b47 numpy-1.0.4.ebuild 2747
 RMD160 318972a12fe979a05a5cf75b628587f5f9d13c61 numpy-1.0.4.ebuild 2747
 SHA256 37ddd98580e94d2917666d91bddf83480e884d488da1c6050e0c005b6ec0914d numpy-1.0.4.ebuild 2747
-MISC ChangeLog 7240 RMD160 79532a50b13c6e0da4eabe893ef2be37f2b4124f SHA1 38541e21dfc2b9a617f35d3a295c0e814e02cdf4 SHA256 7fa64ead96945a53581563b86be1e1b48b66f38aa163bcb6ba193906ec4f44db
-MD5 f69ae5ff91ba68e61b5a73c4ad0039d4 ChangeLog 7240
-RMD160 79532a50b13c6e0da4eabe893ef2be37f2b4124f ChangeLog 7240
-SHA256 7fa64ead96945a53581563b86be1e1b48b66f38aa163bcb6ba193906ec4f44db ChangeLog 7240
+MISC ChangeLog 7463 RMD160 a7c5ce3cd96125dfcacfc900c7414954181aa0ad SHA1 5914c019fa40714dfce4860622bf44260ec8f633 SHA256 60b671b6992b49e84f4bca9685f881f7ffe9f1f6f9ff45b52d36bd862f841160
+MD5 9f30e767e996b9f38c93d1d5e06cf111 ChangeLog 7463
+RMD160 a7c5ce3cd96125dfcacfc900c7414954181aa0ad ChangeLog 7463
+SHA256 60b671b6992b49e84f4bca9685f881f7ffe9f1f6f9ff45b52d36bd862f841160 ChangeLog 7463
 MISC metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 SHA1 c2580aa1116f9f96b8d7901ab95b37a653d0fc56 SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640
 MD5 d623311ce8175e55bcb5e2a9750b5cd4 metadata.xml 747
 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 metadata.xml 747
@@ -25,10 +30,6 @@ SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640 metadata
 MD5 94bdbc968e36fab4985a24ef8a9c6723 files/digest-numpy-1.0.4 238
 RMD160 7d65e348625974e515caa85f69ff5aacca2730ef files/digest-numpy-1.0.4 238
 SHA256 a345b8aac2d5a6bb34019a5920b77254e00066a9a8c6e707fcebc7033a423dc6 files/digest-numpy-1.0.4 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHfj/Z1ycZbhPLE2ARAouDAKCwKR/0xVGoAQ2FJDAQTjVQXG+KcwCfZCbn
-JGpflMX9QWRU3Y3tcQzgKCI=
-=76uW
------END PGP SIGNATURE-----
+MD5 94bdbc968e36fab4985a24ef8a9c6723 files/digest-numpy-1.0.4-r1 238
+RMD160 7d65e348625974e515caa85f69ff5aacca2730ef files/digest-numpy-1.0.4-r1 238
+SHA256 a345b8aac2d5a6bb34019a5920b77254e00066a9a8c6e707fcebc7033a423dc6 files/digest-numpy-1.0.4-r1 238
diff --git a/dev-python/numpy/files/digest-numpy-1.0.4-r1 b/dev-python/numpy/files/digest-numpy-1.0.4-r1
new file mode 100644
index 000000000000..2abfed99cb45
--- /dev/null
+++ b/dev-python/numpy/files/digest-numpy-1.0.4-r1
@@ -0,0 +1,3 @@
+MD5 8f011e9d7697da570efaac61c51725e0 numpy-1.0.4.tar.gz 1547541
+RMD160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5 numpy-1.0.4.tar.gz 1547541
+SHA256 b993ecc060aa2bdca9a45a552f4ea77d96959ce0f429d5f9019e05738d68c9bd numpy-1.0.4.tar.gz 1547541
diff --git a/dev-python/numpy/files/numpy-1.0.4-nocona-cpuinfo.patch b/dev-python/numpy/files/numpy-1.0.4-nocona-cpuinfo.patch
new file mode 100644
index 000000000000..7b344ad8f9f5
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.0.4-nocona-cpuinfo.patch
@@ -0,0 +1,26 @@
+diff -urN numpy-1.0.4/numpy/distutils/cpuinfo.py numpy-1.0.4-patched/numpy/distutils/cpuinfo.py
+--- numpy-1.0.4/numpy/distutils/cpuinfo.py	2007-11-07 17:05:15.000000000 -0500
++++ numpy-1.0.4-patched/numpy/distutils/cpuinfo.py	2008-01-11 11:44:23.000000000 -0500
+@@ -222,7 +222,12 @@
+         return self.is_PentiumIV() and self.has_sse3()
+ 
+     def _is_Nocona(self):
+-        return self.is_64bit() and self.is_PentiumIV()
++        return self.is_Intel() \
++            and ( self.info[0]['cpu family'] == '6' \
++                or self.info[0]['cpu family'] == '15' ) \
++            and self.has_sse3() \
++            and re.match(r'.*?\blm\b',self.info[0]['flags']) is not None
++
+ 
+     def _is_Core2(self):
+         return self.is_64bit() and self.is_Intel() and \
+@@ -263,7 +268,7 @@
+         return re.match(r'.*?\bsse2\b',self.info[0]['flags']) is not None
+ 
+     def _has_sse3(self):
+-        return re.match(r'.*?\bsse3\b',self.info[0]['flags']) is not None
++        return re.match(r'.*?\bsss?e3\b',self.info[0]['flags']) is not None
+ 
+     def _has_3dnow(self):
+         return re.match(r'.*?\b3dnow\b',self.info[0]['flags']) is not None
diff --git a/dev-python/numpy/numpy-1.0.4-r1.ebuild b/dev-python/numpy/numpy-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..7c52a81ff9f6
--- /dev/null
+++ b/dev-python/numpy/numpy-1.0.4-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.4-r1.ebuild,v 1.1 2008/01/11 17:06:18 jsbronder Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils eutils flag-o-matic
+
+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? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	lapack? ( dev-util/pkgconfig )"
+
+IUSE="lapack"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="BSD"
+
+S="${WORKDIR}/${MY_P}"
+
+# whatever LDFLAGS set will break linking
+# see progress in http://projects.scipy.org/scipy/numpy/ticket/573
+[ -n "${LDFLAGS}" ] && append-ldflags -shared
+
+# 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() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix some paths and docs in f2py
+	epatch "${FILESDIR}"/${PN}-1.0.1-f2py.patch
+
+	# Patch to use feclearexcept(3) rather than fpsetsticky(3) on FreeBSD 5.3+
+	epatch "${FILESDIR}"/${P}-freebsd.patch
+
+	# Detect nocona hardware correctly.  Bug #183236.
+	epatch "${FILESDIR}"/${PN}-1.0.4-nocona-cpuinfo.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
+
+	if use lapack; then
+		unset BLAS LAPACK
+		cat > site.cfg <<-EOF
+			[blas]
+			blas_libs = $(pkgconf_cfg --libs-only-l cblas)
+			library_dirs = $(pkgconf_cfg --libs-only-L cblas)
+
+			[lapack]
+			lapack_libs = $(pkgconf_cfg --libs-only-l lapack)
+			library_dirs = $(pkgconf_cfg --libs-only-L lapack)
+		EOF
+	fi
+}
+
+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
+}