Check for __hppa__ not __parisc__ (bug #277438).

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 22 insertions, 14 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 50333c513cc8..827c334bc13b 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.83 2009/07/15 13:04:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.84 2009/07/15 13:48:01 jer Exp $
+
+  15 Jul 2009; Jeroen Roovers <jer@gentoo.org> numpy-1.3.0.ebuild,
+  +files/numpy-1.3.0-parisc.patch:
+  Check for __hppa__ not __parisc__ (bug #277438).
 
   15 Jul 2009; Christian Faulhammer <fauli@gentoo.org> numpy-1.3.0.ebuild:
   stable x86, bug 277354
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index aa07dd50dfe4..49010cb99266 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,10 +1,8 @@
------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.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2 SHA1 5c37ea9be68782e533c7c2d64ca00e8e8ae648ea SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7
+AUX numpy-1.3.0-parisc.patch 402 RMD160 2e9e4b6a4a7f11b084f31fefeb6fb5fc0253284b SHA1 da4c2433bcae1a1c93e139cfccb1063c9dc24438 SHA256 0c9fa364f186b26d88da00b7c501a3a27669cdfdfd920d7b2072b6830743e44f
 DIST numpy-1.0.4.tar.gz 1547541 RMD160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5 SHA1 9a1f09358c3310cf990eecd06dc2eb54aec78321 SHA256 b993ecc060aa2bdca9a45a552f4ea77d96959ce0f429d5f9019e05738d68c9bd
 DIST numpy-1.1.1.tar.gz 1611021 RMD160 745e9fbbd064272199f4c7b49d4a26797405dd17 SHA1 a2755f38ca6aa799b504c84f58b03cd6ce66bc41 SHA256 d430273a77aed959c007595d969fefa36c59249807212d7d89f5d6cf2a701dd6
 DIST numpy-1.2.1.tar.gz 1448933 RMD160 7eb721d0d853f3b0b9b04a4f447353873d6c0997 SHA1 1aa706e733aea18eaffa70d93c0105718acb66c5 SHA256 4392b4b78eb503b187a6004468d2dd14d976c4b30a327e51f2277730c415003e
@@ -12,13 +10,6 @@ DIST numpy-1.3.0.tar.gz 1995868 RMD160 a75155d2014204e16c59857b92356353505c39b9
 EBUILD numpy-1.0.4-r2.ebuild 3507 RMD160 d9e70b8851cda2adf70aedc9b56d732152a3a69d SHA1 60c8073ce0a9eb72283abe0a0d57b220ffc129e8 SHA256 534b11c0d2d135780581e7adfa06b663b73846f188bce996d0841c0c954432d9
 EBUILD numpy-1.1.1.ebuild 3349 RMD160 27aab3eea2c77ac03c8db40dc6e8116b74f9bfce SHA1 bbff358f0e5536a84c59e6a4906172daf7b16950 SHA256 ead32d70a2c65c81e7840920c6b52b6089b206af76fbce20b588131a819de534
 EBUILD numpy-1.2.1.ebuild 4238 RMD160 96a2d4ff884bc16eae0801f682a3d065de883698 SHA1 d52afb3c550ad0417e6b0b08e469011d095f88c0 SHA256 d1b0a6323cec8e972bdc4d9fac424ee08c137b7f3fdba50b0768b06b6e03cb37
-EBUILD numpy-1.3.0.ebuild 3565 RMD160 25e8626ea39d9f94ab01a2bf0a81644012638ef1 SHA1 7604db5d8818f720afffa3ecb37dff5d47eb3f6e SHA256 8404e6a7f1cb7ac2fc060cdd1d2d8b5091cc9395a187d847f27cd07b228173a3
-MISC ChangeLog 12133 RMD160 b83f7bb856da3d1aa7c8de86fbe61576e3b85abd SHA1 b40886fbfaf5b770861cd26e624de73fdcd74549 SHA256 d91908443a43252885f5fc383e1c0ae6af92f56a6cb553592159014c1ee4846d
+EBUILD numpy-1.3.0.ebuild 3617 RMD160 a57e6a646dc71354018b714af62d95f0bfc9aa29 SHA1 bdabcc5d7f988a9bc3c6dcdd32512b3f33068336 SHA256 80a5c1de3eb75bf57bc6c5949a0f72805ba1edd8a3dc98dd466379087da66025
+MISC ChangeLog 12285 RMD160 daee393d39d7a93a55ce4fcf69b1cf0a4c58c827 SHA1 5757ef3f8d1dde5ceb29d3948e7b3ffad9091dcf SHA256 593d5f7f982ecbf19c91757e129d73d18da2a2a230d547ee3ab1e82d78d4e8c2
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpd0+QACgkQNQqtfCuFneMEHwCdHdmCQQH1h7l+lPs0R6Ie7O80
-8IoAnjwtQRAal7tdYJXxcl7oofC2Fi5t
-=RDNS
------END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.3.0-parisc.patch b/dev-python/numpy/files/numpy-1.3.0-parisc.patch
new file mode 100644
index 000000000000..232a568933c1
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.3.0-parisc.patch
@@ -0,0 +1,11 @@
+--- numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h.orig	2009-04-05 10:09:20.000000000 +0200
++++ numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h	2009-07-15 15:29:15.000000000 +0200
+@@ -42,7 +42,7 @@
+     #define NPY_CPU_S390
+ #elif defined(__ia64)
+     #define NPY_CPU_IA64
+-#elif defined(__parisc__)
++#elif defined(__hppa__)
+     /* XXX: Not sure about this one... */
+     #define NPY_CPU_PARISC
+ #else
diff --git a/dev-python/numpy/numpy-1.3.0.ebuild b/dev-python/numpy/numpy-1.3.0.ebuild
index 036807ee1086..165877b82329 100644
--- a/dev-python/numpy/numpy-1.3.0.ebuild
+++ b/dev-python/numpy/numpy-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.3.0.ebuild,v 1.3 2009/07/15 13:04:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.3.0.ebuild,v 1.4 2009/07/15 13:48:01 jer Exp $
 
 NEED_PYTHON=2.4
 EAPI=2
@@ -43,6 +43,8 @@ src_prepare() {
 	# Fix some paths and docs in f2py
 	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
 
+	epatch "${FILESDIR}/${P}-parisc.patch" # bug 277438
+
 	# Gentoo patch for ATLAS library names
 	sed -i \
 		-e "s:'f77blas':'blas':g" \