[gentoo-commits] dev/dilfridge:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/

["Andreas K. Huettel" <dilfridge@gentoo.org>]

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 --
 .../files/tnt-1.2.2-calc-cap-complex-header.patch  |   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 --
 .../files/tnt-1.2.2-calc-rl-complex-header.patch   |   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