Gentoo Archives: gentoo-commits

From: Aisha Tammy <gentoo@×××××.cc>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/
Date: Sat, 26 Sep 2020 17:27:22
Message-Id: 1601141218.bbfa5aaf614dd599639f8d6e3864b82a3b0f5888.epsilon-0@gentoo
1 commit: bbfa5aaf614dd599639f8d6e3864b82a3b0f5888
2 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
3 AuthorDate: Sat Sep 26 17:26:58 2020 +0000
4 Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
5 CommitDate: Sat Sep 26 17:26:58 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bbfa5aaf
7
8 sci-electronics/tnt: drop dead package
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
12
13 .../tnt/files/tnt-1.2.2-autotools.patch | 277 ------------
14 .../tnt/files/tnt-1.2.2-bem-nmmtl.patch | 11 -
15 sci-electronics/tnt/files/tnt-1.2.2-calc.patch | 503 ---------------------
16 sci-electronics/tnt/files/tnt-1.2.2-docs.patch | 66 ---
17 sci-electronics/tnt/files/tnt-1.2.2-f77.patch | 14 -
18 sci-electronics/tnt/files/tnt-1.2.2-gui.patch | 24 -
19 .../tnt/files/tnt-1.2.2-namespaces.patch | 230 ----------
20 sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch | 16 -
21 sci-electronics/tnt/metadata.xml | 11 -
22 sci-electronics/tnt/tnt-1.2.2.ebuild | 62 ---
23 10 files changed, 1214 deletions(-)
24
25 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-autotools.patch b/sci-electronics/tnt/files/tnt-1.2.2-autotools.patch
26 deleted file mode 100644
27 index 36fe517b9..000000000
28 --- a/sci-electronics/tnt/files/tnt-1.2.2-autotools.patch
29 +++ /dev/null
30 @@ -1,277 +0,0 @@
31 - bem/Makefile.am | 5 +++--
32 - calcCAP/Makefile.am | 3 ++-
33 - calcRL/Makefile.am | 3 ++-
34 - csdl/Makefile.am | 5 +++--
35 - gui/Makefile.am | 12 +++---------
36 - sppdgTcllib/Makefile.am | 3 ++-
37 - sppdgTcllib/addressDialog/Makefile.am | 3 ++-
38 - sppdgTcllib/addressDialog/configure.ac | 2 +-
39 - sppdgTcllib/configure.ac | 2 +-
40 - sppdgTcllib/console/Makefile.am | 7 +++----
41 - sppdgTcllib/console/configure.ac | 4 ++--
42 - sppdgTcllib/getFilePreview/Makefile.am | 3 ++-
43 - sppdgTcllib/getFilePreview/configure.ac | 2 +-
44 - sppdgTcllib/sgraph/Makefile.am | 3 ++-
45 - sppdgTcllib/sgraph/configure.ac | 2 +-
46 - units/Makefile.am | 3 ++-
47 - 16 files changed, 32 insertions(+), 30 deletions(-)
48 -
49 -diff --git a/bem/Makefile.am b/bem/Makefile.am
50 -index c2af1cd..9b784ca 100755
51 ---- a/bem/Makefile.am
52 -+++ b/bem/Makefile.am
53 -@@ -31,9 +31,10 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
54 - #---------------------------------------------------------------
55 - # tcl/tk scripts that may need to be installed.
56 - #---------------------------------------------------------------
57 --pkglib_SCRIPTS = \
58 -+scriptsdir=${pkgdatadir}/scripts
59 -+scripts_DATA = \
60 - lib/bem.tcl \
61 -- lib/bem_gpge.itcl \
62 -+ lib/bem_gpge.itcl \
63 - lib/bem_graphs.itcl \
64 - lib/bem_iterate.tcl \
65 - lib/bem_parameters.tcl \
66 -diff --git a/calcCAP/Makefile.am b/calcCAP/Makefile.am
67 -index 703cb0f..ce34995 100755
68 ---- a/calcCAP/Makefile.am
69 -+++ b/calcCAP/Makefile.am
70 -@@ -30,7 +30,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
71 - #---------------------------------------------------------------
72 - # tcl/tk scripts that may need to be installed.
73 - #---------------------------------------------------------------
74 --pkglib_SCRIPTS = \
75 -+scriptsdir=${pkgdatadir}/scripts
76 -+scripts_DATA = \
77 - lib/calcCAP_exe.tcl \
78 - lib/calcCAP.tcl \
79 - lib/epl.bit \
80 -diff --git a/calcRL/Makefile.am b/calcRL/Makefile.am
81 -index 34dbb8d..9c2986c 100755
82 ---- a/calcRL/Makefile.am
83 -+++ b/calcRL/Makefile.am
84 -@@ -31,7 +31,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
85 - #---------------------------------------------------------------
86 - # tcl/tk scripts that may need to be installed.
87 - #---------------------------------------------------------------
88 --pkglib_SCRIPTS = \
89 -+scriptsdir=${pkgdatadir}/scripts
90 -+scripts_SCRIPTS = \
91 - lib/calcRL.tcl \
92 - lib/calcRL_exe.tcl \
93 - lib/pkgIndex.tcl
94 -diff --git a/csdl/Makefile.am b/csdl/Makefile.am
95 -index c49af20..2b74c89 100755
96 ---- a/csdl/Makefile.am
97 -+++ b/csdl/Makefile.am
98 -@@ -31,7 +31,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
99 - #---------------------------------------------------------------
100 - # tcl/tk scripts that may need to be installed.
101 - #---------------------------------------------------------------
102 --pkglib_SCRIPTS = \
103 -+scriptsdir=${pkgdatadir}/scripts
104 -+scripts_DATA = \
105 - csdl.tcl \
106 - csdl_hlcsdl.itcl \
107 - csdl_llcsdl.itcl \
108 -@@ -44,4 +45,4 @@ pkglib_SCRIPTS = \
109 - #---------------------------------------------------------------
110 - pkglibdir = $(libdir)/$(PACKAGE)$(PACKAGE_VERSION)
111 -
112 --
113 -+
114 -diff --git a/gui/Makefile.am b/gui/Makefile.am
115 -index 44a4308..df8c284 100755
116 ---- a/gui/Makefile.am
117 -+++ b/gui/Makefile.am
118 -@@ -30,7 +30,8 @@ AUTOMAKE_OPTIONS = foreign
119 - #---------------------------------------------------------------
120 - # tcl/tk scripts to be installed.
121 - #---------------------------------------------------------------
122 --pkglib_SCRIPTS = \
123 -+scriptsdir=${pkgdatadir}/scripts
124 -+scripts_DATA = \
125 - canvas_functions.tcl \
126 - gui.tcl \
127 - gui_build.tcl \
128 -@@ -41,14 +42,7 @@ pkglib_SCRIPTS = \
129 - gui_xmission.tcl \
130 - pkgIndex.tcl \
131 - splash.tcl \
132 -- style.tcl
133 --
134 --
135 --
136 --#---------------------------------------------------------------
137 --# Data files to be installed
138 --#---------------------------------------------------------------
139 --pkglib_DATA = \
140 -+ style.tcl \
141 - MayoSPPDGlogo.gif \
142 - conductivity.list \
143 - loss_tangent.list \
144 -diff --git a/sppdgTcllib/Makefile.am b/sppdgTcllib/Makefile.am
145 -index 589874b..e16b83e 100755
146 ---- a/sppdgTcllib/Makefile.am
147 -+++ b/sppdgTcllib/Makefile.am
148 -@@ -33,7 +33,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
149 - #---------------------------------------------------------------
150 - # Only one script that needs to be installed.
151 - #---------------------------------------------------------------
152 --pkglib_SCRIPTS = \
153 -+scriptsdir=${pkgdatadir}/scripts
154 -+scripts_DATA = \
155 - pkgIndex.tcl
156 -
157 - #---------------------------------------------------------------
158 -diff --git a/sppdgTcllib/addressDialog/Makefile.am b/sppdgTcllib/addressDialog/Makefile.am
159 -index 32fc525..47ef097 100755
160 ---- a/sppdgTcllib/addressDialog/Makefile.am
161 -+++ b/sppdgTcllib/addressDialog/Makefile.am
162 -@@ -14,7 +14,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
163 - #---------------------------------------------------------------
164 - # tcl/tk scripts that may need to be installed.
165 - #---------------------------------------------------------------
166 --pkglib_SCRIPTS = \
167 -+scriptsdir=${pkgdatadir}/scripts
168 -+scripts_DATA = \
169 - addressDialog.tcl \
170 - pkgIndex.tcl
171 -
172 -diff --git a/sppdgTcllib/addressDialog/configure.ac b/sppdgTcllib/addressDialog/configure.ac
173 -index 488ed2c..288faf3 100755
174 ---- a/sppdgTcllib/addressDialog/configure.ac
175 -+++ b/sppdgTcllib/addressDialog/configure.ac
176 -@@ -21,7 +21,7 @@ AC_INIT(ADDRESSDIALOG, 1.0, schrauf@××××.edu)
177 - # we're going to use automake later.
178 - #----------------------------------------------------------------
179 - AC_CONFIG_SRCDIR
180 --AM_INIT_AUTOMAKE(addressDialog, 1.0)
181 -+AM_INIT_AUTOMAKE
182 -
183 -
184 - #----------------------------------------------------------------
185 -diff --git a/sppdgTcllib/configure.ac b/sppdgTcllib/configure.ac
186 -index e4e8d54..6e010e1 100755
187 ---- a/sppdgTcllib/configure.ac
188 -+++ b/sppdgTcllib/configure.ac
189 -@@ -28,7 +28,7 @@ AC_INIT(sppdgTcllib, 1.0, techentin.robert@××××.edu)
190 - # we're going to use automake later.
191 - #----------------------------------------------------------------
192 - AC_CONFIG_SRCDIR
193 --AM_INIT_AUTOMAKE(sppdgTcllib, 1.0)
194 -+AM_INIT_AUTOMAKE
195 -
196 -
197 - #---------------------------------------------------------------
198 -diff --git a/sppdgTcllib/console/Makefile.am b/sppdgTcllib/console/Makefile.am
199 -index 92d5a2f..9bbe657 100755
200 ---- a/sppdgTcllib/console/Makefile.am
201 -+++ b/sppdgTcllib/console/Makefile.am
202 -@@ -33,13 +33,12 @@ AUTOMAKE_OPTIONS = foreign
203 - #---------------------------------------------------------------
204 - # tcl/tk scripts that may need to be installed.
205 - #---------------------------------------------------------------
206 --pkglib_SCRIPTS = \
207 -+scriptsdir=${pkgdatadir}/scripts
208 -+scripts_DATA = \
209 - console.tcl \
210 - console_demo.tcl \
211 - tkcon.tcl \
212 -- pkgIndex.tcl
213 --
214 --pkglib_DATA = \
215 -+ pkgIndex.tcl \
216 - README
217 -
218 - #---------------------------------------------------------------
219 -diff --git a/sppdgTcllib/console/configure.ac b/sppdgTcllib/console/configure.ac
220 -index 1ce7a3c..bf4d12c 100755
221 ---- a/sppdgTcllib/console/configure.ac
222 -+++ b/sppdgTcllib/console/configure.ac
223 -@@ -22,14 +22,14 @@
224 - # Declare the package name and version.
225 - # All the bouquets and brickbats go to Bob. :-)
226 - #----------------------------------------------------------------
227 --AC_INIT(console, 1.1, techentin.robert@××××.edu)
228 -+AC_INIT([console], [1.1], techentin.robert@××××.edu)
229 -
230 - #----------------------------------------------------------------
231 - # Give autoconf a point of reference, and tell it that
232 - # we're going to use automake later.
233 - #----------------------------------------------------------------
234 - AC_CONFIG_SRCDIR
235 --AM_INIT_AUTOMAKE(console, 1.1)
236 -+AM_INIT_AUTOMAKE
237 -
238 -
239 - #----------------------------------------------------------------
240 -diff --git a/sppdgTcllib/getFilePreview/Makefile.am b/sppdgTcllib/getFilePreview/Makefile.am
241 -index 94394c3..c0c6394 100755
242 ---- a/sppdgTcllib/getFilePreview/Makefile.am
243 -+++ b/sppdgTcllib/getFilePreview/Makefile.am
244 -@@ -32,7 +32,8 @@ AUTOMAKE_OPTIONS = foreign
245 - #---------------------------------------------------------------
246 - # tcl/tk scripts that may need to be installed.
247 - #---------------------------------------------------------------
248 --pkglib_SCRIPTS = \
249 -+scriptsdir=${pkgdatadir}/scripts
250 -+scripts_DATA = \
251 - getFilePreview.tcl \
252 - pkgIndex.tcl
253 -
254 -diff --git a/sppdgTcllib/getFilePreview/configure.ac b/sppdgTcllib/getFilePreview/configure.ac
255 -index ccf33a3..50b1838 100755
256 ---- a/sppdgTcllib/getFilePreview/configure.ac
257 -+++ b/sppdgTcllib/getFilePreview/configure.ac
258 -@@ -28,7 +28,7 @@ AC_INIT(getFilePreview, 1.0, techentin.robert@××××.edu)
259 - # we're going to use automake later.
260 - #----------------------------------------------------------------
261 - AC_CONFIG_SRCDIR
262 --AM_INIT_AUTOMAKE(getFilePreview, 1.0)
263 -+AM_INIT_AUTOMAKE
264 -
265 -
266 - #----------------------------------------------------------------
267 -diff --git a/sppdgTcllib/sgraph/Makefile.am b/sppdgTcllib/sgraph/Makefile.am
268 -index b02a876..b1da3e1 100755
269 ---- a/sppdgTcllib/sgraph/Makefile.am
270 -+++ b/sppdgTcllib/sgraph/Makefile.am
271 -@@ -32,7 +32,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
272 - #---------------------------------------------------------------
273 - # tcl/tk scripts that may need to be installed.
274 - #---------------------------------------------------------------
275 --pkglib_SCRIPTS = \
276 -+scriptsdir=${pkgdatadir}/scripts
277 -+scripts_DATA = \
278 - sgraph.tcl \
279 - pkgIndex.tcl
280 -
281 -diff --git a/sppdgTcllib/sgraph/configure.ac b/sppdgTcllib/sgraph/configure.ac
282 -index 8eb7ef7..e28b7dd 100755
283 ---- a/sppdgTcllib/sgraph/configure.ac
284 -+++ b/sppdgTcllib/sgraph/configure.ac
285 -@@ -29,7 +29,7 @@ AC_INIT(SGRAPH, 1.0, zahn.sharon@××××.edu)
286 - # we're going to use automake later.
287 - #----------------------------------------------------------------
288 - AC_CONFIG_SRCDIR
289 --AM_INIT_AUTOMAKE(sgraph, 1.0)
290 -+AM_INIT_AUTOMAKE
291 -
292 -
293 - #----------------------------------------------------------------
294 -diff --git a/units/Makefile.am b/units/Makefile.am
295 -index c47ec3c..ea941a9 100755
296 ---- a/units/Makefile.am
297 -+++ b/units/Makefile.am
298 -@@ -31,7 +31,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
299 - #---------------------------------------------------------------
300 - # tcl/tk scripts that may need to be installed.
301 - #---------------------------------------------------------------
302 --pkglib_SCRIPTS = \
303 -+scriptsdir=${pkgdatadir}/scripts
304 -+scripts_DATA = \
305 - units.tcl \
306 - pkgIndex.tcl \
307 - units.html
308
309 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-bem-nmmtl.patch b/sci-electronics/tnt/files/tnt-1.2.2-bem-nmmtl.patch
310 deleted file mode 100644
311 index c990c462a..000000000
312 --- a/sci-electronics/tnt/files/tnt-1.2.2-bem-nmmtl.patch
313 +++ /dev/null
314 @@ -1,11 +0,0 @@
315 ---- bem/src/nmmtl.cpp.org 2011-02-19 16:12:58.000000000 -0800
316 -+++ bem/src/nmmtl.cpp 2011-02-19 16:15:36.000000000 -0800
317 -@@ -352,7 +352,7 @@
318 - sprintf (filespec, "%s.result", filename);
319 - if( (output_file1 = fopen(filespec,"w")) == NULL )
320 - {
321 -- printf ("*** Could not open %s for output ***\n");
322 -+ printf ("*** Could not open %s for output ***\n", filespec);
323 - return 0; /* Fatal error; could not open output file */
324 - }
325 -
326
327 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc.patch
328 deleted file mode 100644
329 index 59e11c4f2..000000000
330 --- a/sci-electronics/tnt/files/tnt-1.2.2-calc.patch
331 +++ /dev/null
332 @@ -1,503 +0,0 @@
333 -# Adapt this old source to the new C++ standards
334 -# These patches fix a c++ scope issue, gcc was for some reason
335 -# not able to discover friend function of class Complex.
336 -# This has been solved by making this functions a member instead of a friend.
337 -# George Reitsma <g.p.reitsma@×××××.com>
338 -
339 -diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/calcCAP.cpp tnt-1.2.2/calcCAP/src/calcCAP.cpp
340 ---- tnt-1.2.2-0-vanilla/calcCAP/src/calcCAP.cpp 2004-07-22 21:29:12.000000000 +0200
341 -+++ tnt-1.2.2/calcCAP/src/calcCAP.cpp 2011-02-24 19:29:44.000000000 +0100
342 -@@ -14,6 +14,8 @@
343 - #endif
344 - #include <time.h>
345 - #include <stdio.h>
346 -+#include <string.h>
347 -+using namespace std;
348 -
349 - /********************** Global variables *******************/
350 -
351 -@@ -287,7 +289,7 @@
352 -
353 - for ( i1 = 0; i1 < Nc; i1 ++ ) {
354 -
355 -- sumc[i1] = cmplx( 0.0, 0.0 );
356 -+ sumc[i1] = Complex( 0.0, 0.0 );
357 -
358 -
359 - for ( j1 = 0; j1 < Nw; j1 ++ ) {
360 -diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/cmplxmat.cpp tnt-1.2.2/calcCAP/src/cmplxmat.cpp
361 ---- tnt-1.2.2-0-vanilla/calcCAP/src/cmplxmat.cpp 2004-07-22 21:29:12.000000000 +0200
362 -+++ tnt-1.2.2/calcCAP/src/cmplxmat.cpp 2011-02-24 19:29:44.000000000 +0100
363 -@@ -378,7 +378,7 @@
364 - Matrix result(d_i,d_j);
365 - for(int i = 0; i < d_i; i++)
366 - for(int j = 0; j < d_j; j++)
367 -- result(i,j)=::real(elem(i,j));
368 -+ result(i,j)=elem(i,j).real(); // result(i,j)=::real(elem(i,j));
369 - return (result);
370 - }
371 -
372 -@@ -387,7 +387,7 @@
373 - Matrix result(d_i,d_j);
374 - for(int i = 0; i < d_i; i++)
375 - for(int j = 0; j < d_j; j++)
376 -- result(i,j)=::imag(elem(i,j));
377 -+ result(i,j)=elem(i,j).imag(); // result(i,j)=::imag(elem(i,j));
378 - return (result);
379 - }
380 -
381 -@@ -396,7 +396,7 @@
382 - Matrix result(d_i,d_j);
383 - for(int i = 0; i < d_i; i++)
384 - for(int j = 0; j < d_j; j++)
385 -- result(i,j)=::cabs(elem(i,j));
386 -+ result(i,j)=elem(i,j).cabs(); // result(i,j)=::cabs(elem(i,j));
387 - return (result);
388 - }
389 -
390 -@@ -405,7 +405,7 @@
391 - CmplxMatrix result(d_i,d_j);
392 - for(int i = 0; i < d_i; i++)
393 - for(int j = 0; j < d_j; j++)
394 -- result(i,j)=::conjg(elem(i,j));
395 -+ result(i,j)=elem(i,j).conjg(); // result(i,j)=::conjg(elem(i,j));
396 - return (result);
397 - }
398 -
399 -diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/cmplxvec.cpp tnt-1.2.2/calcCAP/src/cmplxvec.cpp
400 ---- tnt-1.2.2-0-vanilla/calcCAP/src/cmplxvec.cpp 2004-07-22 21:29:12.000000000 +0200
401 -+++ tnt-1.2.2/calcCAP/src/cmplxvec.cpp 2011-02-24 19:29:44.000000000 +0100
402 -@@ -287,7 +287,7 @@
403 -
404 - int n = d;
405 - CmplxVector tmp(n);
406 -- for(int i = 0; i < n; i++) tmp[i] = ::conjg(v[i]);
407 -+ for(int i = 0; i < n; i++) tmp[i] = v[i].conjg(); // tmp[i] = ::conjg(v[i]);
408 - return (tmp);
409 - }
410 -
411 -@@ -295,7 +295,7 @@
412 -
413 - Vector tmp(d);
414 - int n = d;
415 -- while(n--) tmp[n] = ::real(v[n]);
416 -+ while(n--) tmp[n] = v[n].real(); // tmp[n] = ::real(v[n]);
417 - return (tmp);
418 - }
419 -
420 -@@ -303,7 +303,7 @@
421 -
422 - Vector tmp(d);
423 - int n = d;
424 -- while(n--) tmp[n] = ::imag(v[n]);
425 -+ while(n--) tmp[n] = v[n].imag(); // tmp[n] = ::imag(v[n]);
426 - return (tmp);
427 - }
428 -
429 -@@ -311,7 +311,7 @@
430 -
431 - Vector result(d);
432 - for(int i = 0; i < d; i++)
433 -- result[i]=::cabs(v[i]);
434 -+ result[i]=v[i].cabs(); // result[i]=::cabs(v[i]);
435 - return (result);
436 - }
437 -
438 -diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/complex.cpp tnt-1.2.2/calcCAP/src/complex.cpp
439 ---- tnt-1.2.2-0-vanilla/calcCAP/src/complex.cpp 2002-10-10 15:46:00.000000000 +0200
440 -+++ tnt-1.2.2/calcCAP/src/complex.cpp 2011-02-24 19:29:44.000000000 +0100
441 -@@ -203,6 +203,54 @@
442 - return(result);
443 - }
444 -
445 -+double Complex::real(void) {
446 -+
447 -+ return(re);
448 -+}
449 -+
450 -+double Complex::imag(void) {
451 -+
452 -+ return(im);
453 -+}
454 -+
455 -+double Complex::arg(void) {
456 -+
457 -+ return((im == 0.0)&&(re == 0.0) ? 0 : atan2(im, re));
458 -+}
459 -+
460 -+double Complex::cabs(void) {
461 -+
462 -+ double x, y, ans, temp;
463 -+ x = fabs(re);
464 -+ y = fabs(im);
465 -+ if (x == 0.0)
466 -+ ans = y;
467 -+ else if (y == 0.0)
468 -+ ans = x;
469 -+ else if (x > y) {
470 -+ temp = y/x;
471 -+ ans = x*sqrt(1.0+temp*temp);
472 -+ } else {
473 -+ temp = x/y;
474 -+ ans = y*sqrt(1.0+temp*temp);
475 -+ }
476 -+ return ans;
477 -+}
478 -+
479 -+double Complex::cabsm(void) {
480 -+
481 -+ return(sqrt(re*re + im*im));
482 -+}
483 -+
484 -+Complex Complex::conjg(void) {
485 -+
486 -+ Complex com;
487 -+ com.re = re;
488 -+ com.im = -im;
489 -+ return(com);
490 -+}
491 -+
492 -+
493 - /********************* friends *****************************/
494 -
495 - Complex operator*(const double& r, const Complex& c) {
496 -diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/complex.h tnt-1.2.2/calcCAP/src/complex.h
497 ---- tnt-1.2.2-0-vanilla/calcCAP/src/complex.h 2002-10-10 15:46:00.000000000 +0200
498 -+++ tnt-1.2.2/calcCAP/src/complex.h 2011-02-24 19:29:44.000000000 +0100
499 -@@ -1,10 +1,13 @@
500 - #ifndef _complex__h_
501 - #define _complex__h_
502 -
503 --#include <iostream.h>
504 -+#include <iostream>
505 -+using namespace std;
506 -
507 - class Complex
508 - {
509 -+ public:
510 -+
511 - friend Complex operator*(const double&, const Complex&);
512 - friend Complex operator+(const double&, const Complex&);
513 - friend Complex operator-(const double&, const Complex&);
514 -@@ -16,6 +19,14 @@
515 - friend double cabs(const Complex&);
516 - friend double cabsm(const Complex&);
517 - friend Complex conjg(const Complex&);
518 -+
519 -+ double real(void);
520 -+ double imag(void);
521 -+ double arg(void);
522 -+ double cabs(void);
523 -+ double cabsm(void);
524 -+ Complex conjg(void);
525 -+
526 - friend Complex cmplx(const double,const double);
527 - friend Complex polar(const double&, const double&);
528 - friend Complex cos(const Complex&);
529 -@@ -37,7 +48,6 @@
530 - friend ostream& operator<<(ostream&, Complex&);
531 - friend istream& operator>>(istream&, Complex&);
532 -
533 -- public:
534 - Complex(){} // constructors
535 - Complex(double r, double i = 0.0);
536 - Complex(const Complex&);
537 -diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/data.cpp tnt-1.2.2/calcCAP/src/data.cpp
538 ---- tnt-1.2.2-0-vanilla/calcCAP/src/data.cpp 2002-10-10 15:46:01.000000000 +0200
539 -+++ tnt-1.2.2/calcCAP/src/data.cpp 2011-02-24 19:29:44.000000000 +0100
540 -@@ -260,7 +260,7 @@
541 - }
542 - }
543 -
544 -- Ic = cmplx( 0.0, 1.0 );
545 -+ Ic = Complex( 0.0, 1.0 );
546 -
547 - Nc4 = 11*Nh+1;
548 - step_w = 1.0/power( 2.0, J );
549 -diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/calcRL.cpp tnt-1.2.2/calcRL/src/calcRL.cpp
550 ---- tnt-1.2.2-0-vanilla/calcRL/src/calcRL.cpp 2004-07-22 21:29:37.000000000 +0200
551 -+++ tnt-1.2.2/calcRL/src/calcRL.cpp 2011-02-24 19:29:53.000000000 +0100
552 -@@ -43,7 +43,8 @@
553 - #endif
554 - #include <time.h>
555 - #include <stdio.h>
556 --
557 -+#include <string.h>
558 -+using namespace std;
559 - /********************** Global variables *******************/
560 -
561 - int Nc, Die, Rec, Cir, Tri, Ell, Pol, Gnd, Tra;
562 -@@ -564,7 +565,7 @@
563 - tmp4 = Circum[i] / double(Nw);
564 - tmpsum1 = 0.0;
565 - tmpsum2 = 0.0;
566 -- sum2[i] = cmplx( 0.0, 0.0 );
567 -+ sum2[i] = Complex( 0.0, 0.0 );
568 -
569 - for (j = 0; j < Nw; j ++) {
570 -
571 -diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/cmplxmat.cpp tnt-1.2.2/calcRL/src/cmplxmat.cpp
572 ---- tnt-1.2.2-0-vanilla/calcRL/src/cmplxmat.cpp 2004-07-22 21:29:37.000000000 +0200
573 -+++ tnt-1.2.2/calcRL/src/cmplxmat.cpp 2011-02-24 19:29:53.000000000 +0100
574 -@@ -386,7 +386,7 @@
575 - Matrix result(d_i,d_j);
576 - for(int i = 0; i < d_i; i++)
577 - for(int j = 0; j < d_j; j++)
578 -- result(i,j)=::real(elem(i,j));
579 -+ result(i,j)=elem(i,j).real(); // result(i,j)=::real(elem(i,j));
580 - return (result);
581 - }
582 -
583 -@@ -395,7 +395,7 @@
584 - Matrix result(d_i,d_j);
585 - for(int i = 0; i < d_i; i++)
586 - for(int j = 0; j < d_j; j++)
587 -- result(i,j)=::imag(elem(i,j));
588 -+ result(i,j)=elem(i,j).imag(); // result(i,j)=::imag(elem(i,j));
589 - return (result);
590 - }
591 -
592 -@@ -404,7 +404,7 @@
593 - Matrix result(d_i,d_j);
594 - for(int i = 0; i < d_i; i++)
595 - for(int j = 0; j < d_j; j++)
596 -- result(i,j)=::cabs(elem(i,j));
597 -+ result(i,j)=elem(i,j).cabs(); // result(i,j)=::cabj(elem(i,j));
598 - return (result);
599 - }
600 -
601 -@@ -413,7 +413,7 @@
602 - CmplxMatrix result(d_i,d_j);
603 - for(int i = 0; i < d_i; i++)
604 - for(int j = 0; j < d_j; j++)
605 -- result(i,j)=::conjg(elem(i,j));
606 -+ result(i,j)=elem(i,j).conjg(); // result(i,j)=::conjg(elem(i,j));
607 - return (result);
608 - }
609 -
610 -diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/cmplxvec.cpp tnt-1.2.2/calcRL/src/cmplxvec.cpp
611 ---- tnt-1.2.2-0-vanilla/calcRL/src/cmplxvec.cpp 2004-07-22 21:29:37.000000000 +0200
612 -+++ tnt-1.2.2/calcRL/src/cmplxvec.cpp 2011-02-24 19:29:53.000000000 +0100
613 -@@ -289,7 +289,7 @@
614 -
615 - int n = d;
616 - CmplxVector tmp(n);
617 -- for(int i = 0; i < n; i++) tmp[i] = ::conjg(v[i]);
618 -+ for(int i = 0; i < n; i++) tmp[i] = v[i].conjg(); // tmp[i] = ::conjg(v[i]);
619 - return (tmp);
620 - }
621 -
622 -@@ -297,7 +297,7 @@
623 -
624 - Vector tmp(d);
625 - int n = d;
626 -- while(n--) tmp[n] = ::real(v[n]);
627 -+ while(n--) tmp[n] = v[n].real(); // tmp[n] = ::real(v[n]);
628 - return (tmp);
629 - }
630 -
631 -@@ -305,7 +305,7 @@
632 -
633 - Vector tmp(d);
634 - int n = d;
635 -- while(n--) tmp[n] = ::imag(v[n]);
636 -+ while(n--) tmp[n] = v[n].imag(); // tmp[n] = ::imag(v[n])
637 - return (tmp);
638 - }
639 -
640 -@@ -313,7 +313,7 @@
641 -
642 - Vector result(d);
643 - for(int i = 0; i < d; i++)
644 -- result[i]=::cabs(v[i]);
645 -+ result[i]=v[i].cabs(); // result[i]=::cabs(v[i]);
646 - return (result);
647 - }
648 -
649 -diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/complex.cpp tnt-1.2.2/calcRL/src/complex.cpp
650 ---- tnt-1.2.2-0-vanilla/calcRL/src/complex.cpp 2002-10-09 22:23:38.000000000 +0200
651 -+++ tnt-1.2.2/calcRL/src/complex.cpp 2011-02-24 19:29:53.000000000 +0100
652 -@@ -17,6 +17,53 @@
653 -
654 - /*********************** members *********************************/
655 -
656 -+double Complex::real(void) {
657 -+
658 -+ return(re);
659 -+}
660 -+
661 -+double Complex::imag(void) {
662 -+
663 -+ return(im);
664 -+}
665 -+
666 -+double Complex::arg(void) {
667 -+
668 -+ return((im == 0.0)&&(re == 0.0) ? 0 : atan2(im, re));
669 -+}
670 -+
671 -+double Complex::cabs(void) {
672 -+
673 -+ double x, y, ans, temp;
674 -+ x = fabs(re);
675 -+ y = fabs(im);
676 -+ if (x == 0.0)
677 -+ ans = y;
678 -+ else if (y == 0.0)
679 -+ ans = x;
680 -+ else if (x > y) {
681 -+ temp = y/x;
682 -+ ans = x*sqrt(1.0+temp*temp);
683 -+ } else {
684 -+ temp = x/y;
685 -+ ans = y*sqrt(1.0+temp*temp);
686 -+ }
687 -+ return ans;
688 -+}
689 -+
690 -+double Complex::cabsm(void) {
691 -+
692 -+ return(sqrt(re*re + im*im));
693 -+}
694 -+
695 -+Complex Complex::conjg(void) {
696 -+
697 -+ Complex com;
698 -+ com.re = re;
699 -+ com.im = -im;
700 -+ return(com);
701 -+}
702 -+
703 - /********************* friends *****************************/
704 -
705 - Complex operator*(const double& r, const Complex& c) {
706 -diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/complex.h tnt-1.2.2/calcRL/src/complex.h
707 ---- tnt-1.2.2-0-vanilla/calcRL/src/complex.h 2002-10-09 22:23:39.000000000 +0200
708 -+++ tnt-1.2.2/calcRL/src/complex.h 2011-02-24 19:29:53.000000000 +0100
709 -@@ -3,10 +3,12 @@
710 -
711 - #include <stdlib.h>
712 - #include <math.h>
713 --#include <iostream.h>
714 -+#include <iostream>
715 -+using namespace std;
716 -
717 - class Complex
718 - {
719 -+ public:
720 - friend Complex operator*(const double&, const Complex&);
721 - friend Complex operator+(const double&, const Complex&);
722 - friend Complex operator-(const double&, const Complex&);
723 -@@ -14,6 +16,14 @@
724 -
725 - friend double real(const Complex&);
726 - friend double imag(const Complex&);
727 -+ double real(void);
728 -+ double imag(void);
729 -+ double arg(void);
730 -+ double cabs(void);
731 -+ double cabsm(void);
732 -+ Complex conjg(void);
733 -+
734 -+
735 - friend double arg(const Complex&);
736 - friend double cabs(const Complex&);
737 - friend double cabsm(const Complex&);
738 -@@ -39,7 +49,7 @@
739 - friend ostream& operator<<(ostream&, Complex&);
740 - friend istream& operator>>(istream&, Complex&);
741 -
742 -- public:
743 -+
744 - Complex(){} // constructors
745 - Complex(double r, double i = 0.0);
746 - Complex(const Complex&);
747 -diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/data.cpp tnt-1.2.2/calcRL/src/data.cpp
748 ---- tnt-1.2.2-0-vanilla/calcRL/src/data.cpp 2004-07-22 21:29:37.000000000 +0200
749 -+++ tnt-1.2.2/calcRL/src/data.cpp 2011-02-24 19:29:53.000000000 +0100
750 -@@ -251,7 +251,7 @@
751 - }
752 - }
753 -
754 -- Ic = cmplx( 0.0, 1.0 );
755 -+ Ic = Complex( 0.0, 1.0 );
756 -
757 - Nc4 = 11*Nh+1;
758 - step_w = 1.0/power( 2.0, J );
759 -diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/hankel.cpp tnt-1.2.2/calcRL/src/hankel.cpp
760 ---- tnt-1.2.2-0-vanilla/calcRL/src/hankel.cpp 2002-10-09 22:23:40.000000000 +0200
761 -+++ tnt-1.2.2/calcRL/src/hankel.cpp 2011-02-24 19:29:53.000000000 +0100
762 -@@ -19,7 +19,7 @@
763 -
764 - hank01( vj0, vy0, x, 1 );
765 -
766 -- return( cmplx( vj0, -vy0 ) );
767 -+ return( Complex( vj0, -vy0 ) );
768 - }
769 -
770 - /***** Function Hank21 - to calculate H^(2)_1(x), x - double ****/
771 -@@ -30,7 +30,7 @@
772 -
773 - hank11( vj1, vy1, x, 1 );
774 -
775 -- return( cmplx( vj1, -vy1 ) );
776 -+ return( Complex( vj1, -vy1 ) );
777 - }
778 -
779 - /***** Function Hank10 - to calculate H^(1)_0(x), x - double ****/
780 -@@ -41,7 +41,7 @@
781 -
782 - hank01( vj0, vy0, x, 1 );
783 -
784 -- return( cmplx( vj0, vy0 ) );
785 -+ return( Complex( vj0, vy0 ) );
786 - }
787 -
788 - /***** Function Hank11 - to calculate H^(1)_1(x), x - double ****/
789 -@@ -52,7 +52,7 @@
790 -
791 - hank11( vj1, vy1, x, 1 );
792 -
793 -- return( cmplx( vj1, vy1 ) );
794 -+ return( Complex( vj1, vy1 ) );
795 - }
796 -
797 - int hank01( double& vj0, double& vy0, double xd, int n ) {
798 -diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/kelvin.cpp tnt-1.2.2/calcRL/src/kelvin.cpp
799 ---- tnt-1.2.2-0-vanilla/calcRL/src/kelvin.cpp 2002-10-09 22:23:42.000000000 +0200
800 -+++ tnt-1.2.2/calcRL/src/kelvin.cpp 2011-02-24 19:29:53.000000000 +0100
801 -@@ -332,20 +332,20 @@
802 - return(keip);
803 - }
804 -
805 --static Complex seta_p1 = cmplx(0.0,-0.3926991);
806 --static Complex seta_p2 = cmplx(0.0110486,0.0);
807 --static Complex seta_p3 = cmplx(0.0,-0.0009765);
808 --static Complex seta_p4 = cmplx(-0.0000906,-0.0000901);
809 --static Complex seta_p5 = cmplx(-0.0000252,0.0);
810 --static Complex seta_p6 = cmplx(-0.0000034,0.0000051);
811 --static Complex seta_p7 = cmplx(0.0000006,.0000019);
812 --static Complex dphi_p1 = cmplx(0.7071068,0.7071068);
813 --static Complex dphi_p2 = cmplx(-0.0625001,-0.0000001);
814 --static Complex dphi_p3 = cmplx(-0.0013813,0.0013811);
815 --static Complex dphi_p4 = cmplx(0.0000005,0.0002452);
816 --static Complex dphi_p5 = cmplx(0.0000346,0.0000338);
817 --static Complex dphi_p6 = cmplx(0.0000117,-0.0000024);
818 --static Complex dphi_p7 = cmplx(0.0000016,-0.0000032);
819 -+static Complex seta_p1 = Complex(0.0,-0.3926991);
820 -+static Complex seta_p2 = Complex(0.0110486,0.0);
821 -+static Complex seta_p3 = Complex(0.0,-0.0009765);
822 -+static Complex seta_p4 = Complex(-0.0000906,-0.0000901);
823 -+static Complex seta_p5 = Complex(-0.0000252,0.0);
824 -+static Complex seta_p6 = Complex(-0.0000034,0.0000051);
825 -+static Complex seta_p7 = Complex(0.0000006,.0000019);
826 -+static Complex dphi_p1 = Complex(0.7071068,0.7071068);
827 -+static Complex dphi_p2 = Complex(-0.0625001,-0.0000001);
828 -+static Complex dphi_p3 = Complex(-0.0013813,0.0013811);
829 -+static Complex dphi_p4 = Complex(0.0000005,0.0002452);
830 -+static Complex dphi_p5 = Complex(0.0000346,0.0000338);
831 -+static Complex dphi_p6 = Complex(0.0000117,-0.0000024);
832 -+static Complex dphi_p7 = Complex(0.0000016,-0.0000032);
833 -
834 -
835 -
836
837 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-docs.patch b/sci-electronics/tnt/files/tnt-1.2.2-docs.patch
838 deleted file mode 100644
839 index 77fe50445..000000000
840 --- a/sci-electronics/tnt/files/tnt-1.2.2-docs.patch
841 +++ /dev/null
842 @@ -1,66 +0,0 @@
843 -diff -ruN tnt-1.2.2-5-tkcon/Makefile.am tnt-1.2.2/Makefile.am
844 ---- tnt-1.2.2-5-tkcon/Makefile.am 2004-07-22 16:23:32.000000000 +0200
845 -+++ tnt-1.2.2/Makefile.am 2011-02-24 23:43:41.000000000 +0100
846 -@@ -51,14 +51,16 @@
847 - # a prefix. If not, then I suppose README will go into
848 - # /usr.
849 - #---------------------------------------------------------------
850 --appdocsdir = $(prefix)
851 --appdocs_DATA = \
852 -- AUTHORS$(TXTEXT) \
853 -- COPYING$(TXTEXT) \
854 -- ChangeLog$(TXTEXT) \
855 -- NEWS$(TXTEXT) \
856 -- README$(TXTEXT) \
857 -- THANKS$(TXTEXT)
858 -+#
859 -+# Portage takes care for this
860 -+#appdocsdir = $(prefix)
861 -+#appdocs_DATA = \
862 -+# AUTHORS$(TXTEXT) \
863 -+# COPYING$(TXTEXT) \
864 -+# ChangeLog$(TXTEXT) \
865 -+# NEWS$(TXTEXT) \
866 -+# README$(TXTEXT) \
867 -+# THANKS$(TXTEXT)
868 -
869 - #---------------------------------------------------------------
870 - # Convert application documents to text files on Windows.
871 -diff -ruN tnt-1.2.2-5-tkcon/doc/Makefile.am tnt-1.2.2/doc/Makefile.am
872 ---- tnt-1.2.2-5-tkcon/doc/Makefile.am 2004-07-21 17:45:26.000000000 +0200
873 -+++ tnt-1.2.2/doc/Makefile.am 2011-02-24 23:43:45.000000000 +0100
874 -@@ -43,7 +43,7 @@
875 - #
876 - #---------------------------------------------------------------
877 -
878 --docdir = $(prefix)/doc
879 -+#docdir = $(prefix)/doc
880 - doc_DATA = \
881 - user-guide.pdf
882 -
883 -@@ -73,15 +73,17 @@
884 - pdflatex $*
885 - latex2html -split 4 -show_section_numbers -local_icons $<
886 -
887 -+# Removed, because portage takes care of it.
888 -+#
889 - # Custom installation rule
890 --install-data-local:
891 -- for f in $(doc_DATA); do \
892 -- $(mkinstalldirs) $(docdir); \
893 -- $(INSTALL_DATA) $$f $(docdir)/$$f; \
894 -- d=`basename $$f .pdf`; \
895 -- $(mkinstalldirs) $(docdir)/$$d; \
896 -- $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
897 -- done
898 -+#install-data-local:
899 -+# for f in $(doc_DATA); do \
900 -+# $(mkinstalldirs) $(docdir); \
901 -+# $(INSTALL_DATA) $$f $(docdir)/$$f; \
902 -+# d=`basename $$f .pdf`; \
903 -+# $(mkinstalldirs) $(docdir)/$$d; \
904 -+# $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
905 -+# done
906 -
907 - #---------------------------------------------------------------
908 - # clean
909
910 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-f77.patch b/sci-electronics/tnt/files/tnt-1.2.2-f77.patch
911 deleted file mode 100644
912 index b1f3fa150..000000000
913 --- a/sci-electronics/tnt/files/tnt-1.2.2-f77.patch
914 +++ /dev/null
915 @@ -1,14 +0,0 @@
916 -diff -ruN tnt-1.2.2-3-namespace/bem/configure.ac tnt-1.2.2-4-g77/bem/configure.ac
917 ---- tnt-1.2.2-3-namespace/bem/configure.ac 2004-04-22 22:07:12.000000000 +0200
918 -+++ tnt-1.2.2-4-g77/bem/configure.ac 2011-02-24 23:55:35.000000000 +0100
919 -@@ -74,9 +74,7 @@
920 - ;;
921 - *linux*)
922 - # For Linux, all flavors...
923 -- # Use the GNU compilers for C++ and FORTRAN.
924 -- CXX="g++"
925 -- F77="g77"
926 -+ # Use the GNU compilers for C++ and FORTRAN and rely on portage
927 - AM_CXXFLAGS="-DFORTRAN_UNDERBARS"
928 - ;;
929 - esac
930
931 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui.patch
932 deleted file mode 100644
933 index e2a9b4ca4..000000000
934 --- a/sci-electronics/tnt/files/tnt-1.2.2-gui.patch
935 +++ /dev/null
936 @@ -1,24 +0,0 @@
937 -diff -ruN tnt-1.2.2-6-docs/gui/gui_help.tcl tnt-1.2.2/gui/gui_help.tcl
938 ---- tnt-1.2.2-6-docs/gui/gui_help.tcl 2004-07-26 15:37:52.000000000 +0200
939 -+++ tnt-1.2.2/gui/gui_help.tcl 2011-02-24 23:45:27.000000000 +0100
940 -@@ -26,7 +26,7 @@
941 - switch -exact $helpTopic {
942 -
943 - userguide {
944 -- display_online_help user-guide/index.html
945 -+ display_online_help /usr/share/doc/package_name/html/index.html
946 - }
947 -
948 - }
949 -diff -ruN tnt-1.2.2-6-docs/gui/splash.tcl tnt-1.2.2/gui/splash.tcl
950 ---- tnt-1.2.2-6-docs/gui/splash.tcl 2004-07-22 15:16:21.000000000 +0200
951 -+++ tnt-1.2.2/gui/splash.tcl 2011-02-24 23:45:23.000000000 +0100
952 -@@ -81,7 +81,7 @@
953 - } else {
954 - set filename COPYING
955 - }
956 -- set licenseFile [file join $::scriptDir .. $filename]
957 -+ set licenseFile [file join /usr share doc package_name html $filename]
958 - if { [file exists $licenseFile] } {
959 - ::gui::guiPopupFile $licenseFile
960 - } else {
961
962 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-namespaces.patch b/sci-electronics/tnt/files/tnt-1.2.2-namespaces.patch
963 deleted file mode 100644
964 index 74bf0ee49..000000000
965 --- a/sci-electronics/tnt/files/tnt-1.2.2-namespaces.patch
966 +++ /dev/null
967 @@ -1,230 +0,0 @@
968 -diff -ruN tnt-1.2.2-2-bem/bem/src/magicad.h tnt-1.2.2/bem/src/magicad.h
969 ---- tnt-1.2.2-2-bem/bem/src/magicad.h 2002-10-23 00:29:27.000000000 +0200
970 -+++ tnt-1.2.2/bem/src/magicad.h 2011-02-24 19:36:32.000000000 +0100
971 -@@ -100,7 +100,8 @@
972 - #include <stdlib.h>
973 - #include <string.h>
974 - #ifdef __cplusplus
975 --#include <iostream.h>
976 -+#include <iostream>
977 -+using namespace std;
978 - #endif
979 - #include <limits.h>
980 - #if !defined(PATH_MAX) || defined(__hpux)
981 -diff -ruN tnt-1.2.2-2-bem/calcCAP/src/bicgstab.cpp tnt-1.2.2/calcCAP/src/bicgstab.cpp
982 ---- tnt-1.2.2-2-bem/calcCAP/src/bicgstab.cpp 2004-07-22 21:29:12.000000000 +0200
983 -+++ tnt-1.2.2/calcCAP/src/bicgstab.cpp 2011-02-24 19:36:32.000000000 +0100
984 -@@ -9,7 +9,8 @@
985 -
986 -
987 - //#include "stdafx.h"
988 --#include <iostream.h>
989 -+#include <iostream>
990 -+using namespace std;
991 - #include <math.h>
992 -
993 - #include "vector.h"
994 -diff -ruN tnt-1.2.2-2-bem/calcCAP/src/diffrm.cpp tnt-1.2.2/calcCAP/src/diffrm.cpp
995 ---- tnt-1.2.2-2-bem/calcCAP/src/diffrm.cpp 2002-10-10 15:46:02.000000000 +0200
996 -+++ tnt-1.2.2/calcCAP/src/diffrm.cpp 2011-02-24 19:36:41.000000000 +0100
997 -@@ -8,8 +8,10 @@
998 -
999 - //#include "stdafx.h"
1000 - #include <math.h>
1001 --#include <iostream.h>
1002 --#include <iomanip.h>
1003 -+#include <iostream>
1004 -+using namespace std;
1005 -+#include <iomanip>
1006 -+using namespace std;
1007 - #include <stdlib.h>
1008 -
1009 - #include "complex.h"
1010 -diff -ruN tnt-1.2.2-2-bem/calcCAP/src/ivectorl.h tnt-1.2.2/calcCAP/src/ivectorl.h
1011 ---- tnt-1.2.2-2-bem/calcCAP/src/ivectorl.h 2002-10-10 15:46:04.000000000 +0200
1012 -+++ tnt-1.2.2/calcCAP/src/ivectorl.h 2011-02-24 19:36:32.000000000 +0100
1013 -@@ -1,6 +1,7 @@
1014 - #ifndef _IVectorl__h_
1015 - #define _IVectorl__h_
1016 --#include <iostream.h>
1017 -+#include <iostream>
1018 -+using namespace std;
1019 -
1020 - class IVectorl
1021 - {
1022 -diff -ruN tnt-1.2.2-2-bem/calcCAP/src/prony.cpp tnt-1.2.2/calcCAP/src/prony.cpp
1023 ---- tnt-1.2.2-2-bem/calcCAP/src/prony.cpp 2002-10-10 15:46:06.000000000 +0200
1024 -+++ tnt-1.2.2/calcCAP/src/prony.cpp 2011-02-24 19:36:41.000000000 +0100
1025 -@@ -1,6 +1,7 @@
1026 - #include "stdafx.h"
1027 - #include <math.h>
1028 --#include <iomanip.h>
1029 -+#include <iomanip>
1030 -+using namespace std;
1031 - #include <stdlib.h>
1032 - #include "complex.h"
1033 - #include "vector.h"
1034 -diff -ruN tnt-1.2.2-2-bem/calcCAP/src/sparse.cpp tnt-1.2.2/calcCAP/src/sparse.cpp
1035 ---- tnt-1.2.2-2-bem/calcCAP/src/sparse.cpp 2004-07-22 21:29:12.000000000 +0200
1036 -+++ tnt-1.2.2/calcCAP/src/sparse.cpp 2011-02-24 19:36:41.000000000 +0100
1037 -@@ -2,9 +2,11 @@
1038 -
1039 - //#include "stdafx.h"
1040 - #include <math.h>
1041 --#include <iostream.h>
1042 -+#include <iostream>
1043 -+using namespace std;
1044 - #include <stdlib.h>
1045 --#include <iomanip.h>
1046 -+#include <iomanip>
1047 -+using namespace std;
1048 -
1049 - #include "complex.h"
1050 - #include "vector.h"
1051 -diff -ruN tnt-1.2.2-2-bem/calcCAP/src/stdafx.h tnt-1.2.2/calcCAP/src/stdafx.h
1052 ---- tnt-1.2.2-2-bem/calcCAP/src/stdafx.h 2002-10-10 15:46:08.000000000 +0200
1053 -+++ tnt-1.2.2/calcCAP/src/stdafx.h 2011-02-24 19:36:50.000000000 +0100
1054 -@@ -2,11 +2,15 @@
1055 - #define _stdafx__h_
1056 -
1057 - #include <math.h>
1058 --#include <iostream.h>
1059 --#include <iomanip.h>
1060 --#include <fstream.h>
1061 -+#include <iostream>
1062 -+using namespace std;
1063 -+#include <iomanip>
1064 -+using namespace std;
1065 -+#include <fstream>
1066 -+using namespace std;
1067 - #include <stdlib.h>
1068 --#include <iomanip.h>
1069 -+#include <iomanip>
1070 -+using namespace std;
1071 -
1072 - #include "complex.h"
1073 - #include "vector.h"
1074 -diff -ruN tnt-1.2.2-2-bem/calcCAP/src/systsolv.cpp tnt-1.2.2/calcCAP/src/systsolv.cpp
1075 ---- tnt-1.2.2-2-bem/calcCAP/src/systsolv.cpp 2002-10-10 15:46:08.000000000 +0200
1076 -+++ tnt-1.2.2/calcCAP/src/systsolv.cpp 2011-02-24 19:36:32.000000000 +0100
1077 -@@ -3,7 +3,8 @@
1078 -
1079 - //#include "stdafx.h"
1080 -
1081 --#include <iostream.h>
1082 -+#include <iostream>
1083 -+using namespace std;
1084 - #include <math.h>
1085 - #include <stdlib.h>
1086 - #include "complex.h"
1087 -diff -ruN tnt-1.2.2-2-bem/calcCAP/src/vector.h tnt-1.2.2/calcCAP/src/vector.h
1088 ---- tnt-1.2.2-2-bem/calcCAP/src/vector.h 2002-10-10 15:46:09.000000000 +0200
1089 -+++ tnt-1.2.2/calcCAP/src/vector.h 2011-02-24 19:36:41.000000000 +0100
1090 -@@ -1,8 +1,10 @@
1091 - #ifndef _Vector__h_
1092 - #define _Vector__h_
1093 -
1094 --#include <iostream.h>
1095 --#include <iomanip.h>
1096 -+#include <iostream>
1097 -+using namespace std;
1098 -+#include <iomanip>
1099 -+using namespace std;
1100 -
1101 - class Vector
1102 - {
1103 -diff -ruN tnt-1.2.2-2-bem/calcRL/src/bicgstab.cpp tnt-1.2.2/calcRL/src/bicgstab.cpp
1104 ---- tnt-1.2.2-2-bem/calcRL/src/bicgstab.cpp 2004-07-22 21:29:37.000000000 +0200
1105 -+++ tnt-1.2.2/calcRL/src/bicgstab.cpp 2011-02-24 19:36:32.000000000 +0100
1106 -@@ -9,7 +9,8 @@
1107 -
1108 -
1109 - //#include "stdafx.h"
1110 --#include <iostream.h>
1111 -+#include <iostream>
1112 -+using namespace std;
1113 - #include <math.h>
1114 -
1115 - #include "vector.h"
1116 -diff -ruN tnt-1.2.2-2-bem/calcRL/src/ivectorl.h tnt-1.2.2/calcRL/src/ivectorl.h
1117 ---- tnt-1.2.2-2-bem/calcRL/src/ivectorl.h 2002-10-09 22:23:41.000000000 +0200
1118 -+++ tnt-1.2.2/calcRL/src/ivectorl.h 2011-02-24 19:36:32.000000000 +0100
1119 -@@ -2,7 +2,8 @@
1120 - #define _IVectorl__h_
1121 - #include <stdlib.h>
1122 - #include <math.h>
1123 --#include <iostream.h>
1124 -+#include <iostream>
1125 -+using namespace std;
1126 -
1127 - class IVectorl
1128 - {
1129 -diff -ruN tnt-1.2.2-2-bem/calcRL/src/sparse.cpp tnt-1.2.2/calcRL/src/sparse.cpp
1130 ---- tnt-1.2.2-2-bem/calcRL/src/sparse.cpp 2002-10-09 22:23:45.000000000 +0200
1131 -+++ tnt-1.2.2/calcRL/src/sparse.cpp 2011-02-24 19:36:41.000000000 +0100
1132 -@@ -1,9 +1,11 @@
1133 - /******* functions, needed for sparse matrices *******/
1134 -
1135 - #include <math.h>
1136 --#include <iostream.h>
1137 -+#include <iostream>
1138 -+using namespace std;
1139 - #include <stdlib.h>
1140 --#include <iomanip.h>
1141 -+#include <iomanip>
1142 -+using namespace std;
1143 -
1144 - #include "complex.h"
1145 - #include "vector.h"
1146 -diff -ruN tnt-1.2.2-2-bem/calcRL/src/stdafx.h tnt-1.2.2/calcRL/src/stdafx.h
1147 ---- tnt-1.2.2-2-bem/calcRL/src/stdafx.h 2002-10-09 22:23:56.000000000 +0200
1148 -+++ tnt-1.2.2/calcRL/src/stdafx.h 2011-02-24 19:36:50.000000000 +0100
1149 -@@ -2,11 +2,15 @@
1150 - #define _stdafx__h_
1151 -
1152 - #include <math.h>
1153 --#include <iostream.h>
1154 --#include <iomanip.h>
1155 --#include <fstream.h>
1156 -+#include <iostream>
1157 -+using namespace std;
1158 -+#include <iomanip>
1159 -+using namespace std;
1160 -+#include <fstream>
1161 -+using namespace std;
1162 - #include <stdlib.h>
1163 --#include <iomanip.h>
1164 -+#include <iomanip>
1165 -+using namespace std;
1166 -
1167 - #include "complex.h"
1168 - #include "vector.h"
1169 -diff -ruN tnt-1.2.2-2-bem/calcRL/src/systsolv.cpp tnt-1.2.2/calcRL/src/systsolv.cpp
1170 ---- tnt-1.2.2-2-bem/calcRL/src/systsolv.cpp 2002-10-09 22:23:57.000000000 +0200
1171 -+++ tnt-1.2.2/calcRL/src/systsolv.cpp 2011-02-24 19:36:32.000000000 +0100
1172 -@@ -2,7 +2,8 @@
1173 - /*****Source - "NUMERICAL RECIPES IN C", www.nr.com*****/
1174 -
1175 - //#include "stdafx.h"
1176 --#include <iostream.h>
1177 -+#include <iostream>
1178 -+using namespace std;
1179 - #include <math.h>
1180 - #include <stdlib.h>
1181 - #include "complex.h"
1182 -diff -ruN tnt-1.2.2-2-bem/calcRL/src/vector.h tnt-1.2.2/calcRL/src/vector.h
1183 ---- tnt-1.2.2-2-bem/calcRL/src/vector.h 2002-10-09 22:23:59.000000000 +0200
1184 -+++ tnt-1.2.2/calcRL/src/vector.h 2011-02-24 19:36:41.000000000 +0100
1185 -@@ -3,8 +3,10 @@
1186 -
1187 - #include <stdlib.h>
1188 - #include <math.h>
1189 --#include <iostream.h>
1190 --#include <iomanip.h>
1191 -+#include <iostream>
1192 -+using namespace std;
1193 -+#include <iomanip>
1194 -+using namespace std;
1195 -
1196 - class Vector
1197 - {
1198
1199 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch b/sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch
1200 deleted file mode 100644
1201 index 4c603c739..000000000
1202 --- a/sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch
1203 +++ /dev/null
1204 @@ -1,16 +0,0 @@
1205 ---- sppdgTcllib/console/tkcon.tcl.org 2011-02-19 01:46:57.000000000 -0800
1206 -+++ sppdgTcllib/console/tkcon.tcl 2011-02-19 01:47:36.000000000 -0800
1207 -@@ -43,9 +43,10 @@
1208 -
1209 - if {$tcl_version < 8.0} {
1210 - return -code error "tkcon requires at least Tcl/Tk8"
1211 --} else {
1212 -- package require -exact Tk $tcl_version
1213 --}
1214 -+}
1215 -+#else {
1216 -+# package require -exact Tk $tcl_version
1217 -+#}
1218 -
1219 - catch {package require bogus-package-name}
1220 - foreach pkg [info loaded {}] {
1221
1222 diff --git a/sci-electronics/tnt/metadata.xml b/sci-electronics/tnt/metadata.xml
1223 deleted file mode 100644
1224 index 28b4e4efa..000000000
1225 --- a/sci-electronics/tnt/metadata.xml
1226 +++ /dev/null
1227 @@ -1,11 +0,0 @@
1228 -<?xml version="1.0" encoding="UTF-8"?>
1229 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1230 -<pkgmetadata>
1231 - <maintainer type="project">
1232 - <email>sci-electronics@g.o</email>
1233 - <name>Gentoo Electronics Project</name>
1234 - </maintainer>
1235 - <upstream>
1236 - <remote-id type="sourceforge">mmtl</remote-id>
1237 - </upstream>
1238 -</pkgmetadata>
1239
1240 diff --git a/sci-electronics/tnt/tnt-1.2.2.ebuild b/sci-electronics/tnt/tnt-1.2.2.ebuild
1241 deleted file mode 100644
1242 index bfe7e4891..000000000
1243 --- a/sci-electronics/tnt/tnt-1.2.2.ebuild
1244 +++ /dev/null
1245 @@ -1,62 +0,0 @@
1246 -# Copyright 1999-2015 Gentoo Foundation
1247 -# Distributed under the terms of the GNU General Public License v2
1248 -
1249 -EAPI=5
1250 -
1251 -AUTOTOOLS_AUTORECONF=true
1252 -
1253 -inherit autotools-utils fortran-2 toolchain-funcs
1254 -
1255 -DESCRIPTION="MoM 2.5 D stripline simulator"
1256 -HOMEPAGE="http://mmtl.sourceforge.net/"
1257 -SRC_URI="mirror://sourceforge/mmtl/${P}.tar.gz"
1258 -
1259 -SLOT="0"
1260 -LICENSE="BSD GPL-2"
1261 -KEYWORDS="~amd64 ~x86"
1262 -IUSE="doc"
1263 -
1264 -RDEPEND="
1265 - dev-lang/tcl:0=
1266 - dev-tcltk/tcllib
1267 - dev-tcltk/itcl
1268 - dev-tcltk/bwidget"
1269 -DEPEND="${RDEPEND}
1270 - dev-texlive/texlive-latex
1271 - dev-tex/latex2html
1272 - media-gfx/imagemagick"
1273 -
1274 -PATCHES=( "${FILESDIR}/${P}"-{calc,bem-nmmtl,namespaces,f77,tkcon,docs,gui,autotools}.patch )
1275 -
1276 -src_prepare() {
1277 - #adjust new document location in gui
1278 - sed -i "s/package_name/${PF}/" gui/splash.tcl || die
1279 - sed -i "s/package_name/${PF}/" gui/gui_help.tcl || die
1280 -
1281 - autotools-utils_src_prepare
1282 -}
1283 -
1284 -AUTOTOOLS_IN_SOURCE_BUILD=1
1285 -
1286 -src_install () {
1287 - # tcl cannot handle the archives created by dodoc
1288 - if use doc; then
1289 - DOCS=( doc/*.pdf doc/*.png )
1290 - HTML_DOCS=( doc/user-guide/* )
1291 - fi
1292 -
1293 - autotools-utils_src_install
1294 -
1295 - # Install icon
1296 - convert gui/logo.gif gui/tnt.png
1297 - docinto "examples"
1298 - dodoc examples/*
1299 - doicon gui/tnt.png
1300 - make_desktop_entry ${PN} "tnt" ${PN}
1301 -}
1302 -
1303 -pkg_postinst() {
1304 - elog "Warning: the sources are not under development anymore."
1305 - elog "We made it compile, but users should check if the results make sense."
1306 - elog "Examples are in the /usr/share/doc/tnt-1.2.2 folder."
1307 -}