Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/
Date: Mon, 21 Sep 2015 19:06:19
Message-Id: 1442861657.55066272be3a52a2cb2c012c201537c6ee4782cd.jlec@gentoo
1 commit: 55066272be3a52a2cb2c012c201537c6ee4782cd
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 21 18:54:17 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 21 18:54:17 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=55066272
7
8 sci-mathematics/netgen: Add subslot operators
9
10 Package-Manager: portage-2.2.20.1
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 sci-mathematics/netgen/netgen-4.9.13.ebuild | 21 +++++++++++----------
14 sci-mathematics/netgen/netgen-5.0.0.ebuild | 14 +++++++-------
15 2 files changed, 18 insertions(+), 17 deletions(-)
16
17 diff --git a/sci-mathematics/netgen/netgen-4.9.13.ebuild b/sci-mathematics/netgen/netgen-4.9.13.ebuild
18 index 2a0d501..fac506b 100644
19 --- a/sci-mathematics/netgen/netgen-4.9.13.ebuild
20 +++ b/sci-mathematics/netgen/netgen-4.9.13.ebuild
21 @@ -1,27 +1,28 @@
22 -# Copyright 1999-2014 Gentoo Foundation
23 +# Copyright 1999-2015 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 # $Id$
26
27 -EAPI="2"
28 +EAPI=5
29
30 inherit eutils flag-o-matic multilib versionator
31
32 -DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator"
33 +DESCRIPTION="Automatic 3d tetrahedral mesh generator"
34 HOMEPAGE="http://www.hpfem.jku.at/netgen/"
35 SRC_URI="mirror://sourceforge/netgen-mesher/${P}.tar.gz"
36
37 +SLOT="0"
38 LICENSE="LGPL-2.1"
39 KEYWORDS="~amd64 ~x86"
40 IUSE="-ffmpeg jpeg -mpi opencascade"
41 -SLOT="0"
42
43 -DEPEND="dev-tcltk/tix
44 +DEPEND="
45 + dev-tcltk/tix
46 dev-tcltk/togl:1.7
47 virtual/opengl
48 x11-libs/libXmu
49 - opencascade? ( sci-libs/opencascade )
50 + opencascade? ( sci-libs/opencascade:* )
51 ffmpeg? ( media-video/ffmpeg )
52 - jpeg? ( virtual/jpeg )
53 + jpeg? ( virtual/jpeg:0= )
54 mpi? ( virtual/mpi ) "
55 RDEPEND="${DEPEND}"
56 # Note, MPI has not be tested.
57 @@ -60,12 +61,12 @@ src_install() {
58 echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > ./99netgen
59 doenvd 99netgen
60
61 - emake DESTDIR="${D}" install || die "make install failed"
62 + default
63 mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}"
64
65 # Install icon and .desktop for menu entry
66 - doicon "${FILESDIR}"/${PN}.png || die "doicon failed"
67 - domenu "${FILESDIR}"/${PN}.desktop || die "domenu failed"
68 + doicon "${FILESDIR}"/${PN}.png
69 + domenu "${FILESDIR}"/${PN}.desktop
70 }
71
72 pkg_postinst() {
73
74 diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild b/sci-mathematics/netgen/netgen-5.0.0.ebuild
75 index 071a89b..96434c2 100644
76 --- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
77 +++ b/sci-mathematics/netgen/netgen-5.0.0.ebuild
78 @@ -12,24 +12,24 @@ DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator"
79 HOMEPAGE="http://www.hpfem.jku.at/netgen/"
80 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"
81
82 +SLOT="0"
83 LICENSE="LGPL-2.1"
84 KEYWORDS="~amd64 ~x86"
85 IUSE="-ffmpeg jpeg -mpi opencascade"
86 -SLOT="0"
87
88 -DEPEND="dev-tcltk/tix
89 +DEPEND="
90 + dev-tcltk/tix
91 dev-tcltk/togl:1.7
92 virtual/opengl
93 x11-libs/libXmu
94 - opencascade? ( sci-libs/opencascade )
95 + opencascade? ( sci-libs/opencascade:* )
96 ffmpeg? ( media-video/ffmpeg )
97 - jpeg? ( virtual/jpeg )
98 + jpeg? ( virtual/jpeg:0= )
99 mpi? ( virtual/mpi ( || ( sci-libs/parmetis sci-libs/metis ) ) ) "
100 RDEPEND="${DEPEND}"
101 # Note, MPI has not be tested.
102
103 -src_prepare()
104 -{
105 +src_prepare() {
106 # Adapted from http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
107 epatch "${FILESDIR}/${PN}-5.x-compile-against-occ-6.5.x.patch"
108 epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
109 @@ -72,7 +72,7 @@ src_install() {
110 echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > ./99netgen
111 doenvd 99netgen
112
113 - emake DESTDIR="${D}" install
114 + default
115 mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" || die
116
117 # Install icon and .desktop for menu entry