Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-front/, sci-misc/elmer-front/files/
Date: Sat, 30 Jan 2021 14:30:52
Message-Id: 1612016500.b82206858b0c9ab584060c5697960bb44b5eefa4.andrewammerlaan@gentoo
1 commit: b82206858b0c9ab584060c5697960bb44b5eefa4
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
3 AuthorDate: Sat Jan 30 14:21:40 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Sat Jan 30 14:21:40 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b8220685
7
8 sci-misc/elmer-front: remove pack, obsolete
9
10 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
11
12 sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild | 43 -----------------
13 sci-misc/elmer-front/elmer-front-9999.ebuild | 50 --------------------
14 .../elmer-front-6.0_p4651-out-of-source.patch | 30 ------------
15 .../files/elmer-front-6.0_p4651-tcltk8.6.patch | 55 ----------------------
16 .../files/elmer-front-6.0_p4651-underlinking.patch | 16 -------
17 .../files/elmer-front-Makefile-install.patch | 18 -------
18 sci-misc/elmer-front/metadata.xml | 11 -----
19 7 files changed, 223 deletions(-)
20
21 diff --git a/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild b/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
22 deleted file mode 100644
23 index 03458dc96..000000000
24 --- a/sci-misc/elmer-front/elmer-front-6.0_p4651.ebuild
25 +++ /dev/null
26 @@ -1,43 +0,0 @@
27 -# Copyright 1999-2021 Gentoo Authors
28 -# Distributed under the terms of the GNU General Public License v2
29 -
30 -EAPI=5
31 -
32 -AUTOTOOLS_AUTORECONF=true
33 -
34 -inherit autotools-utils multilib
35 -
36 -ELMER_ROOT="elmerfem"
37 -MY_PN=${PN/elmer-/}
38 -
39 -DESCRIPTION="Finite element programs, libraries, and visualization tools - elmer frontend"
40 -HOMEPAGE="https://www.csc.fi/web/elmer"
41 -SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651 -> ${P}.tar.gz"
42 -
43 -LICENSE="GPL-2"
44 -SLOT="0"
45 -KEYWORDS="~amd64 ~x86"
46 -IUSE=""
47 -
48 -RDEPEND="
49 - dev-lang/tcl:0=
50 - dev-lang/tk:0=
51 - sci-misc/elmer-fem
52 - sci-libs/elmer-eio
53 - virtual/opengl"
54 -DEPEND="${RDEPEND}"
55 -
56 -S="${WORKDIR}"/front/front
57 -
58 -PATCHES=(
59 - "${FILESDIR}"/${P}-tcltk8.6.patch
60 - "${FILESDIR}"/${P}-underlinking.patch
61 - "${FILESDIR}"/${P}-out-of-source.patch
62 -)
63 -
64 -src_configure() {
65 - local myeconfargs=(
66 - --with-eioc --with-matc --with-tcltk --with-x
67 - )
68 - autotools-utils_src_configure
69 -}
70
71 diff --git a/sci-misc/elmer-front/elmer-front-9999.ebuild b/sci-misc/elmer-front/elmer-front-9999.ebuild
72 deleted file mode 100644
73 index 6bf0cb0cf..000000000
74 --- a/sci-misc/elmer-front/elmer-front-9999.ebuild
75 +++ /dev/null
76 @@ -1,50 +0,0 @@
77 -# Copyright 1999-2021 Gentoo Authors
78 -# Distributed under the terms of the GNU General Public License v2
79 -
80 -EAPI=5
81 -
82 -AUTOTOOLS_AUTORECONF=true
83 -
84 -inherit autotools-utils multilib subversion
85 -
86 -ELMER_ROOT="elmerfem"
87 -MY_PN=${PN/elmer-/}
88 -
89 -DESCRIPTION="Finite element programs, libraries, and visualization tools - elmer frontend"
90 -HOMEPAGE="https://www.csc.fi/web/elmer"
91 -SRC_URI=""
92 -ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}"
93 -ESVN_PROJECT="${MY_PN}"
94 -
95 -LICENSE="GPL-2"
96 -SLOT="0"
97 -KEYWORDS=""
98 -IUSE=""
99 -
100 -RDEPEND="
101 - dev-lang/tcl:0=
102 - dev-lang/tk:0=
103 - sci-misc/elmer-fem
104 - sci-libs/elmer-eio
105 - virtual/opengl"
106 -DEPEND="${RDEPEND}"
107 -
108 -S="${WORKDIR}/front"
109 -
110 -PATCHES=(
111 - "${FILESDIR}"/${PN}-6.0_p4651-tcltk8.6.patch
112 - "${FILESDIR}"/${PN}-6.0_p4651-underlinking.patch
113 - "${FILESDIR}"/${PN}-6.0_p4651-out-of-source.patch
114 -)
115 -
116 -src_prepare() {
117 - subversion_src_prepare
118 - autotools-utils_src_prepare
119 -}
120 -
121 -src_configure() {
122 - local myeconfargs=(
123 - --with-eioc --with-matc --with-tcltk --with-x
124 - )
125 - autotools-utils_src_configure
126 -}
127
128 diff --git a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-out-of-source.patch b/sci-misc/elmer-front/files/elmer-front-6.0_p4651-out-of-source.patch
129 deleted file mode 100644
130 index 872c03f21..000000000
131 --- a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-out-of-source.patch
132 +++ /dev/null
133 @@ -1,30 +0,0 @@
134 - src/Makefile.am | 9 +++++----
135 - 1 file changed, 5 insertions(+), 4 deletions(-)
136 -
137 -diff --git a/src/Makefile.am b/src/Makefile.am
138 -old mode 100755
139 -new mode 100644
140 -index 894a547..dc7c77b
141 ---- a/src/Makefile.am
142 -+++ b/src/Makefile.am
143 -@@ -87,15 +87,16 @@ endif
144 - ElmerFront_LDADD = -lX11
145 -
146 - install-data-local:
147 -- @echo "Installing tcl scripts to ${prefix}/share/elmerfront/tcl"
148 -+ @echo "Installing tcl scripts to ${DESTDIR}${prefix}/share/elmerfront/tcl"
149 -
150 - mkdir -p "$(DESTDIR)${prefix}/share/elmerfront/tcl"
151 -- cp -r ./tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl"
152 -+ cp -r "${srcdir}"/tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl"
153 -+ cp -r "${builddir}"/tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl"
154 - rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/tcl -name .svn`
155 -
156 -- @echo "Installing *.edf *.rgb to ${prefix}/share/elmerfront/lib"
157 -+ @echo "Installing *.edf *.rgb to ${DESTDIR}${prefix}/share/elmerfront/lib"
158 - mkdir -p "$(DESTDIR)${prefix}/share/elmerfront/lib"
159 -- cp -r ./lib/* "$(DESTDIR)${prefix}/share/elmerfront/lib"
160 -+ cp -r "${srcdir}"/lib/* "$(DESTDIR)${prefix}/share/elmerfront/lib"
161 - rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/lib -name .svn`
162 -
163 -
164
165 diff --git a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch b/sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch
166 deleted file mode 100644
167 index 7fa7605b7..000000000
168 --- a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-tcltk8.6.patch
169 +++ /dev/null
170 @@ -1,55 +0,0 @@
171 - src/ecif_userinterface_TCL.cpp | 18 +++++++++++++++++-
172 - 1 file changed, 17 insertions(+), 1 deletion(-)
173 -
174 -diff --git a/src/ecif_userinterface_TCL.cpp b/src/ecif_userinterface_TCL.cpp
175 -index 7f581a8..53e0432 100644
176 ---- a/src/ecif_userinterface_TCL.cpp
177 -+++ b/src/ecif_userinterface_TCL.cpp
178 -@@ -622,7 +622,11 @@ UserInterface_TCL::createTclEnvironment(Hinst application)
179 -
180 - // *** Invoke application-specific initialization.
181 - if (My_Tcl_AppInit(interp) != TCL_OK) {
182 -+#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
183 - WishPanic("My_Tcl_AppInit failed: %s\n", interp->result);
184 -+#else
185 -+ WishPanic("My_Tcl_AppInit failed: %s\n", Tcl_GetStringResult(interp));
186 -+#endif
187 - }
188 -
189 - // Result value is the Tcl interpreter
190 -@@ -4685,11 +4689,19 @@ UserInterface_TCL::sendCommandToGui(Tcl_Interp* interp, const char* cmd, const c
191 - Tcl_DStringFree( &dstring );
192 - }
193 -
194 -+#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
195 - if (interp->result[0] != '\0') {
196 -+#else
197 -+ if (Tcl_GetStringResult(interp)[0] != '\0') {
198 -+#endif
199 -
200 - char err_buf[256];
201 - err_buf[255] = '\0';
202 -+#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
203 - strncpy(err_buf, interp->result, 255);
204 -+#else
205 -+ strncpy(err_buf, Tcl_GetStringResult(interp), 255);
206 -+#endif
207 -
208 - char cmd_buf[256];
209 - cmd_buf[255] = '\0';
210 -@@ -5350,10 +5362,14 @@ UserInterface_TCL::start(int argc, char** argv)
211 - //--If we can't load the script (= start CONTROL-SIDE interpreter)
212 - if (code != TCL_OK) {
213 -
214 -- char* p = (char *)Tcl_GetVar(theInterp, "errorInfo", glob_flag);
215 -+ const char* p = (const char *)Tcl_GetVar(theInterp, "errorInfo", glob_flag);
216 -
217 - if ((p == NULL) || (*p == '\0')) {
218 -+#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
219 - p = theInterp->result;
220 -+#else
221 -+ p = Tcl_GetStringResult(theInterp);
222 -+#endif
223 - }
224 -
225 - ((ofstream*)debugFile)->open("ElmerFront.log", ios::out);
226
227 diff --git a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-underlinking.patch b/sci-misc/elmer-front/files/elmer-front-6.0_p4651-underlinking.patch
228 deleted file mode 100644
229 index b370ed494..000000000
230 --- a/sci-misc/elmer-front/files/elmer-front-6.0_p4651-underlinking.patch
231 +++ /dev/null
232 @@ -1,16 +0,0 @@
233 - src/Makefile.am | 2 ++
234 - 1 file changed, 2 insertions(+)
235 -
236 -diff --git a/src/Makefile.am b/src/Makefile.am
237 -index 01e3e48..894a547 100755
238 ---- a/src/Makefile.am
239 -+++ b/src/Makefile.am
240 -@@ -84,6 +84,8 @@ ElmerFront_SOURCES = $(COMMON_SRCS)
241 -
242 - endif
243 -
244 -+ElmerFront_LDADD = -lX11
245 -+
246 - install-data-local:
247 - @echo "Installing tcl scripts to ${prefix}/share/elmerfront/tcl"
248 -
249
250 diff --git a/sci-misc/elmer-front/files/elmer-front-Makefile-install.patch b/sci-misc/elmer-front/files/elmer-front-Makefile-install.patch
251 deleted file mode 100644
252 index 6ecbe6f8e..000000000
253 --- a/sci-misc/elmer-front/files/elmer-front-Makefile-install.patch
254 +++ /dev/null
255 @@ -1,18 +0,0 @@
256 ---- front/src/Makefile.am.old 2012-11-12 13:25:34.331046988 +0100
257 -+++ front/src/Makefile.am 2012-11-12 13:27:36.055100527 +0100
258 -@@ -85,13 +85,13 @@
259 - endif
260 -
261 - install-data-local:
262 -- @echo "Installing tcl scripts to ${prefix}/share/elmerfront/tcl"
263 -+ @echo "Installing tcl scripts to ${DESTDIR}${prefix}/share/elmerfront/tcl"
264 -
265 - mkdir -p "$(DESTDIR)${prefix}/share/elmerfront/tcl"
266 - cp -r ./tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl"
267 - rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/tcl -name .svn`
268 -
269 -- @echo "Installing *.edf *.rgb to ${prefix}/share/elmerfront/lib"
270 -+ @echo "Installing *.edf *.rgb to ${DESTDIR}${prefix}/share/elmerfront/lib"
271 - mkdir -p "$(DESTDIR)${prefix}/share/elmerfront/lib"
272 - cp -r ./lib/* "$(DESTDIR)${prefix}/share/elmerfront/lib"
273 - rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/lib -name .svn`
274
275 diff --git a/sci-misc/elmer-front/metadata.xml b/sci-misc/elmer-front/metadata.xml
276 deleted file mode 100644
277 index 070aa2029..000000000
278 --- a/sci-misc/elmer-front/metadata.xml
279 +++ /dev/null
280 @@ -1,11 +0,0 @@
281 -<?xml version="1.0" encoding="UTF-8"?>
282 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
283 -<pkgmetadata>
284 - <maintainer type="project">
285 - <email>sci@g.o</email>
286 - <name>Gentoo Science Project</name>
287 - </maintainer>
288 - <upstream>
289 - <remote-id type="sourceforge">svn</remote-id>
290 - </upstream>
291 -</pkgmetadata>