Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Work on porting numpy to new eclass

Package-Manager: portage-2.2.0_alpha149
  • Loading branch information...
commit ae4c6004cb519a744c2f33becce829589fe94cb2 1 parent 850f694
@kiwifb kiwifb authored
View
6 dev-python/numpy/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.157 2012/05/04 15:12:15 patrick Exp $
+*numpy-1.7.0_pre20121217-r2 (18 Dec 2012)
+
+ 18 Dec 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+ -numpy-1.7.0_pre20121217-r1.ebuild, +numpy-1.7.0_pre20121217-r2.ebuild:
+ more work on porting to new eclass
+
18 Dec 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+numpy-1.7.0_pre20121217.ebuild:
re-instate numpy 1.7.0 using the old python eclass while work on the new
View
4 dev-python/numpy/Manifest
@@ -15,7 +15,7 @@ DIST numpy-1.6.0-ref.pdf 6106335 SHA256 cbeea9b1395e0576bbd256c5de11886c63321d43
DIST numpy-1.6.0-user.pdf 20021 SHA256 d5f157b19585d4db6aa170573e6b41c70d075097221e5e6ba928a16233f5db24 SHA512 63a5e68de8db10fd0eb1e6ff1c06cd772a288c677616cc2055a750e8805e7a4be9d5caed5b2303d09be66cf87842baa062bf6b44740146d2a02f4129e4934bfc WHIRLPOOL ca728169b1f2fa5ee0187893d42db17e3e1733fae1e1b4ec73bafefd683222051e01fd3e3e03b58cd1eb5115693f61f34670c777f003266c899ae11107d97c5e
DIST numpy-c4c169c7cb32075386bd03463a908035c655784b.tar.gz 4806486 SHA256 23665e3c4f8d61a44de8306e8c5a6af45ef8bf3ee297782e4f84fb68fcf4b73e SHA512 aa06344eadf042cfdd4fbcc2a670769aee44be14a84737af184508d8e327b76278e0d1d768da482719b0c81ff2dbd59a31f9fdfc2b3c7b4f5e6a359bb42aab4c WHIRLPOOL 0a9736603ac58e43052e212db800a0a717a8410465d80703265508d68bfbdae159cb6f18d891b758fe3c73671fa4bdb9169c93ee07e2a55d5c31aba6a05875d4
EBUILD numpy-1.5.1.ebuild 5381 SHA256 e498ce9e5155b89d88fb3bd8e73413c1ac790cf421ecea02bb7351e031d6efe6 SHA512 c58a5a2dade2ea25a06ce776dc98b92d232923984775ddf77cee7120584a72414fa123d89c9ba562cc2e50dc1d731cb5269267eb724d90cfb8c170d3fa7d7880 WHIRLPOOL 1b5bb57e67e65393eb4f80f90fcc39b09b4f16c606ada864b0bfa2ebbe5a9d5d1bc9585f7bc072dd153fe13a33cba5e8a486d5746fb20f8abb9947ecd961838c
-EBUILD numpy-1.7.0_pre20121217-r1.ebuild 4303 SHA256 17a3308a438ccd4acc17b8321077638c836d5b05858d9b9d6afbffbdb4d08fe0 SHA512 dff1b1c2a05066af545128f43b78de91a968392231972ee902a4395ce1fefb9a509b8f7092be35330d46bf16daf1ea45a527e4eb2be00eb5f0f30413e15fea21 WHIRLPOOL 1ea9588c51b391e354b27a7d8e947de11feaebc5e89fcaab3b166e01a6ecd40cebcdd7ade574f5f666921af6fd9bb61dfe7998d6da119f44d5746edb3b49ab91
+EBUILD numpy-1.7.0_pre20121217-r2.ebuild 4567 SHA256 e121032cb51c164ffe7520b661b50d20e93644df9be79853407146d4101e85e6 SHA512 0748e6be95c874998a4c1e83292390ceead5c0aeb12f91a9cf752fb29620a983fbc3582de9a4c77f63e9e87360e96d9da1ed5280fe06fdf94937840fc634f57a WHIRLPOOL fad2dec024c221458ad0c8ba397ec2afa617972e1e64843424d9dc6b8d5a6b43551b1c313b02ed4246d1037be2ffc80bd2f6428c67ae6936e249472ff9ce393a
EBUILD numpy-1.7.0_pre20121217.ebuild 4241 SHA256 5633bedf01ed42295f5a5bd8d314389de2def0a75f5a0e91d586659b4bf1ccd3 SHA512 94c98ce3c81edf9b5db78e634da49ced36f064789ab229b8bd230fdd3d189d8985e168d7231e9d6977dd4aff20893ece5bb9591ee4215ac7f972a3677b3b5ef3 WHIRLPOOL 03e45e0a895f5b3c67dcec147b690d92e95eaf37f2457dac8046ed499310a566bb927a4601f2ca72c635f5d56155497be7c70817df7c25b9581c3f6834e049b8
-MISC ChangeLog 23522 SHA256 922f3261c696d618cba782e80b0ed5e4f827fb3cc610895e9ef3340171d59456 SHA512 bee5687f4eddc7d8f52c7558065efe074522e7cccfb1998990c42952b22d43618c0d3f3d6a94873da64efb5e48d557663980c1413c2174d95df12a98652a42ef WHIRLPOOL b5c2a0f04c8d4ee9aa08fdcd57737ec8a343489bd6103a87d58ec31c61277d32c37da88e418680469dda405c30b9e0d45b33403461259b5cb1d92131491078ca
+MISC ChangeLog 23744 SHA256 45e308fcc3ff86dcb08d10686e47e95de6908254a6c0e63f2df5c8aab8d4ef86 SHA512 d2983fd31c8fa47bf6d826d75b7d2f8ce38f62b9e4dfc4bd7a7cb77acebf6bfdecb06d3b0747ed2c28992923769ad9dc41f5f0f0f068eb5dd88ee2154bcc21f0 WHIRLPOOL 8cccf925ee3bed77d33535bbb97b04a0b4d716b0a03ba2d6d85f7365ee41f87dbf0cd8856b048184b3765c0bdcf6f35c186be8fcf896411e291035e726a8f7d6
MISC metadata.xml 615 SHA256 f50bbda17ece7ce10e62c739225822877af67a95b3fb9b6a861ee31db489cab3 SHA512 ffe2529b21b7a5ae0e201e735680603653fe32b2426a2c5cefe22409e4116e32d9e3ab3684192fa56f03e269bcc9ff333a511c0b5499246195c9a011b5779db0 WHIRLPOOL 6b43f449e642d51c693dbcb1c09af5e11dde1959c692073b8e7b366c61746e980ac966eede3ac7cc2cdbf7b7f41a092f8bdbe604cd5f477a7e6a43fc4129e2f7
View
28 ...n/numpy/numpy-1.7.0_pre20121217-r1.ebuild → ...n/numpy/numpy-1.7.0_pre20121217-r2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.6 2012/10/16 18:38:04 jlec Exp $
-EAPI=4
+EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
@@ -29,7 +29,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
IUSE="doc lapack test"
RDEPEND="
- ${PYTHON_DEPS}
dev-python/setuptools[${PYTHON_USEDEP}]
lapack? ( virtual/cblas virtual/lapack )"
DEPEND="${RDEPEND}
@@ -95,7 +94,7 @@ pc_libs() {
-e 's/^-l//' -e 's/[ ]*-l/,/g'
}
-src_prepare() {
+python_prepare_all() {
if use lapack; then
append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
local libdir="${EPREFIX}"/usr/$(get_libdir)
@@ -118,8 +117,16 @@ src_prepare() {
distutils-r1_python_prepare_all
}
-src_compile() {
- distutils-r1_src_compile ${NUMPY_FCONFIG}
+python_configure_all(){
+ # only one fortran to link with:
+ # linking with cblas and lapack library will force
+ # autodetecting and linking to all available fortran compilers
+ if use lapack; then
+ append-fflags -fPIC
+ mydistutilsargs=( config_fc --noopt --noarch )
+ # workaround bug 335908
+ [[ $(tc-getFC) == *gfortran* ]] && mydistutilsargs+=( --fcompiler=gnu95 )
+ fi
}
src_test() {
@@ -135,14 +142,13 @@ src_test() {
python_foreach_impl testing
}
-src_install() {
- distutils-r1_src_install ${NUMPY_FCONFIG}
+python_install(){
+ distutils-r1_python_install
- delete_txt() {
- rm -f "${ED}"$(python_get_sitedir)/numpy/*.txt
- }
- python_foreach_impl delete_txt
+ rm -f "${ED}"$(python_get_sitedir)/numpy/*.txt
+}
+python_install_all(){
docinto f2py
dodoc numpy/f2py/docs/*.txt
doman numpy/f2py/f2py.1
Please sign in to comment.
Something went wrong with that request. Please try again.