1 |
bicatali 07/10/15 14:19:13 |
2 |
|
3 |
Modified: ChangeLog numeric-24.2-r6.ebuild |
4 |
numeric-24.2-r5.ebuild |
5 |
Log: |
6 |
Use the new virtual/cblas. Cleaning latest version ebuilds. |
7 |
(Portage version: 2.1.3.12) |
8 |
|
9 |
Revision Changes Path |
10 |
1.37 dev-python/numeric/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numeric/ChangeLog?rev=1.37&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numeric/ChangeLog?rev=1.37&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numeric/ChangeLog?r1=1.36&r2=1.37 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v |
19 |
retrieving revision 1.36 |
20 |
retrieving revision 1.37 |
21 |
diff -u -r1.36 -r1.37 |
22 |
--- ChangeLog 4 Sep 2007 17:18:57 -0000 1.36 |
23 |
+++ ChangeLog 15 Oct 2007 14:19:12 -0000 1.37 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for dev-python/numeric |
26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.36 2007/09/04 17:18:57 bicatali Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.37 2007/10/15 14:19:12 bicatali Exp $ |
29 |
+ |
30 |
+ 15 Oct 2007; Sébastien Fabbro <bicatali@g.o> |
31 |
+ numeric-24.2-r5.ebuild, numeric-24.2-r6.ebuild: |
32 |
+ Use the new virtual/cblas. Cleaning latest version ebuilds. |
33 |
|
34 |
04 Sep 2007; Sébastien Fabbro <bicatali@g.o> |
35 |
files/numeric-24.2-lapack.patch, numeric-24.2-r6.ebuild: |
36 |
|
37 |
|
38 |
|
39 |
1.5 dev-python/numeric/numeric-24.2-r6.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild?rev=1.5&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild?rev=1.5&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild?r1=1.4&r2=1.5 |
44 |
|
45 |
Index: numeric-24.2-r6.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild,v |
48 |
retrieving revision 1.4 |
49 |
retrieving revision 1.5 |
50 |
diff -u -r1.4 -r1.5 |
51 |
--- numeric-24.2-r6.ebuild 4 Sep 2007 17:18:57 -0000 1.4 |
52 |
+++ numeric-24.2-r6.ebuild 15 Oct 2007 14:19:12 -0000 1.5 |
53 |
@@ -1,10 +1,10 @@ |
54 |
# Copyright 1999-2007 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild,v 1.4 2007/09/04 17:18:57 bicatali Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild,v 1.5 2007/10/15 14:19:12 bicatali Exp $ |
58 |
|
59 |
NEED_PYTHON=2.3 |
60 |
|
61 |
-inherit distutils eutils fortran |
62 |
+inherit distutils eutils |
63 |
|
64 |
MY_P=Numeric-${PV} |
65 |
|
66 |
@@ -13,33 +13,24 @@ |
67 |
SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz |
68 |
doc? ( http://numpy.scipy.org/numpy.pdf )" |
69 |
|
70 |
-# numeric needs cblas (virtual/cblas work in progress) |
71 |
-# and lapack. needs fortran to get the proper fortran to C library. |
72 |
-RDEPEND="lapack? ( || ( >=sci-libs/blas-atlas-3.7.11-r1 |
73 |
- >=sci-libs/cblas-reference-20030223-r3 ) |
74 |
- virtual/lapack )" |
75 |
+RDEPEND="lapack? ( virtual/cblas virtual/lapack )" |
76 |
DEPEND="${RDEPEND} |
77 |
- lapack? ( app-admin/eselect-cblas )" |
78 |
+ lapack? ( dev-util/pkgconfig )" |
79 |
|
80 |
LICENSE="as-is" |
81 |
SLOT="0" |
82 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
83 |
IUSE="doc lapack" |
84 |
|
85 |
-S=${WORKDIR}/${MY_P} |
86 |
+S="${WORKDIR}/${MY_P}" |
87 |
|
88 |
-pkg_setup() { |
89 |
- if use lapack; then |
90 |
- FORTRAN="gfortran g77 ifc" |
91 |
- fortran_pkg_setup |
92 |
- for d in $(eselect cblas show); do mycblas=${d}; done |
93 |
- if [[ -z "${mycblas/reference/}" ]] && [[ -z "${mycblas/atlas/}" ]]; then |
94 |
- ewarn "You need to set cblas to atlas or reference. Do:" |
95 |
- ewarn " eselect cblas set <impl>" |
96 |
- ewarn "where <impl> is atlas, threaded-atlas or reference" |
97 |
- die "setup failed" |
98 |
- fi |
99 |
- fi |
100 |
+# ex usage: pkgconf_cfg --libs-only-l cblas: ['cblas','atlas'] |
101 |
+pkgconf_cfg() { |
102 |
+ local cfg="[" |
103 |
+ for i in $(pkg-config "$1" "$2"); do |
104 |
+ cfg="${cfg}'${i:2}'" |
105 |
+ done |
106 |
+ echo "${cfg//\'\'/','}]" |
107 |
} |
108 |
|
109 |
src_unpack() { |
110 |
@@ -59,35 +50,19 @@ |
111 |
# fix for dotblas from uncommited cvs |
112 |
epatch "${FILESDIR}"/${P}-dotblas.patch |
113 |
|
114 |
- # adapt lapack support |
115 |
+ # adapt lapack/cblas support |
116 |
if use lapack; then |
117 |
- epatch "${FILESDIR}"/${P}-lapack.patch |
118 |
- local flib= |
119 |
- if [[ "${FORTRANC}" == gfortran ]]; then |
120 |
- flib="'gfortran'" |
121 |
- elif [[ "${FORTRANC}" == if* ]]; then |
122 |
- flib="'imf'" |
123 |
- elif [[ "${FORTRANC}" == g77 ]]; then |
124 |
- flib="'g2c'" |
125 |
- fi |
126 |
- local cblaslib= cblasinc= |
127 |
- if [[ "${mycblas}" == reference ]]; then |
128 |
- cblaslib="'blas','cblas'" |
129 |
- cblasinc="'/usr/include/cblas'" |
130 |
- elif [[ "${mycblas}" == atlas ]]; then |
131 |
- cblaslib="'blas','cblas','atlas'" |
132 |
- cblasinc="'/usr/include/atlas'" |
133 |
- elif [[ "${mycblas}" == threaded-atlas ]]; then |
134 |
- cblaslib="'blas','cblas','atlas','pthread'" |
135 |
- cblasinc="'/usr/include/atlas'" |
136 |
- fi |
137 |
- sed -i \ |
138 |
- -e "s:@FLIB@:${flib}:g" \ |
139 |
- -e "s:@LAPACKLIB@:'lapack':g" \ |
140 |
- -e "s:@CBLASLIB@:${cblaslib}:g" \ |
141 |
- -e "s:@CBLASINC@:${cblasinc}:g" \ |
142 |
- "${S}"/customize.py \ |
143 |
- || die "sed for lapack support failed" |
144 |
+ cd "${S}" |
145 |
+ mv customize.py customize.py.orig |
146 |
+ cat > customize.py << EOF |
147 |
+use_system_lapack = 1 |
148 |
+lapack_libraries = $(pkgconf_cfg --libs-only-l lapack) |
149 |
+lapack_library_dirs = $(pkgconf_cfg --libs-only-L lapack) |
150 |
+use_system_blas = 1 |
151 |
+dotblas_libraries = $(pkgconf_cfg --libs-only-l cblas) |
152 |
+dotblas_library_dirs = $(pkgconf_cfg --libs-only-L cblas) |
153 |
+dotblas_cblas_header = '<cblas.h>' |
154 |
+EOF |
155 |
fi |
156 |
} |
157 |
|
158 |
@@ -101,14 +76,14 @@ |
159 |
distutils_src_install |
160 |
|
161 |
# install various README from packages |
162 |
- newdoc Packages/MA/README README.MA |
163 |
- newdoc Packages/RNG/README README.RNG |
164 |
+ newdoc Packages/MA/README README.MA || die |
165 |
+ newdoc Packages/RNG/README README.RNG || die |
166 |
|
167 |
if use lapack; then |
168 |
docinto dotblas |
169 |
- dodoc Packages/dotblas/{README,profileDot}.txt |
170 |
+ dodoc Packages/dotblas/{README,profileDot}.txt || die "doc for dotblas failed" |
171 |
insinto /usr/share/doc/${PF}/dotblas |
172 |
- doins Packages/dotblas/profileDot.py |
173 |
+ doins Packages/dotblas/profileDot.py || die "example for dotblas failed" |
174 |
fi |
175 |
|
176 |
# install tutorial and docs |
177 |
|
178 |
|
179 |
|
180 |
1.2 dev-python/numeric/numeric-24.2-r5.ebuild |
181 |
|
182 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numeric/numeric-24.2-r5.ebuild?rev=1.2&view=markup |
183 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numeric/numeric-24.2-r5.ebuild?rev=1.2&content-type=text/plain |
184 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numeric/numeric-24.2-r5.ebuild?r1=1.1&r2=1.2 |
185 |
|
186 |
Index: numeric-24.2-r5.ebuild |
187 |
=================================================================== |
188 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r5.ebuild,v |
189 |
retrieving revision 1.1 |
190 |
retrieving revision 1.2 |
191 |
diff -u -r1.1 -r1.2 |
192 |
--- numeric-24.2-r5.ebuild 1 Sep 2007 22:24:30 -0000 1.1 |
193 |
+++ numeric-24.2-r5.ebuild 15 Oct 2007 14:19:12 -0000 1.2 |
194 |
@@ -1,6 +1,6 @@ |
195 |
# Copyright 1999-2007 Gentoo Foundation |
196 |
# Distributed under the terms of the GNU General Public License v2 |
197 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r5.ebuild,v 1.1 2007/09/01 22:24:30 bicatali Exp $ |
198 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r5.ebuild,v 1.2 2007/10/15 14:19:12 bicatali Exp $ |
199 |
|
200 |
NEED_PYTHON=2.3 |
201 |
|
202 |
@@ -15,10 +15,10 @@ |
203 |
|
204 |
LICENSE="as-is" |
205 |
SLOT="0" |
206 |
-KEYWORDS="~arm ~mips ~s390" |
207 |
+KEYWORDS="~arm ~mips ~sh ~s390" |
208 |
IUSE="doc" |
209 |
|
210 |
-S=${WORKDIR}/${MY_P} |
211 |
+S="${WORKDIR}/${MY_P}" |
212 |
|
213 |
src_unpack() { |
214 |
unpack ${A} |
215 |
@@ -48,8 +48,8 @@ |
216 |
distutils_src_install |
217 |
|
218 |
# install various README from packages |
219 |
- newdoc Packages/MA/README README.MA |
220 |
- newdoc Packages/RNG/README README.RNG |
221 |
+ newdoc Packages/MA/README README.MA || die |
222 |
+ newdoc Packages/RNG/README README.RNG || die |
223 |
|
224 |
# install tutorial and docs |
225 |
if use doc; then |
226 |
|
227 |
|
228 |
|
229 |
-- |
230 |
gentoo-commits@g.o mailing list |