1 |
jlec 12/04/30 17:40:09 |
2 |
|
3 |
Modified: punc-1.5.ebuild ChangeLog |
4 |
Log: |
5 |
sci-libs/punc: Handle static libs |
6 |
|
7 |
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64, RepoMan options: --force) |
8 |
|
9 |
Revision Changes Path |
10 |
1.6 sci-libs/punc/punc-1.5.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/punc-1.5.ebuild?rev=1.6&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/punc-1.5.ebuild?rev=1.6&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/punc-1.5.ebuild?r1=1.5&r2=1.6 |
15 |
|
16 |
Index: punc-1.5.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.5.ebuild,v |
19 |
retrieving revision 1.5 |
20 |
retrieving revision 1.6 |
21 |
diff -u -r1.5 -r1.6 |
22 |
--- punc-1.5.ebuild 24 Nov 2011 11:01:47 -0000 1.5 |
23 |
+++ punc-1.5.ebuild 30 Apr 2012 17:40:09 -0000 1.6 |
24 |
@@ -1,10 +1,12 @@ |
25 |
-# Copyright 1999-2011 Gentoo Foundation |
26 |
+# Copyright 1999-2012 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.5.ebuild,v 1.5 2011/11/24 11:01:47 jlec Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.5.ebuild,v 1.6 2012/04/30 17:40:09 jlec Exp $ |
30 |
|
31 |
-EAPI="3" |
32 |
+EAPI=4 |
33 |
|
34 |
-inherit autotools fortran-2 multilib |
35 |
+AUTOTOOLS_AUTORECONF=yes |
36 |
+ |
37 |
+inherit autotools-utils fortran-2 multilib |
38 |
|
39 |
DESCRIPTION="Portable Understructure for Numerical Computing" |
40 |
HOMEPAGE="http://fetk.org/codes/punc/index.html" |
41 |
@@ -16,8 +18,6 @@ |
42 |
IUSE="debug doc mpi static-libs" |
43 |
|
44 |
RDEPEND=" |
45 |
- virtual/fortran |
46 |
- |
47 |
dev-libs/maloc[mpi=] |
48 |
dev-libs/libf2c |
49 |
sci-libs/amd |
50 |
@@ -26,6 +26,7 @@ |
51 |
sci-libs/superlu |
52 |
sci-libs/umfpack |
53 |
virtual/blas |
54 |
+ virtual/fortran |
55 |
virtual/lapack |
56 |
mpi? ( virtual/mpi )" |
57 |
DEPEND=" |
58 |
@@ -36,27 +37,28 @@ |
59 |
|
60 |
S="${WORKDIR}/${PN}" |
61 |
|
62 |
+PATCHES=( |
63 |
+ "${FILESDIR}"/${PV}-linking.patch |
64 |
+ "${FILESDIR}"/1.4-doc.patch ) |
65 |
+ |
66 |
src_prepare() { |
67 |
sed 's:punc/slu_ddefs.h:superlu/slu_ddefs.h:g' src/superlu/punc/vsuperlu.h > vsuperlu.h || die |
68 |
sed 's:punc/umfpack.h:umfpack.h:g' src/umfpack/punc/vumfpack.h > vumfpack.h || die |
69 |
rm -rf src/{amd,blas,lapack,arpack,superlu,umfpack} |
70 |
- epatch \ |
71 |
- "${FILESDIR}"/${PV}-linking.patch \ |
72 |
- "${FILESDIR}"/1.4-doc.patch |
73 |
- |
74 |
- cp tools/tests/pmg/*.f src/pmg/ -f |
75 |
- cp tools/tests/pmg/*.c src/pmg/ -f |
76 |
- cp src/pmg/vpmg.h src/vf2c/punc/vpmg.h |
77 |
|
78 |
- eautoreconf |
79 |
+ cp tools/tests/pmg/*.f src/pmg/ -f || die |
80 |
+ cp tools/tests/pmg/*.c src/pmg/ -f || die |
81 |
+ cp src/pmg/vpmg.h src/vf2c/punc/vpmg.h || die |
82 |
+ |
83 |
+ autotools-utils_src_prepare |
84 |
} |
85 |
|
86 |
src_configure() { |
87 |
local fetk_include |
88 |
local fetk_lib |
89 |
- local myconf |
90 |
+ local myeconfargs |
91 |
|
92 |
- use doc || myconf="${myconf} --with-doxygen= --with-dot=" |
93 |
+ use doc || myeconfargs+=( --with-doxygen= --with-dot= ) |
94 |
|
95 |
fetk_include="${EPREFIX}"/usr/include |
96 |
fetk_lib="${EPREFIX}"/usr/$(get_libdir) |
97 |
@@ -70,20 +72,20 @@ |
98 |
export FETK_CGCODE_LIBRARY="${fetk_lib}" |
99 |
export FETK_AMD_LIBRARY="${fetk_lib}" |
100 |
|
101 |
- econf \ |
102 |
- $(use_enable static-libs static) \ |
103 |
- $(use_enable debug vdebug) \ |
104 |
- --enable-vf2cforce \ |
105 |
- --enable-shared \ |
106 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
107 |
- --disable-triplet \ |
108 |
- ${myconf} |
109 |
+ myeconfargs+=( |
110 |
+ $(use_enable debug vdebug) |
111 |
+ --enable-vf2cforce |
112 |
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} |
113 |
+ --disable-triplet |
114 |
+ ) |
115 |
+ autotools-utils_src_configure |
116 |
} |
117 |
|
118 |
src_install() { |
119 |
- emake DESTDIR="${D}" install || die "make install failed" |
120 |
+ autotools-utils_src_install |
121 |
+ |
122 |
insinto /usr/include/punc |
123 |
- doins v*.h || die |
124 |
+ doins v*.h |
125 |
|
126 |
- dohtml doc/index.html || die "failed to install html docs" |
127 |
+ dohtml doc/index.html |
128 |
} |
129 |
|
130 |
|
131 |
|
132 |
1.15 sci-libs/punc/ChangeLog |
133 |
|
134 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/ChangeLog?rev=1.15&view=markup |
135 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/ChangeLog?rev=1.15&content-type=text/plain |
136 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/ChangeLog?r1=1.14&r2=1.15 |
137 |
|
138 |
Index: ChangeLog |
139 |
=================================================================== |
140 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v |
141 |
retrieving revision 1.14 |
142 |
retrieving revision 1.15 |
143 |
diff -u -r1.14 -r1.15 |
144 |
--- ChangeLog 24 Nov 2011 11:01:47 -0000 1.14 |
145 |
+++ ChangeLog 30 Apr 2012 17:40:09 -0000 1.15 |
146 |
@@ -1,6 +1,9 @@ |
147 |
# ChangeLog for sci-libs/punc |
148 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
149 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.14 2011/11/24 11:01:47 jlec Exp $ |
150 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
151 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.15 2012/04/30 17:40:09 jlec Exp $ |
152 |
+ |
153 |
+ 30 Apr 2012; Justin Lecher <jlec@g.o> punc-1.5.ebuild: |
154 |
+ Handle static libs |
155 |
|
156 |
24 Nov 2011; Justin Lecher <jlec@g.o> files/1.5-linking.patch, |
157 |
punc-1.5.ebuild, metadata.xml: |