1 |
commit: f646e47ce7406437af4891c1c6266a671a17c4ad |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 3 10:01:48 2013 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 3 10:01:48 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f646e47c |
7 |
|
8 |
sci-misc/elmer-elmergrid: Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; use correct phase functions; simplify configure; link against external metis |
9 |
|
10 |
Package-Manager: portage-2.2.7 |
11 |
|
12 |
--- |
13 |
sci-misc/elmer-elmergrid/ChangeLog | 12 +++++ |
14 |
.../elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild | 51 ---------------------- |
15 |
.../elmer-elmergrid-6.0_p4651.ebuild | 37 ++++++++++++++++ |
16 |
.../elmer-elmergrid/elmer-elmergrid-9999.ebuild | 46 +++++++++---------- |
17 |
sci-misc/elmer-elmergrid/metadata.xml | 5 +++ |
18 |
5 files changed, 75 insertions(+), 76 deletions(-) |
19 |
|
20 |
diff --git a/sci-misc/elmer-elmergrid/ChangeLog b/sci-misc/elmer-elmergrid/ChangeLog |
21 |
new file mode 100644 |
22 |
index 0000000..95ddc32 |
23 |
--- /dev/null |
24 |
+++ b/sci-misc/elmer-elmergrid/ChangeLog |
25 |
@@ -0,0 +1,12 @@ |
26 |
+# ChangeLog for sci-misc/elmer-elmergrid |
27 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
+# $Header: $ |
29 |
+ |
30 |
+*elmer-elmergrid-6.0_p4651 (03 Dec 2013) |
31 |
+ |
32 |
+ 03 Dec 2013; Justin Lecher <jlec@g.o> -elmer-elmergrid-5.4.1.ebuild, |
33 |
+ +elmer-elmergrid-6.0_p4651.ebuild, elmer-elmergrid-9999.ebuild, |
34 |
+ +metadata.xml: |
35 |
+ Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; use correct phase |
36 |
+ functions; simplify configure; link against external metis |
37 |
+ |
38 |
|
39 |
diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild b/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild |
40 |
deleted file mode 100644 |
41 |
index 1e1bd6f..0000000 |
42 |
--- a/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild |
43 |
+++ /dev/null |
44 |
@@ -1,51 +0,0 @@ |
45 |
-# Copyright 1999-2007 Gentoo Foundation |
46 |
-# Distributed under the terms of the GNU General Public License v2 |
47 |
-# $Header: $ |
48 |
- |
49 |
-EAPI="4" |
50 |
- |
51 |
-inherit autotools eutils |
52 |
- |
53 |
-ELMER_ROOT="elmerfem" |
54 |
-MY_PN=${PN/elmer-/} |
55 |
- |
56 |
-DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, elmergrid" |
57 |
-HOMEPAGE="http://www.csc.fi/english/pages/elmer" |
58 |
-SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV}/${MY_PN}/?view=tar -> ${P}.tar.gz" |
59 |
-RESTRICT="mirror" |
60 |
- |
61 |
-LICENSE="GPL-2" |
62 |
-SLOT="0" |
63 |
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
64 |
-IUSE="debug" |
65 |
-DEPEND="sci-libs/matc |
66 |
- sys-libs/glibc" |
67 |
-RDEPEND="${DEPEND}" |
68 |
- |
69 |
-S="${WORKDIR}/${PV}/elmergrid" |
70 |
- |
71 |
-src_unpack() { |
72 |
- unpack ${A} |
73 |
- cd "${S}" |
74 |
- # configure must be executable |
75 |
- chmod +x configure |
76 |
- eautoreconf |
77 |
-} |
78 |
- |
79 |
-src_compile() { |
80 |
- cd "${S}" |
81 |
- local myconf |
82 |
- export FC="gfortran" |
83 |
- export F77="gfortran" |
84 |
- use debug && |
85 |
- myconf="${myconf} --with-debug" || |
86 |
- myconf="${myconf} --without-debug" |
87 |
- myconf="$myconf --with-matc" |
88 |
- econf $myconf || die "econf failed" |
89 |
- emake || die "emake failed" |
90 |
-} |
91 |
- |
92 |
- |
93 |
-src_install() { |
94 |
- emake DESTDIR="${D}" install || die "emake install failed" |
95 |
-} |
96 |
|
97 |
diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild b/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild |
98 |
new file mode 100644 |
99 |
index 0000000..743d4ee |
100 |
--- /dev/null |
101 |
+++ b/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild |
102 |
@@ -0,0 +1,37 @@ |
103 |
+# Copyright 1999-2013 Gentoo Foundation |
104 |
+# Distributed under the terms of the GNU General Public License v2 |
105 |
+# $Header: $ |
106 |
+ |
107 |
+EAPI=5 |
108 |
+ |
109 |
+AUTOTOOLS_AUTORECONF=true |
110 |
+ |
111 |
+inherit autotools-utils multilib |
112 |
+ |
113 |
+ELMER_ROOT="elmerfem" |
114 |
+MY_PN=${PN/elmer-/} |
115 |
+ |
116 |
+DESCRIPTION="Finite element programs, libraries, and visualization tools - elmergrid" |
117 |
+HOMEPAGE="http://www.csc.fi/english/pages/elmer" |
118 |
+SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651 -> ${P}.tar.gz" |
119 |
+ |
120 |
+LICENSE="GPL-2" |
121 |
+SLOT="0" |
122 |
+KEYWORDS="~amd64 ~x86" |
123 |
+IUSE="debug" |
124 |
+ |
125 |
+RDEPEND=" |
126 |
+ sci-libs/matc |
127 |
+ sci-libs/metis" |
128 |
+DEPEND="${RDEPEND}" |
129 |
+ |
130 |
+S="${WORKDIR}/elmergrid" |
131 |
+ |
132 |
+src_configure() { |
133 |
+ local myeconfargs=( |
134 |
+ $(use_with debug) |
135 |
+ --with-metis-libs="${EPREFIX}"/usr/$(get_libdir) |
136 |
+ --with-metis-include="${EPREFIX}"/usr/include/metis |
137 |
+ ) |
138 |
+ autotools-utils_src_configure |
139 |
+} |
140 |
|
141 |
diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-9999.ebuild b/sci-misc/elmer-elmergrid/elmer-elmergrid-9999.ebuild |
142 |
index 67549e9..fe17b79 100644 |
143 |
--- a/sci-misc/elmer-elmergrid/elmer-elmergrid-9999.ebuild |
144 |
+++ b/sci-misc/elmer-elmergrid/elmer-elmergrid-9999.ebuild |
145 |
@@ -1,48 +1,44 @@ |
146 |
-# Copyright 1999-2007 Gentoo Foundation |
147 |
+# Copyright 1999-2013 Gentoo Foundation |
148 |
# Distributed under the terms of the GNU General Public License v2 |
149 |
# $Header: $ |
150 |
|
151 |
-EAPI="4" |
152 |
+EAPI=5 |
153 |
|
154 |
-inherit autotools eutils subversion |
155 |
+AUTOTOOLS_AUTORECONF=true |
156 |
+ |
157 |
+inherit autotools-utils subversion |
158 |
|
159 |
ELMER_ROOT="elmerfem" |
160 |
MY_PN=${PN/elmer-/} |
161 |
|
162 |
-DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, elmergrid" |
163 |
+DESCRIPTION="Finite element programs, libraries, and visualization tools - elmergrid" |
164 |
HOMEPAGE="http://www.csc.fi/english/pages/elmer" |
165 |
-#SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV}/${MY_PN}/?view=tar -> ${P}.tar.gz" |
166 |
SRC_URI="" |
167 |
-RESTRICT="mirror" |
168 |
ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}" |
169 |
ESVN_PROJECT="${MY_PN}" |
170 |
|
171 |
LICENSE="GPL-2" |
172 |
SLOT="0" |
173 |
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
174 |
+KEYWORDS="" |
175 |
IUSE="debug" |
176 |
-DEPEND="sci-libs/matc |
177 |
- sys-libs/glibc" |
178 |
-RDEPEND="${DEPEND}" |
179 |
|
180 |
-S="${WORKDIR}/${PV}/elmergrid" |
181 |
+RDEPEND=" |
182 |
+ sci-libs/matc |
183 |
+ sci-libs/metis" |
184 |
+DEPEND="${RDEPEND}" |
185 |
+ |
186 |
+S="${WORKDIR}/elmergrid" |
187 |
|
188 |
src_prepare() { |
189 |
- #unpack ${A} |
190 |
- cd "${S}" |
191 |
- # configure must be executable |
192 |
- #chmod +x configure |
193 |
- eautoreconf |
194 |
+ subversion_src_prepare |
195 |
+ autotools-utils_src_prepare |
196 |
} |
197 |
|
198 |
src_configure() { |
199 |
- cd "${S}" |
200 |
- local myconf |
201 |
- export FC="gfortran" |
202 |
- export F77="gfortran" |
203 |
- use debug && |
204 |
- myconf="${myconf} --with-debug" || |
205 |
- myconf="${myconf} --without-debug" |
206 |
- myconf="$myconf --with-matc" |
207 |
- econf $myconf || die "econf failed" |
208 |
+ local myeconfargs=( |
209 |
+ $(use_with debug) |
210 |
+ --with-metis-libs="${EPREFIX}"/usr/$(get_libdir) |
211 |
+ --with-metis-include="${EPREFIX}"/usr/include/metis |
212 |
+ ) |
213 |
+ autotools-utils_src_configure |
214 |
} |
215 |
|
216 |
diff --git a/sci-misc/elmer-elmergrid/metadata.xml b/sci-misc/elmer-elmergrid/metadata.xml |
217 |
new file mode 100644 |
218 |
index 0000000..897aa2e |
219 |
--- /dev/null |
220 |
+++ b/sci-misc/elmer-elmergrid/metadata.xml |
221 |
@@ -0,0 +1,5 @@ |
222 |
+<?xml version="1.0" encoding="UTF-8"?> |
223 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
224 |
+<pkgmetadata> |
225 |
+ <herd>sci</herd> |
226 |
+</pkgmetadata> |