Merge from Prefix

Package-Manager: portage-2.2.00.14552-prefix/cvs/Darwin powerpc
RepoMan-Options: --force

4 files changed, 52 insertions, 23 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index dd9a2930e9bc..68179746adc0 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.96 2009/10/10 10:04:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.97 2009/10/10 18:27:17 grobian Exp $
+
+  10 Oct 2009; Fabian Groffen <grobian@gentoo.org> numpy-1.3.0-r1.ebuild,
+  +files/numpy-1.3.0-fenv-freebsd.patch:
+  Merge from Prefix
 
   10 Oct 2009; Markus Meier <maekke@gentoo.org> numpy-1.3.0-r1.ebuild:
   amd64/arm/x86 stable, bug #287575
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 060b80fa5c98..a980535951b1 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2 SHA1 5c37ea9be68782e533c7c2d64ca00e8e8ae648ea SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7
 AUX numpy-1.3.0-alpha.patch 1210 RMD160 d92ca3fa7d671da1ff8e3e2e1a6b64469cf7142b SHA1 0a8740710d7b2e40b1a8899771b641999440558b SHA256 ea0da717e694338a1bca72f1b635309be15af2cdee206b50de4b38ce95701c64
 AUX numpy-1.3.0-arm-sh.patch 2166 RMD160 cc60f574ab7fe29968ebc56f9018c2427f01f6cc SHA1 59b4751c26abf837a69d8bd637bd9abb89344f72 SHA256 9b373c5b8886df971c350c44766ccdf165ffec6c2082f68704121965ad7a2f37
+AUX numpy-1.3.0-fenv-freebsd.patch 1177 RMD160 78a84e18836472bd9c657771c43a44e417ec3e19 SHA1 4dba898255df4784eac9e52633307991c12029de SHA256 2fa3ed9fdeb9dc529d51da4ba8a3a7ea4cc4bb9998fffa66426b1606f2c637b5
 AUX numpy-1.3.0-parisc.patch 474 RMD160 682971d65894aeb2e87de5f8eac717a8f7803318 SHA1 da6067bd782604119111d69fce06b7536d59f6ca SHA256 413af76d3b5518d2f544c4497110a3401d40a7ea713a7449ea8826facddbf225
 DIST numpy-1.2.1.tar.gz 1448933 RMD160 7eb721d0d853f3b0b9b04a4f447353873d6c0997 SHA1 1aa706e733aea18eaffa70d93c0105718acb66c5 SHA256 4392b4b78eb503b187a6004468d2dd14d976c4b30a327e51f2277730c415003e
 DIST numpy-1.3.0.tar.gz 1995868 RMD160 a75155d2014204e16c59857b92356353505c39b9 SHA1 c04998a1fbf7d990c9a2b99a7b62486012c570ac SHA256 7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d
 EBUILD numpy-1.2.1.ebuild 4237 RMD160 523240c56efc80b8fdc32a7a0356d7bbb7d02059 SHA1 531b4656bfd3077d761c0e5074bf19cc033067cd SHA256 18d23bb2e7a8d9cc8c24e039a00b8004773f492af7ce6cd070bc6d1acdb28bc7
-EBUILD numpy-1.3.0-r1.ebuild 3947 RMD160 8dc937454907cc4931a20e721a0722e756ae4929 SHA1 93342d6c577b98ffd4a5b8c48f2398876016f109 SHA256 4e701caf35fe48eaf17cf11f0f3224e914f890e37756a333eb8a2d486b97b50e
+EBUILD numpy-1.3.0-r1.ebuild 4315 RMD160 32b1513428e5dedb6c2e6d683ed86dfcf5ccbb74 SHA1 d995edf6785805e9c7fdf914a5cd8e99f0812b8c SHA256 b619950eaed6e3431b97df48dc09f62b3cf520a7c4f199b68f9c464785d9f12a
 EBUILD numpy-1.3.0.ebuild 3730 RMD160 c0d829ee7118786377feafc13bee29fd87607bce SHA1 74b47ee040e480a28e37ff3c14fa4f4ffc08f95e SHA256 03726529570ea97cc39867718c5f24e5d020425628eaa7a15210318b19fbfe09
