* [gentoo-commits] dev/dilfridge:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/
@ 2011-02-24 21:44 Andreas K. Huettel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Huettel @ 2011-02-24 21:44 UTC (permalink / raw
To: gentoo-commits
commit: d6512a020a4b26e0a22d40c00eb86288e6d09c86
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Feb 24 18:00:42 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 18:00:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=d6512a02
[sci-electronics/tnt] Added files from George Reitsma
---
sci-electronics/tnt/Manifest | 22 ++++
.../tnt/files/tnt-1.2.2-Makefile-am.patch | 27 +++++
.../tnt/files/tnt-1.2.2-bem-nmmtl.patch | 11 ++
.../tnt/files/tnt-1.2.2-calc-cap-calcCAP.patch | 20 ++++
.../tnt/files/tnt-1.2.2-calc-cap-cmplxmat.patch | 38 +++++++
.../tnt/files/tnt-1.2.2-calc-cap-cmplxvec.patch | 38 +++++++
| 40 +++++++
.../files/tnt-1.2.2-calc-cap-complex-source.patch | 57 ++++++++++
.../tnt/files/tnt-1.2.2-calc-cap-data.patch | 11 ++
.../tnt/files/tnt-1.2.2-calc-rl-calcRL.patch | 21 ++++
.../tnt/files/tnt-1.2.2-calc-rl-cmplxmat.patch | 38 +++++++
.../tnt/files/tnt-1.2.2-calc-rl-cmplxvec.patch | 38 +++++++
| 40 +++++++
.../tnt/files/tnt-1.2.2-calc-rl-complex.patch | 56 ++++++++++
.../tnt/files/tnt-1.2.2-calc-rl-data.patch | 11 ++
.../tnt/files/tnt-1.2.2-calc-rl-hankel.patch | 38 +++++++
.../tnt/files/tnt-1.2.2-calc-rl-kelvin.patch | 37 +++++++
.../tnt/files/tnt-1.2.2-doc-Makefile-am.patch | 37 +++++++
.../tnt/files/tnt-1.2.2-gui-splash.patch | 11 ++
sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch | 11 ++
sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch | 16 +++
sci-electronics/tnt/tnt-1.2.2.ebuild | 108 ++++++++++++++++++++
22 files changed, 726 insertions(+), 0 deletions(-)
diff --git a/sci-electronics/tnt/Manifest b/sci-electronics/tnt/Manifest
new file mode 100644
index 0000000..2391b0c
--- /dev/null
+++ b/sci-electronics/tnt/Manifest
@@ -0,0 +1,22 @@
+AUX tnt-1.2.2-Makefile-am.patch 758 RMD160 2524d177a9ea2f28889775ee8dad0663f55a586c SHA1 5dc022c9009ad5f425fed591c880e73047d2eeb1 SHA256 aea0daec458376e63315736a45bc307a4768443c2a3be85aeb29f6fd1caf1f34
+AUX tnt-1.2.2-bem-nmmtl.patch 456 RMD160 8463540d64226a8bf769a66d7fdd9fd5daf61cb6 SHA1 8b08be79fee98f1e06c5ded2e4fa24aacd8c6007 SHA256 f6f0bde8df73c524545e2290958a9612692f2a76114ed1ba7a6b984b81cb1dd1
+AUX tnt-1.2.2-calc-cap-calcCAP.patch 484 RMD160 5e78e1ae6b44c03335e0847f484b21532554e696 SHA1 c6885d59f601b8af04e3bed683fc8739c00a52fe SHA256 57312831069af91d0215b1be8cde0f9bbe540b51e65daa85427de024d103a68e
+AUX tnt-1.2.2-calc-cap-cmplxmat.patch 1135 RMD160 8233a0f92ef0a71de7e79d459ac3747c26bc40ca SHA1 e73882c19ec5a27eb0db862679d66cc53d1c4c1b SHA256 ca3ff5197aa4dc8402aa981003d137002160a98b5c571dba8ccab7ff0987498a
+AUX tnt-1.2.2-calc-cap-cmplxvec.patch 873 RMD160 ae8e8579ab450ce8b0c4a59eebcc1b403660f777 SHA1 dff16b36ef487614274fe8eefacd605df0fcd9a6 SHA256 a5c1a7dace24550aa6d60c094bf083e2ae45e8d543c9481314e0a2ac4943abbb
+AUX tnt-1.2.2-calc-cap-complex-header.patch 1204 RMD160 531131c3db6974bd3d57ccd5c551c489adbd153a SHA1 a83d68df2e36d29f62ee247c4fecf4a168ef8031 SHA256 aae30f19b33f5daa3ef039d05bdd920a69577e17b32544f7748529e1ff14965e
+AUX tnt-1.2.2-calc-cap-complex-source.patch 1010 RMD160 592d9869c27d02d9419e9cfc4b73cffc3b39b8b2 SHA1 2b38bb4dc963b37d39ec616f3052bec1a08af405 SHA256 cfe2934a2e69f721391f36ab4a272205a4184fd33f913b7ad3a04f12e9bf2654
+AUX tnt-1.2.2-calc-cap-data.patch 289 RMD160 f25915f15fb1989485dbdc6e454fd83a029bd5db SHA1 d81efcdde0b4518a8de34c0acb40f512174f8600 SHA256 6d9c6b256e9b6fe01cded01b2ebc342d16ae2e64a8d7ecce6b9d7165a1b9b59a
+AUX tnt-1.2.2-calc-rl-calcRL.patch 548 RMD160 371c4e8dc91f90f70fe081e9ea53f596fa72200f SHA1 a7782d82e5c71fdb06c4ab51de767fa5947c4a5d SHA256 b291ad1eb8507f6f4cce43dac89a0ace0b0da34bc5634b8293319747b838cd99
+AUX tnt-1.2.2-calc-rl-cmplxmat.patch 1133 RMD160 85f99f8a45cba635db451f4ad63be28f2fd10e3a SHA1 578909d004227e0e29eba526160c7ce4aca746df SHA256 7c50f0b5d6391f70da6ecedd46f8a5928d6ae3f6922630538a59d4b150fdd579
+AUX tnt-1.2.2-calc-rl-cmplxvec.patch 870 RMD160 ebd44088a8eacfe9dcdb31de0482d05e40c425bc SHA1 35f54c649cec1ce5452d17edd90a4fdad79b955a SHA256 0bc587393e5bbec3810600e3e5287253eb3908fdddb423ac5092b50737c702e6
+AUX tnt-1.2.2-calc-rl-complex-header.patch 1133 RMD160 887e68ec21b5f19f7796373f721b6e3d9bc6ff74 SHA1 0e422436a03db4cdf9f746b99204e7cace1fe342 SHA256 b0be0c3fb20dd9b004639050bf3728f7e230fc343d2828ce02b22ad3e2c1dbdf
+AUX tnt-1.2.2-calc-rl-complex.patch 1053 RMD160 e8f60fa8d4618924ca270bfbc2ab3bf2cea02bb2 SHA1 a2c7f008e0897492e6720719f3bae27eabd1bf49 SHA256 6e68cb9a3bf1827f369e50f0bbcd95d3e1e2e00a065c800f3dfbc09f57394695
+AUX tnt-1.2.2-calc-rl-data.patch 287 RMD160 66dbcda32dc943a1f4232777b68f382096787632 SHA1 5e987f85d4cae8c9ead6b803d3dfcb699ddb00b8 SHA256 62b18eaba9f74f7f22feb9057c6e38f1de03ae635c85b269b5c7e8dcbe59afc2
+AUX tnt-1.2.2-calc-rl-hankel.patch 899 RMD160 ad6f8bbbc84b052deea92ce7532d5b093bced253 SHA1 da1cc1a1d12cbf64d4678da71e69f3abf1b857aa SHA256 24271b20db123c428ed2fe26d71b4ae4f95bbb10c36e47333c35c1efdbfe53f6
+AUX tnt-1.2.2-calc-rl-kelvin.patch 1718 RMD160 3c7395aa8d822513f61bb4f0848d7e8712ff093f SHA1 cf219dab2e5061eeb6f7fafc33c134c00a8fc4a8 SHA256 f759d98f36c6a5a8ec0fd639698510d4d01c8ba77fd1b3446c45e24267636fc6
+AUX tnt-1.2.2-doc-Makefile-am.patch 1032 RMD160 f8175289f67577cadb61649c00f4a233ff2b16b6 SHA1 24c83817bd7afdcd59260f1f52d2757e98bdf947 SHA256 38862d969bcee3e35623317572d3b22122f16678b88a95e79f4727c7d6f9ffa0
+AUX tnt-1.2.2-gui-splash.patch 401 RMD160 7870cc511eea6d591ee8be96504c5d5a63e40375 SHA1 e5fe12e4e1af6bb0627440f3722894a5d9aaaa8f SHA256 aede7920d86ec402463a4ce3ea43f839b509dda6859a12ae01796eadf77bd2ef
+AUX tnt-1.2.2-gui_help.patch 315 RMD160 050721d4c09efe2a9706ab8fe21a1ae072fae50b SHA1 9722eeb18a7daa1026f5b1a730801da675c727d1 SHA256 bf0c7b39a2c4a8eb8e5195868ee1b9751ebc53ab531435cc7e970ad7a8199d7f
+AUX tnt-1.2.2-tkcon.patch 447 RMD160 d3b708d681a5a468c9f17b27dba6c273e3b472ad SHA1 55e8f6bb54d4e59ce73620d2909d6d8b23197770 SHA256 1302823cd11ad31dcca115abb93a6f1c07299872bf5d48d51815b5436bbee846
+DIST tnt-1.2.2.tar.gz 2020099 RMD160 1a2ba68a93ee21590bb25a3eacf85d3773c3e77d SHA1 bd089863ca2cd939009253e83f4ab75317191047 SHA256 cbb418d0de4f244d8174e8826e4d8272bce753f50431c9d87af08928f5817445
+EBUILD tnt-1.2.2.ebuild 3583 RMD160 6a82f137314f74b17fc0b0c1a7550c3d2f4a3fbe SHA1 4e55494cbfe84b915355038693c9f97559ca27fa SHA256 e9760aed64970a0177a6043aa1fe453fb597fabb5d690bef454976947f1ce64f
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch b/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch
new file mode 100644
index 0000000..aea1e2e
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch
@@ -0,0 +1,27 @@
+--- Makefile.am.org 2011-02-19 00:22:25.000000000 -0800
++++ Makefile.am 2011-02-19 00:23:29.000000000 -0800
+@@ -51,14 +51,16 @@
+ # a prefix. If not, then I suppose README will go into
+ # /usr.
+ #---------------------------------------------------------------
+-appdocsdir = $(prefix)
+-appdocs_DATA = \
+- AUTHORS$(TXTEXT) \
+- COPYING$(TXTEXT) \
+- ChangeLog$(TXTEXT) \
+- NEWS$(TXTEXT) \
+- README$(TXTEXT) \
+- THANKS$(TXTEXT)
++#
++# Portage takes care for this
++#appdocsdir = $(prefix)
++#appdocs_DATA = \
++# AUTHORS$(TXTEXT) \
++# COPYING$(TXTEXT) \
++# ChangeLog$(TXTEXT) \
++# NEWS$(TXTEXT) \
++# README$(TXTEXT) \
++# THANKS$(TXTEXT)
+
+ #---------------------------------------------------------------
+ # Convert application documents to text files on Windows.
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
new file mode 100644
index 0000000..c990c46
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-bem-nmmtl.patch
@@ -0,0 +1,11 @@
+--- bem/src/nmmtl.cpp.org 2011-02-19 16:12:58.000000000 -0800
++++ bem/src/nmmtl.cpp 2011-02-19 16:15:36.000000000 -0800
+@@ -352,7 +352,7 @@
+ sprintf (filespec, "%s.result", filename);
+ if( (output_file1 = fopen(filespec,"w")) == NULL )
+ {
+- printf ("*** Could not open %s for output ***\n");
++ printf ("*** Could not open %s for output ***\n", filespec);
+ return 0; /* Fatal error; could not open output file */
+ }
+
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-calcCAP.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-calcCAP.patch
new file mode 100644
index 0000000..efec2c4
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-calcCAP.patch
@@ -0,0 +1,20 @@
+--- calcCAP/src/calcCAP.cpp.org 2011-02-18 02:05:38.000000000 -0800
++++ calcCAP/src/calcCAP.cpp 2011-02-18 01:44:47.000000000 -0800
+@@ -14,6 +14,8 @@
+ #endif
+ #include <time.h>
+ #include <stdio.h>
++#include <string.h>
++using namespace std;
+
+ /********************** Global variables *******************/
+
+@@ -287,7 +289,7 @@
+
+ for ( i1 = 0; i1 < Nc; i1 ++ ) {
+
+- sumc[i1] = cmplx( 0.0, 0.0 );
++ sumc[i1] = Complex( 0.0, 0.0 );
+
+
+ for ( j1 = 0; j1 < Nw; j1 ++ ) {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxmat.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxmat.patch
new file mode 100644
index 0000000..e3eda78
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxmat.patch
@@ -0,0 +1,38 @@
+--- calcCAP/src/cmplxmat.cpp.org 2011-02-18 02:07:06.000000000 -0800
++++ calcCAP/src/cmplxmat.cpp 2011-02-18 01:38:34.000000000 -0800
+@@ -378,7 +378,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::real(elem(i,j));
++ result(i,j)=elem(i,j).real(); // result(i,j)=::real(elem(i,j));
+ return (result);
+ }
+
+@@ -387,7 +387,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::imag(elem(i,j));
++ result(i,j)=elem(i,j).imag(); // result(i,j)=::imag(elem(i,j));
+ return (result);
+ }
+
+@@ -396,7 +396,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::cabs(elem(i,j));
++ result(i,j)=elem(i,j).cabs(); // result(i,j)=::cabs(elem(i,j));
+ return (result);
+ }
+
+@@ -405,7 +405,7 @@
+ CmplxMatrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::conjg(elem(i,j));
++ result(i,j)=elem(i,j).conjg(); // result(i,j)=::conjg(elem(i,j));
+ return (result);
+ }
+
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxvec.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxvec.patch
new file mode 100644
index 0000000..2ec0567
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxvec.patch
@@ -0,0 +1,38 @@
+--- calcCAP/src/cmplxvec.cpp.org 2011-02-18 02:06:39.000000000 -0800
++++ calcCAP/src/cmplxvec.cpp 2011-02-18 01:42:05.000000000 -0800
+@@ -287,7 +287,7 @@
+
+ int n = d;
+ CmplxVector tmp(n);
+- for(int i = 0; i < n; i++) tmp[i] = ::conjg(v[i]);
++ for(int i = 0; i < n; i++) tmp[i] = v[i].conjg(); // tmp[i] = ::conjg(v[i]);
+ return (tmp);
+ }
+
+@@ -295,7 +295,7 @@
+
+ Vector tmp(d);
+ int n = d;
+- while(n--) tmp[n] = ::real(v[n]);
++ while(n--) tmp[n] = v[n].real(); // tmp[n] = ::real(v[n]);
+ return (tmp);
+ }
+
+@@ -303,7 +303,7 @@
+
+ Vector tmp(d);
+ int n = d;
+- while(n--) tmp[n] = ::imag(v[n]);
++ while(n--) tmp[n] = v[n].imag(); // tmp[n] = ::imag(v[n]);
+ return (tmp);
+ }
+
+@@ -311,7 +311,7 @@
+
+ Vector result(d);
+ for(int i = 0; i < d; i++)
+- result[i]=::cabs(v[i]);
++ result[i]=v[i].cabs(); // result[i]=::cabs(v[i]);
+ return (result);
+ }
+
--git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-header.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-header.patch
new file mode 100644
index 0000000..482bd55
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-header.patch
@@ -0,0 +1,40 @@
+--- calcCAP/src/complex.h.org 2011-02-18 02:07:37.000000000 -0800
++++ calcCAP/src/complex.h 2011-02-18 01:33:02.000000000 -0800
+@@ -1,10 +1,13 @@
+ #ifndef _complex__h_
+ #define _complex__h_
+
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+
+ class Complex
+ {
++ public:
++
+ friend Complex operator*(const double&, const Complex&);
+ friend Complex operator+(const double&, const Complex&);
+ friend Complex operator-(const double&, const Complex&);
+@@ -16,6 +19,14 @@
+ friend double cabs(const Complex&);
+ friend double cabsm(const Complex&);
+ friend Complex conjg(const Complex&);
++
++ double real(void);
++ double imag(void);
++ double arg(void);
++ double cabs(void);
++ double cabsm(void);
++ Complex conjg(void);
++
+ friend Complex cmplx(const double,const double);
+ friend Complex polar(const double&, const double&);
+ friend Complex cos(const Complex&);
+@@ -37,7 +48,6 @@
+ friend ostream& operator<<(ostream&, Complex&);
+ friend istream& operator>>(istream&, Complex&);
+
+- public:
+ Complex(){} // constructors
+ Complex(double r, double i = 0.0);
+ Complex(const Complex&);
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-source.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-source.patch
new file mode 100644
index 0000000..141add6
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-source.patch
@@ -0,0 +1,57 @@
+--- calcCAP/src/complex.cpp.org 2011-02-18 02:07:29.000000000 -0800
++++ calcCAP/src/complex.cpp 2011-02-18 01:34:51.000000000 -0800
+@@ -203,6 +203,54 @@
+ return(result);
+ }
+
++double Complex::real(void) {
++
++ return(re);
++}
++
++double Complex::imag(void) {
++
++ return(im);
++}
++
++double Complex::arg(void) {
++
++ return((im == 0.0)&&(re == 0.0) ? 0 : atan2(im, re));
++}
++
++double Complex::cabs(void) {
++
++ double x, y, ans, temp;
++ x = fabs(re);
++ y = fabs(im);
++ if (x == 0.0)
++ ans = y;
++ else if (y == 0.0)
++ ans = x;
++ else if (x > y) {
++ temp = y/x;
++ ans = x*sqrt(1.0+temp*temp);
++ } else {
++ temp = x/y;
++ ans = y*sqrt(1.0+temp*temp);
++ }
++ return ans;
++}
++
++double Complex::cabsm(void) {
++
++ return(sqrt(re*re + im*im));
++}
++
++Complex Complex::conjg(void) {
++
++ Complex com;
++ com.re = re;
++ com.im = -im;
++ return(com);
++}
++
++
+ /********************* friends *****************************/
+
+ Complex operator*(const double& r, const Complex& c) {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-data.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-data.patch
new file mode 100644
index 0000000..ad18429
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-data.patch
@@ -0,0 +1,11 @@
+--- calcCAP/src/data.cpp.org 2011-02-18 02:06:06.000000000 -0800
++++ calcCAP/src/data.cpp 2011-02-18 01:42:50.000000000 -0800
+@@ -260,7 +260,7 @@
+ }
+ }
+
+- Ic = cmplx( 0.0, 1.0 );
++ Ic = Complex( 0.0, 1.0 );
+
+ Nc4 = 11*Nh+1;
+ step_w = 1.0/power( 2.0, J );
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-calcRL.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-calcRL.patch
new file mode 100644
index 0000000..db1a39e
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-calcRL.patch
@@ -0,0 +1,21 @@
+--- calcRL/src/calcRL.cpp.org 2011-02-18 02:24:51.000000000 -0800
++++ calcRL/src/calcRL.cpp 2011-02-18 01:30:13.000000000 -0800
+@@ -43,7 +43,8 @@
+ #endif
+ #include <time.h>
+ #include <stdio.h>
+-
++#include <string.h>
++using namespace std;
+ /********************** Global variables *******************/
+
+ int Nc, Die, Rec, Cir, Tri, Ell, Pol, Gnd, Tra;
+@@ -564,7 +565,7 @@
+ tmp4 = Circum[i] / double(Nw);
+ tmpsum1 = 0.0;
+ tmpsum2 = 0.0;
+- sum2[i] = cmplx( 0.0, 0.0 );
++ sum2[i] = Complex( 0.0, 0.0 );
+
+ for (j = 0; j < Nw; j ++) {
+
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxmat.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxmat.patch
new file mode 100644
index 0000000..6df3fb9
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxmat.patch
@@ -0,0 +1,38 @@
+--- calcRL/src/cmplxmat.cpp.org 2011-02-18 02:26:04.000000000 -0800
++++ calcRL/src/cmplxmat.cpp 2011-02-18 01:13:48.000000000 -0800
+@@ -386,7 +386,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::real(elem(i,j));
++ result(i,j)=elem(i,j).real(); // result(i,j)=::real(elem(i,j));
+ return (result);
+ }
+
+@@ -395,7 +395,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::imag(elem(i,j));
++ result(i,j)=elem(i,j).imag(); // result(i,j)=::imag(elem(i,j));
+ return (result);
+ }
+
+@@ -404,7 +404,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::cabs(elem(i,j));
++ result(i,j)=elem(i,j).cabs(); // result(i,j)=::cabj(elem(i,j));
+ return (result);
+ }
+
+@@ -413,7 +413,7 @@
+ CmplxMatrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::conjg(elem(i,j));
++ result(i,j)=elem(i,j).conjg(); // result(i,j)=::conjg(elem(i,j));
+ return (result);
+ }
+
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxvec.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxvec.patch
new file mode 100644
index 0000000..767098c
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxvec.patch
@@ -0,0 +1,38 @@
+--- calcRL/src/cmplxvec.cpp.org 2011-02-18 02:25:44.000000000 -0800
++++ calcRL/src/cmplxvec.cpp 2011-02-18 01:24:09.000000000 -0800
+@@ -289,7 +289,7 @@
+
+ int n = d;
+ CmplxVector tmp(n);
+- for(int i = 0; i < n; i++) tmp[i] = ::conjg(v[i]);
++ for(int i = 0; i < n; i++) tmp[i] = v[i].conjg(); // tmp[i] = ::conjg(v[i]);
+ return (tmp);
+ }
+
+@@ -297,7 +297,7 @@
+
+ Vector tmp(d);
+ int n = d;
+- while(n--) tmp[n] = ::real(v[n]);
++ while(n--) tmp[n] = v[n].real(); // tmp[n] = ::real(v[n]);
+ return (tmp);
+ }
+
+@@ -305,7 +305,7 @@
+
+ Vector tmp(d);
+ int n = d;
+- while(n--) tmp[n] = ::imag(v[n]);
++ while(n--) tmp[n] = v[n].imag(); // tmp[n] = ::imag(v[n])
+ return (tmp);
+ }
+
+@@ -313,7 +313,7 @@
+
+ Vector result(d);
+ for(int i = 0; i < d; i++)
+- result[i]=::cabs(v[i]);
++ result[i]=v[i].cabs(); // result[i]=::cabs(v[i]);
+ return (result);
+ }
+
--git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex-header.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex-header.patch
new file mode 100644
index 0000000..d0d81d3
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex-header.patch
@@ -0,0 +1,40 @@
+--- calcRL/src/complex.h.org 2011-02-18 02:26:34.000000000 -0800
++++ calcRL/src/complex.h 2011-02-18 01:11:29.000000000 -0800
+@@ -3,10 +3,12 @@
+
+ #include <stdlib.h>
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+
+ class Complex
+ {
++ public:
+ friend Complex operator*(const double&, const Complex&);
+ friend Complex operator+(const double&, const Complex&);
+ friend Complex operator-(const double&, const Complex&);
+@@ -14,6 +16,14 @@
+
+ friend double real(const Complex&);
+ friend double imag(const Complex&);
++ double real(void);
++ double imag(void);
++ double arg(void);
++ double cabs(void);
++ double cabsm(void);
++ Complex conjg(void);
++
++
+ friend double arg(const Complex&);
+ friend double cabs(const Complex&);
+ friend double cabsm(const Complex&);
+@@ -39,7 +49,7 @@
+ friend ostream& operator<<(ostream&, Complex&);
+ friend istream& operator>>(istream&, Complex&);
+
+- public:
++
+ Complex(){} // constructors
+ Complex(double r, double i = 0.0);
+ Complex(const Complex&);
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex.patch
new file mode 100644
index 0000000..81d94ff
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex.patch
@@ -0,0 +1,56 @@
+--- calcRL/src/complex.cpp.org 2011-02-18 02:26:46.000000000 -0800
++++ calcRL/src/complex.cpp 2011-02-18 01:11:15.000000000 -0800
+@@ -17,6 +17,53 @@
+
+ /*********************** members *********************************/
+
++double Complex::real(void) {
++
++ return(re);
++}
++
++double Complex::imag(void) {
++
++ return(im);
++}
++
++double Complex::arg(void) {
++
++ return((im == 0.0)&&(re == 0.0) ? 0 : atan2(im, re));
++}
++
++double Complex::cabs(void) {
++
++ double x, y, ans, temp;
++ x = fabs(re);
++ y = fabs(im);
++ if (x == 0.0)
++ ans = y;
++ else if (y == 0.0)
++ ans = x;
++ else if (x > y) {
++ temp = y/x;
++ ans = x*sqrt(1.0+temp*temp);
++ } else {
++ temp = x/y;
++ ans = y*sqrt(1.0+temp*temp);
++ }
++ return ans;
++}
++
++double Complex::cabsm(void) {
++
++ return(sqrt(re*re + im*im));
++}
++
++Complex Complex::conjg(void) {
++
++ Complex com;
++ com.re = re;
++ com.im = -im;
++ return(com);
++}
++
+ /********************* friends *****************************/
+
+ Complex operator*(const double& r, const Complex& c) {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-data.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-data.patch
new file mode 100644
index 0000000..dedb221
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-data.patch
@@ -0,0 +1,11 @@
+--- calcRL/src/data.cpp.org 2011-02-18 02:25:27.000000000 -0800
++++ calcRL/src/data.cpp 2011-02-18 02:32:13.000000000 -0800
+@@ -251,7 +251,7 @@
+ }
+ }
+
+- Ic = cmplx( 0.0, 1.0 );
++ Ic = Complex( 0.0, 1.0 );
+
+ Nc4 = 11*Nh+1;
+ step_w = 1.0/power( 2.0, J );
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-hankel.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-hankel.patch
new file mode 100644
index 0000000..f0fc7f6
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-hankel.patch
@@ -0,0 +1,38 @@
+--- calcRL/src/hankel.cpp.org 2011-02-18 03:17:58.000000000 -0800
++++ calcRL/src/hankel.cpp 2011-02-18 03:18:42.000000000 -0800
+@@ -19,7 +19,7 @@
+
+ hank01( vj0, vy0, x, 1 );
+
+- return( cmplx( vj0, -vy0 ) );
++ return( Complex( vj0, -vy0 ) );
+ }
+
+ /***** Function Hank21 - to calculate H^(2)_1(x), x - double ****/
+@@ -30,7 +30,7 @@
+
+ hank11( vj1, vy1, x, 1 );
+
+- return( cmplx( vj1, -vy1 ) );
++ return( Complex( vj1, -vy1 ) );
+ }
+
+ /***** Function Hank10 - to calculate H^(1)_0(x), x - double ****/
+@@ -41,7 +41,7 @@
+
+ hank01( vj0, vy0, x, 1 );
+
+- return( cmplx( vj0, vy0 ) );
++ return( Complex( vj0, vy0 ) );
+ }
+
+ /***** Function Hank11 - to calculate H^(1)_1(x), x - double ****/
+@@ -52,7 +52,7 @@
+
+ hank11( vj1, vy1, x, 1 );
+
+- return( cmplx( vj1, vy1 ) );
++ return( Complex( vj1, vy1 ) );
+ }
+
+ int hank01( double& vj0, double& vy0, double xd, int n ) {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-kelvin.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-kelvin.patch
new file mode 100644
index 0000000..9c3e521
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-kelvin.patch
@@ -0,0 +1,37 @@
+--- calcRL/src/kelvin.cpp.org 2011-02-18 02:25:08.000000000 -0800
++++ calcRL/src/kelvin.cpp 2011-02-18 01:26:26.000000000 -0800
+@@ -332,20 +332,20 @@
+ return(keip);
+ }
+
+-static Complex seta_p1 = cmplx(0.0,-0.3926991);
+-static Complex seta_p2 = cmplx(0.0110486,0.0);
+-static Complex seta_p3 = cmplx(0.0,-0.0009765);
+-static Complex seta_p4 = cmplx(-0.0000906,-0.0000901);
+-static Complex seta_p5 = cmplx(-0.0000252,0.0);
+-static Complex seta_p6 = cmplx(-0.0000034,0.0000051);
+-static Complex seta_p7 = cmplx(0.0000006,.0000019);
+-static Complex dphi_p1 = cmplx(0.7071068,0.7071068);
+-static Complex dphi_p2 = cmplx(-0.0625001,-0.0000001);
+-static Complex dphi_p3 = cmplx(-0.0013813,0.0013811);
+-static Complex dphi_p4 = cmplx(0.0000005,0.0002452);
+-static Complex dphi_p5 = cmplx(0.0000346,0.0000338);
+-static Complex dphi_p6 = cmplx(0.0000117,-0.0000024);
+-static Complex dphi_p7 = cmplx(0.0000016,-0.0000032);
++static Complex seta_p1 = Complex(0.0,-0.3926991);
++static Complex seta_p2 = Complex(0.0110486,0.0);
++static Complex seta_p3 = Complex(0.0,-0.0009765);
++static Complex seta_p4 = Complex(-0.0000906,-0.0000901);
++static Complex seta_p5 = Complex(-0.0000252,0.0);
++static Complex seta_p6 = Complex(-0.0000034,0.0000051);
++static Complex seta_p7 = Complex(0.0000006,.0000019);
++static Complex dphi_p1 = Complex(0.7071068,0.7071068);
++static Complex dphi_p2 = Complex(-0.0625001,-0.0000001);
++static Complex dphi_p3 = Complex(-0.0013813,0.0013811);
++static Complex dphi_p4 = Complex(0.0000005,0.0002452);
++static Complex dphi_p5 = Complex(0.0000346,0.0000338);
++static Complex dphi_p6 = Complex(0.0000117,-0.0000024);
++static Complex dphi_p7 = Complex(0.0000016,-0.0000032);
+
+
+
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch b/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch
new file mode 100644
index 0000000..092158b
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch
@@ -0,0 +1,37 @@
+--- doc/Makefile.am.org 2011-02-19 00:25:11.000000000 -0800
++++ doc/Makefile.am 2011-02-19 00:28:31.000000000 -0800
+@@ -43,7 +43,7 @@
+ #
+ #---------------------------------------------------------------
+
+-docdir = $(prefix)/doc
++#docdir = $(prefix)/doc
+ doc_DATA = \
+ user-guide.pdf
+
+@@ -73,15 +73,17 @@
+ pdflatex $*
+ latex2html -split 4 -show_section_numbers -local_icons $<
+
++# Removed, because portage takes care of it.
++#
+ # Custom installation rule
+-install-data-local:
+- for f in $(doc_DATA); do \
+- $(mkinstalldirs) $(docdir); \
+- $(INSTALL_DATA) $$f $(docdir)/$$f; \
+- d=`basename $$f .pdf`; \
+- $(mkinstalldirs) $(docdir)/$$d; \
+- $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
+- done
++#install-data-local:
++# for f in $(doc_DATA); do \
++# $(mkinstalldirs) $(docdir); \
++# $(INSTALL_DATA) $$f $(docdir)/$$f; \
++# d=`basename $$f .pdf`; \
++# $(mkinstalldirs) $(docdir)/$$d; \
++# $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
++# done
+
+ #---------------------------------------------------------------
+ # clean
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch
new file mode 100644
index 0000000..e0c381a
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch
@@ -0,0 +1,11 @@
+--- gui/splash.tcl.org 2011-02-19 18:30:20.000000000 -0800
++++ gui/splash.tcl 2011-02-19 18:40:53.000000000 -0800
+@@ -81,7 +81,7 @@
+ } else {
+ set filename COPYING
+ }
+- set licenseFile [file join $::scriptDir .. $filename]
++ set licenseFile [file join /usr share doc package_name html $filename]
+ if { [file exists $licenseFile] } {
+ ::gui::guiPopupFile $licenseFile
+ } else {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch
new file mode 100644
index 0000000..ba5da09
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch
@@ -0,0 +1,11 @@
+--- gui/gui_help.tcl.org 2011-02-19 18:52:20.000000000 -0800
++++ gui/gui_help.tcl 2011-02-19 18:59:17.000000000 -0800
+@@ -26,7 +26,7 @@
+ switch -exact $helpTopic {
+
+ userguide {
+- display_online_help user-guide/index.html
++ display_online_help /usr/share/doc/package_name/html/index.html
+ }
+
+ }
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch b/sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch
new file mode 100644
index 0000000..4c603c7
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch
@@ -0,0 +1,16 @@
+--- sppdgTcllib/console/tkcon.tcl.org 2011-02-19 01:46:57.000000000 -0800
++++ sppdgTcllib/console/tkcon.tcl 2011-02-19 01:47:36.000000000 -0800
+@@ -43,9 +43,10 @@
+
+ if {$tcl_version < 8.0} {
+ return -code error "tkcon requires at least Tcl/Tk8"
+-} else {
+- package require -exact Tk $tcl_version
+-}
++}
++#else {
++# package require -exact Tk $tcl_version
++#}
+
+ catch {package require bogus-package-name}
+ foreach pkg [info loaded {}] {
diff --git a/sci-electronics/tnt/tnt-1.2.2.ebuild b/sci-electronics/tnt/tnt-1.2.2.ebuild
new file mode 100644
index 0000000..53a1464
--- /dev/null
+++ b/sci-electronics/tnt/tnt-1.2.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:Exp $
+
+EAPI=2
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="MoM 2.5 D stripline simulator"
+SRC_URI="mirror://sourceforge/mmtl/${P}.tar.gz"
+HOMEPAGE="http://mmtl.sourceforge.net"
+LICENSE="BSD GPL-2"
+S="${WORKDIR}/${P}"
+
+SLOT="0"
+IUSE="doc"
+KEYWORDS="amd64 ~ppc x86"
+
+DEPEND="sys-devel/gcc[fortran]
+ dev-texlive/texlive-latex
+ dev-tex/latex2html
+ media-gfx/imagemagick
+ dev-lang/tcl
+ dev-tcltk/tcllib
+ dev-tcltk/itcl
+ dev-tcltk/bwidget"
+
+RDEPEND="dev-lang/tcl
+ dev-tcltk/tcllib
+ dev-tcltk/itcl
+ dev-tcltk/bwidget"
+
+src_prepare() {
+ # Adapt this old source to the new C++ standards
+ # These patches fix a c++ scope issue, gcc was for some reason
+ # not able to discover friend function of class Complex.
+ # This has been solved by making this functions a member instead of a friend.
+ epatch "${FILESDIR}/${P}"-calc-cap-calcCAP.patch
+ epatch "${FILESDIR}/${P}"-calc-cap-cmplxmat.patch
+ epatch "${FILESDIR}/${P}"-calc-cap-cmplxvec.patch
+ epatch "${FILESDIR}/${P}"-calc-cap-complex-header.patch
+ epatch "${FILESDIR}/${P}"-calc-cap-complex-source.patch
+ epatch "${FILESDIR}/${P}"-calc-cap-data.patch
+ epatch "${FILESDIR}/${P}"-calc-rl-calcRL.patch
+ epatch "${FILESDIR}/${P}"-calc-rl-cmplxmat.patch
+ epatch "${FILESDIR}/${P}"-calc-rl-cmplxvec.patch
+ epatch "${FILESDIR}/${P}"-calc-rl-complex-header.patch
+ epatch "${FILESDIR}/${P}"-calc-rl-complex.patch
+ epatch "${FILESDIR}/${P}"-calc-rl-data.patch
+ epatch "${FILESDIR}/${P}"-calc-rl-kelvin.patch
+ epatch "${FILESDIR}/${P}"-calc-rl-hankel.patch
+ #fix a minor code error
+ epatch "${FILESDIR}/${P}"-bem-nmmtl.patch
+ # Update headers in remaining files
+ # The source code is from the pre-namespace era.
+ sed -i 's/<iostream.h>/\<iostream\>\nusing\ namespace\ std\;/' `grep -r -l iostream.h *`
+ sed -i 's/<iomanip.h>/\<iomanip\>\nusing\ namespace\ std\;/' `grep -r -l iomanip.h *`
+ sed -i 's/<fstream.h>/\<fstream\>\nusing\ namespace\ std\;/' `grep -r -l fstream.h *`
+ # Update fortran compiler
+ sed -i 's/\"g77\"/\"$(tc-getF77)\"/' bem/configure.ac
+ sed -i 's/\"g77\"/\"$(tc-getF77)\"/' calcCAP/configure.ac
+ sed -i 's/\"g77\"/\"$(tc-getF77)\"/' calcRL/configure.ac
+ #block document installation
+ epatch "${FILESDIR}/${P}"-Makefile-am.patch
+ epatch "${FILESDIR}/${P}"-doc-Makefile-am.patch
+ epatch "${FILESDIR}/${P}"-tkcon.patch
+ #adjust new document location in gui
+ epatch "${FILESDIR}/${P}"-gui-splash.patch
+ sed -i "s/package_name/${PF}/" gui/splash.tcl
+ epatch "${FILESDIR}/${P}"-gui_help.patch
+ sed -i "s/package_name/${PF}/" gui/gui_help.tcl
+ # regenerate the configure and make files
+ rm aclocal.m4
+ eautoreconf --force
+}
+
+
+src_configure() {
+ econf || die "econf failed"
+}
+
+src_compile() {
+ emake || die "emake failed"
+}
+
+src_install () {
+ emake DESTDIR="${D}" install || die "make install failed"
+ dodoc AUTHORS COPYING ChangeLog NEWS README THANKS || die "failed to install docs"
+ dohtml COPYING #tcl cannot handle the archives created by dodoc
+ if use doc; then
+ dodoc doc/*.pdf doc/*.png
+ dohtml doc/user-guide/*
+ fi
+ #Install icon
+ convert gui/logo.gif gui/tnt.png
+ docinto "examples"
+ dodoc examples/* || die "failed to install exampels"
+ newicon gui/tnt.png tnt.png
+ make_desktop_entry ${PN} "Mttl" ${PN}
+}
+
+
+
+pkg_postinst() {
+ einfo "Warning: the sources are not under development anymore."
+ einfo "We made it compile, but users should check if the results make sens."
+ einfo "The GUI was written in an old version of TCL/TK."
+ einfo "Examples are in the /usr/share/doc/tnt-1.2.2 folder."
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/
@ 2011-02-24 21:44 Andreas K. Huettel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Huettel @ 2011-02-24 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 92553746796db1af5ab0328d4189ef2cbbe9550a
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Feb 24 18:42:50 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 18:42:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=92553746
[sci-electronics/tnt] Started summarizing patches
(Portage version: 2.1.9.41/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
sci-electronics/tnt/ChangeLog | 17 +
sci-electronics/tnt/Manifest | 46 +--
.../tnt/files/tnt-1.2.2-calc-cap-calcCAP.patch | 20 -
.../tnt/files/tnt-1.2.2-calc-cap-cmplxmat.patch | 38 --
.../tnt/files/tnt-1.2.2-calc-cap-cmplxvec.patch | 38 --
| 40 --
.../files/tnt-1.2.2-calc-cap-complex-source.patch | 57 ---
.../tnt/files/tnt-1.2.2-calc-cap-data.patch | 11 -
.../tnt/files/tnt-1.2.2-calc-rl-calcRL.patch | 21 -
.../tnt/files/tnt-1.2.2-calc-rl-cmplxmat.patch | 38 --
.../tnt/files/tnt-1.2.2-calc-rl-cmplxvec.patch | 38 --
| 40 --
.../tnt/files/tnt-1.2.2-calc-rl-complex.patch | 56 ---
.../tnt/files/tnt-1.2.2-calc-rl-data.patch | 11 -
.../tnt/files/tnt-1.2.2-calc-rl-hankel.patch | 38 --
.../tnt/files/tnt-1.2.2-calc-rl-kelvin.patch | 37 --
sci-electronics/tnt/files/tnt-1.2.2-calc.patch | 503 ++++++++++++++++++++
.../tnt/files/tnt-1.2.2-namespaces.patch | 230 +++++++++
sci-electronics/tnt/tnt-1.2.2.ebuild | 29 +-
19 files changed, 771 insertions(+), 537 deletions(-)
diff --git a/sci-electronics/tnt/ChangeLog b/sci-electronics/tnt/ChangeLog
index a90625e..c92dc3e 100644
--- a/sci-electronics/tnt/ChangeLog
+++ b/sci-electronics/tnt/ChangeLog
@@ -2,6 +2,23 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> tnt-1.2.2.ebuild,
+ +files/tnt-1.2.2-calc.patch, -files/tnt-1.2.2-calc-cap-calcCAP.patch,
+ -files/tnt-1.2.2-calc-cap-cmplxmat.patch,
+ -files/tnt-1.2.2-calc-cap-cmplxvec.patch,
+ -files/tnt-1.2.2-calc-cap-complex-header.patch,
+ -files/tnt-1.2.2-calc-cap-complex-source.patch,
+ -files/tnt-1.2.2-calc-cap-data.patch,
+ -files/tnt-1.2.2-calc-rl-calcRL.patch,
+ -files/tnt-1.2.2-calc-rl-cmplxmat.patch,
+ -files/tnt-1.2.2-calc-rl-cmplxvec.patch,
+ -files/tnt-1.2.2-calc-rl-complex.patch,
+ -files/tnt-1.2.2-calc-rl-complex-header.patch,
+ -files/tnt-1.2.2-calc-rl-data.patch,
+ -files/tnt-1.2.2-calc-rl-hankel.patch,
+ -files/tnt-1.2.2-calc-rl-kelvin.patch, +files/tnt-1.2.2-namespaces.patch:
+ Started summarizing patches
+
24 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> tnt-1.2.2.ebuild:
Clean up keywords and dependencies
diff --git a/sci-electronics/tnt/Manifest b/sci-electronics/tnt/Manifest
index 351fde6..e242eb8 100644
--- a/sci-electronics/tnt/Manifest
+++ b/sci-electronics/tnt/Manifest
@@ -3,42 +3,30 @@ Hash: SHA1
AUX tnt-1.2.2-Makefile-am.patch 758 RMD160 2524d177a9ea2f28889775ee8dad0663f55a586c SHA1 5dc022c9009ad5f425fed591c880e73047d2eeb1 SHA256 aea0daec458376e63315736a45bc307a4768443c2a3be85aeb29f6fd1caf1f34
AUX tnt-1.2.2-bem-nmmtl.patch 456 RMD160 8463540d64226a8bf769a66d7fdd9fd5daf61cb6 SHA1 8b08be79fee98f1e06c5ded2e4fa24aacd8c6007 SHA256 f6f0bde8df73c524545e2290958a9612692f2a76114ed1ba7a6b984b81cb1dd1
-AUX tnt-1.2.2-calc-cap-calcCAP.patch 484 RMD160 5e78e1ae6b44c03335e0847f484b21532554e696 SHA1 c6885d59f601b8af04e3bed683fc8739c00a52fe SHA256 57312831069af91d0215b1be8cde0f9bbe540b51e65daa85427de024d103a68e
-AUX tnt-1.2.2-calc-cap-cmplxmat.patch 1135 RMD160 8233a0f92ef0a71de7e79d459ac3747c26bc40ca SHA1 e73882c19ec5a27eb0db862679d66cc53d1c4c1b SHA256 ca3ff5197aa4dc8402aa981003d137002160a98b5c571dba8ccab7ff0987498a
-AUX tnt-1.2.2-calc-cap-cmplxvec.patch 873 RMD160 ae8e8579ab450ce8b0c4a59eebcc1b403660f777 SHA1 dff16b36ef487614274fe8eefacd605df0fcd9a6 SHA256 a5c1a7dace24550aa6d60c094bf083e2ae45e8d543c9481314e0a2ac4943abbb
-AUX tnt-1.2.2-calc-cap-complex-header.patch 1204 RMD160 531131c3db6974bd3d57ccd5c551c489adbd153a SHA1 a83d68df2e36d29f62ee247c4fecf4a168ef8031 SHA256 aae30f19b33f5daa3ef039d05bdd920a69577e17b32544f7748529e1ff14965e
-AUX tnt-1.2.2-calc-cap-complex-source.patch 1010 RMD160 592d9869c27d02d9419e9cfc4b73cffc3b39b8b2 SHA1 2b38bb4dc963b37d39ec616f3052bec1a08af405 SHA256 cfe2934a2e69f721391f36ab4a272205a4184fd33f913b7ad3a04f12e9bf2654
-AUX tnt-1.2.2-calc-cap-data.patch 289 RMD160 f25915f15fb1989485dbdc6e454fd83a029bd5db SHA1 d81efcdde0b4518a8de34c0acb40f512174f8600 SHA256 6d9c6b256e9b6fe01cded01b2ebc342d16ae2e64a8d7ecce6b9d7165a1b9b59a
-AUX tnt-1.2.2-calc-rl-calcRL.patch 548 RMD160 371c4e8dc91f90f70fe081e9ea53f596fa72200f SHA1 a7782d82e5c71fdb06c4ab51de767fa5947c4a5d SHA256 b291ad1eb8507f6f4cce43dac89a0ace0b0da34bc5634b8293319747b838cd99
-AUX tnt-1.2.2-calc-rl-cmplxmat.patch 1133 RMD160 85f99f8a45cba635db451f4ad63be28f2fd10e3a SHA1 578909d004227e0e29eba526160c7ce4aca746df SHA256 7c50f0b5d6391f70da6ecedd46f8a5928d6ae3f6922630538a59d4b150fdd579
-AUX tnt-1.2.2-calc-rl-cmplxvec.patch 870 RMD160 ebd44088a8eacfe9dcdb31de0482d05e40c425bc SHA1 35f54c649cec1ce5452d17edd90a4fdad79b955a SHA256 0bc587393e5bbec3810600e3e5287253eb3908fdddb423ac5092b50737c702e6
-AUX tnt-1.2.2-calc-rl-complex-header.patch 1133 RMD160 887e68ec21b5f19f7796373f721b6e3d9bc6ff74 SHA1 0e422436a03db4cdf9f746b99204e7cace1fe342 SHA256 b0be0c3fb20dd9b004639050bf3728f7e230fc343d2828ce02b22ad3e2c1dbdf
-AUX tnt-1.2.2-calc-rl-complex.patch 1053 RMD160 e8f60fa8d4618924ca270bfbc2ab3bf2cea02bb2 SHA1 a2c7f008e0897492e6720719f3bae27eabd1bf49 SHA256 6e68cb9a3bf1827f369e50f0bbcd95d3e1e2e00a065c800f3dfbc09f57394695
-AUX tnt-1.2.2-calc-rl-data.patch 287 RMD160 66dbcda32dc943a1f4232777b68f382096787632 SHA1 5e987f85d4cae8c9ead6b803d3dfcb699ddb00b8 SHA256 62b18eaba9f74f7f22feb9057c6e38f1de03ae635c85b269b5c7e8dcbe59afc2
-AUX tnt-1.2.2-calc-rl-hankel.patch 899 RMD160 ad6f8bbbc84b052deea92ce7532d5b093bced253 SHA1 da1cc1a1d12cbf64d4678da71e69f3abf1b857aa SHA256 24271b20db123c428ed2fe26d71b4ae4f95bbb10c36e47333c35c1efdbfe53f6
-AUX tnt-1.2.2-calc-rl-kelvin.patch 1718 RMD160 3c7395aa8d822513f61bb4f0848d7e8712ff093f SHA1 cf219dab2e5061eeb6f7fafc33c134c00a8fc4a8 SHA256 f759d98f36c6a5a8ec0fd639698510d4d01c8ba77fd1b3446c45e24267636fc6
+AUX tnt-1.2.2-calc.patch 14487 RMD160 9234f56886cb95db4c1d1501250dc2f4954214d3 SHA1 e9b3b58a9409986b767a6b9678f2d37d8201fcb3 SHA256 daee74c5c2fb46a9a3742be5d9d8441260119dddcb52e9a06ddfe54147f5b735
AUX tnt-1.2.2-doc-Makefile-am.patch 1032 RMD160 f8175289f67577cadb61649c00f4a233ff2b16b6 SHA1 24c83817bd7afdcd59260f1f52d2757e98bdf947 SHA256 38862d969bcee3e35623317572d3b22122f16678b88a95e79f4727c7d6f9ffa0
AUX tnt-1.2.2-gui-splash.patch 401 RMD160 7870cc511eea6d591ee8be96504c5d5a63e40375 SHA1 e5fe12e4e1af6bb0627440f3722894a5d9aaaa8f SHA256 aede7920d86ec402463a4ce3ea43f839b509dda6859a12ae01796eadf77bd2ef
AUX tnt-1.2.2-gui_help.patch 315 RMD160 050721d4c09efe2a9706ab8fe21a1ae072fae50b SHA1 9722eeb18a7daa1026f5b1a730801da675c727d1 SHA256 bf0c7b39a2c4a8eb8e5195868ee1b9751ebc53ab531435cc7e970ad7a8199d7f
+AUX tnt-1.2.2-namespaces.patch 6862 RMD160 2a32bb175e4769f35bd9d91521da7c9ac13c11d9 SHA1 7a181abc878951f631d576188144e44422743eea SHA256 d777646d0e7a43aee5c68e5061a85cd99be45cd539b683afff7752d7581d16c1
AUX tnt-1.2.2-tkcon.patch 447 RMD160 d3b708d681a5a468c9f17b27dba6c273e3b472ad SHA1 55e8f6bb54d4e59ce73620d2909d6d8b23197770 SHA256 1302823cd11ad31dcca115abb93a6f1c07299872bf5d48d51815b5436bbee846
DIST tnt-1.2.2.tar.gz 2020099 RMD160 1a2ba68a93ee21590bb25a3eacf85d3773c3e77d SHA1 bd089863ca2cd939009253e83f4ab75317191047 SHA256 cbb418d0de4f244d8174e8826e4d8272bce753f50431c9d87af08928f5817445
-EBUILD tnt-1.2.2.ebuild 3506 RMD160 271aeea75e67adb2bf41492284774a1aa9a3697f SHA1 4c8a460fa681b82c36bf9686af59b75b28eb4d01 SHA256 a4a93d2dbab3e9127a1fcfd908ffa8a4ce72509cbb49d7c5a736da5566efc854
-MISC ChangeLog 233 RMD160 2ebcc0ec49afbc91ed9d8dc10b0fefc0d88543fb SHA1 20e3a9dc3196535371de34029643ee83ea1a59a9 SHA256 e3146420a11a1c574e80b7b108d7fdd322024af61973f117871c344c6d7f510e
+EBUILD tnt-1.2.2.ebuild 2213 RMD160 05f65a9e5ab0dc5a6b6e899741e98685cc01d9ec SHA1 2fc154af1a1ead865577d75dae0dc5e6430d8cfb SHA256 ae7aebfad09e94606d3d84910af4a88c7b0b123d64b2b963f96881360f656a23
+MISC ChangeLog 1013 RMD160 2dfa7a993395195056cf06e365cd08fecb6af6db SHA1 b0969f00bee62dfe2d6962bb33c73d46b8f7a76f SHA256 459c200d376175e95ef4395d7d20433b8371560a454e8e23b9e7de468160a6f3
MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJNZp82AAoJENwGBM22xffeNgUQAIkUSAhUfmtk3lLyULA0IjyR
-jcyPZZPqTKUQzIgRNTl162vGlHeuLLlpjFEcywDSSyqTKQU0Vw1AfsHP7O7rpU0G
-Clk7Fw3Mw3EBxKhf51wOjoen4vaOQg8shXOjFC+ICJEVmq2vIb5lkh5VKMaSMaSa
-yjIsWwNh8MYCiB8r+SDAN32u5vE8nUz6F6lIMh1BPufI7FdaDDdma/xT7K7I+kcS
-P75QsLc7iJ7HxsgUtMojl+QC7TaJ34TyM6cg6oHGZCOBH2/syyHDobVXue9k7XMY
-RMoxNsZVCll6CGHyaCP8CKptbeU05FEnpiz6JlqxB6UGsN8iI4gWFPWfthas43/m
-ANpf/ineHbRvSOLa5oNMaiAKx8kNqtb6md5lSBvQK2C8sjn/stKgh6G+8KxChHZg
-KUNK0zQr6bRKyfEgPb69wO/s7BUCrmX6nte6XfE9SK0c7PLssm+f02GL6HmQGRSg
-/9TQxi0pTdXGyZdPT/Ecdx9kmJq5vRagdhIwA/lb9aJJtrsavY/lNKIwUiLyFtsW
-cPvJwIyhIjqlLaL8IvZtAzq7GQ0Mi2fbOpDQ/AND9ZVlfW7QErqhqeFQuaOdBelv
-bIWQFucq3yKikNpaH/71b53phG5aFG5CeWWxJPjjmmkYln+DOAVRtN2pC7p9oQAl
-XTXz6OJNgisC0r71Lh8D
-=kVdT
+iQIcBAEBAgAGBQJNZqaqAAoJENwGBM22xffe2XAQAJwvYBGGt7oeNAi14C0s+oJ6
+5sVOBY90n9zzH0RZxdwO4saKWhEoHhcuSW8Dek9g4GlwM7pxDlCY4SrYc6sK5v4t
+Q+NxTKSMxeVFkvHFD2x8xbLaNW9D+wG7NCgmQtRkcKy5QS5BNntXMRoe+xFGNvk7
+bihmLN2tJuanOhw6wLKdDK9SSLrvkqOrP8na1YUTiIOO5Ma2W2E5SK2KPO1N7q5x
+xbiSX0rgEN+FhZAte3hr3OVndnGv6YvrHZYu6592N7wcZarwitg1S4qWeBpCyOfp
+/R/Cy9BvqLxav+FxI0O4v/MUkQT25+oDw+dDiwu+WhsGrU+rHlvkKRdobqi1TcjP
+1ypdOddHFsC/R4mzUOH6w7/ew10/OJE/KabYlaptFchq+AeBpp0rWKWJtROc+YuR
+oNkgt854XswaubF2t9QFn2vPGpYefNPtnXh3hAVv94Dmh7KUdhzKXuhllX68BlWr
+FqwTMhdo1gGeh9XPmE5XF1qa/zHDlcNg8CBh00w3sE9E68aKQ2zWc2R2WNY+jyWn
+LfIZ6Kpr7cF8FbE6XNOW7yl/afaRAzbWYueu6OT4cYHCOoO3c1RAc5wInT4pAK1g
+gv4hUipgXlIQqiodZ8n9N9UmJOLZc7UjexkPk6jbOX8uZ3Zt144SJQ1jSP+7U2Nd
+Neie6vdDFakNDl13zpq2
+=uLQ+
-----END PGP SIGNATURE-----
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-calcCAP.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-calcCAP.patch
deleted file mode 100644
index efec2c4..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-calcCAP.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- calcCAP/src/calcCAP.cpp.org 2011-02-18 02:05:38.000000000 -0800
-+++ calcCAP/src/calcCAP.cpp 2011-02-18 01:44:47.000000000 -0800
-@@ -14,6 +14,8 @@
- #endif
- #include <time.h>
- #include <stdio.h>
-+#include <string.h>
-+using namespace std;
-
- /********************** Global variables *******************/
-
-@@ -287,7 +289,7 @@
-
- for ( i1 = 0; i1 < Nc; i1 ++ ) {
-
-- sumc[i1] = cmplx( 0.0, 0.0 );
-+ sumc[i1] = Complex( 0.0, 0.0 );
-
-
- for ( j1 = 0; j1 < Nw; j1 ++ ) {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxmat.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxmat.patch
deleted file mode 100644
index e3eda78..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxmat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- calcCAP/src/cmplxmat.cpp.org 2011-02-18 02:07:06.000000000 -0800
-+++ calcCAP/src/cmplxmat.cpp 2011-02-18 01:38:34.000000000 -0800
-@@ -378,7 +378,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::real(elem(i,j));
-+ result(i,j)=elem(i,j).real(); // result(i,j)=::real(elem(i,j));
- return (result);
- }
-
-@@ -387,7 +387,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::imag(elem(i,j));
-+ result(i,j)=elem(i,j).imag(); // result(i,j)=::imag(elem(i,j));
- return (result);
- }
-
-@@ -396,7 +396,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::cabs(elem(i,j));
-+ result(i,j)=elem(i,j).cabs(); // result(i,j)=::cabs(elem(i,j));
- return (result);
- }
-
-@@ -405,7 +405,7 @@
- CmplxMatrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::conjg(elem(i,j));
-+ result(i,j)=elem(i,j).conjg(); // result(i,j)=::conjg(elem(i,j));
- return (result);
- }
-
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxvec.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxvec.patch
deleted file mode 100644
index 2ec0567..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxvec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- calcCAP/src/cmplxvec.cpp.org 2011-02-18 02:06:39.000000000 -0800
-+++ calcCAP/src/cmplxvec.cpp 2011-02-18 01:42:05.000000000 -0800
-@@ -287,7 +287,7 @@
-
- int n = d;
- CmplxVector tmp(n);
-- for(int i = 0; i < n; i++) tmp[i] = ::conjg(v[i]);
-+ for(int i = 0; i < n; i++) tmp[i] = v[i].conjg(); // tmp[i] = ::conjg(v[i]);
- return (tmp);
- }
-
-@@ -295,7 +295,7 @@
-
- Vector tmp(d);
- int n = d;
-- while(n--) tmp[n] = ::real(v[n]);
-+ while(n--) tmp[n] = v[n].real(); // tmp[n] = ::real(v[n]);
- return (tmp);
- }
-
-@@ -303,7 +303,7 @@
-
- Vector tmp(d);
- int n = d;
-- while(n--) tmp[n] = ::imag(v[n]);
-+ while(n--) tmp[n] = v[n].imag(); // tmp[n] = ::imag(v[n]);
- return (tmp);
- }
-
-@@ -311,7 +311,7 @@
-
- Vector result(d);
- for(int i = 0; i < d; i++)
-- result[i]=::cabs(v[i]);
-+ result[i]=v[i].cabs(); // result[i]=::cabs(v[i]);
- return (result);
- }
-
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-header.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-header.patch
deleted file mode 100644
index 482bd55..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-header.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- calcCAP/src/complex.h.org 2011-02-18 02:07:37.000000000 -0800
-+++ calcCAP/src/complex.h 2011-02-18 01:33:02.000000000 -0800
-@@ -1,10 +1,13 @@
- #ifndef _complex__h_
- #define _complex__h_
-
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
-
- class Complex
- {
-+ public:
-+
- friend Complex operator*(const double&, const Complex&);
- friend Complex operator+(const double&, const Complex&);
- friend Complex operator-(const double&, const Complex&);
-@@ -16,6 +19,14 @@
- friend double cabs(const Complex&);
- friend double cabsm(const Complex&);
- friend Complex conjg(const Complex&);
-+
-+ double real(void);
-+ double imag(void);
-+ double arg(void);
-+ double cabs(void);
-+ double cabsm(void);
-+ Complex conjg(void);
-+
- friend Complex cmplx(const double,const double);
- friend Complex polar(const double&, const double&);
- friend Complex cos(const Complex&);
-@@ -37,7 +48,6 @@
- friend ostream& operator<<(ostream&, Complex&);
- friend istream& operator>>(istream&, Complex&);
-
-- public:
- Complex(){} // constructors
- Complex(double r, double i = 0.0);
- Complex(const Complex&);
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-source.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-source.patch
deleted file mode 100644
index 141add6..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-source.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- calcCAP/src/complex.cpp.org 2011-02-18 02:07:29.000000000 -0800
-+++ calcCAP/src/complex.cpp 2011-02-18 01:34:51.000000000 -0800
-@@ -203,6 +203,54 @@
- return(result);
- }
-
-+double Complex::real(void) {
-+
-+ return(re);
-+}
-+
-+double Complex::imag(void) {
-+
-+ return(im);
-+}
-+
-+double Complex::arg(void) {
-+
-+ return((im == 0.0)&&(re == 0.0) ? 0 : atan2(im, re));
-+}
-+
-+double Complex::cabs(void) {
-+
-+ double x, y, ans, temp;
-+ x = fabs(re);
-+ y = fabs(im);
-+ if (x == 0.0)
-+ ans = y;
-+ else if (y == 0.0)
-+ ans = x;
-+ else if (x > y) {
-+ temp = y/x;
-+ ans = x*sqrt(1.0+temp*temp);
-+ } else {
-+ temp = x/y;
-+ ans = y*sqrt(1.0+temp*temp);
-+ }
-+ return ans;
-+}
-+
-+double Complex::cabsm(void) {
-+
-+ return(sqrt(re*re + im*im));
-+}
-+
-+Complex Complex::conjg(void) {
-+
-+ Complex com;
-+ com.re = re;
-+ com.im = -im;
-+ return(com);
-+}
-+
-+
- /********************* friends *****************************/
-
- Complex operator*(const double& r, const Complex& c) {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-data.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-data.patch
deleted file mode 100644
index ad18429..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-data.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- calcCAP/src/data.cpp.org 2011-02-18 02:06:06.000000000 -0800
-+++ calcCAP/src/data.cpp 2011-02-18 01:42:50.000000000 -0800
-@@ -260,7 +260,7 @@
- }
- }
-
-- Ic = cmplx( 0.0, 1.0 );
-+ Ic = Complex( 0.0, 1.0 );
-
- Nc4 = 11*Nh+1;
- step_w = 1.0/power( 2.0, J );
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-calcRL.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-calcRL.patch
deleted file mode 100644
index db1a39e..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-calcRL.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- calcRL/src/calcRL.cpp.org 2011-02-18 02:24:51.000000000 -0800
-+++ calcRL/src/calcRL.cpp 2011-02-18 01:30:13.000000000 -0800
-@@ -43,7 +43,8 @@
- #endif
- #include <time.h>
- #include <stdio.h>
--
-+#include <string.h>
-+using namespace std;
- /********************** Global variables *******************/
-
- int Nc, Die, Rec, Cir, Tri, Ell, Pol, Gnd, Tra;
-@@ -564,7 +565,7 @@
- tmp4 = Circum[i] / double(Nw);
- tmpsum1 = 0.0;
- tmpsum2 = 0.0;
-- sum2[i] = cmplx( 0.0, 0.0 );
-+ sum2[i] = Complex( 0.0, 0.0 );
-
- for (j = 0; j < Nw; j ++) {
-
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxmat.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxmat.patch
deleted file mode 100644
index 6df3fb9..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxmat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- calcRL/src/cmplxmat.cpp.org 2011-02-18 02:26:04.000000000 -0800
-+++ calcRL/src/cmplxmat.cpp 2011-02-18 01:13:48.000000000 -0800
-@@ -386,7 +386,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::real(elem(i,j));
-+ result(i,j)=elem(i,j).real(); // result(i,j)=::real(elem(i,j));
- return (result);
- }
-
-@@ -395,7 +395,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::imag(elem(i,j));
-+ result(i,j)=elem(i,j).imag(); // result(i,j)=::imag(elem(i,j));
- return (result);
- }
-
-@@ -404,7 +404,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::cabs(elem(i,j));
-+ result(i,j)=elem(i,j).cabs(); // result(i,j)=::cabj(elem(i,j));
- return (result);
- }
-
-@@ -413,7 +413,7 @@
- CmplxMatrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::conjg(elem(i,j));
-+ result(i,j)=elem(i,j).conjg(); // result(i,j)=::conjg(elem(i,j));
- return (result);
- }
-
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxvec.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxvec.patch
deleted file mode 100644
index 767098c..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxvec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- calcRL/src/cmplxvec.cpp.org 2011-02-18 02:25:44.000000000 -0800
-+++ calcRL/src/cmplxvec.cpp 2011-02-18 01:24:09.000000000 -0800
-@@ -289,7 +289,7 @@
-
- int n = d;
- CmplxVector tmp(n);
-- for(int i = 0; i < n; i++) tmp[i] = ::conjg(v[i]);
-+ for(int i = 0; i < n; i++) tmp[i] = v[i].conjg(); // tmp[i] = ::conjg(v[i]);
- return (tmp);
- }
-
-@@ -297,7 +297,7 @@
-
- Vector tmp(d);
- int n = d;
-- while(n--) tmp[n] = ::real(v[n]);
-+ while(n--) tmp[n] = v[n].real(); // tmp[n] = ::real(v[n]);
- return (tmp);
- }
-
-@@ -305,7 +305,7 @@
-
- Vector tmp(d);
- int n = d;
-- while(n--) tmp[n] = ::imag(v[n]);
-+ while(n--) tmp[n] = v[n].imag(); // tmp[n] = ::imag(v[n])
- return (tmp);
- }
-
-@@ -313,7 +313,7 @@
-
- Vector result(d);
- for(int i = 0; i < d; i++)
-- result[i]=::cabs(v[i]);
-+ result[i]=v[i].cabs(); // result[i]=::cabs(v[i]);
- return (result);
- }
-
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex-header.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex-header.patch
deleted file mode 100644
index d0d81d3..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex-header.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- calcRL/src/complex.h.org 2011-02-18 02:26:34.000000000 -0800
-+++ calcRL/src/complex.h 2011-02-18 01:11:29.000000000 -0800
-@@ -3,10 +3,12 @@
-
- #include <stdlib.h>
- #include <math.h>
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
-
- class Complex
- {
-+ public:
- friend Complex operator*(const double&, const Complex&);
- friend Complex operator+(const double&, const Complex&);
- friend Complex operator-(const double&, const Complex&);
-@@ -14,6 +16,14 @@
-
- friend double real(const Complex&);
- friend double imag(const Complex&);
-+ double real(void);
-+ double imag(void);
-+ double arg(void);
-+ double cabs(void);
-+ double cabsm(void);
-+ Complex conjg(void);
-+
-+
- friend double arg(const Complex&);
- friend double cabs(const Complex&);
- friend double cabsm(const Complex&);
-@@ -39,7 +49,7 @@
- friend ostream& operator<<(ostream&, Complex&);
- friend istream& operator>>(istream&, Complex&);
-
-- public:
-+
- Complex(){} // constructors
- Complex(double r, double i = 0.0);
- Complex(const Complex&);
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex.patch
deleted file mode 100644
index 81d94ff..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- calcRL/src/complex.cpp.org 2011-02-18 02:26:46.000000000 -0800
-+++ calcRL/src/complex.cpp 2011-02-18 01:11:15.000000000 -0800
-@@ -17,6 +17,53 @@
-
- /*********************** members *********************************/
-
-+double Complex::real(void) {
-+
-+ return(re);
-+}
-+
-+double Complex::imag(void) {
-+
-+ return(im);
-+}
-+
-+double Complex::arg(void) {
-+
-+ return((im == 0.0)&&(re == 0.0) ? 0 : atan2(im, re));
-+}
-+
-+double Complex::cabs(void) {
-+
-+ double x, y, ans, temp;
-+ x = fabs(re);
-+ y = fabs(im);
-+ if (x == 0.0)
-+ ans = y;
-+ else if (y == 0.0)
-+ ans = x;
-+ else if (x > y) {
-+ temp = y/x;
-+ ans = x*sqrt(1.0+temp*temp);
-+ } else {
-+ temp = x/y;
-+ ans = y*sqrt(1.0+temp*temp);
-+ }
-+ return ans;
-+}
-+
-+double Complex::cabsm(void) {
-+
-+ return(sqrt(re*re + im*im));
-+}
-+
-+Complex Complex::conjg(void) {
-+
-+ Complex com;
-+ com.re = re;
-+ com.im = -im;
-+ return(com);
-+}
-+
- /********************* friends *****************************/
-
- Complex operator*(const double& r, const Complex& c) {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-data.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-data.patch
deleted file mode 100644
index dedb221..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-data.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- calcRL/src/data.cpp.org 2011-02-18 02:25:27.000000000 -0800
-+++ calcRL/src/data.cpp 2011-02-18 02:32:13.000000000 -0800
-@@ -251,7 +251,7 @@
- }
- }
-
-- Ic = cmplx( 0.0, 1.0 );
-+ Ic = Complex( 0.0, 1.0 );
-
- Nc4 = 11*Nh+1;
- step_w = 1.0/power( 2.0, J );
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-hankel.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-hankel.patch
deleted file mode 100644
index f0fc7f6..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-hankel.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- calcRL/src/hankel.cpp.org 2011-02-18 03:17:58.000000000 -0800
-+++ calcRL/src/hankel.cpp 2011-02-18 03:18:42.000000000 -0800
-@@ -19,7 +19,7 @@
-
- hank01( vj0, vy0, x, 1 );
-
-- return( cmplx( vj0, -vy0 ) );
-+ return( Complex( vj0, -vy0 ) );
- }
-
- /***** Function Hank21 - to calculate H^(2)_1(x), x - double ****/
-@@ -30,7 +30,7 @@
-
- hank11( vj1, vy1, x, 1 );
-
-- return( cmplx( vj1, -vy1 ) );
-+ return( Complex( vj1, -vy1 ) );
- }
-
- /***** Function Hank10 - to calculate H^(1)_0(x), x - double ****/
-@@ -41,7 +41,7 @@
-
- hank01( vj0, vy0, x, 1 );
-
-- return( cmplx( vj0, vy0 ) );
-+ return( Complex( vj0, vy0 ) );
- }
-
- /***** Function Hank11 - to calculate H^(1)_1(x), x - double ****/
-@@ -52,7 +52,7 @@
-
- hank11( vj1, vy1, x, 1 );
-
-- return( cmplx( vj1, vy1 ) );
-+ return( Complex( vj1, vy1 ) );
- }
-
- int hank01( double& vj0, double& vy0, double xd, int n ) {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-kelvin.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-kelvin.patch
deleted file mode 100644
index 9c3e521..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-kelvin.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- calcRL/src/kelvin.cpp.org 2011-02-18 02:25:08.000000000 -0800
-+++ calcRL/src/kelvin.cpp 2011-02-18 01:26:26.000000000 -0800
-@@ -332,20 +332,20 @@
- return(keip);
- }
-
--static Complex seta_p1 = cmplx(0.0,-0.3926991);
--static Complex seta_p2 = cmplx(0.0110486,0.0);
--static Complex seta_p3 = cmplx(0.0,-0.0009765);
--static Complex seta_p4 = cmplx(-0.0000906,-0.0000901);
--static Complex seta_p5 = cmplx(-0.0000252,0.0);
--static Complex seta_p6 = cmplx(-0.0000034,0.0000051);
--static Complex seta_p7 = cmplx(0.0000006,.0000019);
--static Complex dphi_p1 = cmplx(0.7071068,0.7071068);
--static Complex dphi_p2 = cmplx(-0.0625001,-0.0000001);
--static Complex dphi_p3 = cmplx(-0.0013813,0.0013811);
--static Complex dphi_p4 = cmplx(0.0000005,0.0002452);
--static Complex dphi_p5 = cmplx(0.0000346,0.0000338);
--static Complex dphi_p6 = cmplx(0.0000117,-0.0000024);
--static Complex dphi_p7 = cmplx(0.0000016,-0.0000032);
-+static Complex seta_p1 = Complex(0.0,-0.3926991);
-+static Complex seta_p2 = Complex(0.0110486,0.0);
-+static Complex seta_p3 = Complex(0.0,-0.0009765);
-+static Complex seta_p4 = Complex(-0.0000906,-0.0000901);
-+static Complex seta_p5 = Complex(-0.0000252,0.0);
-+static Complex seta_p6 = Complex(-0.0000034,0.0000051);
-+static Complex seta_p7 = Complex(0.0000006,.0000019);
-+static Complex dphi_p1 = Complex(0.7071068,0.7071068);
-+static Complex dphi_p2 = Complex(-0.0625001,-0.0000001);
-+static Complex dphi_p3 = Complex(-0.0013813,0.0013811);
-+static Complex dphi_p4 = Complex(0.0000005,0.0002452);
-+static Complex dphi_p5 = Complex(0.0000346,0.0000338);
-+static Complex dphi_p6 = Complex(0.0000117,-0.0000024);
-+static Complex dphi_p7 = Complex(0.0000016,-0.0000032);
-
-
-
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc.patch
new file mode 100644
index 0000000..59e11c4
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-calc.patch
@@ -0,0 +1,503 @@
+# Adapt this old source to the new C++ standards
+# These patches fix a c++ scope issue, gcc was for some reason
+# not able to discover friend function of class Complex.
+# This has been solved by making this functions a member instead of a friend.
+# George Reitsma <g.p.reitsma@gmail.com>
+
+diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/calcCAP.cpp tnt-1.2.2/calcCAP/src/calcCAP.cpp
+--- tnt-1.2.2-0-vanilla/calcCAP/src/calcCAP.cpp 2004-07-22 21:29:12.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/calcCAP.cpp 2011-02-24 19:29:44.000000000 +0100
+@@ -14,6 +14,8 @@
+ #endif
+ #include <time.h>
+ #include <stdio.h>
++#include <string.h>
++using namespace std;
+
+ /********************** Global variables *******************/
+
+@@ -287,7 +289,7 @@
+
+ for ( i1 = 0; i1 < Nc; i1 ++ ) {
+
+- sumc[i1] = cmplx( 0.0, 0.0 );
++ sumc[i1] = Complex( 0.0, 0.0 );
+
+
+ for ( j1 = 0; j1 < Nw; j1 ++ ) {
+diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/cmplxmat.cpp tnt-1.2.2/calcCAP/src/cmplxmat.cpp
+--- tnt-1.2.2-0-vanilla/calcCAP/src/cmplxmat.cpp 2004-07-22 21:29:12.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/cmplxmat.cpp 2011-02-24 19:29:44.000000000 +0100
+@@ -378,7 +378,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::real(elem(i,j));
++ result(i,j)=elem(i,j).real(); // result(i,j)=::real(elem(i,j));
+ return (result);
+ }
+
+@@ -387,7 +387,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::imag(elem(i,j));
++ result(i,j)=elem(i,j).imag(); // result(i,j)=::imag(elem(i,j));
+ return (result);
+ }
+
+@@ -396,7 +396,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::cabs(elem(i,j));
++ result(i,j)=elem(i,j).cabs(); // result(i,j)=::cabs(elem(i,j));
+ return (result);
+ }
+
+@@ -405,7 +405,7 @@
+ CmplxMatrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::conjg(elem(i,j));
++ result(i,j)=elem(i,j).conjg(); // result(i,j)=::conjg(elem(i,j));
+ return (result);
+ }
+
+diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/cmplxvec.cpp tnt-1.2.2/calcCAP/src/cmplxvec.cpp
+--- tnt-1.2.2-0-vanilla/calcCAP/src/cmplxvec.cpp 2004-07-22 21:29:12.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/cmplxvec.cpp 2011-02-24 19:29:44.000000000 +0100
+@@ -287,7 +287,7 @@
+
+ int n = d;
+ CmplxVector tmp(n);
+- for(int i = 0; i < n; i++) tmp[i] = ::conjg(v[i]);
++ for(int i = 0; i < n; i++) tmp[i] = v[i].conjg(); // tmp[i] = ::conjg(v[i]);
+ return (tmp);
+ }
+
+@@ -295,7 +295,7 @@
+
+ Vector tmp(d);
+ int n = d;
+- while(n--) tmp[n] = ::real(v[n]);
++ while(n--) tmp[n] = v[n].real(); // tmp[n] = ::real(v[n]);
+ return (tmp);
+ }
+
+@@ -303,7 +303,7 @@
+
+ Vector tmp(d);
+ int n = d;
+- while(n--) tmp[n] = ::imag(v[n]);
++ while(n--) tmp[n] = v[n].imag(); // tmp[n] = ::imag(v[n]);
+ return (tmp);
+ }
+
+@@ -311,7 +311,7 @@
+
+ Vector result(d);
+ for(int i = 0; i < d; i++)
+- result[i]=::cabs(v[i]);
++ result[i]=v[i].cabs(); // result[i]=::cabs(v[i]);
+ return (result);
+ }
+
+diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/complex.cpp tnt-1.2.2/calcCAP/src/complex.cpp
+--- tnt-1.2.2-0-vanilla/calcCAP/src/complex.cpp 2002-10-10 15:46:00.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/complex.cpp 2011-02-24 19:29:44.000000000 +0100
+@@ -203,6 +203,54 @@
+ return(result);
+ }
+
++double Complex::real(void) {
++
++ return(re);
++}
++
++double Complex::imag(void) {
++
++ return(im);
++}
++
++double Complex::arg(void) {
++
++ return((im == 0.0)&&(re == 0.0) ? 0 : atan2(im, re));
++}
++
++double Complex::cabs(void) {
++
++ double x, y, ans, temp;
++ x = fabs(re);
++ y = fabs(im);
++ if (x == 0.0)
++ ans = y;
++ else if (y == 0.0)
++ ans = x;
++ else if (x > y) {
++ temp = y/x;
++ ans = x*sqrt(1.0+temp*temp);
++ } else {
++ temp = x/y;
++ ans = y*sqrt(1.0+temp*temp);
++ }
++ return ans;
++}
++
++double Complex::cabsm(void) {
++
++ return(sqrt(re*re + im*im));
++}
++
++Complex Complex::conjg(void) {
++
++ Complex com;
++ com.re = re;
++ com.im = -im;
++ return(com);
++}
++
++
+ /********************* friends *****************************/
+
+ Complex operator*(const double& r, const Complex& c) {
+diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/complex.h tnt-1.2.2/calcCAP/src/complex.h
+--- tnt-1.2.2-0-vanilla/calcCAP/src/complex.h 2002-10-10 15:46:00.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/complex.h 2011-02-24 19:29:44.000000000 +0100
+@@ -1,10 +1,13 @@
+ #ifndef _complex__h_
+ #define _complex__h_
+
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+
+ class Complex
+ {
++ public:
++
+ friend Complex operator*(const double&, const Complex&);
+ friend Complex operator+(const double&, const Complex&);
+ friend Complex operator-(const double&, const Complex&);
+@@ -16,6 +19,14 @@
+ friend double cabs(const Complex&);
+ friend double cabsm(const Complex&);
+ friend Complex conjg(const Complex&);
++
++ double real(void);
++ double imag(void);
++ double arg(void);
++ double cabs(void);
++ double cabsm(void);
++ Complex conjg(void);
++
+ friend Complex cmplx(const double,const double);
+ friend Complex polar(const double&, const double&);
+ friend Complex cos(const Complex&);
+@@ -37,7 +48,6 @@
+ friend ostream& operator<<(ostream&, Complex&);
+ friend istream& operator>>(istream&, Complex&);
+
+- public:
+ Complex(){} // constructors
+ Complex(double r, double i = 0.0);
+ Complex(const Complex&);
+diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/data.cpp tnt-1.2.2/calcCAP/src/data.cpp
+--- tnt-1.2.2-0-vanilla/calcCAP/src/data.cpp 2002-10-10 15:46:01.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/data.cpp 2011-02-24 19:29:44.000000000 +0100
+@@ -260,7 +260,7 @@
+ }
+ }
+
+- Ic = cmplx( 0.0, 1.0 );
++ Ic = Complex( 0.0, 1.0 );
+
+ Nc4 = 11*Nh+1;
+ step_w = 1.0/power( 2.0, J );
+diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/calcRL.cpp tnt-1.2.2/calcRL/src/calcRL.cpp
+--- tnt-1.2.2-0-vanilla/calcRL/src/calcRL.cpp 2004-07-22 21:29:37.000000000 +0200
++++ tnt-1.2.2/calcRL/src/calcRL.cpp 2011-02-24 19:29:53.000000000 +0100
+@@ -43,7 +43,8 @@
+ #endif
+ #include <time.h>
+ #include <stdio.h>
+-
++#include <string.h>
++using namespace std;
+ /********************** Global variables *******************/
+
+ int Nc, Die, Rec, Cir, Tri, Ell, Pol, Gnd, Tra;
+@@ -564,7 +565,7 @@
+ tmp4 = Circum[i] / double(Nw);
+ tmpsum1 = 0.0;
+ tmpsum2 = 0.0;
+- sum2[i] = cmplx( 0.0, 0.0 );
++ sum2[i] = Complex( 0.0, 0.0 );
+
+ for (j = 0; j < Nw; j ++) {
+
+diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/cmplxmat.cpp tnt-1.2.2/calcRL/src/cmplxmat.cpp
+--- tnt-1.2.2-0-vanilla/calcRL/src/cmplxmat.cpp 2004-07-22 21:29:37.000000000 +0200
++++ tnt-1.2.2/calcRL/src/cmplxmat.cpp 2011-02-24 19:29:53.000000000 +0100
+@@ -386,7 +386,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::real(elem(i,j));
++ result(i,j)=elem(i,j).real(); // result(i,j)=::real(elem(i,j));
+ return (result);
+ }
+
+@@ -395,7 +395,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::imag(elem(i,j));
++ result(i,j)=elem(i,j).imag(); // result(i,j)=::imag(elem(i,j));
+ return (result);
+ }
+
+@@ -404,7 +404,7 @@
+ Matrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::cabs(elem(i,j));
++ result(i,j)=elem(i,j).cabs(); // result(i,j)=::cabj(elem(i,j));
+ return (result);
+ }
+
+@@ -413,7 +413,7 @@
+ CmplxMatrix result(d_i,d_j);
+ for(int i = 0; i < d_i; i++)
+ for(int j = 0; j < d_j; j++)
+- result(i,j)=::conjg(elem(i,j));
++ result(i,j)=elem(i,j).conjg(); // result(i,j)=::conjg(elem(i,j));
+ return (result);
+ }
+
+diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/cmplxvec.cpp tnt-1.2.2/calcRL/src/cmplxvec.cpp
+--- tnt-1.2.2-0-vanilla/calcRL/src/cmplxvec.cpp 2004-07-22 21:29:37.000000000 +0200
++++ tnt-1.2.2/calcRL/src/cmplxvec.cpp 2011-02-24 19:29:53.000000000 +0100
+@@ -289,7 +289,7 @@
+
+ int n = d;
+ CmplxVector tmp(n);
+- for(int i = 0; i < n; i++) tmp[i] = ::conjg(v[i]);
++ for(int i = 0; i < n; i++) tmp[i] = v[i].conjg(); // tmp[i] = ::conjg(v[i]);
+ return (tmp);
+ }
+
+@@ -297,7 +297,7 @@
+
+ Vector tmp(d);
+ int n = d;
+- while(n--) tmp[n] = ::real(v[n]);
++ while(n--) tmp[n] = v[n].real(); // tmp[n] = ::real(v[n]);
+ return (tmp);
+ }
+
+@@ -305,7 +305,7 @@
+
+ Vector tmp(d);
+ int n = d;
+- while(n--) tmp[n] = ::imag(v[n]);
++ while(n--) tmp[n] = v[n].imag(); // tmp[n] = ::imag(v[n])
+ return (tmp);
+ }
+
+@@ -313,7 +313,7 @@
+
+ Vector result(d);
+ for(int i = 0; i < d; i++)
+- result[i]=::cabs(v[i]);
++ result[i]=v[i].cabs(); // result[i]=::cabs(v[i]);
+ return (result);
+ }
+
+diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/complex.cpp tnt-1.2.2/calcRL/src/complex.cpp
+--- tnt-1.2.2-0-vanilla/calcRL/src/complex.cpp 2002-10-09 22:23:38.000000000 +0200
++++ tnt-1.2.2/calcRL/src/complex.cpp 2011-02-24 19:29:53.000000000 +0100
+@@ -17,6 +17,53 @@
+
+ /*********************** members *********************************/
+
++double Complex::real(void) {
++
++ return(re);
++}
++
++double Complex::imag(void) {
++
++ return(im);
++}
++
++double Complex::arg(void) {
++
++ return((im == 0.0)&&(re == 0.0) ? 0 : atan2(im, re));
++}
++
++double Complex::cabs(void) {
++
++ double x, y, ans, temp;
++ x = fabs(re);
++ y = fabs(im);
++ if (x == 0.0)
++ ans = y;
++ else if (y == 0.0)
++ ans = x;
++ else if (x > y) {
++ temp = y/x;
++ ans = x*sqrt(1.0+temp*temp);
++ } else {
++ temp = x/y;
++ ans = y*sqrt(1.0+temp*temp);
++ }
++ return ans;
++}
++
++double Complex::cabsm(void) {
++
++ return(sqrt(re*re + im*im));
++}
++
++Complex Complex::conjg(void) {
++
++ Complex com;
++ com.re = re;
++ com.im = -im;
++ return(com);
++}
++
+ /********************* friends *****************************/
+
+ Complex operator*(const double& r, const Complex& c) {
+diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/complex.h tnt-1.2.2/calcRL/src/complex.h
+--- tnt-1.2.2-0-vanilla/calcRL/src/complex.h 2002-10-09 22:23:39.000000000 +0200
++++ tnt-1.2.2/calcRL/src/complex.h 2011-02-24 19:29:53.000000000 +0100
+@@ -3,10 +3,12 @@
+
+ #include <stdlib.h>
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+
+ class Complex
+ {
++ public:
+ friend Complex operator*(const double&, const Complex&);
+ friend Complex operator+(const double&, const Complex&);
+ friend Complex operator-(const double&, const Complex&);
+@@ -14,6 +16,14 @@
+
+ friend double real(const Complex&);
+ friend double imag(const Complex&);
++ double real(void);
++ double imag(void);
++ double arg(void);
++ double cabs(void);
++ double cabsm(void);
++ Complex conjg(void);
++
++
+ friend double arg(const Complex&);
+ friend double cabs(const Complex&);
+ friend double cabsm(const Complex&);
+@@ -39,7 +49,7 @@
+ friend ostream& operator<<(ostream&, Complex&);
+ friend istream& operator>>(istream&, Complex&);
+
+- public:
++
+ Complex(){} // constructors
+ Complex(double r, double i = 0.0);
+ Complex(const Complex&);
+diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/data.cpp tnt-1.2.2/calcRL/src/data.cpp
+--- tnt-1.2.2-0-vanilla/calcRL/src/data.cpp 2004-07-22 21:29:37.000000000 +0200
++++ tnt-1.2.2/calcRL/src/data.cpp 2011-02-24 19:29:53.000000000 +0100
+@@ -251,7 +251,7 @@
+ }
+ }
+
+- Ic = cmplx( 0.0, 1.0 );
++ Ic = Complex( 0.0, 1.0 );
+
+ Nc4 = 11*Nh+1;
+ step_w = 1.0/power( 2.0, J );
+diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/hankel.cpp tnt-1.2.2/calcRL/src/hankel.cpp
+--- tnt-1.2.2-0-vanilla/calcRL/src/hankel.cpp 2002-10-09 22:23:40.000000000 +0200
++++ tnt-1.2.2/calcRL/src/hankel.cpp 2011-02-24 19:29:53.000000000 +0100
+@@ -19,7 +19,7 @@
+
+ hank01( vj0, vy0, x, 1 );
+
+- return( cmplx( vj0, -vy0 ) );
++ return( Complex( vj0, -vy0 ) );
+ }
+
+ /***** Function Hank21 - to calculate H^(2)_1(x), x - double ****/
+@@ -30,7 +30,7 @@
+
+ hank11( vj1, vy1, x, 1 );
+
+- return( cmplx( vj1, -vy1 ) );
++ return( Complex( vj1, -vy1 ) );
+ }
+
+ /***** Function Hank10 - to calculate H^(1)_0(x), x - double ****/
+@@ -41,7 +41,7 @@
+
+ hank01( vj0, vy0, x, 1 );
+
+- return( cmplx( vj0, vy0 ) );
++ return( Complex( vj0, vy0 ) );
+ }
+
+ /***** Function Hank11 - to calculate H^(1)_1(x), x - double ****/
+@@ -52,7 +52,7 @@
+
+ hank11( vj1, vy1, x, 1 );
+
+- return( cmplx( vj1, vy1 ) );
++ return( Complex( vj1, vy1 ) );
+ }
+
+ int hank01( double& vj0, double& vy0, double xd, int n ) {
+diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/kelvin.cpp tnt-1.2.2/calcRL/src/kelvin.cpp
+--- tnt-1.2.2-0-vanilla/calcRL/src/kelvin.cpp 2002-10-09 22:23:42.000000000 +0200
++++ tnt-1.2.2/calcRL/src/kelvin.cpp 2011-02-24 19:29:53.000000000 +0100
+@@ -332,20 +332,20 @@
+ return(keip);
+ }
+
+-static Complex seta_p1 = cmplx(0.0,-0.3926991);
+-static Complex seta_p2 = cmplx(0.0110486,0.0);
+-static Complex seta_p3 = cmplx(0.0,-0.0009765);
+-static Complex seta_p4 = cmplx(-0.0000906,-0.0000901);
+-static Complex seta_p5 = cmplx(-0.0000252,0.0);
+-static Complex seta_p6 = cmplx(-0.0000034,0.0000051);
+-static Complex seta_p7 = cmplx(0.0000006,.0000019);
+-static Complex dphi_p1 = cmplx(0.7071068,0.7071068);
+-static Complex dphi_p2 = cmplx(-0.0625001,-0.0000001);
+-static Complex dphi_p3 = cmplx(-0.0013813,0.0013811);
+-static Complex dphi_p4 = cmplx(0.0000005,0.0002452);
+-static Complex dphi_p5 = cmplx(0.0000346,0.0000338);
+-static Complex dphi_p6 = cmplx(0.0000117,-0.0000024);
+-static Complex dphi_p7 = cmplx(0.0000016,-0.0000032);
++static Complex seta_p1 = Complex(0.0,-0.3926991);
++static Complex seta_p2 = Complex(0.0110486,0.0);
++static Complex seta_p3 = Complex(0.0,-0.0009765);
++static Complex seta_p4 = Complex(-0.0000906,-0.0000901);
++static Complex seta_p5 = Complex(-0.0000252,0.0);
++static Complex seta_p6 = Complex(-0.0000034,0.0000051);
++static Complex seta_p7 = Complex(0.0000006,.0000019);
++static Complex dphi_p1 = Complex(0.7071068,0.7071068);
++static Complex dphi_p2 = Complex(-0.0625001,-0.0000001);
++static Complex dphi_p3 = Complex(-0.0013813,0.0013811);
++static Complex dphi_p4 = Complex(0.0000005,0.0002452);
++static Complex dphi_p5 = Complex(0.0000346,0.0000338);
++static Complex dphi_p6 = Complex(0.0000117,-0.0000024);
++static Complex dphi_p7 = Complex(0.0000016,-0.0000032);
+
+
+
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-namespaces.patch b/sci-electronics/tnt/files/tnt-1.2.2-namespaces.patch
new file mode 100644
index 0000000..74bf0ee
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-namespaces.patch
@@ -0,0 +1,230 @@
+diff -ruN tnt-1.2.2-2-bem/bem/src/magicad.h tnt-1.2.2/bem/src/magicad.h
+--- tnt-1.2.2-2-bem/bem/src/magicad.h 2002-10-23 00:29:27.000000000 +0200
++++ tnt-1.2.2/bem/src/magicad.h 2011-02-24 19:36:32.000000000 +0100
+@@ -100,7 +100,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #ifdef __cplusplus
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #endif
+ #include <limits.h>
+ #if !defined(PATH_MAX) || defined(__hpux)
+diff -ruN tnt-1.2.2-2-bem/calcCAP/src/bicgstab.cpp tnt-1.2.2/calcCAP/src/bicgstab.cpp
+--- tnt-1.2.2-2-bem/calcCAP/src/bicgstab.cpp 2004-07-22 21:29:12.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/bicgstab.cpp 2011-02-24 19:36:32.000000000 +0100
+@@ -9,7 +9,8 @@
+
+
+ //#include "stdafx.h"
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <math.h>
+
+ #include "vector.h"
+diff -ruN tnt-1.2.2-2-bem/calcCAP/src/diffrm.cpp tnt-1.2.2/calcCAP/src/diffrm.cpp
+--- tnt-1.2.2-2-bem/calcCAP/src/diffrm.cpp 2002-10-10 15:46:02.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/diffrm.cpp 2011-02-24 19:36:41.000000000 +0100
+@@ -8,8 +8,10 @@
+
+ //#include "stdafx.h"
+ #include <math.h>
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++using namespace std;
++#include <iomanip>
++using namespace std;
+ #include <stdlib.h>
+
+ #include "complex.h"
+diff -ruN tnt-1.2.2-2-bem/calcCAP/src/ivectorl.h tnt-1.2.2/calcCAP/src/ivectorl.h
+--- tnt-1.2.2-2-bem/calcCAP/src/ivectorl.h 2002-10-10 15:46:04.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/ivectorl.h 2011-02-24 19:36:32.000000000 +0100
+@@ -1,6 +1,7 @@
+ #ifndef _IVectorl__h_
+ #define _IVectorl__h_
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+
+ class IVectorl
+ {
+diff -ruN tnt-1.2.2-2-bem/calcCAP/src/prony.cpp tnt-1.2.2/calcCAP/src/prony.cpp
+--- tnt-1.2.2-2-bem/calcCAP/src/prony.cpp 2002-10-10 15:46:06.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/prony.cpp 2011-02-24 19:36:41.000000000 +0100
+@@ -1,6 +1,7 @@
+ #include "stdafx.h"
+ #include <math.h>
+-#include <iomanip.h>
++#include <iomanip>
++using namespace std;
+ #include <stdlib.h>
+ #include "complex.h"
+ #include "vector.h"
+diff -ruN tnt-1.2.2-2-bem/calcCAP/src/sparse.cpp tnt-1.2.2/calcCAP/src/sparse.cpp
+--- tnt-1.2.2-2-bem/calcCAP/src/sparse.cpp 2004-07-22 21:29:12.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/sparse.cpp 2011-02-24 19:36:41.000000000 +0100
+@@ -2,9 +2,11 @@
+
+ //#include "stdafx.h"
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdlib.h>
+-#include <iomanip.h>
++#include <iomanip>
++using namespace std;
+
+ #include "complex.h"
+ #include "vector.h"
+diff -ruN tnt-1.2.2-2-bem/calcCAP/src/stdafx.h tnt-1.2.2/calcCAP/src/stdafx.h
+--- tnt-1.2.2-2-bem/calcCAP/src/stdafx.h 2002-10-10 15:46:08.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/stdafx.h 2011-02-24 19:36:50.000000000 +0100
+@@ -2,11 +2,15 @@
+ #define _stdafx__h_
+
+ #include <math.h>
+-#include <iostream.h>
+-#include <iomanip.h>
+-#include <fstream.h>
++#include <iostream>
++using namespace std;
++#include <iomanip>
++using namespace std;
++#include <fstream>
++using namespace std;
+ #include <stdlib.h>
+-#include <iomanip.h>
++#include <iomanip>
++using namespace std;
+
+ #include "complex.h"
+ #include "vector.h"
+diff -ruN tnt-1.2.2-2-bem/calcCAP/src/systsolv.cpp tnt-1.2.2/calcCAP/src/systsolv.cpp
+--- tnt-1.2.2-2-bem/calcCAP/src/systsolv.cpp 2002-10-10 15:46:08.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/systsolv.cpp 2011-02-24 19:36:32.000000000 +0100
+@@ -3,7 +3,8 @@
+
+ //#include "stdafx.h"
+
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <math.h>
+ #include <stdlib.h>
+ #include "complex.h"
+diff -ruN tnt-1.2.2-2-bem/calcCAP/src/vector.h tnt-1.2.2/calcCAP/src/vector.h
+--- tnt-1.2.2-2-bem/calcCAP/src/vector.h 2002-10-10 15:46:09.000000000 +0200
++++ tnt-1.2.2/calcCAP/src/vector.h 2011-02-24 19:36:41.000000000 +0100
+@@ -1,8 +1,10 @@
+ #ifndef _Vector__h_
+ #define _Vector__h_
+
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++using namespace std;
++#include <iomanip>
++using namespace std;
+
+ class Vector
+ {
+diff -ruN tnt-1.2.2-2-bem/calcRL/src/bicgstab.cpp tnt-1.2.2/calcRL/src/bicgstab.cpp
+--- tnt-1.2.2-2-bem/calcRL/src/bicgstab.cpp 2004-07-22 21:29:37.000000000 +0200
++++ tnt-1.2.2/calcRL/src/bicgstab.cpp 2011-02-24 19:36:32.000000000 +0100
+@@ -9,7 +9,8 @@
+
+
+ //#include "stdafx.h"
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <math.h>
+
+ #include "vector.h"
+diff -ruN tnt-1.2.2-2-bem/calcRL/src/ivectorl.h tnt-1.2.2/calcRL/src/ivectorl.h
+--- tnt-1.2.2-2-bem/calcRL/src/ivectorl.h 2002-10-09 22:23:41.000000000 +0200
++++ tnt-1.2.2/calcRL/src/ivectorl.h 2011-02-24 19:36:32.000000000 +0100
+@@ -2,7 +2,8 @@
+ #define _IVectorl__h_
+ #include <stdlib.h>
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+
+ class IVectorl
+ {
+diff -ruN tnt-1.2.2-2-bem/calcRL/src/sparse.cpp tnt-1.2.2/calcRL/src/sparse.cpp
+--- tnt-1.2.2-2-bem/calcRL/src/sparse.cpp 2002-10-09 22:23:45.000000000 +0200
++++ tnt-1.2.2/calcRL/src/sparse.cpp 2011-02-24 19:36:41.000000000 +0100
+@@ -1,9 +1,11 @@
+ /******* functions, needed for sparse matrices *******/
+
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdlib.h>
+-#include <iomanip.h>
++#include <iomanip>
++using namespace std;
+
+ #include "complex.h"
+ #include "vector.h"
+diff -ruN tnt-1.2.2-2-bem/calcRL/src/stdafx.h tnt-1.2.2/calcRL/src/stdafx.h
+--- tnt-1.2.2-2-bem/calcRL/src/stdafx.h 2002-10-09 22:23:56.000000000 +0200
++++ tnt-1.2.2/calcRL/src/stdafx.h 2011-02-24 19:36:50.000000000 +0100
+@@ -2,11 +2,15 @@
+ #define _stdafx__h_
+
+ #include <math.h>
+-#include <iostream.h>
+-#include <iomanip.h>
+-#include <fstream.h>
++#include <iostream>
++using namespace std;
++#include <iomanip>
++using namespace std;
++#include <fstream>
++using namespace std;
+ #include <stdlib.h>
+-#include <iomanip.h>
++#include <iomanip>
++using namespace std;
+
+ #include "complex.h"
+ #include "vector.h"
+diff -ruN tnt-1.2.2-2-bem/calcRL/src/systsolv.cpp tnt-1.2.2/calcRL/src/systsolv.cpp
+--- tnt-1.2.2-2-bem/calcRL/src/systsolv.cpp 2002-10-09 22:23:57.000000000 +0200
++++ tnt-1.2.2/calcRL/src/systsolv.cpp 2011-02-24 19:36:32.000000000 +0100
+@@ -2,7 +2,8 @@
+ /*****Source - "NUMERICAL RECIPES IN C", www.nr.com*****/
+
+ //#include "stdafx.h"
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <math.h>
+ #include <stdlib.h>
+ #include "complex.h"
+diff -ruN tnt-1.2.2-2-bem/calcRL/src/vector.h tnt-1.2.2/calcRL/src/vector.h
+--- tnt-1.2.2-2-bem/calcRL/src/vector.h 2002-10-09 22:23:59.000000000 +0200
++++ tnt-1.2.2/calcRL/src/vector.h 2011-02-24 19:36:41.000000000 +0100
+@@ -3,8 +3,10 @@
+
+ #include <stdlib.h>
+ #include <math.h>
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++using namespace std;
++#include <iomanip>
++using namespace std;
+
+ class Vector
+ {
diff --git a/sci-electronics/tnt/tnt-1.2.2.ebuild b/sci-electronics/tnt/tnt-1.2.2.ebuild
index a083063..6fb8b5f 100644
--- a/sci-electronics/tnt/tnt-1.2.2.ebuild
+++ b/sci-electronics/tnt/tnt-1.2.2.ebuild
@@ -27,32 +27,11 @@ DEPEND="${RDEPEND}
media-gfx/imagemagick
"
+PATCHES=( "${FILESDIR}/${P}"-{calc,bem-nmmtl,namespaces}.patch )
+
src_prepare() {
- # Adapt this old source to the new C++ standards
- # These patches fix a c++ scope issue, gcc was for some reason
- # not able to discover friend function of class Complex.
- # This has been solved by making this functions a member instead of a friend.
- epatch "${FILESDIR}/${P}"-calc-cap-calcCAP.patch
- epatch "${FILESDIR}/${P}"-calc-cap-cmplxmat.patch
- epatch "${FILESDIR}/${P}"-calc-cap-cmplxvec.patch
- epatch "${FILESDIR}/${P}"-calc-cap-complex-header.patch
- epatch "${FILESDIR}/${P}"-calc-cap-complex-source.patch
- epatch "${FILESDIR}/${P}"-calc-cap-data.patch
- epatch "${FILESDIR}/${P}"-calc-rl-calcRL.patch
- epatch "${FILESDIR}/${P}"-calc-rl-cmplxmat.patch
- epatch "${FILESDIR}/${P}"-calc-rl-cmplxvec.patch
- epatch "${FILESDIR}/${P}"-calc-rl-complex-header.patch
- epatch "${FILESDIR}/${P}"-calc-rl-complex.patch
- epatch "${FILESDIR}/${P}"-calc-rl-data.patch
- epatch "${FILESDIR}/${P}"-calc-rl-kelvin.patch
- epatch "${FILESDIR}/${P}"-calc-rl-hankel.patch
- #fix a minor code error
- epatch "${FILESDIR}/${P}"-bem-nmmtl.patch
- # Update headers in remaining files
- # The source code is from the pre-namespace era.
- sed -i 's/<iostream.h>/\<iostream\>\nusing\ namespace\ std\;/' `grep -r -l iostream.h *`
- sed -i 's/<iomanip.h>/\<iomanip\>\nusing\ namespace\ std\;/' `grep -r -l iomanip.h *`
- sed -i 's/<fstream.h>/\<fstream\>\nusing\ namespace\ std\;/' `grep -r -l fstream.h *`
+ base_src_prepare
+
# Update fortran compiler
sed -i 's/\"g77\"/\"$(tc-getF77)\"/' bem/configure.ac
sed -i 's/\"g77\"/\"$(tc-getF77)\"/' calcCAP/configure.ac
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/
@ 2011-02-25 7:29 Andreas K. Huettel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Huettel @ 2011-02-25 7:29 UTC (permalink / raw
To: gentoo-commits
commit: fab19b1e9728b5d62c6418b7d0beb574452ee783
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Feb 24 23:30:04 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 23:30:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=fab19b1e
[sci-electronics/tnt] General cleanup
(Portage version: 2.1.9.41/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
sci-electronics/tnt/ChangeLog | 7 ++
sci-electronics/tnt/Manifest | 37 +++++------
.../tnt/files/tnt-1.2.2-Makefile-am.patch | 27 --------
.../tnt/files/tnt-1.2.2-doc-Makefile-am.patch | 37 -----------
sci-electronics/tnt/files/tnt-1.2.2-docs.patch | 66 ++++++++++++++++++++
sci-electronics/tnt/files/tnt-1.2.2-f77.patch | 14 ++++
.../tnt/files/tnt-1.2.2-gui-splash.patch | 11 ---
sci-electronics/tnt/files/tnt-1.2.2-gui.patch | 24 +++++++
sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch | 11 ---
sci-electronics/tnt/tnt-1.2.2.ebuild | 46 +++++---------
10 files changed, 144 insertions(+), 136 deletions(-)
diff --git a/sci-electronics/tnt/ChangeLog b/sci-electronics/tnt/ChangeLog
index c92dc3e..96ae9fb 100644
--- a/sci-electronics/tnt/ChangeLog
+++ b/sci-electronics/tnt/ChangeLog
@@ -3,6 +3,13 @@
# $Header: $
24 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> tnt-1.2.2.ebuild,
+ -files/tnt-1.2.2-Makefile-am.patch,
+ -files/tnt-1.2.2-doc-Makefile-am.patch, +files/tnt-1.2.2-docs.patch,
+ +files/tnt-1.2.2-f77.patch, +files/tnt-1.2.2-gui.patch,
+ -files/tnt-1.2.2-gui-splash.patch, -files/tnt-1.2.2-gui_help.patch:
+ General cleanup and simplification
+
+ 24 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> tnt-1.2.2.ebuild,
+files/tnt-1.2.2-calc.patch, -files/tnt-1.2.2-calc-cap-calcCAP.patch,
-files/tnt-1.2.2-calc-cap-cmplxmat.patch,
-files/tnt-1.2.2-calc-cap-cmplxvec.patch,
diff --git a/sci-electronics/tnt/Manifest b/sci-electronics/tnt/Manifest
index e242eb8..05147b6 100644
--- a/sci-electronics/tnt/Manifest
+++ b/sci-electronics/tnt/Manifest
@@ -1,32 +1,31 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX tnt-1.2.2-Makefile-am.patch 758 RMD160 2524d177a9ea2f28889775ee8dad0663f55a586c SHA1 5dc022c9009ad5f425fed591c880e73047d2eeb1 SHA256 aea0daec458376e63315736a45bc307a4768443c2a3be85aeb29f6fd1caf1f34
AUX tnt-1.2.2-bem-nmmtl.patch 456 RMD160 8463540d64226a8bf769a66d7fdd9fd5daf61cb6 SHA1 8b08be79fee98f1e06c5ded2e4fa24aacd8c6007 SHA256 f6f0bde8df73c524545e2290958a9612692f2a76114ed1ba7a6b984b81cb1dd1
AUX tnt-1.2.2-calc.patch 14487 RMD160 9234f56886cb95db4c1d1501250dc2f4954214d3 SHA1 e9b3b58a9409986b767a6b9678f2d37d8201fcb3 SHA256 daee74c5c2fb46a9a3742be5d9d8441260119dddcb52e9a06ddfe54147f5b735
-AUX tnt-1.2.2-doc-Makefile-am.patch 1032 RMD160 f8175289f67577cadb61649c00f4a233ff2b16b6 SHA1 24c83817bd7afdcd59260f1f52d2757e98bdf947 SHA256 38862d969bcee3e35623317572d3b22122f16678b88a95e79f4727c7d6f9ffa0
-AUX tnt-1.2.2-gui-splash.patch 401 RMD160 7870cc511eea6d591ee8be96504c5d5a63e40375 SHA1 e5fe12e4e1af6bb0627440f3722894a5d9aaaa8f SHA256 aede7920d86ec402463a4ce3ea43f839b509dda6859a12ae01796eadf77bd2ef
-AUX tnt-1.2.2-gui_help.patch 315 RMD160 050721d4c09efe2a9706ab8fe21a1ae072fae50b SHA1 9722eeb18a7daa1026f5b1a730801da675c727d1 SHA256 bf0c7b39a2c4a8eb8e5195868ee1b9751ebc53ab531435cc7e970ad7a8199d7f
+AUX tnt-1.2.2-docs.patch 1970 RMD160 ecfa0e2c973fcdcda155de3bf49eab1ef29b40a6 SHA1 28c2b8aa2ec2ad94e4e38ae57f514fc3ad03a4ce SHA256 35741bb44d5c97f718830fbfa63ed23f00c84cf4e5c1007bfa997f0e3f842520
+AUX tnt-1.2.2-f77.patch 482 RMD160 8f45a248f511bdd5aae54d0511a6f23abfbfdbc2 SHA1 f6d9f5b22d85fc7ac8d84845558497514009aab2 SHA256 b80cd8fdf9000ba115511b4b440d929dcdb55d8778bf01c52a1082607fd82362
+AUX tnt-1.2.2-gui.patch 900 RMD160 acfa4c03aa92c97b257f3d7d5a08e01d94834e77 SHA1 8486e487c10d29b6d3c09bb219b030d32039d6cf SHA256 d1c3cc7cf0f6d084d583502aa67a10687e1fbcd5a5833aca986b3c2d3fd37a20
AUX tnt-1.2.2-namespaces.patch 6862 RMD160 2a32bb175e4769f35bd9d91521da7c9ac13c11d9 SHA1 7a181abc878951f631d576188144e44422743eea SHA256 d777646d0e7a43aee5c68e5061a85cd99be45cd539b683afff7752d7581d16c1
AUX tnt-1.2.2-tkcon.patch 447 RMD160 d3b708d681a5a468c9f17b27dba6c273e3b472ad SHA1 55e8f6bb54d4e59ce73620d2909d6d8b23197770 SHA256 1302823cd11ad31dcca115abb93a6f1c07299872bf5d48d51815b5436bbee846
DIST tnt-1.2.2.tar.gz 2020099 RMD160 1a2ba68a93ee21590bb25a3eacf85d3773c3e77d SHA1 bd089863ca2cd939009253e83f4ab75317191047 SHA256 cbb418d0de4f244d8174e8826e4d8272bce753f50431c9d87af08928f5817445
-EBUILD tnt-1.2.2.ebuild 2213 RMD160 05f65a9e5ab0dc5a6b6e899741e98685cc01d9ec SHA1 2fc154af1a1ead865577d75dae0dc5e6430d8cfb SHA256 ae7aebfad09e94606d3d84910af4a88c7b0b123d64b2b963f96881360f656a23
-MISC ChangeLog 1013 RMD160 2dfa7a993395195056cf06e365cd08fecb6af6db SHA1 b0969f00bee62dfe2d6962bb33c73d46b8f7a76f SHA256 459c200d376175e95ef4395d7d20433b8371560a454e8e23b9e7de468160a6f3
+EBUILD tnt-1.2.2.ebuild 1560 RMD160 cf0dc81a332f776ea0d74861a840b0f65c5c5055 SHA1 d64b470d0edf236e2447e646c4cc31c81d3a6579 SHA256 db439bd394e69329ace1f76cba887df819c1f67a9a4e9f01cc04eca743efe15c
+MISC ChangeLog 1363 RMD160 4ca3eafee7154329f2c59ee6fc41623197ff7c73 SHA1 a6406509983d84621dddd59c816f8be1e8a6ae83 SHA256 62962a9ddbe3996c739b676a9cc8fd04ce270988f6d09bc466c7e5d13f7e484f
MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJNZqaqAAoJENwGBM22xffe2XAQAJwvYBGGt7oeNAi14C0s+oJ6
-5sVOBY90n9zzH0RZxdwO4saKWhEoHhcuSW8Dek9g4GlwM7pxDlCY4SrYc6sK5v4t
-Q+NxTKSMxeVFkvHFD2x8xbLaNW9D+wG7NCgmQtRkcKy5QS5BNntXMRoe+xFGNvk7
-bihmLN2tJuanOhw6wLKdDK9SSLrvkqOrP8na1YUTiIOO5Ma2W2E5SK2KPO1N7q5x
-xbiSX0rgEN+FhZAte3hr3OVndnGv6YvrHZYu6592N7wcZarwitg1S4qWeBpCyOfp
-/R/Cy9BvqLxav+FxI0O4v/MUkQT25+oDw+dDiwu+WhsGrU+rHlvkKRdobqi1TcjP
-1ypdOddHFsC/R4mzUOH6w7/ew10/OJE/KabYlaptFchq+AeBpp0rWKWJtROc+YuR
-oNkgt854XswaubF2t9QFn2vPGpYefNPtnXh3hAVv94Dmh7KUdhzKXuhllX68BlWr
-FqwTMhdo1gGeh9XPmE5XF1qa/zHDlcNg8CBh00w3sE9E68aKQ2zWc2R2WNY+jyWn
-LfIZ6Kpr7cF8FbE6XNOW7yl/afaRAzbWYueu6OT4cYHCOoO3c1RAc5wInT4pAK1g
-gv4hUipgXlIQqiodZ8n9N9UmJOLZc7UjexkPk6jbOX8uZ3Zt144SJQ1jSP+7U2Nd
-Neie6vdDFakNDl13zpq2
-=uLQ+
+iQIcBAEBAgAGBQJNZun8AAoJENwGBM22xffev5wQAKJXT2pZ1zIjiUJI+Nx5pOtH
+MYpNmrLRedxCD/awO/WU60PfAdCxXIpxZ3lQlheAy55sKV2U2P0Zspw128ZCxcav
+IQU5XWI2uiF4RDF/m28mRVYz15BsLx9uRNogkWko4ewLNgr8Z6ulP4Vhpli+wbdl
+ZTpvNmfvhqEG1DWLwycy/pk3IGn+zdlbyPOAfI9RKjjEnVIQVfgxMiW6B2+4eAc/
+1Fze8g6hc7TkqLZjB8dxyddu6tZhzAkG3HNDYkJSLKxkECcusznoMvjqEt1h6X35
+hp+PdcZXPO6OyiP8wIrInDT50VQ/uAhG6H1LKKalvD5u2Q0rWQzteIKeOWoYbWpi
+KmBU33urUvJq61H2J5Aqb4eAZ06IPVRUWe7keDbomuK40DoR8BhwiTSBJlVOfS/X
+odjXKK1GvEIHNZ2JugycAO4/D/FwTJNnqS64+DCdz4i1uPmplVlXMpxY71fYTAki
+jXN6rR6R3QCPRzbW8jZgS1XdhQhnv15ZsfKLxraek93sB373Ap3Kuu08HamJ9oHK
+t8i54gGucknDvWwoMwXWIK47SE+5+R6YC2thIu9xFmx6bCtti+0f5MuTOCp/C2X7
+x6ruqnphajtyeoX5Sup1NxznPKixebhyRl3iGgvzXFw9ZAUpOyfOPy8J1DyC6wz7
+rrxbsEsGvSVAtqfdsLjf
+=L4xp
-----END PGP SIGNATURE-----
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch b/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch
deleted file mode 100644
index aea1e2e..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.am.org 2011-02-19 00:22:25.000000000 -0800
-+++ Makefile.am 2011-02-19 00:23:29.000000000 -0800
-@@ -51,14 +51,16 @@
- # a prefix. If not, then I suppose README will go into
- # /usr.
- #---------------------------------------------------------------
--appdocsdir = $(prefix)
--appdocs_DATA = \
-- AUTHORS$(TXTEXT) \
-- COPYING$(TXTEXT) \
-- ChangeLog$(TXTEXT) \
-- NEWS$(TXTEXT) \
-- README$(TXTEXT) \
-- THANKS$(TXTEXT)
-+#
-+# Portage takes care for this
-+#appdocsdir = $(prefix)
-+#appdocs_DATA = \
-+# AUTHORS$(TXTEXT) \
-+# COPYING$(TXTEXT) \
-+# ChangeLog$(TXTEXT) \
-+# NEWS$(TXTEXT) \
-+# README$(TXTEXT) \
-+# THANKS$(TXTEXT)
-
- #---------------------------------------------------------------
- # Convert application documents to text files on Windows.
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch b/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch
deleted file mode 100644
index 092158b..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- doc/Makefile.am.org 2011-02-19 00:25:11.000000000 -0800
-+++ doc/Makefile.am 2011-02-19 00:28:31.000000000 -0800
-@@ -43,7 +43,7 @@
- #
- #---------------------------------------------------------------
-
--docdir = $(prefix)/doc
-+#docdir = $(prefix)/doc
- doc_DATA = \
- user-guide.pdf
-
-@@ -73,15 +73,17 @@
- pdflatex $*
- latex2html -split 4 -show_section_numbers -local_icons $<
-
-+# Removed, because portage takes care of it.
-+#
- # Custom installation rule
--install-data-local:
-- for f in $(doc_DATA); do \
-- $(mkinstalldirs) $(docdir); \
-- $(INSTALL_DATA) $$f $(docdir)/$$f; \
-- d=`basename $$f .pdf`; \
-- $(mkinstalldirs) $(docdir)/$$d; \
-- $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
-- done
-+#install-data-local:
-+# for f in $(doc_DATA); do \
-+# $(mkinstalldirs) $(docdir); \
-+# $(INSTALL_DATA) $$f $(docdir)/$$f; \
-+# d=`basename $$f .pdf`; \
-+# $(mkinstalldirs) $(docdir)/$$d; \
-+# $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
-+# done
-
- #---------------------------------------------------------------
- # clean
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-docs.patch b/sci-electronics/tnt/files/tnt-1.2.2-docs.patch
new file mode 100644
index 0000000..77fe504
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-docs.patch
@@ -0,0 +1,66 @@
+diff -ruN tnt-1.2.2-5-tkcon/Makefile.am tnt-1.2.2/Makefile.am
+--- tnt-1.2.2-5-tkcon/Makefile.am 2004-07-22 16:23:32.000000000 +0200
++++ tnt-1.2.2/Makefile.am 2011-02-24 23:43:41.000000000 +0100
+@@ -51,14 +51,16 @@
+ # a prefix. If not, then I suppose README will go into
+ # /usr.
+ #---------------------------------------------------------------
+-appdocsdir = $(prefix)
+-appdocs_DATA = \
+- AUTHORS$(TXTEXT) \
+- COPYING$(TXTEXT) \
+- ChangeLog$(TXTEXT) \
+- NEWS$(TXTEXT) \
+- README$(TXTEXT) \
+- THANKS$(TXTEXT)
++#
++# Portage takes care for this
++#appdocsdir = $(prefix)
++#appdocs_DATA = \
++# AUTHORS$(TXTEXT) \
++# COPYING$(TXTEXT) \
++# ChangeLog$(TXTEXT) \
++# NEWS$(TXTEXT) \
++# README$(TXTEXT) \
++# THANKS$(TXTEXT)
+
+ #---------------------------------------------------------------
+ # Convert application documents to text files on Windows.
+diff -ruN tnt-1.2.2-5-tkcon/doc/Makefile.am tnt-1.2.2/doc/Makefile.am
+--- tnt-1.2.2-5-tkcon/doc/Makefile.am 2004-07-21 17:45:26.000000000 +0200
++++ tnt-1.2.2/doc/Makefile.am 2011-02-24 23:43:45.000000000 +0100
+@@ -43,7 +43,7 @@
+ #
+ #---------------------------------------------------------------
+
+-docdir = $(prefix)/doc
++#docdir = $(prefix)/doc
+ doc_DATA = \
+ user-guide.pdf
+
+@@ -73,15 +73,17 @@
+ pdflatex $*
+ latex2html -split 4 -show_section_numbers -local_icons $<
+
++# Removed, because portage takes care of it.
++#
+ # Custom installation rule
+-install-data-local:
+- for f in $(doc_DATA); do \
+- $(mkinstalldirs) $(docdir); \
+- $(INSTALL_DATA) $$f $(docdir)/$$f; \
+- d=`basename $$f .pdf`; \
+- $(mkinstalldirs) $(docdir)/$$d; \
+- $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
+- done
++#install-data-local:
++# for f in $(doc_DATA); do \
++# $(mkinstalldirs) $(docdir); \
++# $(INSTALL_DATA) $$f $(docdir)/$$f; \
++# d=`basename $$f .pdf`; \
++# $(mkinstalldirs) $(docdir)/$$d; \
++# $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
++# done
+
+ #---------------------------------------------------------------
+ # clean
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-f77.patch b/sci-electronics/tnt/files/tnt-1.2.2-f77.patch
new file mode 100644
index 0000000..b1f3fa1
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-f77.patch
@@ -0,0 +1,14 @@
+diff -ruN tnt-1.2.2-3-namespace/bem/configure.ac tnt-1.2.2-4-g77/bem/configure.ac
+--- tnt-1.2.2-3-namespace/bem/configure.ac 2004-04-22 22:07:12.000000000 +0200
++++ tnt-1.2.2-4-g77/bem/configure.ac 2011-02-24 23:55:35.000000000 +0100
+@@ -74,9 +74,7 @@
+ ;;
+ *linux*)
+ # For Linux, all flavors...
+- # Use the GNU compilers for C++ and FORTRAN.
+- CXX="g++"
+- F77="g77"
++ # Use the GNU compilers for C++ and FORTRAN and rely on portage
+ AM_CXXFLAGS="-DFORTRAN_UNDERBARS"
+ ;;
+ esac
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch
deleted file mode 100644
index e0c381a..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/splash.tcl.org 2011-02-19 18:30:20.000000000 -0800
-+++ gui/splash.tcl 2011-02-19 18:40:53.000000000 -0800
-@@ -81,7 +81,7 @@
- } else {
- set filename COPYING
- }
-- set licenseFile [file join $::scriptDir .. $filename]
-+ set licenseFile [file join /usr share doc package_name html $filename]
- if { [file exists $licenseFile] } {
- ::gui::guiPopupFile $licenseFile
- } else {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui.patch
new file mode 100644
index 0000000..e2a9b4c
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-gui.patch
@@ -0,0 +1,24 @@
+diff -ruN tnt-1.2.2-6-docs/gui/gui_help.tcl tnt-1.2.2/gui/gui_help.tcl
+--- tnt-1.2.2-6-docs/gui/gui_help.tcl 2004-07-26 15:37:52.000000000 +0200
++++ tnt-1.2.2/gui/gui_help.tcl 2011-02-24 23:45:27.000000000 +0100
+@@ -26,7 +26,7 @@
+ switch -exact $helpTopic {
+
+ userguide {
+- display_online_help user-guide/index.html
++ display_online_help /usr/share/doc/package_name/html/index.html
+ }
+
+ }
+diff -ruN tnt-1.2.2-6-docs/gui/splash.tcl tnt-1.2.2/gui/splash.tcl
+--- tnt-1.2.2-6-docs/gui/splash.tcl 2004-07-22 15:16:21.000000000 +0200
++++ tnt-1.2.2/gui/splash.tcl 2011-02-24 23:45:23.000000000 +0100
+@@ -81,7 +81,7 @@
+ } else {
+ set filename COPYING
+ }
+- set licenseFile [file join $::scriptDir .. $filename]
++ set licenseFile [file join /usr share doc package_name html $filename]
+ if { [file exists $licenseFile] } {
+ ::gui::guiPopupFile $licenseFile
+ } else {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch
deleted file mode 100644
index ba5da09..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/gui_help.tcl.org 2011-02-19 18:52:20.000000000 -0800
-+++ gui/gui_help.tcl 2011-02-19 18:59:17.000000000 -0800
-@@ -26,7 +26,7 @@
- switch -exact $helpTopic {
-
- userguide {
-- display_online_help user-guide/index.html
-+ display_online_help /usr/share/doc/package_name/html/index.html
- }
-
- }
diff --git a/sci-electronics/tnt/tnt-1.2.2.ebuild b/sci-electronics/tnt/tnt-1.2.2.ebuild
index 6fb8b5f..8ce4ae0 100644
--- a/sci-electronics/tnt/tnt-1.2.2.ebuild
+++ b/sci-electronics/tnt/tnt-1.2.2.ebuild
@@ -27,56 +27,40 @@ DEPEND="${RDEPEND}
media-gfx/imagemagick
"
-PATCHES=( "${FILESDIR}/${P}"-{calc,bem-nmmtl,namespaces}.patch )
+PATCHES=( "${FILESDIR}/${P}"-{calc,bem-nmmtl,namespaces,f77,tkcon,docs,gui}.patch )
src_prepare() {
base_src_prepare
- # Update fortran compiler
- sed -i 's/\"g77\"/\"$(tc-getF77)\"/' bem/configure.ac
- sed -i 's/\"g77\"/\"$(tc-getF77)\"/' calcCAP/configure.ac
- sed -i 's/\"g77\"/\"$(tc-getF77)\"/' calcRL/configure.ac
- #block document installation
- epatch "${FILESDIR}/${P}"-Makefile-am.patch
- epatch "${FILESDIR}/${P}"-doc-Makefile-am.patch
- epatch "${FILESDIR}/${P}"-tkcon.patch
#adjust new document location in gui
- epatch "${FILESDIR}/${P}"-gui-splash.patch
sed -i "s/package_name/${PF}/" gui/splash.tcl
- epatch "${FILESDIR}/${P}"-gui_help.patch
sed -i "s/package_name/${PF}/" gui/gui_help.tcl
- # regenerate the configure and make files
- rm aclocal.m4
- eautoreconf --force
-}
-
-src_configure() {
- econf || die "econf failed"
-}
-src_compile() {
- emake || die "emake failed"
+ eautoreconf
}
src_install () {
emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS README THANKS || die "failed to install docs"
- dohtml COPYING #tcl cannot handle the archives created by dodoc
+
+ dodoc AUTHORS ChangeLog NEWS README THANKS || die
+
+ # tcl cannot handle the archives created by dodoc
+ dohtml COPYING || die
if use doc; then
- dodoc doc/*.pdf doc/*.png
- dohtml doc/user-guide/*
+ dodoc doc/*.pdf doc/*.png || die
+ dohtml doc/user-guide/* || die
fi
- #Install icon
+
+ # Install icon
convert gui/logo.gif gui/tnt.png
docinto "examples"
dodoc examples/* || die "failed to install exampels"
newicon gui/tnt.png tnt.png
- make_desktop_entry ${PN} "Mttl" ${PN}
+ make_desktop_entry ${PN} "tnt" ${PN}
}
pkg_postinst() {
- einfo "Warning: the sources are not under development anymore."
- einfo "We made it compile, but users should check if the results make sense."
- einfo "The GUI was written in an old version of TCL/TK."
- einfo "Examples are in the /usr/share/doc/tnt-1.2.2 folder."
+ elog "Warning: the sources are not under development anymore."
+ elog "We made it compile, but users should check if the results make sense."
+ elog "Examples are in the /usr/share/doc/tnt-1.2.2 folder."
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/
@ 2014-10-20 19:09 Andreas Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2014-10-20 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 754862599978ecd0a0f2176eb586071cd184dbd2
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 19:09:14 2014 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Oct 20 19:09:14 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=75486259
[sci-electronics/tnt] not needed anymore
---
sci-electronics/tnt/ChangeLog | 31 --
sci-electronics/tnt/Manifest | 31 --
.../tnt/files/tnt-1.2.2-bem-nmmtl.patch | 11 -
sci-electronics/tnt/files/tnt-1.2.2-calc.patch | 503 ---------------------
sci-electronics/tnt/files/tnt-1.2.2-docs.patch | 66 ---
sci-electronics/tnt/files/tnt-1.2.2-f77.patch | 14 -
sci-electronics/tnt/files/tnt-1.2.2-gui.patch | 24 -
.../tnt/files/tnt-1.2.2-namespaces.patch | 230 ----------
sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch | 16 -
sci-electronics/tnt/metadata.xml | 9 -
sci-electronics/tnt/tnt-1.2.2.ebuild | 66 ---
11 files changed, 1001 deletions(-)
diff --git a/sci-electronics/tnt/ChangeLog b/sci-electronics/tnt/ChangeLog
deleted file mode 100644
index 96ae9fb..0000000
--- a/sci-electronics/tnt/ChangeLog
+++ /dev/null
@@ -1,31 +0,0 @@
-# ChangeLog for sci-electronics/tnt
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 24 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> tnt-1.2.2.ebuild,
- -files/tnt-1.2.2-Makefile-am.patch,
- -files/tnt-1.2.2-doc-Makefile-am.patch, +files/tnt-1.2.2-docs.patch,
- +files/tnt-1.2.2-f77.patch, +files/tnt-1.2.2-gui.patch,
- -files/tnt-1.2.2-gui-splash.patch, -files/tnt-1.2.2-gui_help.patch:
- General cleanup and simplification
-
- 24 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> tnt-1.2.2.ebuild,
- +files/tnt-1.2.2-calc.patch, -files/tnt-1.2.2-calc-cap-calcCAP.patch,
- -files/tnt-1.2.2-calc-cap-cmplxmat.patch,
- -files/tnt-1.2.2-calc-cap-cmplxvec.patch,
- -files/tnt-1.2.2-calc-cap-complex-header.patch,
- -files/tnt-1.2.2-calc-cap-complex-source.patch,
- -files/tnt-1.2.2-calc-cap-data.patch,
- -files/tnt-1.2.2-calc-rl-calcRL.patch,
- -files/tnt-1.2.2-calc-rl-cmplxmat.patch,
- -files/tnt-1.2.2-calc-rl-cmplxvec.patch,
- -files/tnt-1.2.2-calc-rl-complex.patch,
- -files/tnt-1.2.2-calc-rl-complex-header.patch,
- -files/tnt-1.2.2-calc-rl-data.patch,
- -files/tnt-1.2.2-calc-rl-hankel.patch,
- -files/tnt-1.2.2-calc-rl-kelvin.patch, +files/tnt-1.2.2-namespaces.patch:
- Started summarizing patches
-
- 24 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> tnt-1.2.2.ebuild:
- Clean up keywords and dependencies
-
diff --git a/sci-electronics/tnt/Manifest b/sci-electronics/tnt/Manifest
deleted file mode 100644
index 05147b6..0000000
--- a/sci-electronics/tnt/Manifest
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX tnt-1.2.2-bem-nmmtl.patch 456 RMD160 8463540d64226a8bf769a66d7fdd9fd5daf61cb6 SHA1 8b08be79fee98f1e06c5ded2e4fa24aacd8c6007 SHA256 f6f0bde8df73c524545e2290958a9612692f2a76114ed1ba7a6b984b81cb1dd1
-AUX tnt-1.2.2-calc.patch 14487 RMD160 9234f56886cb95db4c1d1501250dc2f4954214d3 SHA1 e9b3b58a9409986b767a6b9678f2d37d8201fcb3 SHA256 daee74c5c2fb46a9a3742be5d9d8441260119dddcb52e9a06ddfe54147f5b735
-AUX tnt-1.2.2-docs.patch 1970 RMD160 ecfa0e2c973fcdcda155de3bf49eab1ef29b40a6 SHA1 28c2b8aa2ec2ad94e4e38ae57f514fc3ad03a4ce SHA256 35741bb44d5c97f718830fbfa63ed23f00c84cf4e5c1007bfa997f0e3f842520
-AUX tnt-1.2.2-f77.patch 482 RMD160 8f45a248f511bdd5aae54d0511a6f23abfbfdbc2 SHA1 f6d9f5b22d85fc7ac8d84845558497514009aab2 SHA256 b80cd8fdf9000ba115511b4b440d929dcdb55d8778bf01c52a1082607fd82362
-AUX tnt-1.2.2-gui.patch 900 RMD160 acfa4c03aa92c97b257f3d7d5a08e01d94834e77 SHA1 8486e487c10d29b6d3c09bb219b030d32039d6cf SHA256 d1c3cc7cf0f6d084d583502aa67a10687e1fbcd5a5833aca986b3c2d3fd37a20
-AUX tnt-1.2.2-namespaces.patch 6862 RMD160 2a32bb175e4769f35bd9d91521da7c9ac13c11d9 SHA1 7a181abc878951f631d576188144e44422743eea SHA256 d777646d0e7a43aee5c68e5061a85cd99be45cd539b683afff7752d7581d16c1
-AUX tnt-1.2.2-tkcon.patch 447 RMD160 d3b708d681a5a468c9f17b27dba6c273e3b472ad SHA1 55e8f6bb54d4e59ce73620d2909d6d8b23197770 SHA256 1302823cd11ad31dcca115abb93a6f1c07299872bf5d48d51815b5436bbee846
-DIST tnt-1.2.2.tar.gz 2020099 RMD160 1a2ba68a93ee21590bb25a3eacf85d3773c3e77d SHA1 bd089863ca2cd939009253e83f4ab75317191047 SHA256 cbb418d0de4f244d8174e8826e4d8272bce753f50431c9d87af08928f5817445
-EBUILD tnt-1.2.2.ebuild 1560 RMD160 cf0dc81a332f776ea0d74861a840b0f65c5c5055 SHA1 d64b470d0edf236e2447e646c4cc31c81d3a6579 SHA256 db439bd394e69329ace1f76cba887df819c1f67a9a4e9f01cc04eca743efe15c
-MISC ChangeLog 1363 RMD160 4ca3eafee7154329f2c59ee6fc41623197ff7c73 SHA1 a6406509983d84621dddd59c816f8be1e8a6ae83 SHA256 62962a9ddbe3996c739b676a9cc8fd04ce270988f6d09bc466c7e5d13f7e484f
-MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNZun8AAoJENwGBM22xffev5wQAKJXT2pZ1zIjiUJI+Nx5pOtH
-MYpNmrLRedxCD/awO/WU60PfAdCxXIpxZ3lQlheAy55sKV2U2P0Zspw128ZCxcav
-IQU5XWI2uiF4RDF/m28mRVYz15BsLx9uRNogkWko4ewLNgr8Z6ulP4Vhpli+wbdl
-ZTpvNmfvhqEG1DWLwycy/pk3IGn+zdlbyPOAfI9RKjjEnVIQVfgxMiW6B2+4eAc/
-1Fze8g6hc7TkqLZjB8dxyddu6tZhzAkG3HNDYkJSLKxkECcusznoMvjqEt1h6X35
-hp+PdcZXPO6OyiP8wIrInDT50VQ/uAhG6H1LKKalvD5u2Q0rWQzteIKeOWoYbWpi
-KmBU33urUvJq61H2J5Aqb4eAZ06IPVRUWe7keDbomuK40DoR8BhwiTSBJlVOfS/X
-odjXKK1GvEIHNZ2JugycAO4/D/FwTJNnqS64+DCdz4i1uPmplVlXMpxY71fYTAki
-jXN6rR6R3QCPRzbW8jZgS1XdhQhnv15ZsfKLxraek93sB373Ap3Kuu08HamJ9oHK
-t8i54gGucknDvWwoMwXWIK47SE+5+R6YC2thIu9xFmx6bCtti+0f5MuTOCp/C2X7
-x6ruqnphajtyeoX5Sup1NxznPKixebhyRl3iGgvzXFw9ZAUpOyfOPy8J1DyC6wz7
-rrxbsEsGvSVAtqfdsLjf
-=L4xp
------END PGP SIGNATURE-----
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
deleted file mode 100644
index c990c46..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-bem-nmmtl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bem/src/nmmtl.cpp.org 2011-02-19 16:12:58.000000000 -0800
-+++ bem/src/nmmtl.cpp 2011-02-19 16:15:36.000000000 -0800
-@@ -352,7 +352,7 @@
- sprintf (filespec, "%s.result", filename);
- if( (output_file1 = fopen(filespec,"w")) == NULL )
- {
-- printf ("*** Could not open %s for output ***\n");
-+ printf ("*** Could not open %s for output ***\n", filespec);
- return 0; /* Fatal error; could not open output file */
- }
-
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc.patch b/sci-electronics/tnt/files/tnt-1.2.2-calc.patch
deleted file mode 100644
index 59e11c4..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-calc.patch
+++ /dev/null
@@ -1,503 +0,0 @@
-# Adapt this old source to the new C++ standards
-# These patches fix a c++ scope issue, gcc was for some reason
-# not able to discover friend function of class Complex.
-# This has been solved by making this functions a member instead of a friend.
-# George Reitsma <g.p.reitsma@gmail.com>
-
-diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/calcCAP.cpp tnt-1.2.2/calcCAP/src/calcCAP.cpp
---- tnt-1.2.2-0-vanilla/calcCAP/src/calcCAP.cpp 2004-07-22 21:29:12.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/calcCAP.cpp 2011-02-24 19:29:44.000000000 +0100
-@@ -14,6 +14,8 @@
- #endif
- #include <time.h>
- #include <stdio.h>
-+#include <string.h>
-+using namespace std;
-
- /********************** Global variables *******************/
-
-@@ -287,7 +289,7 @@
-
- for ( i1 = 0; i1 < Nc; i1 ++ ) {
-
-- sumc[i1] = cmplx( 0.0, 0.0 );
-+ sumc[i1] = Complex( 0.0, 0.0 );
-
-
- for ( j1 = 0; j1 < Nw; j1 ++ ) {
-diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/cmplxmat.cpp tnt-1.2.2/calcCAP/src/cmplxmat.cpp
---- tnt-1.2.2-0-vanilla/calcCAP/src/cmplxmat.cpp 2004-07-22 21:29:12.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/cmplxmat.cpp 2011-02-24 19:29:44.000000000 +0100
-@@ -378,7 +378,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::real(elem(i,j));
-+ result(i,j)=elem(i,j).real(); // result(i,j)=::real(elem(i,j));
- return (result);
- }
-
-@@ -387,7 +387,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::imag(elem(i,j));
-+ result(i,j)=elem(i,j).imag(); // result(i,j)=::imag(elem(i,j));
- return (result);
- }
-
-@@ -396,7 +396,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::cabs(elem(i,j));
-+ result(i,j)=elem(i,j).cabs(); // result(i,j)=::cabs(elem(i,j));
- return (result);
- }
-
-@@ -405,7 +405,7 @@
- CmplxMatrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::conjg(elem(i,j));
-+ result(i,j)=elem(i,j).conjg(); // result(i,j)=::conjg(elem(i,j));
- return (result);
- }
-
-diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/cmplxvec.cpp tnt-1.2.2/calcCAP/src/cmplxvec.cpp
---- tnt-1.2.2-0-vanilla/calcCAP/src/cmplxvec.cpp 2004-07-22 21:29:12.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/cmplxvec.cpp 2011-02-24 19:29:44.000000000 +0100
-@@ -287,7 +287,7 @@
-
- int n = d;
- CmplxVector tmp(n);
-- for(int i = 0; i < n; i++) tmp[i] = ::conjg(v[i]);
-+ for(int i = 0; i < n; i++) tmp[i] = v[i].conjg(); // tmp[i] = ::conjg(v[i]);
- return (tmp);
- }
-
-@@ -295,7 +295,7 @@
-
- Vector tmp(d);
- int n = d;
-- while(n--) tmp[n] = ::real(v[n]);
-+ while(n--) tmp[n] = v[n].real(); // tmp[n] = ::real(v[n]);
- return (tmp);
- }
-
-@@ -303,7 +303,7 @@
-
- Vector tmp(d);
- int n = d;
-- while(n--) tmp[n] = ::imag(v[n]);
-+ while(n--) tmp[n] = v[n].imag(); // tmp[n] = ::imag(v[n]);
- return (tmp);
- }
-
-@@ -311,7 +311,7 @@
-
- Vector result(d);
- for(int i = 0; i < d; i++)
-- result[i]=::cabs(v[i]);
-+ result[i]=v[i].cabs(); // result[i]=::cabs(v[i]);
- return (result);
- }
-
-diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/complex.cpp tnt-1.2.2/calcCAP/src/complex.cpp
---- tnt-1.2.2-0-vanilla/calcCAP/src/complex.cpp 2002-10-10 15:46:00.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/complex.cpp 2011-02-24 19:29:44.000000000 +0100
-@@ -203,6 +203,54 @@
- return(result);
- }
-
-+double Complex::real(void) {
-+
-+ return(re);
-+}
-+
-+double Complex::imag(void) {
-+
-+ return(im);
-+}
-+
-+double Complex::arg(void) {
-+
-+ return((im == 0.0)&&(re == 0.0) ? 0 : atan2(im, re));
-+}
-+
-+double Complex::cabs(void) {
-+
-+ double x, y, ans, temp;
-+ x = fabs(re);
-+ y = fabs(im);
-+ if (x == 0.0)
-+ ans = y;
-+ else if (y == 0.0)
-+ ans = x;
-+ else if (x > y) {
-+ temp = y/x;
-+ ans = x*sqrt(1.0+temp*temp);
-+ } else {
-+ temp = x/y;
-+ ans = y*sqrt(1.0+temp*temp);
-+ }
-+ return ans;
-+}
-+
-+double Complex::cabsm(void) {
-+
-+ return(sqrt(re*re + im*im));
-+}
-+
-+Complex Complex::conjg(void) {
-+
-+ Complex com;
-+ com.re = re;
-+ com.im = -im;
-+ return(com);
-+}
-+
-+
- /********************* friends *****************************/
-
- Complex operator*(const double& r, const Complex& c) {
-diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/complex.h tnt-1.2.2/calcCAP/src/complex.h
---- tnt-1.2.2-0-vanilla/calcCAP/src/complex.h 2002-10-10 15:46:00.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/complex.h 2011-02-24 19:29:44.000000000 +0100
-@@ -1,10 +1,13 @@
- #ifndef _complex__h_
- #define _complex__h_
-
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
-
- class Complex
- {
-+ public:
-+
- friend Complex operator*(const double&, const Complex&);
- friend Complex operator+(const double&, const Complex&);
- friend Complex operator-(const double&, const Complex&);
-@@ -16,6 +19,14 @@
- friend double cabs(const Complex&);
- friend double cabsm(const Complex&);
- friend Complex conjg(const Complex&);
-+
-+ double real(void);
-+ double imag(void);
-+ double arg(void);
-+ double cabs(void);
-+ double cabsm(void);
-+ Complex conjg(void);
-+
- friend Complex cmplx(const double,const double);
- friend Complex polar(const double&, const double&);
- friend Complex cos(const Complex&);
-@@ -37,7 +48,6 @@
- friend ostream& operator<<(ostream&, Complex&);
- friend istream& operator>>(istream&, Complex&);
-
-- public:
- Complex(){} // constructors
- Complex(double r, double i = 0.0);
- Complex(const Complex&);
-diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/data.cpp tnt-1.2.2/calcCAP/src/data.cpp
---- tnt-1.2.2-0-vanilla/calcCAP/src/data.cpp 2002-10-10 15:46:01.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/data.cpp 2011-02-24 19:29:44.000000000 +0100
-@@ -260,7 +260,7 @@
- }
- }
-
-- Ic = cmplx( 0.0, 1.0 );
-+ Ic = Complex( 0.0, 1.0 );
-
- Nc4 = 11*Nh+1;
- step_w = 1.0/power( 2.0, J );
-diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/calcRL.cpp tnt-1.2.2/calcRL/src/calcRL.cpp
---- tnt-1.2.2-0-vanilla/calcRL/src/calcRL.cpp 2004-07-22 21:29:37.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/calcRL.cpp 2011-02-24 19:29:53.000000000 +0100
-@@ -43,7 +43,8 @@
- #endif
- #include <time.h>
- #include <stdio.h>
--
-+#include <string.h>
-+using namespace std;
- /********************** Global variables *******************/
-
- int Nc, Die, Rec, Cir, Tri, Ell, Pol, Gnd, Tra;
-@@ -564,7 +565,7 @@
- tmp4 = Circum[i] / double(Nw);
- tmpsum1 = 0.0;
- tmpsum2 = 0.0;
-- sum2[i] = cmplx( 0.0, 0.0 );
-+ sum2[i] = Complex( 0.0, 0.0 );
-
- for (j = 0; j < Nw; j ++) {
-
-diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/cmplxmat.cpp tnt-1.2.2/calcRL/src/cmplxmat.cpp
---- tnt-1.2.2-0-vanilla/calcRL/src/cmplxmat.cpp 2004-07-22 21:29:37.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/cmplxmat.cpp 2011-02-24 19:29:53.000000000 +0100
-@@ -386,7 +386,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::real(elem(i,j));
-+ result(i,j)=elem(i,j).real(); // result(i,j)=::real(elem(i,j));
- return (result);
- }
-
-@@ -395,7 +395,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::imag(elem(i,j));
-+ result(i,j)=elem(i,j).imag(); // result(i,j)=::imag(elem(i,j));
- return (result);
- }
-
-@@ -404,7 +404,7 @@
- Matrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::cabs(elem(i,j));
-+ result(i,j)=elem(i,j).cabs(); // result(i,j)=::cabj(elem(i,j));
- return (result);
- }
-
-@@ -413,7 +413,7 @@
- CmplxMatrix result(d_i,d_j);
- for(int i = 0; i < d_i; i++)
- for(int j = 0; j < d_j; j++)
-- result(i,j)=::conjg(elem(i,j));
-+ result(i,j)=elem(i,j).conjg(); // result(i,j)=::conjg(elem(i,j));
- return (result);
- }
-
-diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/cmplxvec.cpp tnt-1.2.2/calcRL/src/cmplxvec.cpp
---- tnt-1.2.2-0-vanilla/calcRL/src/cmplxvec.cpp 2004-07-22 21:29:37.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/cmplxvec.cpp 2011-02-24 19:29:53.000000000 +0100
-@@ -289,7 +289,7 @@
-
- int n = d;
- CmplxVector tmp(n);
-- for(int i = 0; i < n; i++) tmp[i] = ::conjg(v[i]);
-+ for(int i = 0; i < n; i++) tmp[i] = v[i].conjg(); // tmp[i] = ::conjg(v[i]);
- return (tmp);
- }
-
-@@ -297,7 +297,7 @@
-
- Vector tmp(d);
- int n = d;
-- while(n--) tmp[n] = ::real(v[n]);
-+ while(n--) tmp[n] = v[n].real(); // tmp[n] = ::real(v[n]);
- return (tmp);
- }
-
-@@ -305,7 +305,7 @@
-
- Vector tmp(d);
- int n = d;
-- while(n--) tmp[n] = ::imag(v[n]);
-+ while(n--) tmp[n] = v[n].imag(); // tmp[n] = ::imag(v[n])
- return (tmp);
- }
-
-@@ -313,7 +313,7 @@
-
- Vector result(d);
- for(int i = 0; i < d; i++)
-- result[i]=::cabs(v[i]);
-+ result[i]=v[i].cabs(); // result[i]=::cabs(v[i]);
- return (result);
- }
-
-diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/complex.cpp tnt-1.2.2/calcRL/src/complex.cpp
---- tnt-1.2.2-0-vanilla/calcRL/src/complex.cpp 2002-10-09 22:23:38.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/complex.cpp 2011-02-24 19:29:53.000000000 +0100
-@@ -17,6 +17,53 @@
-
- /*********************** members *********************************/
-
-+double Complex::real(void) {
-+
-+ return(re);
-+}
-+
-+double Complex::imag(void) {
-+
-+ return(im);
-+}
-+
-+double Complex::arg(void) {
-+
-+ return((im == 0.0)&&(re == 0.0) ? 0 : atan2(im, re));
-+}
-+
-+double Complex::cabs(void) {
-+
-+ double x, y, ans, temp;
-+ x = fabs(re);
-+ y = fabs(im);
-+ if (x == 0.0)
-+ ans = y;
-+ else if (y == 0.0)
-+ ans = x;
-+ else if (x > y) {
-+ temp = y/x;
-+ ans = x*sqrt(1.0+temp*temp);
-+ } else {
-+ temp = x/y;
-+ ans = y*sqrt(1.0+temp*temp);
-+ }
-+ return ans;
-+}
-+
-+double Complex::cabsm(void) {
-+
-+ return(sqrt(re*re + im*im));
-+}
-+
-+Complex Complex::conjg(void) {
-+
-+ Complex com;
-+ com.re = re;
-+ com.im = -im;
-+ return(com);
-+}
-+
- /********************* friends *****************************/
-
- Complex operator*(const double& r, const Complex& c) {
-diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/complex.h tnt-1.2.2/calcRL/src/complex.h
---- tnt-1.2.2-0-vanilla/calcRL/src/complex.h 2002-10-09 22:23:39.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/complex.h 2011-02-24 19:29:53.000000000 +0100
-@@ -3,10 +3,12 @@
-
- #include <stdlib.h>
- #include <math.h>
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
-
- class Complex
- {
-+ public:
- friend Complex operator*(const double&, const Complex&);
- friend Complex operator+(const double&, const Complex&);
- friend Complex operator-(const double&, const Complex&);
-@@ -14,6 +16,14 @@
-
- friend double real(const Complex&);
- friend double imag(const Complex&);
-+ double real(void);
-+ double imag(void);
-+ double arg(void);
-+ double cabs(void);
-+ double cabsm(void);
-+ Complex conjg(void);
-+
-+
- friend double arg(const Complex&);
- friend double cabs(const Complex&);
- friend double cabsm(const Complex&);
-@@ -39,7 +49,7 @@
- friend ostream& operator<<(ostream&, Complex&);
- friend istream& operator>>(istream&, Complex&);
-
-- public:
-+
- Complex(){} // constructors
- Complex(double r, double i = 0.0);
- Complex(const Complex&);
-diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/data.cpp tnt-1.2.2/calcRL/src/data.cpp
---- tnt-1.2.2-0-vanilla/calcRL/src/data.cpp 2004-07-22 21:29:37.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/data.cpp 2011-02-24 19:29:53.000000000 +0100
-@@ -251,7 +251,7 @@
- }
- }
-
-- Ic = cmplx( 0.0, 1.0 );
-+ Ic = Complex( 0.0, 1.0 );
-
- Nc4 = 11*Nh+1;
- step_w = 1.0/power( 2.0, J );
-diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/hankel.cpp tnt-1.2.2/calcRL/src/hankel.cpp
---- tnt-1.2.2-0-vanilla/calcRL/src/hankel.cpp 2002-10-09 22:23:40.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/hankel.cpp 2011-02-24 19:29:53.000000000 +0100
-@@ -19,7 +19,7 @@
-
- hank01( vj0, vy0, x, 1 );
-
-- return( cmplx( vj0, -vy0 ) );
-+ return( Complex( vj0, -vy0 ) );
- }
-
- /***** Function Hank21 - to calculate H^(2)_1(x), x - double ****/
-@@ -30,7 +30,7 @@
-
- hank11( vj1, vy1, x, 1 );
-
-- return( cmplx( vj1, -vy1 ) );
-+ return( Complex( vj1, -vy1 ) );
- }
-
- /***** Function Hank10 - to calculate H^(1)_0(x), x - double ****/
-@@ -41,7 +41,7 @@
-
- hank01( vj0, vy0, x, 1 );
-
-- return( cmplx( vj0, vy0 ) );
-+ return( Complex( vj0, vy0 ) );
- }
-
- /***** Function Hank11 - to calculate H^(1)_1(x), x - double ****/
-@@ -52,7 +52,7 @@
-
- hank11( vj1, vy1, x, 1 );
-
-- return( cmplx( vj1, vy1 ) );
-+ return( Complex( vj1, vy1 ) );
- }
-
- int hank01( double& vj0, double& vy0, double xd, int n ) {
-diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/kelvin.cpp tnt-1.2.2/calcRL/src/kelvin.cpp
---- tnt-1.2.2-0-vanilla/calcRL/src/kelvin.cpp 2002-10-09 22:23:42.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/kelvin.cpp 2011-02-24 19:29:53.000000000 +0100
-@@ -332,20 +332,20 @@
- return(keip);
- }
-
--static Complex seta_p1 = cmplx(0.0,-0.3926991);
--static Complex seta_p2 = cmplx(0.0110486,0.0);
--static Complex seta_p3 = cmplx(0.0,-0.0009765);
--static Complex seta_p4 = cmplx(-0.0000906,-0.0000901);
--static Complex seta_p5 = cmplx(-0.0000252,0.0);
--static Complex seta_p6 = cmplx(-0.0000034,0.0000051);
--static Complex seta_p7 = cmplx(0.0000006,.0000019);
--static Complex dphi_p1 = cmplx(0.7071068,0.7071068);
--static Complex dphi_p2 = cmplx(-0.0625001,-0.0000001);
--static Complex dphi_p3 = cmplx(-0.0013813,0.0013811);
--static Complex dphi_p4 = cmplx(0.0000005,0.0002452);
--static Complex dphi_p5 = cmplx(0.0000346,0.0000338);
--static Complex dphi_p6 = cmplx(0.0000117,-0.0000024);
--static Complex dphi_p7 = cmplx(0.0000016,-0.0000032);
-+static Complex seta_p1 = Complex(0.0,-0.3926991);
-+static Complex seta_p2 = Complex(0.0110486,0.0);
-+static Complex seta_p3 = Complex(0.0,-0.0009765);
-+static Complex seta_p4 = Complex(-0.0000906,-0.0000901);
-+static Complex seta_p5 = Complex(-0.0000252,0.0);
-+static Complex seta_p6 = Complex(-0.0000034,0.0000051);
-+static Complex seta_p7 = Complex(0.0000006,.0000019);
-+static Complex dphi_p1 = Complex(0.7071068,0.7071068);
-+static Complex dphi_p2 = Complex(-0.0625001,-0.0000001);
-+static Complex dphi_p3 = Complex(-0.0013813,0.0013811);
-+static Complex dphi_p4 = Complex(0.0000005,0.0002452);
-+static Complex dphi_p5 = Complex(0.0000346,0.0000338);
-+static Complex dphi_p6 = Complex(0.0000117,-0.0000024);
-+static Complex dphi_p7 = Complex(0.0000016,-0.0000032);
-
-
-
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-docs.patch b/sci-electronics/tnt/files/tnt-1.2.2-docs.patch
deleted file mode 100644
index 77fe504..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-docs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ruN tnt-1.2.2-5-tkcon/Makefile.am tnt-1.2.2/Makefile.am
---- tnt-1.2.2-5-tkcon/Makefile.am 2004-07-22 16:23:32.000000000 +0200
-+++ tnt-1.2.2/Makefile.am 2011-02-24 23:43:41.000000000 +0100
-@@ -51,14 +51,16 @@
- # a prefix. If not, then I suppose README will go into
- # /usr.
- #---------------------------------------------------------------
--appdocsdir = $(prefix)
--appdocs_DATA = \
-- AUTHORS$(TXTEXT) \
-- COPYING$(TXTEXT) \
-- ChangeLog$(TXTEXT) \
-- NEWS$(TXTEXT) \
-- README$(TXTEXT) \
-- THANKS$(TXTEXT)
-+#
-+# Portage takes care for this
-+#appdocsdir = $(prefix)
-+#appdocs_DATA = \
-+# AUTHORS$(TXTEXT) \
-+# COPYING$(TXTEXT) \
-+# ChangeLog$(TXTEXT) \
-+# NEWS$(TXTEXT) \
-+# README$(TXTEXT) \
-+# THANKS$(TXTEXT)
-
- #---------------------------------------------------------------
- # Convert application documents to text files on Windows.
-diff -ruN tnt-1.2.2-5-tkcon/doc/Makefile.am tnt-1.2.2/doc/Makefile.am
---- tnt-1.2.2-5-tkcon/doc/Makefile.am 2004-07-21 17:45:26.000000000 +0200
-+++ tnt-1.2.2/doc/Makefile.am 2011-02-24 23:43:45.000000000 +0100
-@@ -43,7 +43,7 @@
- #
- #---------------------------------------------------------------
-
--docdir = $(prefix)/doc
-+#docdir = $(prefix)/doc
- doc_DATA = \
- user-guide.pdf
-
-@@ -73,15 +73,17 @@
- pdflatex $*
- latex2html -split 4 -show_section_numbers -local_icons $<
-
-+# Removed, because portage takes care of it.
-+#
- # Custom installation rule
--install-data-local:
-- for f in $(doc_DATA); do \
-- $(mkinstalldirs) $(docdir); \
-- $(INSTALL_DATA) $$f $(docdir)/$$f; \
-- d=`basename $$f .pdf`; \
-- $(mkinstalldirs) $(docdir)/$$d; \
-- $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
-- done
-+#install-data-local:
-+# for f in $(doc_DATA); do \
-+# $(mkinstalldirs) $(docdir); \
-+# $(INSTALL_DATA) $$f $(docdir)/$$f; \
-+# d=`basename $$f .pdf`; \
-+# $(mkinstalldirs) $(docdir)/$$d; \
-+# $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
-+# done
-
- #---------------------------------------------------------------
- # clean
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-f77.patch b/sci-electronics/tnt/files/tnt-1.2.2-f77.patch
deleted file mode 100644
index b1f3fa1..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-f77.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN tnt-1.2.2-3-namespace/bem/configure.ac tnt-1.2.2-4-g77/bem/configure.ac
---- tnt-1.2.2-3-namespace/bem/configure.ac 2004-04-22 22:07:12.000000000 +0200
-+++ tnt-1.2.2-4-g77/bem/configure.ac 2011-02-24 23:55:35.000000000 +0100
-@@ -74,9 +74,7 @@
- ;;
- *linux*)
- # For Linux, all flavors...
-- # Use the GNU compilers for C++ and FORTRAN.
-- CXX="g++"
-- F77="g77"
-+ # Use the GNU compilers for C++ and FORTRAN and rely on portage
- AM_CXXFLAGS="-DFORTRAN_UNDERBARS"
- ;;
- esac
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui.patch
deleted file mode 100644
index e2a9b4c..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-gui.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN tnt-1.2.2-6-docs/gui/gui_help.tcl tnt-1.2.2/gui/gui_help.tcl
---- tnt-1.2.2-6-docs/gui/gui_help.tcl 2004-07-26 15:37:52.000000000 +0200
-+++ tnt-1.2.2/gui/gui_help.tcl 2011-02-24 23:45:27.000000000 +0100
-@@ -26,7 +26,7 @@
- switch -exact $helpTopic {
-
- userguide {
-- display_online_help user-guide/index.html
-+ display_online_help /usr/share/doc/package_name/html/index.html
- }
-
- }
-diff -ruN tnt-1.2.2-6-docs/gui/splash.tcl tnt-1.2.2/gui/splash.tcl
---- tnt-1.2.2-6-docs/gui/splash.tcl 2004-07-22 15:16:21.000000000 +0200
-+++ tnt-1.2.2/gui/splash.tcl 2011-02-24 23:45:23.000000000 +0100
-@@ -81,7 +81,7 @@
- } else {
- set filename COPYING
- }
-- set licenseFile [file join $::scriptDir .. $filename]
-+ set licenseFile [file join /usr share doc package_name html $filename]
- if { [file exists $licenseFile] } {
- ::gui::guiPopupFile $licenseFile
- } else {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-namespaces.patch b/sci-electronics/tnt/files/tnt-1.2.2-namespaces.patch
deleted file mode 100644
index 74bf0ee..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-namespaces.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff -ruN tnt-1.2.2-2-bem/bem/src/magicad.h tnt-1.2.2/bem/src/magicad.h
---- tnt-1.2.2-2-bem/bem/src/magicad.h 2002-10-23 00:29:27.000000000 +0200
-+++ tnt-1.2.2/bem/src/magicad.h 2011-02-24 19:36:32.000000000 +0100
-@@ -100,7 +100,8 @@
- #include <stdlib.h>
- #include <string.h>
- #ifdef __cplusplus
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #endif
- #include <limits.h>
- #if !defined(PATH_MAX) || defined(__hpux)
-diff -ruN tnt-1.2.2-2-bem/calcCAP/src/bicgstab.cpp tnt-1.2.2/calcCAP/src/bicgstab.cpp
---- tnt-1.2.2-2-bem/calcCAP/src/bicgstab.cpp 2004-07-22 21:29:12.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/bicgstab.cpp 2011-02-24 19:36:32.000000000 +0100
-@@ -9,7 +9,8 @@
-
-
- //#include "stdafx.h"
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include <math.h>
-
- #include "vector.h"
-diff -ruN tnt-1.2.2-2-bem/calcCAP/src/diffrm.cpp tnt-1.2.2/calcCAP/src/diffrm.cpp
---- tnt-1.2.2-2-bem/calcCAP/src/diffrm.cpp 2002-10-10 15:46:02.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/diffrm.cpp 2011-02-24 19:36:41.000000000 +0100
-@@ -8,8 +8,10 @@
-
- //#include "stdafx.h"
- #include <math.h>
--#include <iostream.h>
--#include <iomanip.h>
-+#include <iostream>
-+using namespace std;
-+#include <iomanip>
-+using namespace std;
- #include <stdlib.h>
-
- #include "complex.h"
-diff -ruN tnt-1.2.2-2-bem/calcCAP/src/ivectorl.h tnt-1.2.2/calcCAP/src/ivectorl.h
---- tnt-1.2.2-2-bem/calcCAP/src/ivectorl.h 2002-10-10 15:46:04.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/ivectorl.h 2011-02-24 19:36:32.000000000 +0100
-@@ -1,6 +1,7 @@
- #ifndef _IVectorl__h_
- #define _IVectorl__h_
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
-
- class IVectorl
- {
-diff -ruN tnt-1.2.2-2-bem/calcCAP/src/prony.cpp tnt-1.2.2/calcCAP/src/prony.cpp
---- tnt-1.2.2-2-bem/calcCAP/src/prony.cpp 2002-10-10 15:46:06.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/prony.cpp 2011-02-24 19:36:41.000000000 +0100
-@@ -1,6 +1,7 @@
- #include "stdafx.h"
- #include <math.h>
--#include <iomanip.h>
-+#include <iomanip>
-+using namespace std;
- #include <stdlib.h>
- #include "complex.h"
- #include "vector.h"
-diff -ruN tnt-1.2.2-2-bem/calcCAP/src/sparse.cpp tnt-1.2.2/calcCAP/src/sparse.cpp
---- tnt-1.2.2-2-bem/calcCAP/src/sparse.cpp 2004-07-22 21:29:12.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/sparse.cpp 2011-02-24 19:36:41.000000000 +0100
-@@ -2,9 +2,11 @@
-
- //#include "stdafx.h"
- #include <math.h>
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include <stdlib.h>
--#include <iomanip.h>
-+#include <iomanip>
-+using namespace std;
-
- #include "complex.h"
- #include "vector.h"
-diff -ruN tnt-1.2.2-2-bem/calcCAP/src/stdafx.h tnt-1.2.2/calcCAP/src/stdafx.h
---- tnt-1.2.2-2-bem/calcCAP/src/stdafx.h 2002-10-10 15:46:08.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/stdafx.h 2011-02-24 19:36:50.000000000 +0100
-@@ -2,11 +2,15 @@
- #define _stdafx__h_
-
- #include <math.h>
--#include <iostream.h>
--#include <iomanip.h>
--#include <fstream.h>
-+#include <iostream>
-+using namespace std;
-+#include <iomanip>
-+using namespace std;
-+#include <fstream>
-+using namespace std;
- #include <stdlib.h>
--#include <iomanip.h>
-+#include <iomanip>
-+using namespace std;
-
- #include "complex.h"
- #include "vector.h"
-diff -ruN tnt-1.2.2-2-bem/calcCAP/src/systsolv.cpp tnt-1.2.2/calcCAP/src/systsolv.cpp
---- tnt-1.2.2-2-bem/calcCAP/src/systsolv.cpp 2002-10-10 15:46:08.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/systsolv.cpp 2011-02-24 19:36:32.000000000 +0100
-@@ -3,7 +3,8 @@
-
- //#include "stdafx.h"
-
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include <math.h>
- #include <stdlib.h>
- #include "complex.h"
-diff -ruN tnt-1.2.2-2-bem/calcCAP/src/vector.h tnt-1.2.2/calcCAP/src/vector.h
---- tnt-1.2.2-2-bem/calcCAP/src/vector.h 2002-10-10 15:46:09.000000000 +0200
-+++ tnt-1.2.2/calcCAP/src/vector.h 2011-02-24 19:36:41.000000000 +0100
-@@ -1,8 +1,10 @@
- #ifndef _Vector__h_
- #define _Vector__h_
-
--#include <iostream.h>
--#include <iomanip.h>
-+#include <iostream>
-+using namespace std;
-+#include <iomanip>
-+using namespace std;
-
- class Vector
- {
-diff -ruN tnt-1.2.2-2-bem/calcRL/src/bicgstab.cpp tnt-1.2.2/calcRL/src/bicgstab.cpp
---- tnt-1.2.2-2-bem/calcRL/src/bicgstab.cpp 2004-07-22 21:29:37.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/bicgstab.cpp 2011-02-24 19:36:32.000000000 +0100
-@@ -9,7 +9,8 @@
-
-
- //#include "stdafx.h"
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include <math.h>
-
- #include "vector.h"
-diff -ruN tnt-1.2.2-2-bem/calcRL/src/ivectorl.h tnt-1.2.2/calcRL/src/ivectorl.h
---- tnt-1.2.2-2-bem/calcRL/src/ivectorl.h 2002-10-09 22:23:41.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/ivectorl.h 2011-02-24 19:36:32.000000000 +0100
-@@ -2,7 +2,8 @@
- #define _IVectorl__h_
- #include <stdlib.h>
- #include <math.h>
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
-
- class IVectorl
- {
-diff -ruN tnt-1.2.2-2-bem/calcRL/src/sparse.cpp tnt-1.2.2/calcRL/src/sparse.cpp
---- tnt-1.2.2-2-bem/calcRL/src/sparse.cpp 2002-10-09 22:23:45.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/sparse.cpp 2011-02-24 19:36:41.000000000 +0100
-@@ -1,9 +1,11 @@
- /******* functions, needed for sparse matrices *******/
-
- #include <math.h>
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include <stdlib.h>
--#include <iomanip.h>
-+#include <iomanip>
-+using namespace std;
-
- #include "complex.h"
- #include "vector.h"
-diff -ruN tnt-1.2.2-2-bem/calcRL/src/stdafx.h tnt-1.2.2/calcRL/src/stdafx.h
---- tnt-1.2.2-2-bem/calcRL/src/stdafx.h 2002-10-09 22:23:56.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/stdafx.h 2011-02-24 19:36:50.000000000 +0100
-@@ -2,11 +2,15 @@
- #define _stdafx__h_
-
- #include <math.h>
--#include <iostream.h>
--#include <iomanip.h>
--#include <fstream.h>
-+#include <iostream>
-+using namespace std;
-+#include <iomanip>
-+using namespace std;
-+#include <fstream>
-+using namespace std;
- #include <stdlib.h>
--#include <iomanip.h>
-+#include <iomanip>
-+using namespace std;
-
- #include "complex.h"
- #include "vector.h"
-diff -ruN tnt-1.2.2-2-bem/calcRL/src/systsolv.cpp tnt-1.2.2/calcRL/src/systsolv.cpp
---- tnt-1.2.2-2-bem/calcRL/src/systsolv.cpp 2002-10-09 22:23:57.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/systsolv.cpp 2011-02-24 19:36:32.000000000 +0100
-@@ -2,7 +2,8 @@
- /*****Source - "NUMERICAL RECIPES IN C", www.nr.com*****/
-
- //#include "stdafx.h"
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #include <math.h>
- #include <stdlib.h>
- #include "complex.h"
-diff -ruN tnt-1.2.2-2-bem/calcRL/src/vector.h tnt-1.2.2/calcRL/src/vector.h
---- tnt-1.2.2-2-bem/calcRL/src/vector.h 2002-10-09 22:23:59.000000000 +0200
-+++ tnt-1.2.2/calcRL/src/vector.h 2011-02-24 19:36:41.000000000 +0100
-@@ -3,8 +3,10 @@
-
- #include <stdlib.h>
- #include <math.h>
--#include <iostream.h>
--#include <iomanip.h>
-+#include <iostream>
-+using namespace std;
-+#include <iomanip>
-+using namespace std;
-
- class Vector
- {
diff --git a/sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch b/sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch
deleted file mode 100644
index 4c603c7..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-tkcon.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- sppdgTcllib/console/tkcon.tcl.org 2011-02-19 01:46:57.000000000 -0800
-+++ sppdgTcllib/console/tkcon.tcl 2011-02-19 01:47:36.000000000 -0800
-@@ -43,9 +43,10 @@
-
- if {$tcl_version < 8.0} {
- return -code error "tkcon requires at least Tcl/Tk8"
--} else {
-- package require -exact Tk $tcl_version
--}
-+}
-+#else {
-+# package require -exact Tk $tcl_version
-+#}
-
- catch {package require bogus-package-name}
- foreach pkg [info loaded {}] {
diff --git a/sci-electronics/tnt/metadata.xml b/sci-electronics/tnt/metadata.xml
deleted file mode 100644
index 90e3ad4..0000000
--- a/sci-electronics/tnt/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>no-herd</herd>
- <maintainer>
- <email>dilfridge@gentoo.org</email>
- <name>Andreas K. Huettel</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sci-electronics/tnt/tnt-1.2.2.ebuild b/sci-electronics/tnt/tnt-1.2.2.ebuild
deleted file mode 100644
index 8ce4ae0..0000000
--- a/sci-electronics/tnt/tnt-1.2.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit base autotools eutils toolchain-funcs
-
-DESCRIPTION="MoM 2.5 D stripline simulator"
-SRC_URI="mirror://sourceforge/mmtl/${P}.tar.gz"
-HOMEPAGE="http://mmtl.sourceforge.net/"
-LICENSE="BSD GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="
- dev-lang/tcl
- dev-tcltk/tcllib
- dev-tcltk/itcl
- dev-tcltk/bwidget
- sys-devel/gcc[fortran]
-"
-DEPEND="${RDEPEND}
- dev-texlive/texlive-latex
- dev-tex/latex2html
- media-gfx/imagemagick
-"
-
-PATCHES=( "${FILESDIR}/${P}"-{calc,bem-nmmtl,namespaces,f77,tkcon,docs,gui}.patch )
-
-src_prepare() {
- base_src_prepare
-
- #adjust new document location in gui
- sed -i "s/package_name/${PF}/" gui/splash.tcl
- sed -i "s/package_name/${PF}/" gui/gui_help.tcl
-
- eautoreconf
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die "make install failed"
-
- dodoc AUTHORS ChangeLog NEWS README THANKS || die
-
- # tcl cannot handle the archives created by dodoc
- dohtml COPYING || die
- if use doc; then
- dodoc doc/*.pdf doc/*.png || die
- dohtml doc/user-guide/* || die
- fi
-
- # Install icon
- convert gui/logo.gif gui/tnt.png
- docinto "examples"
- dodoc examples/* || die "failed to install exampels"
- newicon gui/tnt.png tnt.png
- make_desktop_entry ${PN} "tnt" ${PN}
-}
-
-pkg_postinst() {
- elog "Warning: the sources are not under development anymore."
- elog "We made it compile, but users should check if the results make sense."
- elog "Examples are in the /usr/share/doc/tnt-1.2.2 folder."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-10-20 19:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-25 7:29 [gentoo-commits] dev/dilfridge:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/ Andreas K. Huettel
-- strict thread matches above, loose matches on Subject: below --
2014-10-20 19:09 Andreas Hüttel
2011-02-24 21:44 Andreas K. Huettel
2011-02-24 21:44 Andreas K. Huettel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox