Applied cpu patch for AMD phenom architecture, thanks to Nylan (bug #183236)

Package-Manager: portage-2.1.5

5 files changed, 155 insertions, 33 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 6a7a41c5b463..58b705cd90bd 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,11 @@
 # 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.59 2008/05/06 19:24:08 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.60 2008/05/20 13:52:31 bicatali Exp $
+
+  20 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/numpy-1.0.4-cpuinfo.patch, -files/numpy-1.0.4-nocona-cpuinfo.patch,
+  numpy-1.0.4-r2.ebuild:
+  Applied cpu patch for AMD phenom architecture, thanks to Nylan (bug #183236)
 
   06 May 2008; Markus Dittrich <markusle@gentoo.org> numpy-1.0.4-r2.ebuild:
   Fixed linking error when LDFLAGS is not set (see bug #219205).
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 7319c2be2bfa..279182176fcb 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX numpy-1.0.1-f2py.patch 1403 RMD160 4a02205910231c3b08ae919a45facc21dd2818ae SHA1 148118c4ee9d8a754a0891621ece9b5774e76016 SHA256 746b437aff172764a238bb75d6a5b7b0547113c8a256721cf4bec2b1819bcf51
+AUX numpy-1.0.4-cpuinfo.patch 4188 RMD160 540961a3aa87530703d8c5795c21dd5f0adc5aad SHA1 e05ed0360a1ac3a980d5b85c536819827c5ca7b7 SHA256 c217b30365c9134482949a5e4a8fdac0577b3205c2d46f30a327323fef5bd1c7
 AUX numpy-1.0.4-freebsd.patch 3084 RMD160 9ec6841d9b8205d584f33356fcafc30047134d63 SHA1 719621772bbb7f4016396081cac1742d15050c01 SHA256 514f00a761ceb40f4380962f36035816fdd2ca7cde8d6c5aab74aab7fd11b073
-AUX numpy-1.0.4-nocona-cpuinfo.patch 1149 RMD160 e1f315be9b94e5e826325380b9265257cd61dd2a SHA1 9b55dec66115563b6b43184b832bad0a517e233e SHA256 fc55d99132d6d3fdedde39174dd1599bcdcc152447127497953b7dce8f691bc0
 DIST numpy-1.0.4.tar.gz 1547541 RMD160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5 SHA1 9a1f09358c3310cf990eecd06dc2eb54aec78321 SHA256 b993ecc060aa2bdca9a45a552f4ea77d96959ce0f429d5f9019e05738d68c9bd
-EBUILD numpy-1.0.4-r2.ebuild 3591 RMD160 6736962a6885a0d8dee7b315c92dbfe54c0a7f06 SHA1 650af8e8b43d35a3912a780741c656d31182e714 SHA256 0f481e84cf1954c1fa4c273b87e2b6c602293e5af4e87059bb65ea8d32dd5b48
-MISC ChangeLog 8812 RMD160 f69ef528f8612a1e9cfaa9ebbad2e39f268f3b3b SHA1 327e21b9a3c42de4e4d91b31cfed68b30711806b SHA256 e6dcd935d223805f24cd912d1067cc6c9d1173ad42c64fdfefac3b054073ed00
+EBUILD numpy-1.0.4-r2.ebuild 3596 RMD160 b7448b4e2dcb6aff05fa8997ded423b340acee61 SHA1 19d161ba08eab0c9f903001ae65d5cedd55ac6cc SHA256 6e0e94151ffb47cbee08032f917611970bb0fa6bb3cff164bbaa354db3ac1e36
+MISC ChangeLog 9049 RMD160 31f8ee1637d05b2c51b0e41e39d6032d5b849275 SHA1 e4cdf22d6ec6531536abdcd5bb4a5f064812f8a4 SHA256 564f1ab9d4e3fda8a37641f9f2a47d6ae4dc488f9a7cbd2dabe0ef3f9b710980
 MISC metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 SHA1 c2580aa1116f9f96b8d7901ab95b37a653d0fc56 SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgy2GUACgkQ1ycZbhPLE2CByQCfXdXDLLRbWCELcUkA93OEUOyN
+r+4AnRsGqRw69mNmOo9BDyEKaT/nXk2r
+=xkRS
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.0.4-cpuinfo.patch b/dev-python/numpy/files/numpy-1.0.4-cpuinfo.patch
new file mode 100644
index 000000000000..f38b43038971
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.0.4-cpuinfo.patch
@@ -0,0 +1,133 @@
+--- numpy-1.0.4/numpy/distutils/cpuinfo.py	2007-11-07 23:05:15.000000000 +0100
++++ numpy-1.0.4_changed/numpy/distutils/cpuinfo.py	2008-05-19 20:30:40.000000000 +0200
+@@ -18,6 +18,7 @@
+ import os
+ import commands
+ import warnings
++import platform
+ 
+ def getoutput(cmd, successful_status=(0,), stacklevel=1):
+     try:
+@@ -80,8 +81,16 @@
+     def _getNCPUs(self):
+         return 1
+ 
++    def __get_nbits(self):
++        abits = platform.architecture()[0]
++        nbits = re.compile('(\d+)bit').search(abits).group(1)
++        return nbits
++
+     def _is_32bit(self):
+-        return not self.is_64bit()
++        return self.__get_nbits() == '32'
++
++    def _is_64bit(self):
++        return self.__get_nbits() == '64'
+ 
+ class LinuxCPUInfo(CPUInfoBase):
+ 
+@@ -104,7 +113,7 @@
+                 if len(name_value) != 2:
+                     continue
+                 name, value = name_value
+-                if not info or info[-1].has_key(name): # next processor
++                if not info or name in info[-1]: # next processor
+                     info.append({})
+                 info[-1][name] = value
+             fo.close()
+@@ -134,7 +143,16 @@
+                         self.info[0]['model name']) is not None
+ 
+     def _is_AMD64(self):
+-        return self.is_AMD() and self.info[0]['family'] == '15'
++        if 'family' in self.info[0]:
++          family=self.info[0]['family'] in ['15','16']
++        else:
++          family=False
++        if 'cpu family' in self.info[0]:
++          cpu_family=self.info[0]['cpu family']in ['15','16']
++        else:
++          cpu_family=False
++        result=(self.is_AMD() and family) or cpu_family
++        return result    	
+ 
+     def _is_Athlon64(self):
+         return re.match(r'.*?Athlon\(tm\) 64\b',
+@@ -152,6 +170,10 @@
+         return re.match(r'.*?Hammer\b',
+                         self.info[0]['model name']) is not None
+ 
++    def _is_Phenom(self):
++	return re.match(r'.*?Phenom\b',
++			self.info[0]['model name']) is not None
++
+     # Alpha
+ 
+     def _is_Alpha(self):
+@@ -222,7 +244,11 @@
+         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 not self.has_ssse3())\
++               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 +289,10 @@
+         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'.*?\bpni\b',self.info[0]['flags']) is not None
++
++    def _has_ssse3(self):
++        return re.match(r'.*?\bssse3\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
+@@ -271,20 +300,6 @@
+     def _has_3dnowext(self):
+         return re.match(r'.*?\b3dnowext\b',self.info[0]['flags']) is not None
+ 
+-    def _is_64bit(self):
+-        if self.is_Alpha():
+-            return True
+-        if self.info[0].get('clflush size','')=='64':
+-            return True
+-        if self.info[0].get('uname_m','')=='x86_64':
+-            return True
+-        if self.info[0].get('arch','')=='IA-64':
+-            return True
+-        return False
+-
+-    def _is_32bit(self):
+-        return not self.is_64bit()
+-
+ class IRIXCPUInfo(CPUInfoBase):
+     info = None
+ 
+@@ -412,11 +427,6 @@
+ 
+     def _not_impl(self): pass
+ 
+-    def _is_32bit(self):
+-        return self.info['isainfo_b']=='32'
+-    def _is_64bit(self):
+-        return self.info['isainfo_b']=='64'
+-
+     def _is_i386(self):
+         return self.info['isainfo_n']=='i386'
+     def _is_sparc(self):
+@@ -552,7 +562,7 @@
+     # require looking at the 'brand' from cpuid
+ 
+     def _is_AMD64(self):
+-        return self.is_AMD() and self.info[0]['Family'] == 15
++        return self.is_AMD() and self.info[0]['Family'] in [15,16]
+ 
+     # Intel
+ 
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
deleted file mode 100644
index 7b344ad8f9f5..000000000000
--- a/dev-python/numpy/files/numpy-1.0.4-nocona-cpuinfo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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-r2.ebuild b/dev-python/numpy/numpy-1.0.4-r2.ebuild
index 8cc80f0206ab..c6e865db2587 100644
--- a/dev-python/numpy/numpy-1.0.4-r2.ebuild
+++ b/dev-python/numpy/numpy-1.0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.9 2008/05/06 19:24:08 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.4-r2.ebuild,v 1.10 2008/05/20 13:52:31 bicatali Exp $
 
 NEED_PYTHON=2.3
 
@@ -73,8 +73,8 @@ src_unpack() {
 	# 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}"/${P}-nocona-cpuinfo.patch
+	# Detect phenom and nocona hardware correctly.  Bug #183236.
+	epatch "${FILESDIR}"/${P}-cpuinfo.patch
 
 	# Gentoo patch for ATLAS library and include dirs
 	sed -i \