1 |
commit: 87f3353e9c170e07a5f21e2d295e93a2d50f9c7d |
2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
3 |
AuthorDate: Thu Jan 28 19:26:35 2021 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
5 |
CommitDate: Thu Jan 28 19:26:35 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=87f3353e |
7 |
|
8 |
sci-mathematics/netgen: EAPI bump, add 6.0-beta |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
11 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
12 |
|
13 |
sci-mathematics/netgen/netgen-4.9.13.ebuild | 77 ------------------- |
14 |
sci-mathematics/netgen/netgen-5.0.0.ebuild | 88 ---------------------- |
15 |
sci-mathematics/netgen/netgen-5.3.1.ebuild | 14 ++-- |
16 |
...{netgen-5.3.1.ebuild => netgen-6.0_beta.ebuild} | 22 +++--- |
17 |
4 files changed, 22 insertions(+), 179 deletions(-) |
18 |
|
19 |
diff --git a/sci-mathematics/netgen/netgen-4.9.13.ebuild b/sci-mathematics/netgen/netgen-4.9.13.ebuild |
20 |
deleted file mode 100644 |
21 |
index 1e98480e3..000000000 |
22 |
--- a/sci-mathematics/netgen/netgen-4.9.13.ebuild |
23 |
+++ /dev/null |
24 |
@@ -1,77 +0,0 @@ |
25 |
-# Copyright 1999-2021 Gentoo Authors |
26 |
-# Distributed under the terms of the GNU General Public License v2 |
27 |
- |
28 |
-EAPI=5 |
29 |
- |
30 |
-inherit eutils flag-o-matic multilib versionator |
31 |
- |
32 |
-DESCRIPTION="Automatic 3d tetrahedral mesh generator" |
33 |
-HOMEPAGE="https://sourceforge.net/projects/netgen/" |
34 |
-SRC_URI="mirror://sourceforge/netgen-mesher/${P}.tar.gz" |
35 |
- |
36 |
-SLOT="0" |
37 |
-LICENSE="LGPL-2.1" |
38 |
-KEYWORDS="~amd64 ~x86" |
39 |
-IUSE="-ffmpeg jpeg -mpi opencascade" |
40 |
- |
41 |
-DEPEND=" |
42 |
- dev-tcltk/tix |
43 |
- dev-tcltk/togl:1.7 |
44 |
- virtual/opengl |
45 |
- x11-libs/libXmu |
46 |
- opencascade? ( sci-libs/opencascade:* ) |
47 |
- ffmpeg? ( media-video/ffmpeg ) |
48 |
- jpeg? ( virtual/jpeg:0= ) |
49 |
- mpi? ( virtual/mpi ) " |
50 |
-RDEPEND="${DEPEND}" |
51 |
-# Note, MPI has not be tested. |
52 |
- |
53 |
-src_configure() { |
54 |
- # This is not the most clever way to deal with these flags |
55 |
- # but --disable-xxx does not seem to work correcly, so... |
56 |
- local myconf="--with-togl=/usr/$(get_libdir)/Togl1.7" |
57 |
- |
58 |
- if use opencascade; then |
59 |
- myconf="${myconf} --enable-occ --with-occ=$CASROOT" |
60 |
- append-ldflags -L$CASROOT/lin/$(get_libdir) |
61 |
- fi |
62 |
- |
63 |
- use mpi && myconf="${myconf} --enable-parallel" |
64 |
- use ffmpeg && myconf="${myconf} --enable-ffmpeg" |
65 |
- use jpeg && myconf="${myconf} --enable-jpeglib" |
66 |
- |
67 |
- append-flags -I/usr/include/togl-1.7 |
68 |
- |
69 |
- econf \ |
70 |
- ${myconf} |
71 |
- |
72 |
- # This would be the more elegant way: |
73 |
-# econf \ |
74 |
-# $(use_enable opencascade occ) \ |
75 |
-# $(use_with opencascade "occ=$CASROOT") \ |
76 |
-# $(use_enable mpi parallel) \ |
77 |
-# $(use_enable ffmpeg) \ |
78 |
-# $(use_enable jpeg jpeglib) |
79 |
-} |
80 |
- |
81 |
-src_install() { |
82 |
- local NETGENDIR="/usr/share/netgen" |
83 |
- |
84 |
- echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > ./99netgen |
85 |
- doenvd 99netgen |
86 |
- |
87 |
- default |
88 |
- mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" |
89 |
- |
90 |
- # Install icon and .desktop for menu entry |
91 |
- doicon "${FILESDIR}"/${PN}.png |
92 |
- domenu "${FILESDIR}"/${PN}.desktop |
93 |
-} |
94 |
- |
95 |
-pkg_postinst() { |
96 |
- elog "Please make sure to update your environment variables:" |
97 |
- elog "env-update && source /etc/profile" |
98 |
- elog "Netgen ebuild is still under development." |
99 |
- elog "Help us improve the ebuild in:" |
100 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=155424" |
101 |
-} |
102 |
|
103 |
diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild b/sci-mathematics/netgen/netgen-5.0.0.ebuild |
104 |
deleted file mode 100644 |
105 |
index 639122f31..000000000 |
106 |
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild |
107 |
+++ /dev/null |
108 |
@@ -1,88 +0,0 @@ |
109 |
-# Copyright 1999-2021 Gentoo Authors |
110 |
-# Distributed under the terms of the GNU General Public License v2 |
111 |
- |
112 |
-EAPI=5 |
113 |
- |
114 |
-inherit autotools eutils flag-o-matic multilib versionator |
115 |
- |
116 |
-MY_PN=${PN}-mesher |
117 |
-MY_PV=$(get_version_component_range 1-2) |
118 |
-DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator" |
119 |
-HOMEPAGE="https://sourceforge.net/projects/netgen/" |
120 |
-SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz" |
121 |
- |
122 |
-SLOT="0" |
123 |
-LICENSE="LGPL-2.1" |
124 |
-KEYWORDS="~amd64 ~x86" |
125 |
-IUSE="-ffmpeg jpeg -mpi opencascade" |
126 |
- |
127 |
-DEPEND=" |
128 |
- dev-tcltk/tix |
129 |
- dev-tcltk/togl:1.7 |
130 |
- virtual/opengl |
131 |
- x11-libs/libXmu |
132 |
- opencascade? ( sci-libs/opencascade:* ) |
133 |
- ffmpeg? ( media-video/ffmpeg ) |
134 |
- jpeg? ( virtual/jpeg:0= ) |
135 |
- mpi? ( virtual/mpi ( || ( sci-libs/parmetis sci-libs/metis ) ) ) " |
136 |
-RDEPEND="${DEPEND}" |
137 |
-# Note, MPI has not be tested. |
138 |
- |
139 |
-src_prepare() { |
140 |
- # Adapted from http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824 |
141 |
- epatch "${FILESDIR}/${PN}-5.x-compile-against-occ-6.5.x.patch" |
142 |
- epatch "${FILESDIR}/${PN}-5.x-missing-define.patch" |
143 |
- eautoreconf |
144 |
-} |
145 |
- |
146 |
-src_configure() { |
147 |
- # This is not the most clever way to deal with these flags |
148 |
- # but --disable-xxx does not seem to work correcly, so... |
149 |
- sed -i -e 's:-lTogl:-lTogl1.7:' ng/Makefile.am || die |
150 |
- local myconf="--with-togl=/usr/$(get_libdir)/Togl1.7" |
151 |
- |
152 |
- if use opencascade; then |
153 |
- myconf="${myconf} --enable-occ --with-occ=$CASROOT" |
154 |
- append-ldflags -L$CASROOT/lin/$(get_libdir) |
155 |
- fi |
156 |
- if use mpi; then |
157 |
- myconf="${myconf} --enable-parallel" |
158 |
- append-cppflags -I/usr/include/metis |
159 |
- fi |
160 |
- use ffmpeg && myconf="${myconf} --enable-ffmpeg" |
161 |
- use jpeg && myconf="${myconf} --enable-jpeglib" |
162 |
- append-cppflags -I/usr/include/togl-1.7 |
163 |
- |
164 |
- econf \ |
165 |
- ${myconf} |
166 |
- |
167 |
- # This would be the more elegant way: |
168 |
-# econf \ |
169 |
-# $(use_enable opencascade occ) \ |
170 |
-# $(use_with opencascade "occ=$CASROOT") \ |
171 |
-# $(use_enable mpi parallel) \ |
172 |
-# $(use_enable ffmpeg) \ |
173 |
-# $(use_enable jpeg jpeglib) |
174 |
-} |
175 |
- |
176 |
-src_install() { |
177 |
- local NETGENDIR="/usr/share/netgen" |
178 |
- |
179 |
- echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > ./99netgen |
180 |
- doenvd 99netgen |
181 |
- |
182 |
- default |
183 |
- mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" || die |
184 |
- |
185 |
- # Install icon and .desktop for menu entry |
186 |
- doicon "${FILESDIR}"/${PN}.png |
187 |
- domenu "${FILESDIR}"/${PN}.desktop |
188 |
-} |
189 |
- |
190 |
-pkg_postinst() { |
191 |
- elog "Please make sure to update your environment variables:" |
192 |
- elog "env-update && source /etc/profile" |
193 |
- elog "Netgen ebuild is still under development." |
194 |
- elog "Help us improve the ebuild in:" |
195 |
- elog "https://bugs.gentoo.org/show_bug.cgi?id=155424" |
196 |
-} |
197 |
|
198 |
diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild |
199 |
index 25b4da389..594347da5 100644 |
200 |
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild |
201 |
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild |
202 |
@@ -1,12 +1,13 @@ |
203 |
# Copyright 1999-2021 Gentoo Authors |
204 |
# Distributed under the terms of the GNU General Public License v2 |
205 |
|
206 |
-EAPI=6 |
207 |
+EAPI=7 |
208 |
|
209 |
-inherit autotools eutils flag-o-matic multilib versionator |
210 |
+inherit autotools flag-o-matic multilib xdg |
211 |
|
212 |
MY_PN=${PN}-mesher |
213 |
-MY_PV=$(get_version_component_range 1-2) |
214 |
+MY_PV=$(ver_cut 1-2) |
215 |
+ |
216 |
DESCRIPTION="Automatic 3d tetrahedral mesh generator" |
217 |
HOMEPAGE="https://sourceforge.net/projects/netgen/" |
218 |
SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz" |
219 |
@@ -14,7 +15,8 @@ SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz" |
220 |
SLOT="0" |
221 |
LICENSE="LGPL-2.1" |
222 |
KEYWORDS="~amd64 ~x86" |
223 |
-IUSE="-ffmpeg jpeg -mpi opencascade openmp" |
224 |
+ |
225 |
+IUSE="ffmpeg jpeg mpi opencascade openmp" |
226 |
|
227 |
DEPEND=" |
228 |
dev-lang/tcl:0 |
229 |
@@ -27,7 +29,8 @@ DEPEND=" |
230 |
opencascade? ( sci-libs/opencascade:* ) |
231 |
ffmpeg? ( media-video/ffmpeg ) |
232 |
jpeg? ( virtual/jpeg:0= ) |
233 |
- mpi? ( virtual/mpi || ( sci-libs/parmetis <sci-libs/metis-5.0 ) opencascade? ( sci-libs/hdf5[mpi] ) ) " |
234 |
+ mpi? ( virtual/mpi || ( sci-libs/parmetis <sci-libs/metis-5.0 ) opencascade? ( sci-libs/hdf5[mpi] ) ) |
235 |
+" |
236 |
RDEPEND="${DEPEND}" |
237 |
# Note, MPI has not be tested. |
238 |
|
239 |
@@ -111,6 +114,7 @@ src_install() { |
240 |
} |
241 |
|
242 |
pkg_postinst() { |
243 |
+ xdg_pkg_postinst |
244 |
elog "Please make sure to update your environment variables:" |
245 |
elog "env-update && source /etc/profile" |
246 |
elog "Netgen ebuild is still under development." |
247 |
|
248 |
diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-6.0_beta.ebuild |
249 |
similarity index 88% |
250 |
copy from sci-mathematics/netgen/netgen-5.3.1.ebuild |
251 |
copy to sci-mathematics/netgen/netgen-6.0_beta.ebuild |
252 |
index 25b4da389..ffdac83dd 100644 |
253 |
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild |
254 |
+++ b/sci-mathematics/netgen/netgen-6.0_beta.ebuild |
255 |
@@ -1,20 +1,22 @@ |
256 |
# Copyright 1999-2021 Gentoo Authors |
257 |
# Distributed under the terms of the GNU General Public License v2 |
258 |
|
259 |
-EAPI=6 |
260 |
+EAPI=7 |
261 |
|
262 |
-inherit autotools eutils flag-o-matic multilib versionator |
263 |
+inherit autotools flag-o-matic multilib xdg |
264 |
|
265 |
MY_PN=${PN}-mesher |
266 |
-MY_PV=$(get_version_component_range 1-2) |
267 |
+MY_PV=${PV//_/-} |
268 |
+ |
269 |
DESCRIPTION="Automatic 3d tetrahedral mesh generator" |
270 |
HOMEPAGE="https://sourceforge.net/projects/netgen/" |
271 |
-SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz" |
272 |
+SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/$(ver_cut 1-2)/${PN}-${MY_PV}.tar.gz" |
273 |
|
274 |
SLOT="0" |
275 |
LICENSE="LGPL-2.1" |
276 |
KEYWORDS="~amd64 ~x86" |
277 |
-IUSE="-ffmpeg jpeg -mpi opencascade openmp" |
278 |
+ |
279 |
+IUSE="ffmpeg jpeg mpi opencascade openmp" |
280 |
|
281 |
DEPEND=" |
282 |
dev-lang/tcl:0 |
283 |
@@ -27,24 +29,25 @@ DEPEND=" |
284 |
opencascade? ( sci-libs/opencascade:* ) |
285 |
ffmpeg? ( media-video/ffmpeg ) |
286 |
jpeg? ( virtual/jpeg:0= ) |
287 |
- mpi? ( virtual/mpi || ( sci-libs/parmetis <sci-libs/metis-5.0 ) opencascade? ( sci-libs/hdf5[mpi] ) ) " |
288 |
+ mpi? ( virtual/mpi || ( sci-libs/parmetis <sci-libs/metis-5.0 ) opencascade? ( sci-libs/hdf5[mpi] ) ) |
289 |
+" |
290 |
RDEPEND="${DEPEND}" |
291 |
# Note, MPI has not be tested. |
292 |
|
293 |
PATCHES=( |
294 |
# Adapted from http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824 |
295 |
- "${FILESDIR}"/${PN}-5.x-missing-define.patch |
296 |
+ |
297 |
# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch |
298 |
"${FILESDIR}"/${PN}-5.x-metis-fixes.patch |
299 |
"${FILESDIR}"/${PN}-5.x-occ-stl-api-change.patch |
300 |
# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch |
301 |
- "${FILESDIR}"/${PN}-5.x-makefiles-fixes.patch |
302 |
# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch |
303 |
- "${FILESDIR}"/${PN}-5.x-fedora-fixes.patch |
304 |
"${FILESDIR}"/${PN}-5.x-includes-fixes.patch |
305 |
"${FILESDIR}"/${PN}-5.x-parallelmetis4-fix.patch |
306 |
) |
307 |
|
308 |
+S="${WORKDIR}/${PN}-${MY_PV}" |
309 |
+ |
310 |
src_prepare() { |
311 |
default |
312 |
if use mpi; then |
313 |
@@ -111,6 +114,7 @@ src_install() { |
314 |
} |
315 |
|
316 |
pkg_postinst() { |
317 |
+ xdg_pkg_postinst |
318 |
elog "Please make sure to update your environment variables:" |
319 |
elog "env-update && source /etc/profile" |
320 |
elog "Netgen ebuild is still under development." |