summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-01-05 19:50:16 +0000
committerFabian Groffen <grobian@gentoo.org>2010-01-05 19:50:16 +0000
commit19213e46f091d211251b97f369dac1cef5aa727c (patch)
tree4605841e764c6a0fbd592120793288639e061862 /sci-libs/scipy
parentppc stable #296340 (diff)
downloadhistorical-19213e46f091d211251b97f369dac1cef5aa727c.tar.gz
historical-19213e46f091d211251b97f369dac1cef5aa727c.tar.bz2
historical-19213e46f091d211251b97f369dac1cef5aa727c.zip
Fix for Darwin, marked ~ppc-macos
Package-Manager: portage-2.2.00.15171-prefix/cvs/Darwin powerpc RepoMan-Options: --force
Diffstat (limited to 'sci-libs/scipy')
-rw-r--r--sci-libs/scipy/ChangeLog5
-rw-r--r--sci-libs/scipy/Manifest14
-rw-r--r--sci-libs/scipy/scipy-0.7.1.ebuild10
3 files changed, 13 insertions, 16 deletions
diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 951f9e5a3492..3258b5888945 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/scipy
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.45 2010/01/02 18:16:49 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.46 2010/01/05 19:50:16 grobian Exp $
+
+ 05 Jan 2010; Fabian Groffen <grobian@gentoo.org> scipy-0.7.1.ebuild:
+ Fix for Darwin, marked ~ppc-macos
02 Jan 2010; Christian Faulhammer <fauli@gentoo.org> scipy-0.7.1.ebuild:
Transfer Prefix keywords
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 0fe20f6016ad..d19ff27fbbe7 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX scipy-0.6.0-stsci.patch 2209 RMD160 c7c21a23aef7fff9318f224ef2383f7970c1caf9 SHA1 4b86ad61346660959a61dce24b2b9f20595ea473 SHA256 69cec7cfedbc39a30f54ec12852a84017b5a256e966e60a64b4e891b497fd1be
AUX scipy-0.7.0_beta1-implicit.patch 905 RMD160 a22d5b5c7a67b3a806b63d7708654562fc241300 SHA1 40239fd3a77dc6f8cf9914a266953fd7b4ef41fe SHA256 cbde48ba3e22ef994b4ae0744c6186ef6d3ec608a74b3d0082f22d0be9591b96
DIST scipy-0.7-html.zip 5723344 RMD160 2629be4420fcad20bd7d9f080e01e4dcf7639c10 SHA1 3db044ef8603578e15754ae890a6e2fddcdadae9 SHA256 35e2e4e4a7aaba8c348175366c120b1a802951abe50af10458c532631e0133bb
DIST scipy-0.7-ref.pdf 3380649 RMD160 88bda2a06bc20627afbb0354fbe57c1b82dda7eb SHA1 091e1df2d28ee85428c50ee268db56146be96746 SHA256 4acbd75979fabfea9ff9d0cf60e06520c1f4d372f5369add8294f72303d3d0e0
DIST scipy-0.7.1.tar.gz 4538765 RMD160 b3cb0b40a739cd8b61182f123581d57443b9401a SHA1 ab637e29743cc0c42903a8815043f85d13fb9e42 SHA256 08830d6363a8753ca1376dd22da86d164902711c5feaf0f768b5ee086b3ecd5f
-EBUILD scipy-0.7.1.ebuild 3931 RMD160 4cba1742a129dc0441c335a6f82c8cc79adad6eb SHA1 4a30b1327fef3b48769490e6f9925a99e8f57d3a SHA256 ae6c076a510823cb1c312c9e5a4fafbcd1a5a944e8354dbfc8400e561905a758
-MISC ChangeLog 10066 RMD160 dfef34bb29e5a5887ac747ad796d2c7329d1f504 SHA1 0c2ac764f1b8c0035dfe13f45a7916623b5ca8c0 SHA256 e1fb3ed97b22f495deaf19282b44e13cdde982bacac49df4afa4ac875ea47b3f
+EBUILD scipy-0.7.1.ebuild 4170 RMD160 82e019e535de2327632e26bb2f2e86bae7b1f585 SHA1 d14eb94cecefe913a6c923c39b0fda3270cd1aea SHA256 d6b841d8e981f5069fadf2d2cf5859897820d3954197ac7f9cbef292d31e5b08
+MISC ChangeLog 10176 RMD160 ee5dce201b7759f83c6388c586bd5d512e5d438b SHA1 a5b4dae933212ff5d128db3d4c0d6f15b5e0ddcc SHA256 14e7dd25cf0d5cceec4ee6c41c7d227a821a4cf787eee71c27640f1f40860c08
MISC metadata.xml 697 RMD160 05eb973594c8fe27be71e813f2a2294cf9e3f46e SHA1 1dbbb06751c0fc5760618d8998f9d169b3f774ae SHA256 1bfca083b6aa7c4fbd95b638daa2158b2eaa5cb93fe7a99abe9a2bc08b21e48e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks/jZcACgkQNQqtfCuFneNrawCaAzJJGQXRC7lwJt+22nMsBOoC
-D2EAnic4C1rB1nMEJ8BKuFFvMlTXmPPu
-=i3Km
------END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.7.1.ebuild b/sci-libs/scipy/scipy-0.7.1.ebuild
index f800033c00b5..c1550abf52f0 100644
--- a/sci-libs/scipy/scipy-0.7.1.ebuild
+++ b/sci-libs/scipy/scipy-0.7.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.5 2010/01/02 18:16:49 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.6 2010/01/05 19:50:16 grobian Exp $
EAPI="2"
NEED_PYTHON="2.4"
@@ -23,7 +23,7 @@ LICENSE="BSD"
SLOT="0"
IUSE="doc umfpack"
#IUSE="test umfpack"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
CDEPEND=">=dev-python/numpy-1.2
virtual/cblas
@@ -50,7 +50,11 @@ pkg_setup() {
# scipy automatically detects libraries by default
export {FFTW,FFTW3,UMFPACK}=None
use umfpack && unset UMFPACK
- append-ldflags -shared
+ # the missing symbols are in -lpythonX.Y, but since the version can
+ # differ, we just introduce the same scaryness as on Linux/ELF
+ [[ ${CHOST} == *-darwin* ]] \
+ && append-ldflags -bundle "-undefined dynamic_lookup" \
+ || append-ldflags -shared
[[ -z ${FC} ]] && export FC=$(tc-getFC)
# hack to force F77 to be FC until bug #278772 is fixed
[[ -z ${F77} ]] && export F77=$(tc-getFC)