-MISC ChangeLog 13606 RMD160 64a4f350587ee4a3dd43ae70045d478f05d07c2a SHA1 762646240bbb50e01646c49010f2dd8fdaa9b171 SHA256 c9d759f32c66246cefebd4adfbc34d0c3edf5ec4cc02a1ecf1bf2721d163dfc6
+MISC ChangeLog 13743 RMD160 0547949064443770d44336a35693657e35b7fa06 SHA1 f5b46a539a235036195a18f7e18c1807be4b222a SHA256 ac07a12790858fca78c8ad5d49d728446f0fc1b736350ffd630b89a81d1b9869
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrQXE8ACgkQkKaRLQcq0GKsKQCdE9+al/MRLwSCmtP9DtI6qov/
-LVUAn1cDSKAku7MPJe9lSuJMrmKOZCuG
-=Qlgc
------END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.3.0-fenv-freebsd.patch b/dev-python/numpy/files/numpy-1.3.0-fenv-freebsd.patch
new file mode 100644
index 000000000000..629fc761ced3
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.3.0-fenv-freebsd.patch
@@ -0,0 +1,28 @@
+--- numpy/core/include/numpy/ufuncobject.h.orig	2009-07-28 15:04:42 -0400
++++ numpy/core/include/numpy/ufuncobject.h	2009-07-28 15:05:58 -0400
+@@ -318,8 +318,10 @@
+ 
+ #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
+ 
+-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__)
++#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) 
+ #include <fenv.h>
++#elif defined(__FreeBSD__)
++#include "fenv/fenv.h"
+ #elif defined(__CYGWIN__)
+ #include "fenv/fenv.c"
+ #endif
+--- numpy/numarray/_capi.c.orig	2009-07-28 15:18:13 -0400
++++ numpy/numarray/_capi.c	2009-07-28 15:19:04 -0400
+@@ -8,8 +8,10 @@
+ #include <sys/param.h>
+ #endif
+ 
+-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
++#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
+ #include <fenv.h>
++#elif (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
++#include "numpy/fenv/fenv.h"
+ #elif defined(__CYGWIN__)
+ #include "numpy/fenv/fenv.h"
+ #include "numpy/fenv/fenv.c"
diff --git a/dev-python/numpy/numpy-1.3.0-r1.ebuild b/dev-python/numpy/numpy-1.3.0-r1.ebuild
index 65a0ee3e4b74..e074760000a4 100644
--- a/dev-python/numpy/numpy-1.3.0-r1.ebuild
+++ b/dev-python/numpy/numpy-1.3.0-r1.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-r1.ebuild,v 1.4 2009/10/10 10:04:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.3.0-r1.ebuild,v 1.5 2009/10/10 18:27:17 grobian Exp $
 
 EAPI="2"
 
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}
 
 IUSE="lapack test"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 LICENSE="BSD"
 
 RESTRICT_PYTHON_ABIS="3*"
@@ -29,10 +29,14 @@ RESTRICT_PYTHON_ABIS="3*"
 pkg_setup() {
 	# whatever LDFLAGS set will break linking
 	# see progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	if [[ -n "${LDFLAGS}" ]]; then
-		append-ldflags -shared
-	else
-		LDFLAGS="-shared"
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		if [[ -n "${LDFLAGS}" ]]; then
+			append-ldflags -shared
+		else
+			LDFLAGS="-shared"
+		fi
 	fi
 
 	# only one fortran to link with:
@@ -53,6 +57,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-alpha.patch" # bug 277438
 	epatch "${FILESDIR}/${P}-arm-sh.patch"
 
+	epatch "${FILESDIR}"/${P}-fenv-freebsd.patch # bug 279487
+
 	# Gentoo patch for ATLAS library names
 	sed -i \
 		-e "s:'f77blas':'blas':g" \
@@ -71,7 +77,7 @@ src_prepare() {
 				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
 			library_dirs = $(pkg-config --libs-only-L \
 				cblas blas lapack | sed -e \
-				's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir)
+				's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):"${EPREFIX}"/usr/$(get_libdir)
 			atlas_libs = $(pkg-config --libs-only-l \
 				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 			lapack_libs = $(pkg-config --libs-only-l \
@@ -81,13 +87,13 @@ src_prepare() {
 				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
 			library_dirs = $(pkg-config --libs-only-L \
 				cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
-				-e 's/ //g'):/usr/$(get_libdir)
+				-e 's/ //g'):"${EPREFIX}"/usr/$(get_libdir)
 			libraries = $(pkg-config --libs-only-l \
 				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 			[lapack_opt]
 			library_dirs = $(pkg-config --libs-only-L \
 				lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \
-				-e 's/ //g'):/usr/$(get_libdir)
+				-e 's/ //g'):"${EPREFIX}"/usr/$(get_libdir)
 			libraries = $(pkg-config --libs-only-l \
 				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 		EOF
@@ -116,7 +122,7 @@ src_test() {
 src_install() {
 	distutils_src_install ${NUMPY_FCONFIG}
 	dodoc THANKS.txt DEV_README.txt COMPATIBILITY
-	rm -f "${D}"/usr/lib/python*/site-packages/numpy/*.txt || die
+	rm -f "${ED}"/usr/lib/python*/site-packages/numpy/*.txt || die
 	docinto f2py
 	dodoc numpy/f2py/docs/*.txt || die "dodoc f2py failed"
 	doman numpy/f2py/f2py.1 || die "doman failed"