Gentoo Archives: gentoo-commits

From: Christoph Junghans <junghans@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-gui/files/, sci-misc/elmer-gui/
Date: Fri, 26 Oct 2018 12:37:16
Message-Id: 1540557310.7ffd6e172ce9c55d7d956650210e34b2ba40c3f7.junghans@gentoo
1 commit: 7ffd6e172ce9c55d7d956650210e34b2ba40c3f7
2 Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 26 12:35:10 2018 +0000
4 Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 26 12:35:10 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7ffd6e17
7
8 sci-misc/elmer-gui: remove as qt4 is gone
9
10 Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org>
11
12 sci-misc/elmer-gui/elmer-gui-9999.ebuild | 150 ---------------------
13 .../elmer-gui/files/elmer-gui-netgen-fixes.patch | 11 --
14 sci-misc/elmer-gui/metadata.xml | 16 ---
15 3 files changed, 177 deletions(-)
16
17 diff --git a/sci-misc/elmer-gui/elmer-gui-9999.ebuild b/sci-misc/elmer-gui/elmer-gui-9999.ebuild
18 deleted file mode 100644
19 index be427d331..000000000
20 --- a/sci-misc/elmer-gui/elmer-gui-9999.ebuild
21 +++ /dev/null
22 @@ -1,150 +0,0 @@
23 -# Copyright 1999-2015 Gentoo Foundation
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=5
27 -
28 -PYTHON_COMPAT=( python2_7 )
29 -
30 -inherit autotools eutils qt4-r2 subversion python-single-r1 versionator
31 -
32 -ELMER_ROOT="elmerfem"
33 -MY_PN=ElmerGUI
34 -
35 -DESCRIPTION="Finite element programs, libraries, visualization tools"
36 -HOMEPAGE="http://www.csc.fi/english/pages/elmer"
37 -SRC_URI=""
38 -ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}"
39 -ESVN_PROJECT="${MY_PN}"
40 -
41 -LICENSE="GPL-2"
42 -SLOT="0"
43 -KEYWORDS=""
44 -IUSE="debug +bundled_netgen matc opencascade python qwt vtk"
45 -
46 -REQUIRED_USE="opencascade? ( vtk )"
47 -
48 -DEPEND="
49 - ~sci-libs/elmer-eio-${PV}
50 - !bundled_netgen? ( sci-mathematics/netgen )
51 - virtual/glu
52 - || (
53 - ~sci-misc/elmer-post-${PV}
54 - >=sci-libs/vtk-5.0.0[qt4,python?]
55 - )
56 - matc? ( ~sci-libs/matc-${PV} )
57 - vtk? ( >=sci-libs/vtk-5.0.0[qt4,python?] )
58 - opencascade? ( >=sci-libs/opencascade-6.3:* )
59 - python? ( dev-python/pythonqt[${PYTHON_USEDEP}] )
60 - qwt? ( x11-libs/qwt:5 )
61 - >=dev-qt/qtcore-4.3:4
62 - >=dev-qt/qtopengl-4.3:4
63 - >=dev-qt/qtscript-4.3:4"
64 -RDEPEND="${DEPEND}"
65 -
66 -src_prepare() {
67 - # Do not build bundled matc and PythonQt
68 - sed \
69 - -e 's/matc//' \
70 - -e 's/PythonQt//' \
71 - -i ${MY_PN}.pro || die
72 -
73 - # Ideally we would avoid buildling thirdparty code
74 - # and use a separate package but this currently fails
75 - # to build. ElmerGui provides its own patched version of
76 - # NetGen. Currently considering backporting them to
77 - # sci-mathematics/netgen
78 - if use !bundled_netgen; then
79 - sed -i 's/netgen//' ${MY_PN}.pro || die
80 - sed \
81 - -e "s:INCLUDEPATH += ../netgen/libsrc/interface:INCLUDEPATH += ${EPREFIX}/usr/include:g" \
82 - -e "s:LIBPATH += ../netgen/ngcore:LIBPATH += ${EPREFIX}/usr/$(get_libdir):g" \
83 - -e "s:LIBS += -lng:LIBS += -lnglib:g" \
84 - -i Application/Application.pro || die
85 -
86 - eerror "${PN} currently fails to build against sci-mathematics/netgen."
87 - fi
88 -
89 - # Fix install path
90 - sed \
91 - -e 's|unix: ELMER_HOME = /usr/local|unix: ELMER_HOME = /usr|g' \
92 - -i ${MY_PN}.pri || die
93 -
94 - if use amd64; then
95 - sed -i 's/32/64/' ${MY_PN}.pri || die
96 - fi
97 -
98 - if use !qwt; then
99 - # QWT is activated by default, disable
100 - sed -i 's/DEFINES += EG_QWT//' ${MY_PN}.pri || die
101 - else
102 - # Detect x11-libs/qwt version and fix paths
103 - local QWT_VER=`echo $(best_version "x11-libs/qwt") | sed 's:x11-libs/qwt-::'`
104 - local QWT_MAJOR=$(get_major_version ${QWT_VER})
105 - local QWT_MAJOR=5
106 -
107 - if [[ ${QWT_MAJOR} -lt 6 ]]; then
108 - local QWT_LIBS=-lqwt
109 - else
110 - local QWT_LIBS=-lqwt${QWT_MAJOR}
111 - fi
112 -
113 - local QWT_INCLUDEPATH=${EPREFIX}/usr/include/qwt${QWT_MAJOR}
114 - local QWT_LIBPATH=${EPREFIX}/usr/$(get_libdir)
115 -
116 - sed -i \
117 - -e "s:QWT_INCLUDEPATH.*:QWT_INCLUDEPATH = ${QWT_INCLUDEPATH}:g" \
118 - -e "s:QWT_LIBPATH.*:QWT_LIBPATH = ${QWT_LIBPATH}:g" \
119 - -e "s:QWT_LIBS.*:QWT_LIBS = ${QWT_LIBS}:g" \
120 - ${MY_PN}.pri || die
121 - fi
122 -
123 - if use !vtk; then
124 - # VTK is activated by default, disable
125 - sed -i 's/DEFINES += EG_VTK//' ${MY_PN}.pri || die
126 - else
127 - # Fix paths
128 - local VTK_VER=`echo ${VTK_DIR} | cut -d/ -f4`
129 - sed -i \
130 - -e "s:VTK_INCLUDEPATH.*:VTK_INCLUDEPATH = ${EPREFIX}/usr/include/${VTK_VER}:g" \
131 - -e "s:VTK_LIBPATH.*:VTK_LIBPATH = ${VTK_DIR}:g" \
132 - ${MY_PN}.pri || die
133 - fi
134 -
135 - if use !matc; then
136 - sed -i 's/DEFINES += EG_MATC//' ${MY_PN}.pri || die
137 - else
138 - sed -i "s:LIBPATH += ../matc/lib:LIBPATH += ${EPREFIX}/usr/$(get_libdir):g" Application/Application.pro || die
139 - fi
140 -
141 - if use !opencascade; then
142 - # Opencascade is activated by default, disable
143 - sed -i 's/DEFINES += EG_OCC//' ${MY_PN}.pri || die
144 - else
145 - # Fix paths, depend on portage version of opencascade
146 - sed -i \
147 - -e "s:OCC_INCLUDEPATH.*:OCC_INCLUDEPATH = ${CASROOT}/inc:g" \
148 - -e "s:OCC_LIBPATH.*:OCC_LIBPATH = ${CASROOT}/$(get_libdir):g" \
149 - ${MY_PN}.pri || die
150 - fi
151 -
152 - if use python; then
153 - # Fix paths
154 - sed -i \
155 - -e 's/DEFINES -= EG_PYTHON/DEFINES += EG_PYTHON/g' \
156 - -e "s:PY_INCLUDEPATH.*:PY_INCLUDEPATH = $(python_get_includedir):g" \
157 - -e "s:PY_LIBPATH.*:PY_LIBPATH = $(python_get_libdir):g" \
158 - -e "s:PY_LIBS.*:PY_LIBS = $(python_get_library -l):g" \
159 - ${MY_PN}.pri || die
160 -
161 - # Fix paths and invert Python(Qt) linking order to work with --Wl,--as-needed
162 - sed -i \
163 - -e "s:INCLUDEPATH += $${PY_INCLUDEPATH} ../PythonQt/src:${EPREFIX}/usr/include/PythonQt:g" \
164 - -e "s:LIBPATH += $${PY_LIBPATH} ../PythonQt/lib:${EPREFIX}/usr/$(get_libdir):g" \
165 - -e "s:LIBS += $${PY_LIBS} -lPythonQt:LIBS += -lPythonQt $${PY_LIBS}:" \
166 - Application/Application.pro || die
167 - fi
168 -}
169 -
170 -src_configure() {
171 - eqmake4 "${S}" ./${MY_PN}.pro
172 -}
173
174 diff --git a/sci-misc/elmer-gui/files/elmer-gui-netgen-fixes.patch b/sci-misc/elmer-gui/files/elmer-gui-netgen-fixes.patch
175 deleted file mode 100644
176 index 0918c8ea9..000000000
177 --- a/sci-misc/elmer-gui/files/elmer-gui-netgen-fixes.patch
178 +++ /dev/null
179 @@ -1,11 +0,0 @@
180 ---- /var/tmp/portage/sci-misc/elmer-gui-9999/work/elmer-gui-9999/Application/src/mainwindow.cpp.auto-diff-temp 2012-11-15 17:16:40.602279216 +0100
181 -+++ /var/tmp/portage/sci-misc/elmer-gui-9999/work/elmer-gui-9999/Application/src/mainwindow.cpp 2012-11-15 17:16:52.226288133 +0100
182 -@@ -4778,7 +4778,7 @@
183 -
184 - mp.maxh = meshControl->nglibMaxH.toDouble();
185 - mp.fineness = meshControl->nglibFineness.toDouble();
186 -- mp.secondorder = 0;
187 -+ mp.second_order = 0;
188 - mp.meshsize_filename = backgroundmesh;
189 -
190 - if(ngDim == 3) {
191
192 diff --git a/sci-misc/elmer-gui/metadata.xml b/sci-misc/elmer-gui/metadata.xml
193 deleted file mode 100644
194 index ea0c38830..000000000
195 --- a/sci-misc/elmer-gui/metadata.xml
196 +++ /dev/null
197 @@ -1,16 +0,0 @@
198 -<?xml version="1.0" encoding="UTF-8"?>
199 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
200 -<pkgmetadata>
201 - <maintainer type="project">
202 - <email>sci@g.o</email>
203 - <name>Gentoo Science Project</name>
204 - </maintainer>
205 - <use>
206 - <flag name="bundled_netgen"> Use bundled version of <pkg>sci-mathematics/netgen</pkg></flag>
207 - <flag name="matc"> Enables <pkg>sci-libs/matc</pkg> support</flag>
208 - <flag name="opencascade"> Enable <pkg>sci-libs/opencascade</pkg>
209 -support</flag>
210 - <flag name="qwt"> Enables <pkg>x11-libs/qwt</pkg> support</flag>
211 - <flag name="vtk"> Enables <pkg>sci-libs/vtk</pkg> support</flag>
212 - </use>
213 -</pkgmetadata>