* [gentoo-commits] gentoo-x86 commit in dev-python/numpy: numpy-1.5.1.ebuild ChangeLog numpy-1.6.0.ebuild
@ 2011-06-21 9:40 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2011-06-21 9:40 UTC (permalink / raw
To: gentoo-commits
jlec 11/06/21 09:40:15
Modified: numpy-1.5.1.ebuild ChangeLog numpy-1.6.0.ebuild
Log:
Added fortran-2.eclass support
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Revision Changes Path
1.16 dev-python/numpy/numpy-1.5.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild?r1=1.15&r2=1.16
Index: numpy-1.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- numpy-1.5.1.ebuild 3 Apr 2011 11:46:01 -0000 1.15
+++ numpy-1.5.1.ebuild 21 Jun 2011 09:40:15 -0000 1.16
@@ -1,13 +1,13 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v 1.15 2011/04/03 11:46:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v 1.16 2011/06/21 09:40:15 jlec Exp $
EAPI="3"
PYTHON_DEPEND="*"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="*-jython"
-inherit distutils eutils flag-o-matic toolchain-funcs versionator
+inherit distutils eutils fortran-2 flag-o-matic toolchain-funcs versionator
NP="${PN}-1.5"
@@ -37,6 +37,7 @@
DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
pkg_setup() {
+ fortran-2_pkg_setup
python_pkg_setup
# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
1.145 dev-python/numpy/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.144&r2=1.145
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- ChangeLog 19 Jun 2011 15:37:02 -0000 1.144
+++ ChangeLog 21 Jun 2011 09:40:15 -0000 1.145
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/numpy
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.144 2011/06/19 15:37:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.145 2011/06/21 09:40:15 jlec Exp $
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> numpy-1.5.1.ebuild,
+ numpy-1.6.0.ebuild:
+ Added fortran-2.eclass support
19 Jun 2011; Markus Meier <maekke@gentoo.org> numpy-1.6.0.ebuild:
x86 stable, bug #371673
1.6 dev-python/numpy/numpy-1.6.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild?r1=1.5&r2=1.6
Index: numpy-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- numpy-1.6.0.ebuild 19 Jun 2011 15:37:02 -0000 1.5
+++ numpy-1.6.0.ebuild 21 Jun 2011 09:40:15 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v 1.5 2011/06/19 15:37:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v 1.6 2011/06/21 09:40:15 jlec Exp $
EAPI="3"
PYTHON_DEPEND="*"
@@ -40,6 +40,7 @@
DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
pkg_setup() {
+ fortran-2_pkg_setup
python_pkg_setup
# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/numpy: numpy-1.5.1.ebuild ChangeLog numpy-1.6.0.ebuild
@ 2011-06-21 16:12 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2011-06-21 16:12 UTC (permalink / raw
To: gentoo-commits
jlec 11/06/21 16:12:21
Modified: numpy-1.5.1.ebuild ChangeLog numpy-1.6.0.ebuild
Log:
Add dependency on virtual/fortran
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Revision Changes Path
1.17 dev-python/numpy/numpy-1.5.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild?r1=1.16&r2=1.17
Index: numpy-1.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- numpy-1.5.1.ebuild 21 Jun 2011 09:40:15 -0000 1.16
+++ numpy-1.5.1.ebuild 21 Jun 2011 16:12:21 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v 1.16 2011/06/21 09:40:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v 1.17 2011/06/21 16:12:21 jlec Exp $
EAPI="3"
PYTHON_DEPEND="*"
@@ -25,7 +25,9 @@
KEYWORDS="alpha amd64 arm hppa ia64 ~mips 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"
IUSE="doc lapack test"
-RDEPEND="dev-python/setuptools
+RDEPEND="
+ dev-python/setuptools
+ virtual/fortran
lapack? ( virtual/cblas virtual/lapack )"
DEPEND="${RDEPEND}
doc? ( app-arch/unzip )
1.146 dev-python/numpy/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.146&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.146&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.145&r2=1.146
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- ChangeLog 21 Jun 2011 09:40:15 -0000 1.145
+++ ChangeLog 21 Jun 2011 16:12:21 -0000 1.146
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/numpy
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.145 2011/06/21 09:40:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.146 2011/06/21 16:12:21 jlec Exp $
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> numpy-1.5.1.ebuild,
+ numpy-1.6.0.ebuild:
+ Add dependency on virtual/fortran
21 Jun 2011; Justin Lecher <jlec@gentoo.org> numpy-1.5.1.ebuild,
numpy-1.6.0.ebuild:
1.7 dev-python/numpy/numpy-1.6.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild?r1=1.6&r2=1.7
Index: numpy-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- numpy-1.6.0.ebuild 21 Jun 2011 09:40:15 -0000 1.6
+++ numpy-1.6.0.ebuild 21 Jun 2011 16:12:21 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v 1.6 2011/06/21 09:40:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v 1.7 2011/06/21 16:12:21 jlec Exp $
EAPI="3"
PYTHON_DEPEND="*"
@@ -25,7 +25,9 @@
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~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"
IUSE="doc lapack test"
-RDEPEND="dev-python/setuptools
+RDEPEND="
+ dev-python/setuptools
+ virtual/fortran
lapack? ( virtual/cblas virtual/lapack )"
DEPEND="${RDEPEND}
doc? ( app-arch/unzip )
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/numpy: numpy-1.5.1.ebuild ChangeLog numpy-1.6.0.ebuild
@ 2011-06-21 18:05 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2011-06-21 18:05 UTC (permalink / raw
To: gentoo-commits
jlec 11/06/21 18:05:21
Modified: numpy-1.5.1.ebuild ChangeLog numpy-1.6.0.ebuild
Log:
Use USE=lapack to depend conditionally on fortran support
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Revision Changes Path
1.18 dev-python/numpy/numpy-1.5.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild?r1=1.17&r2=1.18
Index: numpy-1.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- numpy-1.5.1.ebuild 21 Jun 2011 16:12:21 -0000 1.17
+++ numpy-1.5.1.ebuild 21 Jun 2011 18:05:21 -0000 1.18
@@ -1,8 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v 1.17 2011/06/21 16:12:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v 1.18 2011/06/21 18:05:21 jlec Exp $
+
+EAPI=3
-EAPI="3"
PYTHON_DEPEND="*"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="*-jython"
@@ -27,8 +28,7 @@
RDEPEND="
dev-python/setuptools
- virtual/fortran
- lapack? ( virtual/cblas virtual/lapack )"
+ lapack? ( virtual/cblas virtual/lapack virtual/fortran )"
DEPEND="${RDEPEND}
doc? ( app-arch/unzip )
lapack? ( dev-util/pkgconfig )
@@ -39,7 +39,7 @@
DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
pkg_setup() {
- fortran-2_pkg_setup
+ use lapack && fortran-2_pkg_setup
python_pkg_setup
# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
@@ -53,9 +53,7 @@
# linking with cblas and lapack library will force
# autodetecting and linking to all available fortran compilers
use lapack || return
- [[ -z ${FC} ]] && FC=$(tc-getFC)
- # when fortran flags are set, pic is removed.
- FFLAGS="${FFLAGS} -fPIC"
+ append-fflags -fPIC
NUMPY_FCONFIG="config_fc --noopt --noarch"
# workaround bug 335908
[[ ${FC} == *gfortran* ]] && NUMPY_FCONFIG="${NUMPY_FCONFIG} --fcompiler=gnu95"
1.147 dev-python/numpy/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.147&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.147&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.146&r2=1.147
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- ChangeLog 21 Jun 2011 16:12:21 -0000 1.146
+++ ChangeLog 21 Jun 2011 18:05:21 -0000 1.147
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/numpy
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.146 2011/06/21 16:12:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.147 2011/06/21 18:05:21 jlec Exp $
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> numpy-1.5.1.ebuild,
+ numpy-1.6.0.ebuild:
+ Use USE=lapack to depend conditionally on fortran support
21 Jun 2011; Justin Lecher <jlec@gentoo.org> numpy-1.5.1.ebuild,
numpy-1.6.0.ebuild:
1.8 dev-python/numpy/numpy-1.6.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild?r1=1.7&r2=1.8
Index: numpy-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- numpy-1.6.0.ebuild 21 Jun 2011 16:12:21 -0000 1.7
+++ numpy-1.6.0.ebuild 21 Jun 2011 18:05:21 -0000 1.8
@@ -1,13 +1,14 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v 1.7 2011/06/21 16:12:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.0.ebuild,v 1.8 2011/06/21 18:05:21 jlec Exp $
+
+EAPI=3
-EAPI="3"
PYTHON_DEPEND="*"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="*-jython"
-inherit distutils flag-o-matic toolchain-funcs versionator
+inherit distutils flag-o-matic fortran-2 toolchain-funcs versionator
DOC_P="${PN}-1.5"
@@ -27,8 +28,7 @@
RDEPEND="
dev-python/setuptools
- virtual/fortran
- lapack? ( virtual/cblas virtual/lapack )"
+ lapack? ( virtual/cblas virtual/lapack virtual/fortran )"
DEPEND="${RDEPEND}
doc? ( app-arch/unzip )
lapack? ( dev-util/pkgconfig )
@@ -42,7 +42,7 @@
DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
pkg_setup() {
- fortran-2_pkg_setup
+ use lapack && fortran-2_pkg_setup
python_pkg_setup
# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
@@ -56,9 +56,7 @@
# linking with cblas and lapack library will force
# autodetecting and linking to all available fortran compilers
if use lapack; then
- [[ -z ${FC} ]] && FC=$(tc-getFC)
- # when fortran flags are set, pic is removed.
- FFLAGS="${FFLAGS} -fPIC"
+ append-fflags -fPIC
NUMPY_FCONFIG="config_fc --noopt --noarch"
# workaround bug 335908
[[ ${FC} == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-06-21 18:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-21 9:40 [gentoo-commits] gentoo-x86 commit in dev-python/numpy: numpy-1.5.1.ebuild ChangeLog numpy-1.6.0.ebuild Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2011-06-21 16:12 Justin Lecher (jlec)
2011-06-21 18:05 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox