From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Psizo-0005zq-UF for garchives@archives.gentoo.org; Thu, 24 Feb 2011 21:45:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DBF41C006; Thu, 24 Feb 2011 21:45:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EB9E91C006 for ; Thu, 24 Feb 2011 21:45:00 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 539A51B4105 for ; Thu, 24 Feb 2011 21:45:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 09E0A80073 for ; Thu, 24 Feb 2011 21:44:59 +0000 (UTC) From: "Andreas K. Huettel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Huettel" Message-ID: <92553746796db1af5ab0328d4189ef2cbbe9550a.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/ X-VCS-Repository: dev/dilfridge X-VCS-Files: sci-electronics/tnt/ChangeLog sci-electronics/tnt/Manifest sci-electronics/tnt/files/tnt-1.2.2-calc-cap-calcCAP.patch sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxmat.patch sci-electronics/tnt/files/tnt-1.2.2-calc-cap-cmplxvec.patch sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-header.patch sci-electronics/tnt/files/tnt-1.2.2-calc-cap-complex-source.patch sci-electronics/tnt/files/tnt-1.2.2-calc-cap-data.patch sci-electronics/tnt/files/tnt-1.2.2-calc-rl-calcRL.patch sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxmat.patch sci-electronics/tnt/files/tnt-1.2.2-calc-rl-cmplxvec.patch sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex-header.patch sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex.patch sci-electronics/tnt/files/tnt-1.2.2-calc-rl-data.patch sci-electronics/tnt/files/tnt-1.2.2-calc-rl-hankel.patch sci-electronics/tnt/files/tnt-1.2.2-calc-rl-kelvin.patch sci-electronics/tnt/files/tnt-1.2.2-calc.patch sci-electronics/tnt/files/tnt-1.2.2-n amespaces.patch sci-electronics/tnt/tnt-1.2.2.ebuild X-VCS-Directories: sci-electronics/tnt/ sci-electronics/tnt/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Huettel X-VCS-Revision: 92553746796db1af5ab0328d4189ef2cbbe9550a Date: Thu, 24 Feb 2011 21:44:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 418721543b9163f0cfa8fc322a719c7f commit: 92553746796db1af5ab0328d4189ef2cbbe9550a Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Thu Feb 24 18:42:50 2011 +0000 Commit: Andreas K. Huettel gentoo org> CommitDate: Thu Feb 24 18:42:50 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3D92553746 [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/ChangeLo= g 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: $ =20 + 24 Feb 2011; Andreas K. Huettel tnt-1.2.2.ebuil= d, + +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.pat= ch: + Started summarizing patches + 24 Feb 2011; Andreas K. Huettel tnt-1.2.2.ebuil= d: Clean up keywords and dependencies =20 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 =20 AUX tnt-1.2.2-Makefile-am.patch 758 RMD160 2524d177a9ea2f28889775ee8dad0= 663f55a586c SHA1 5dc022c9009ad5f425fed591c880e73047d2eeb1 SHA256 aea0daec= 458376e63315736a45bc307a4768443c2a3be85aeb29f6fd1caf1f34 AUX tnt-1.2.2-bem-nmmtl.patch 456 RMD160 8463540d64226a8bf769a66d7fdd9fd= 5daf61cb6 SHA1 8b08be79fee98f1e06c5ded2e4fa24aacd8c6007 SHA256 f6f0bde8df= 73c524545e2290958a9612692f2a76114ed1ba7a6b984b81cb1dd1 -AUX tnt-1.2.2-calc-cap-calcCAP.patch 484 RMD160 5e78e1ae6b44c03335e0847f= 484b21532554e696 SHA1 c6885d59f601b8af04e3bed683fc8739c00a52fe SHA256 573= 12831069af91d0215b1be8cde0f9bbe540b51e65daa85427de024d103a68e -AUX tnt-1.2.2-calc-cap-cmplxmat.patch 1135 RMD160 8233a0f92ef0a71de7e79d= 459ac3747c26bc40ca SHA1 e73882c19ec5a27eb0db862679d66cc53d1c4c1b SHA256 c= a3ff5197aa4dc8402aa981003d137002160a98b5c571dba8ccab7ff0987498a -AUX tnt-1.2.2-calc-cap-cmplxvec.patch 873 RMD160 ae8e8579ab450ce8b0c4a59= eebcc1b403660f777 SHA1 dff16b36ef487614274fe8eefacd605df0fcd9a6 SHA256 a5= c1a7dace24550aa6d60c094bf083e2ae45e8d543c9481314e0a2ac4943abbb -AUX tnt-1.2.2-calc-cap-complex-header.patch 1204 RMD160 531131c3db6974bd= 3d57ccd5c551c489adbd153a SHA1 a83d68df2e36d29f62ee247c4fecf4a168ef8031 SH= A256 aae30f19b33f5daa3ef039d05bdd920a69577e17b32544f7748529e1ff14965e -AUX tnt-1.2.2-calc-cap-complex-source.patch 1010 RMD160 592d9869c27d02d9= 419e9cfc4b73cffc3b39b8b2 SHA1 2b38bb4dc963b37d39ec616f3052bec1a08af405 SH= A256 cfe2934a2e69f721391f36ab4a272205a4184fd33f913b7ad3a04f12e9bf2654 -AUX tnt-1.2.2-calc-cap-data.patch 289 RMD160 f25915f15fb1989485dbdc6e454= fd83a029bd5db SHA1 d81efcdde0b4518a8de34c0acb40f512174f8600 SHA256 6d9c6b= 256e9b6fe01cded01b2ebc342d16ae2e64a8d7ecce6b9d7165a1b9b59a -AUX tnt-1.2.2-calc-rl-calcRL.patch 548 RMD160 371c4e8dc91f90f70fe081e9ea= 53f596fa72200f SHA1 a7782d82e5c71fdb06c4ab51de767fa5947c4a5d SHA256 b291a= d1eb8507f6f4cce43dac89a0ace0b0da34bc5634b8293319747b838cd99 -AUX tnt-1.2.2-calc-rl-cmplxmat.patch 1133 RMD160 85f99f8a45cba635db451f4= ad63be28f2fd10e3a SHA1 578909d004227e0e29eba526160c7ce4aca746df SHA256 7c= 50f0b5d6391f70da6ecedd46f8a5928d6ae3f6922630538a59d4b150fdd579 -AUX tnt-1.2.2-calc-rl-cmplxvec.patch 870 RMD160 ebd44088a8eacfe9dcdb31de= 0482d05e40c425bc SHA1 35f54c649cec1ce5452d17edd90a4fdad79b955a SHA256 0bc= 587393e5bbec3810600e3e5287253eb3908fdddb423ac5092b50737c702e6 -AUX tnt-1.2.2-calc-rl-complex-header.patch 1133 RMD160 887e68ec21b5f19f7= 796373f721b6e3d9bc6ff74 SHA1 0e422436a03db4cdf9f746b99204e7cace1fe342 SHA= 256 b0be0c3fb20dd9b004639050bf3728f7e230fc343d2828ce02b22ad3e2c1dbdf -AUX tnt-1.2.2-calc-rl-complex.patch 1053 RMD160 e8f60fa8d4618924ca270bfb= c2ab3bf2cea02bb2 SHA1 a2c7f008e0897492e6720719f3bae27eabd1bf49 SHA256 6e6= 8cb9a3bf1827f369e50f0bbcd95d3e1e2e00a065c800f3dfbc09f57394695 -AUX tnt-1.2.2-calc-rl-data.patch 287 RMD160 66dbcda32dc943a1f4232777b68f= 382096787632 SHA1 5e987f85d4cae8c9ead6b803d3dfcb699ddb00b8 SHA256 62b18ea= ba9f74f7f22feb9057c6e38f1de03ae635c85b269b5c7e8dcbe59afc2 -AUX tnt-1.2.2-calc-rl-hankel.patch 899 RMD160 ad6f8bbbc84b052deea92ce753= 2d5b093bced253 SHA1 da1cc1a1d12cbf64d4678da71e69f3abf1b857aa SHA256 24271= b20db123c428ed2fe26d71b4ae4f95bbb10c36e47333c35c1efdbfe53f6 -AUX tnt-1.2.2-calc-rl-kelvin.patch 1718 RMD160 3c7395aa8d822513f61bb4f08= 48d7e8712ff093f SHA1 cf219dab2e5061eeb6f7fafc33c134c00a8fc4a8 SHA256 f759= d98f36c6a5a8ec0fd639698510d4d01c8ba77fd1b3446c45e24267636fc6 +AUX tnt-1.2.2-calc.patch 14487 RMD160 9234f56886cb95db4c1d1501250dc2f495= 4214d3 SHA1 e9b3b58a9409986b767a6b9678f2d37d8201fcb3 SHA256 daee74c5c2fb4= 6a9a3742be5d9d8441260119dddcb52e9a06ddfe54147f5b735 AUX tnt-1.2.2-doc-Makefile-am.patch 1032 RMD160 f8175289f67577cadb61649c= 00f4a233ff2b16b6 SHA1 24c83817bd7afdcd59260f1f52d2757e98bdf947 SHA256 388= 62d969bcee3e35623317572d3b22122f16678b88a95e79f4727c7d6f9ffa0 AUX tnt-1.2.2-gui-splash.patch 401 RMD160 7870cc511eea6d591ee8be96504c5d= 5a63e40375 SHA1 e5fe12e4e1af6bb0627440f3722894a5d9aaaa8f SHA256 aede7920d= 86ec402463a4ce3ea43f839b509dda6859a12ae01796eadf77bd2ef AUX tnt-1.2.2-gui_help.patch 315 RMD160 050721d4c09efe2a9706ab8fe21a1ae0= 72fae50b SHA1 9722eeb18a7daa1026f5b1a730801da675c727d1 SHA256 bf0c7b39a2c= 4a8eb8e5195868ee1b9751ebc53ab531435cc7e970ad7a8199d7f +AUX tnt-1.2.2-namespaces.patch 6862 RMD160 2a32bb175e4769f35bd9d91521da7= c9ac13c11d9 SHA1 7a181abc878951f631d576188144e44422743eea SHA256 d777646d= 0e7a43aee5c68e5061a85cd99be45cd539b683afff7752d7581d16c1 AUX tnt-1.2.2-tkcon.patch 447 RMD160 d3b708d681a5a468c9f17b27dba6c273e3b= 472ad SHA1 55e8f6bb54d4e59ce73620d2909d6d8b23197770 SHA256 1302823cd11ad3= 1dcca115abb93a6f1c07299872bf5d48d51815b5436bbee846 DIST tnt-1.2.2.tar.gz 2020099 RMD160 1a2ba68a93ee21590bb25a3eacf85d3773c= 3e77d SHA1 bd089863ca2cd939009253e83f4ab75317191047 SHA256 cbb418d0de4f24= 4d8174e8826e4d8272bce753f50431c9d87af08928f5817445 -EBUILD tnt-1.2.2.ebuild 3506 RMD160 271aeea75e67adb2bf41492284774a1aa9a3= 697f SHA1 4c8a460fa681b82c36bf9686af59b75b28eb4d01 SHA256 a4a93d2dbab3e91= 27a1fcfd908ffa8a4ce72509cbb49d7c5a736da5566efc854 -MISC ChangeLog 233 RMD160 2ebcc0ec49afbc91ed9d8dc10b0fefc0d88543fb SHA1 = 20e3a9dc3196535371de34029643ee83ea1a59a9 SHA256 e3146420a11a1c574e80b7b10= 8d7fdd322024af61973f117871c344c6d7f510e +EBUILD tnt-1.2.2.ebuild 2213 RMD160 05f65a9e5ab0dc5a6b6e899741e98685cc01= d9ec SHA1 2fc154af1a1ead865577d75dae0dc5e6430d8cfb SHA256 ae7aebfad09e946= 06d3d84910af4a88c7b0b123d64b2b963f96881360f656a23 +MISC ChangeLog 1013 RMD160 2dfa7a993395195056cf06e365cd08fecb6af6db SHA1= b0969f00bee62dfe2d6962bb33c73d46b8f7a76f SHA256 459c200d376175e95ef4395d= 7d20433b8371560a454e8e23b9e7de468160a6f3 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SH= A1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b= 78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -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 -=3DkVdT +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 +=3DuLQ+ -----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 - #include -+#include -+using namespace std; -=20 - /********************** Global variables *******************/ -=20 -@@ -287,7 +289,7 @@ - =20 - for ( i1 =3D 0; i1 < Nc; i1 ++ ) { - =09 -- sumc[i1] =3D cmplx( 0.0, 0.0 ); -+ sumc[i1] =3D Complex( 0.0, 0.0 ); -=20 - =09 - for ( j1 =3D 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 =3D 0; i < d_i; i++) - for(int j =3D 0; j < d_j; j++) -- result(i,j)=3D::real(elem(i,j)); -+ result(i,j)=3Delem(i,j).real(); // result(i,j)=3D::real(elem(i,j)= ); - return (result); - } -=20 -@@ -387,7 +387,7 @@ - Matrix result(d_i,d_j); - for(int i =3D 0; i < d_i; i++) - for(int j =3D 0; j < d_j; j++) -- result(i,j)=3D::imag(elem(i,j)); -+ result(i,j)=3Delem(i,j).imag(); // result(i,j)=3D::imag(elem(i,j)= ); - return (result); - } -=20 -@@ -396,7 +396,7 @@ - Matrix result(d_i,d_j); - for(int i =3D 0; i < d_i; i++) - for(int j =3D 0; j < d_j; j++) -- result(i,j)=3D::cabs(elem(i,j)); -+ result(i,j)=3Delem(i,j).cabs(); // result(i,j)=3D::cabs(elem(i,j)= ); - return (result); - } -=20 -@@ -405,7 +405,7 @@ - CmplxMatrix result(d_i,d_j); - for(int i =3D 0; i < d_i; i++) - for(int j =3D 0; j < d_j; j++) -- result(i,j)=3D::conjg(elem(i,j)); -+ result(i,j)=3Delem(i,j).conjg(); // result(i,j)=3D::conjg(elem(i,= j)); - return (result); - } - =20 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 @@ - =20 - int n =3D d; - CmplxVector tmp(n); -- for(int i =3D 0; i < n; i++) tmp[i] =3D ::conjg(v[i]); -+ for(int i =3D 0; i < n; i++) tmp[i] =3D v[i].conjg(); // tmp[i] =3D := :conjg(v[i]); - return (tmp); - } -=20 -@@ -295,7 +295,7 @@ - =20 - Vector tmp(d); - int n =3D d; -- while(n--) tmp[n] =3D ::real(v[n]); -+ while(n--) tmp[n] =3D v[n].real(); // tmp[n] =3D ::real(v[n]); - return (tmp); - } -=20 -@@ -303,7 +303,7 @@ - =20 - Vector tmp(d); - int n =3D d; -- while(n--) tmp[n] =3D ::imag(v[n]); -+ while(n--) tmp[n] =3D v[n].imag(); // tmp[n] =3D ::imag(v[n]); - return (tmp); - } -=20 -@@ -311,7 +311,7 @@ -=20 - Vector result(d); - for(int i =3D 0; i < d; i++) -- result[i]=3D::cabs(v[i]); -+ result[i]=3Dv[i].cabs(); // result[i]=3D::cabs(v[i]); - return (result); - } -=20 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_ -=20 --#include -+#include -+using namespace std; -=20 - 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); =20 - 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&); -=20 -- public: - Complex(){} // constructors - Complex(double r, double i =3D 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); - } -=20 -+double Complex::real(void) { -+=20 -+ return(re); -+} -+ -+double Complex::imag(void) { -+=20 -+ return(im); -+} -+ -+double Complex::arg(void) { -+ -+ return((im =3D=3D 0.0)&&(re =3D=3D 0.0) ? 0 : atan2(im, re)); -+} -+ -+double Complex::cabs(void) { -+=20 -+ double x, y, ans, temp; -+ x =3D fabs(re); -+ y =3D fabs(im); -+ if (x =3D=3D 0.0) -+ ans =3D y; -+ else if (y =3D=3D 0.0) =20 -+ ans =3D x; -+ else if (x > y) { -+ temp =3D y/x; -+ ans =3D x*sqrt(1.0+temp*temp); -+ } else { -+ temp =3D x/y; -+ ans =3D y*sqrt(1.0+temp*temp); -+ } -+ return ans; =20 -+} -+ -+double Complex::cabsm(void) { -+=20 -+ return(sqrt(re*re + im*im)); -+} -+ -+Complex Complex::conjg(void) { -+=20 -+ Complex com; -+ com.re =3D re; -+ com.im =3D -im; -+ return(com); -+} -+ -+ - /********************* friends *****************************/ -=20 - Complex operator*(const double& r, const Complex& c) {=20 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-cap-data.patch b/sc= i-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 @@ - } - } - =20 -- Ic =3D cmplx( 0.0, 1.0 ); -+ Ic =3D Complex( 0.0, 1.0 ); - =20 - Nc4 =3D 11*Nh+1; - step_w =3D 1.0/power( 2.0, J ); diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-calcRL.patch b/s= ci-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 - #include -- -+#include -+using namespace std; - /********************** Global variables *******************/ -=20 - int Nc, Die, Rec, Cir, Tri, Ell, Pol, Gnd, Tra; -@@ -564,7 +565,7 @@ - tmp4 =3D Circum[i] / double(Nw); - tmpsum1 =3D 0.0; - tmpsum2 =3D 0.0; -- sum2[i] =3D cmplx( 0.0, 0.0 ); -+ sum2[i] =3D Complex( 0.0, 0.0 ); - =09 - for (j =3D 0; j < Nw; j ++) { - =20 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 =3D 0; i < d_i; i++) - for(int j =3D 0; j < d_j; j++) -- result(i,j)=3D::real(elem(i,j)); -+ result(i,j)=3Delem(i,j).real(); // result(i,j)=3D::real(elem(i,j)= ); - return (result); - } -=20 -@@ -395,7 +395,7 @@ - Matrix result(d_i,d_j); - for(int i =3D 0; i < d_i; i++) - for(int j =3D 0; j < d_j; j++) -- result(i,j)=3D::imag(elem(i,j)); -+ result(i,j)=3Delem(i,j).imag(); // result(i,j)=3D::imag(elem(i,j)= ); - return (result); - } -=20 -@@ -404,7 +404,7 @@ - Matrix result(d_i,d_j); - for(int i =3D 0; i < d_i; i++) - for(int j =3D 0; j < d_j; j++) -- result(i,j)=3D::cabs(elem(i,j)); -+ result(i,j)=3Delem(i,j).cabs(); // result(i,j)=3D::cabj(elem(i,j)= ); - return (result); - } -=20 -@@ -413,7 +413,7 @@ - CmplxMatrix result(d_i,d_j); - for(int i =3D 0; i < d_i; i++) - for(int j =3D 0; j < d_j; j++) -- result(i,j)=3D::conjg(elem(i,j)); -+ result(i,j)=3Delem(i,j).conjg(); // result(i,j)=3D::conjg(elem(i,= j)); - return (result); - } - =20 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 @@ - =20 - int n =3D d; - CmplxVector tmp(n); -- for(int i =3D 0; i < n; i++) tmp[i] =3D ::conjg(v[i]); -+ for(int i =3D 0; i < n; i++) tmp[i] =3D v[i].conjg(); // tmp[i] =3D := :conjg(v[i]); - return (tmp); - } -=20 -@@ -297,7 +297,7 @@ - =20 - Vector tmp(d); - int n =3D d; -- while(n--) tmp[n] =3D ::real(v[n]); -+ while(n--) tmp[n] =3D v[n].real(); // tmp[n] =3D ::real(v[n]); - return (tmp); - } -=20 -@@ -305,7 +305,7 @@ - =20 - Vector tmp(d); - int n =3D d; -- while(n--) tmp[n] =3D ::imag(v[n]); -+ while(n--) tmp[n] =3D v[n].imag(); // tmp[n] =3D ::imag(v[n]) - return (tmp); - } -=20 -@@ -313,7 +313,7 @@ -=20 - Vector result(d); - for(int i =3D 0; i < d; i++) -- result[i]=3D::cabs(v[i]); -+ result[i]=3Dv[i].cabs(); // result[i]=3D::cabs(v[i]); - return (result); - } -=20 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-complex-header.p= atch 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 @@ -=20 - #include - #include --#include -+#include -+using namespace std; -=20 - 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 @@ -=20 - 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); -+ =20 -+ - 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&); -=20 -- public: -+ - Complex(){} // constructors - Complex(double r, double i =3D 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 @@ -=20 - /*********************** members *********************************/ -=20 -+double Complex::real(void) { -+=20 -+ return(re); -+} -+ -+double Complex::imag(void) { -+=20 -+ return(im); -+} -+ -+double Complex::arg(void) { -+ -+ return((im =3D=3D 0.0)&&(re =3D=3D 0.0) ? 0 : atan2(im, re)); -+} -+ -+double Complex::cabs(void) { -+=20 -+ double x, y, ans, temp; -+ x =3D fabs(re); -+ y =3D fabs(im); -+ if (x =3D=3D 0.0) -+ ans =3D y; -+ else if (y =3D=3D 0.0) =20 -+ ans =3D x; -+ else if (x > y) { -+ temp =3D y/x; -+ ans =3D x*sqrt(1.0+temp*temp); -+ } else { -+ temp =3D x/y; -+ ans =3D y*sqrt(1.0+temp*temp); -+ } -+ return ans; =20 -+} -+ -+double Complex::cabsm(void) { -+=20 -+ return(sqrt(re*re + im*im)); -+} -+ -+Complex Complex::conjg(void) { -+=20 -+ Complex com; -+ com.re =3D re; -+ com.im =3D -im; -+ return(com); -+} -+ - /********************* friends *****************************/ -=20 - Complex operator*(const double& r, const Complex& c) {=20 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 @@ - } - } - =20 -- Ic =3D cmplx( 0.0, 1.0 ); -+ Ic =3D Complex( 0.0, 1.0 ); - =20 - Nc4 =3D 11*Nh+1; - step_w =3D 1.0/power( 2.0, J ); diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc-rl-hankel.patch b/s= ci-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 @@ -=20 - hank01( vj0, vy0, x, 1 ); -=20 -- return( cmplx( vj0, -vy0 ) ); -+ return( Complex( vj0, -vy0 ) ); - } -=20 - /***** Function Hank21 - to calculate H^(2)_1(x), x - double ****/ -@@ -30,7 +30,7 @@ -=20 - hank11( vj1, vy1, x, 1 ); -=20 -- return( cmplx( vj1, -vy1 ) ); -+ return( Complex( vj1, -vy1 ) ); - } -=20 - /***** Function Hank10 - to calculate H^(1)_0(x), x - double ****/ -@@ -41,7 +41,7 @@ -=20 - hank01( vj0, vy0, x, 1 ); -=20 -- return( cmplx( vj0, vy0 ) ); -+ return( Complex( vj0, vy0 ) ); - } -=20 - /***** Function Hank11 - to calculate H^(1)_1(x), x - double ****/ -@@ -52,7 +52,7 @@ -=20 - hank11( vj1, vy1, x, 1 ); -=20 -- return( cmplx( vj1, vy1 ) ); -+ return( Complex( vj1, vy1 ) ); - } -=20 - 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/s= ci-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); - } -=20 --static Complex seta_p1 =3D cmplx(0.0,-0.3926991); --static Complex seta_p2 =3D cmplx(0.0110486,0.0); --static Complex seta_p3 =3D cmplx(0.0,-0.0009765); --static Complex seta_p4 =3D cmplx(-0.0000906,-0.0000901); --static Complex seta_p5 =3D cmplx(-0.0000252,0.0); --static Complex seta_p6 =3D cmplx(-0.0000034,0.0000051); --static Complex seta_p7 =3D cmplx(0.0000006,.0000019); --static Complex dphi_p1 =3D cmplx(0.7071068,0.7071068); --static Complex dphi_p2 =3D cmplx(-0.0625001,-0.0000001); --static Complex dphi_p3 =3D cmplx(-0.0013813,0.0013811); --static Complex dphi_p4 =3D cmplx(0.0000005,0.0002452); --static Complex dphi_p5 =3D cmplx(0.0000346,0.0000338); --static Complex dphi_p6 =3D cmplx(0.0000117,-0.0000024); --static Complex dphi_p7 =3D cmplx(0.0000016,-0.0000032); -+static Complex seta_p1 =3D Complex(0.0,-0.3926991); -+static Complex seta_p2 =3D Complex(0.0110486,0.0); -+static Complex seta_p3 =3D Complex(0.0,-0.0009765); -+static Complex seta_p4 =3D Complex(-0.0000906,-0.0000901); -+static Complex seta_p5 =3D Complex(-0.0000252,0.0); -+static Complex seta_p6 =3D Complex(-0.0000034,0.0000051); -+static Complex seta_p7 =3D Complex(0.0000006,.0000019); -+static Complex dphi_p1 =3D Complex(0.7071068,0.7071068); -+static Complex dphi_p2 =3D Complex(-0.0625001,-0.0000001); -+static Complex dphi_p3 =3D Complex(-0.0013813,0.0013811); -+static Complex dphi_p4 =3D Complex(0.0000005,0.0002452); -+static Complex dphi_p5 =3D Complex(0.0000346,0.0000338); -+static Complex dphi_p6 =3D Complex(0.0000117,-0.0000024); -+static Complex dphi_p7 =3D Complex(0.0000016,-0.0000032); -=20 -=20 -=20 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-calc.patch b/sci-electro= nics/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 fr= iend. +# George Reitsma + +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.0000= 00000 +0200 ++++ tnt-1.2.2/calcCAP/src/calcCAP.cpp 2011-02-24 19:29:44.000000000 +010= 0 +@@ -14,6 +14,8 @@ + #endif + #include + #include ++#include ++using namespace std; +=20 + /********************** Global variables *******************/ +=20 +@@ -287,7 +289,7 @@ + =20 + for ( i1 =3D 0; i1 < Nc; i1 ++ ) { + =09 +- sumc[i1] =3D cmplx( 0.0, 0.0 ); ++ sumc[i1] =3D Complex( 0.0, 0.0 ); +=20 + =09 + for ( j1 =3D 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.000= 000000 +0200 ++++ tnt-1.2.2/calcCAP/src/cmplxmat.cpp 2011-02-24 19:29:44.000000000 +01= 00 +@@ -378,7 +378,7 @@ + Matrix result(d_i,d_j); + for(int i =3D 0; i < d_i; i++) + for(int j =3D 0; j < d_j; j++) +- result(i,j)=3D::real(elem(i,j)); ++ result(i,j)=3Delem(i,j).real(); // result(i,j)=3D::real(elem(i,j)= ); + return (result); + } +=20 +@@ -387,7 +387,7 @@ + Matrix result(d_i,d_j); + for(int i =3D 0; i < d_i; i++) + for(int j =3D 0; j < d_j; j++) +- result(i,j)=3D::imag(elem(i,j)); ++ result(i,j)=3Delem(i,j).imag(); // result(i,j)=3D::imag(elem(i,j)= ); + return (result); + } +=20 +@@ -396,7 +396,7 @@ + Matrix result(d_i,d_j); + for(int i =3D 0; i < d_i; i++) + for(int j =3D 0; j < d_j; j++) +- result(i,j)=3D::cabs(elem(i,j)); ++ result(i,j)=3Delem(i,j).cabs(); // result(i,j)=3D::cabs(elem(i,j)= ); + return (result); + } +=20 +@@ -405,7 +405,7 @@ + CmplxMatrix result(d_i,d_j); + for(int i =3D 0; i < d_i; i++) + for(int j =3D 0; j < d_j; j++) +- result(i,j)=3D::conjg(elem(i,j)); ++ result(i,j)=3Delem(i,j).conjg(); // result(i,j)=3D::conjg(elem(i,= j)); + return (result); + } + =20 +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.000= 000000 +0200 ++++ tnt-1.2.2/calcCAP/src/cmplxvec.cpp 2011-02-24 19:29:44.000000000 +01= 00 +@@ -287,7 +287,7 @@ + =20 + int n =3D d; + CmplxVector tmp(n); +- for(int i =3D 0; i < n; i++) tmp[i] =3D ::conjg(v[i]); ++ for(int i =3D 0; i < n; i++) tmp[i] =3D v[i].conjg(); // tmp[i] =3D := :conjg(v[i]); + return (tmp); + } +=20 +@@ -295,7 +295,7 @@ + =20 + Vector tmp(d); + int n =3D d; +- while(n--) tmp[n] =3D ::real(v[n]); ++ while(n--) tmp[n] =3D v[n].real(); // tmp[n] =3D ::real(v[n]); + return (tmp); + } +=20 +@@ -303,7 +303,7 @@ + =20 + Vector tmp(d); + int n =3D d; +- while(n--) tmp[n] =3D ::imag(v[n]); ++ while(n--) tmp[n] =3D v[n].imag(); // tmp[n] =3D ::imag(v[n]); + return (tmp); + } +=20 +@@ -311,7 +311,7 @@ +=20 + Vector result(d); + for(int i =3D 0; i < d; i++) +- result[i]=3D::cabs(v[i]); ++ result[i]=3Dv[i].cabs(); // result[i]=3D::cabs(v[i]); + return (result); + } +=20 +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.0000= 00000 +0200 ++++ tnt-1.2.2/calcCAP/src/complex.cpp 2011-02-24 19:29:44.000000000 +010= 0 +@@ -203,6 +203,54 @@ + return(result); + } +=20 ++double Complex::real(void) { ++=20 ++ return(re); ++} ++ ++double Complex::imag(void) { ++=20 ++ return(im); ++} ++ ++double Complex::arg(void) { ++ ++ return((im =3D=3D 0.0)&&(re =3D=3D 0.0) ? 0 : atan2(im, re)); ++} ++ ++double Complex::cabs(void) { ++=20 ++ double x, y, ans, temp; ++ x =3D fabs(re); ++ y =3D fabs(im); ++ if (x =3D=3D 0.0) ++ ans =3D y; ++ else if (y =3D=3D 0.0) =20 ++ ans =3D x; ++ else if (x > y) { ++ temp =3D y/x; ++ ans =3D x*sqrt(1.0+temp*temp); ++ } else { ++ temp =3D x/y; ++ ans =3D y*sqrt(1.0+temp*temp); ++ } ++ return ans; =20 ++} ++ ++double Complex::cabsm(void) { ++=20 ++ return(sqrt(re*re + im*im)); ++} ++ ++Complex Complex::conjg(void) { ++=20 ++ Complex com; ++ com.re =3D re; ++ com.im =3D -im; ++ return(com); ++} ++ ++ + /********************* friends *****************************/ +=20 + Complex operator*(const double& r, const Complex& c) {=20 +diff -ruN tnt-1.2.2-0-vanilla/calcCAP/src/complex.h tnt-1.2.2/calcCAP/sr= c/complex.h +--- tnt-1.2.2-0-vanilla/calcCAP/src/complex.h 2002-10-10 15:46:00.000000= 000 +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_ +=20 +-#include ++#include ++using namespace std; +=20 + 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); =20 + 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&); +=20 +- public: + Complex(){} // constructors + Complex(double r, double i =3D 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.0000000= 00 +0200 ++++ tnt-1.2.2/calcCAP/src/data.cpp 2011-02-24 19:29:44.000000000 +0100 +@@ -260,7 +260,7 @@ + } + } + =20 +- Ic =3D cmplx( 0.0, 1.0 ); ++ Ic =3D Complex( 0.0, 1.0 ); + =20 + Nc4 =3D 11*Nh+1; + step_w =3D 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.000000= 000 +0200 ++++ tnt-1.2.2/calcRL/src/calcRL.cpp 2011-02-24 19:29:53.000000000 +0100 +@@ -43,7 +43,8 @@ + #endif + #include + #include +- ++#include ++using namespace std; + /********************** Global variables *******************/ +=20 + int Nc, Die, Rec, Cir, Tri, Ell, Pol, Gnd, Tra; +@@ -564,7 +565,7 @@ + tmp4 =3D Circum[i] / double(Nw); + tmpsum1 =3D 0.0; + tmpsum2 =3D 0.0; +- sum2[i] =3D cmplx( 0.0, 0.0 ); ++ sum2[i] =3D Complex( 0.0, 0.0 ); + =09 + for (j =3D 0; j < Nw; j ++) { + =20 +diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/cmplxmat.cpp tnt-1.2.2/calcRL/s= rc/cmplxmat.cpp +--- tnt-1.2.2-0-vanilla/calcRL/src/cmplxmat.cpp 2004-07-22 21:29:37.0000= 00000 +0200 ++++ tnt-1.2.2/calcRL/src/cmplxmat.cpp 2011-02-24 19:29:53.000000000 +010= 0 +@@ -386,7 +386,7 @@ + Matrix result(d_i,d_j); + for(int i =3D 0; i < d_i; i++) + for(int j =3D 0; j < d_j; j++) +- result(i,j)=3D::real(elem(i,j)); ++ result(i,j)=3Delem(i,j).real(); // result(i,j)=3D::real(elem(i,j)= ); + return (result); + } +=20 +@@ -395,7 +395,7 @@ + Matrix result(d_i,d_j); + for(int i =3D 0; i < d_i; i++) + for(int j =3D 0; j < d_j; j++) +- result(i,j)=3D::imag(elem(i,j)); ++ result(i,j)=3Delem(i,j).imag(); // result(i,j)=3D::imag(elem(i,j)= ); + return (result); + } +=20 +@@ -404,7 +404,7 @@ + Matrix result(d_i,d_j); + for(int i =3D 0; i < d_i; i++) + for(int j =3D 0; j < d_j; j++) +- result(i,j)=3D::cabs(elem(i,j)); ++ result(i,j)=3Delem(i,j).cabs(); // result(i,j)=3D::cabj(elem(i,j)= ); + return (result); + } +=20 +@@ -413,7 +413,7 @@ + CmplxMatrix result(d_i,d_j); + for(int i =3D 0; i < d_i; i++) + for(int j =3D 0; j < d_j; j++) +- result(i,j)=3D::conjg(elem(i,j)); ++ result(i,j)=3Delem(i,j).conjg(); // result(i,j)=3D::conjg(elem(i,= j)); + return (result); + } + =20 +diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/cmplxvec.cpp tnt-1.2.2/calcRL/s= rc/cmplxvec.cpp +--- tnt-1.2.2-0-vanilla/calcRL/src/cmplxvec.cpp 2004-07-22 21:29:37.0000= 00000 +0200 ++++ tnt-1.2.2/calcRL/src/cmplxvec.cpp 2011-02-24 19:29:53.000000000 +010= 0 +@@ -289,7 +289,7 @@ + =20 + int n =3D d; + CmplxVector tmp(n); +- for(int i =3D 0; i < n; i++) tmp[i] =3D ::conjg(v[i]); ++ for(int i =3D 0; i < n; i++) tmp[i] =3D v[i].conjg(); // tmp[i] =3D := :conjg(v[i]); + return (tmp); + } +=20 +@@ -297,7 +297,7 @@ + =20 + Vector tmp(d); + int n =3D d; +- while(n--) tmp[n] =3D ::real(v[n]); ++ while(n--) tmp[n] =3D v[n].real(); // tmp[n] =3D ::real(v[n]); + return (tmp); + } +=20 +@@ -305,7 +305,7 @@ + =20 + Vector tmp(d); + int n =3D d; +- while(n--) tmp[n] =3D ::imag(v[n]); ++ while(n--) tmp[n] =3D v[n].imag(); // tmp[n] =3D ::imag(v[n]) + return (tmp); + } +=20 +@@ -313,7 +313,7 @@ +=20 + Vector result(d); + for(int i =3D 0; i < d; i++) +- result[i]=3D::cabs(v[i]); ++ result[i]=3Dv[i].cabs(); // result[i]=3D::cabs(v[i]); + return (result); + } +=20 +diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/complex.cpp tnt-1.2.2/calcRL/sr= c/complex.cpp +--- tnt-1.2.2-0-vanilla/calcRL/src/complex.cpp 2002-10-09 22:23:38.00000= 0000 +0200 ++++ tnt-1.2.2/calcRL/src/complex.cpp 2011-02-24 19:29:53.000000000 +0100 +@@ -17,6 +17,53 @@ +=20 + /*********************** members *********************************/ +=20 ++double Complex::real(void) { ++=20 ++ return(re); ++} ++ ++double Complex::imag(void) { ++=20 ++ return(im); ++} ++ ++double Complex::arg(void) { ++ ++ return((im =3D=3D 0.0)&&(re =3D=3D 0.0) ? 0 : atan2(im, re)); ++} ++ ++double Complex::cabs(void) { ++=20 ++ double x, y, ans, temp; ++ x =3D fabs(re); ++ y =3D fabs(im); ++ if (x =3D=3D 0.0) ++ ans =3D y; ++ else if (y =3D=3D 0.0) =20 ++ ans =3D x; ++ else if (x > y) { ++ temp =3D y/x; ++ ans =3D x*sqrt(1.0+temp*temp); ++ } else { ++ temp =3D x/y; ++ ans =3D y*sqrt(1.0+temp*temp); ++ } ++ return ans; =20 ++} ++ ++double Complex::cabsm(void) { ++=20 ++ return(sqrt(re*re + im*im)); ++} ++ ++Complex Complex::conjg(void) { ++=20 ++ Complex com; ++ com.re =3D re; ++ com.im =3D -im; ++ return(com); ++} ++ + /********************* friends *****************************/ +=20 + Complex operator*(const double& r, const Complex& c) {=20 +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.0000000= 00 +0200 ++++ tnt-1.2.2/calcRL/src/complex.h 2011-02-24 19:29:53.000000000 +0100 +@@ -3,10 +3,12 @@ +=20 + #include + #include +-#include ++#include ++using namespace std; +=20 + 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 @@ +=20 + 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); ++ =20 ++ + 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&); +=20 +- public: ++ + Complex(){} // constructors + Complex(double r, double i =3D 0.0); + Complex(const Complex&); +diff -ruN tnt-1.2.2-0-vanilla/calcRL/src/data.cpp tnt-1.2.2/calcRL/src/d= ata.cpp +--- tnt-1.2.2-0-vanilla/calcRL/src/data.cpp 2004-07-22 21:29:37.00000000= 0 +0200 ++++ tnt-1.2.2/calcRL/src/data.cpp 2011-02-24 19:29:53.000000000 +0100 +@@ -251,7 +251,7 @@ + } + } + =20 +- Ic =3D cmplx( 0.0, 1.0 ); ++ Ic =3D Complex( 0.0, 1.0 ); + =20 + Nc4 =3D 11*Nh+1; + step_w =3D 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.000000= 000 +0200 ++++ tnt-1.2.2/calcRL/src/hankel.cpp 2011-02-24 19:29:53.000000000 +0100 +@@ -19,7 +19,7 @@ +=20 + hank01( vj0, vy0, x, 1 ); +=20 +- return( cmplx( vj0, -vy0 ) ); ++ return( Complex( vj0, -vy0 ) ); + } +=20 + /***** Function Hank21 - to calculate H^(2)_1(x), x - double ****/ +@@ -30,7 +30,7 @@ +=20 + hank11( vj1, vy1, x, 1 ); +=20 +- return( cmplx( vj1, -vy1 ) ); ++ return( Complex( vj1, -vy1 ) ); + } +=20 + /***** Function Hank10 - to calculate H^(1)_0(x), x - double ****/ +@@ -41,7 +41,7 @@ +=20 + hank01( vj0, vy0, x, 1 ); +=20 +- return( cmplx( vj0, vy0 ) ); ++ return( Complex( vj0, vy0 ) ); + } +=20 + /***** Function Hank11 - to calculate H^(1)_1(x), x - double ****/ +@@ -52,7 +52,7 @@ +=20 + hank11( vj1, vy1, x, 1 ); +=20 +- return( cmplx( vj1, vy1 ) ); ++ return( Complex( vj1, vy1 ) ); + } +=20 + 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.000000= 000 +0200 ++++ tnt-1.2.2/calcRL/src/kelvin.cpp 2011-02-24 19:29:53.000000000 +0100 +@@ -332,20 +332,20 @@ + return(keip); + } +=20 +-static Complex seta_p1 =3D cmplx(0.0,-0.3926991); +-static Complex seta_p2 =3D cmplx(0.0110486,0.0); +-static Complex seta_p3 =3D cmplx(0.0,-0.0009765); +-static Complex seta_p4 =3D cmplx(-0.0000906,-0.0000901); +-static Complex seta_p5 =3D cmplx(-0.0000252,0.0); +-static Complex seta_p6 =3D cmplx(-0.0000034,0.0000051); +-static Complex seta_p7 =3D cmplx(0.0000006,.0000019); +-static Complex dphi_p1 =3D cmplx(0.7071068,0.7071068); +-static Complex dphi_p2 =3D cmplx(-0.0625001,-0.0000001); +-static Complex dphi_p3 =3D cmplx(-0.0013813,0.0013811); +-static Complex dphi_p4 =3D cmplx(0.0000005,0.0002452); +-static Complex dphi_p5 =3D cmplx(0.0000346,0.0000338); +-static Complex dphi_p6 =3D cmplx(0.0000117,-0.0000024); +-static Complex dphi_p7 =3D cmplx(0.0000016,-0.0000032); ++static Complex seta_p1 =3D Complex(0.0,-0.3926991); ++static Complex seta_p2 =3D Complex(0.0110486,0.0); ++static Complex seta_p3 =3D Complex(0.0,-0.0009765); ++static Complex seta_p4 =3D Complex(-0.0000906,-0.0000901); ++static Complex seta_p5 =3D Complex(-0.0000252,0.0); ++static Complex seta_p6 =3D Complex(-0.0000034,0.0000051); ++static Complex seta_p7 =3D Complex(0.0000006,.0000019); ++static Complex dphi_p1 =3D Complex(0.7071068,0.7071068); ++static Complex dphi_p2 =3D Complex(-0.0625001,-0.0000001); ++static Complex dphi_p3 =3D Complex(-0.0013813,0.0013811); ++static Complex dphi_p4 =3D Complex(0.0000005,0.0002452); ++static Complex dphi_p5 =3D Complex(0.0000346,0.0000338); ++static Complex dphi_p6 =3D Complex(0.0000117,-0.0000024); ++static Complex dphi_p7 =3D Complex(0.0000016,-0.0000032); +=20 +=20 +=20 diff --git a/sci-electronics/tnt/files/tnt-1.2.2-namespaces.patch b/sci-e= lectronics/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 +020= 0 ++++ tnt-1.2.2/bem/src/magicad.h 2011-02-24 19:36:32.000000000 +0100 +@@ -100,7 +100,8 @@ + #include + #include + #ifdef __cplusplus +-#include ++#include ++using namespace std; + #endif + #include + #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.0000000= 00 +0200 ++++ tnt-1.2.2/calcCAP/src/bicgstab.cpp 2011-02-24 19:36:32.000000000 +01= 00 +@@ -9,7 +9,8 @@ +=20 +=20 + //#include "stdafx.h" +-#include ++#include ++using namespace std; + #include +=20 + #include "vector.h" +diff -ruN tnt-1.2.2-2-bem/calcCAP/src/diffrm.cpp tnt-1.2.2/calcCAP/src/d= iffrm.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 @@ +=20 + //#include "stdafx.h" + #include +-#include +-#include ++#include ++using namespace std; ++#include ++using namespace std; + #include +=20 + #include "complex.h" +diff -ruN tnt-1.2.2-2-bem/calcCAP/src/ivectorl.h tnt-1.2.2/calcCAP/src/i= vectorl.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 ++#include ++using namespace std; +=20 + class IVectorl + { +diff -ruN tnt-1.2.2-2-bem/calcCAP/src/prony.cpp tnt-1.2.2/calcCAP/src/pr= ony.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 +-#include ++#include ++using namespace std; + #include + #include "complex.h" + #include "vector.h" +diff -ruN tnt-1.2.2-2-bem/calcCAP/src/sparse.cpp tnt-1.2.2/calcCAP/src/s= parse.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 @@ +=20 + //#include "stdafx.h" + #include +-#include ++#include ++using namespace std; + #include +-#include ++#include ++using namespace std; +=20 + #include "complex.h"=20 + #include "vector.h"=20 +diff -ruN tnt-1.2.2-2-bem/calcCAP/src/stdafx.h tnt-1.2.2/calcCAP/src/std= afx.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_ +=20 + #include +-#include +-#include +-#include ++#include ++using namespace std; ++#include ++using namespace std; ++#include ++using namespace std; + #include +-#include ++#include ++using namespace std; +=20 + #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.0000000= 00 +0200 ++++ tnt-1.2.2/calcCAP/src/systsolv.cpp 2011-02-24 19:36:32.000000000 +01= 00 +@@ -3,7 +3,8 @@ +=20 + //#include "stdafx.h" +=20 +-#include ++#include ++using namespace std; + #include + #include + #include "complex.h" +diff -ruN tnt-1.2.2-2-bem/calcCAP/src/vector.h tnt-1.2.2/calcCAP/src/vec= tor.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_ +=20 +-#include +-#include ++#include ++using namespace std; ++#include ++using namespace std; +=20 + class Vector + { +diff -ruN tnt-1.2.2-2-bem/calcRL/src/bicgstab.cpp tnt-1.2.2/calcRL/src/b= icgstab.cpp +--- tnt-1.2.2-2-bem/calcRL/src/bicgstab.cpp 2004-07-22 21:29:37.00000000= 0 +0200 ++++ tnt-1.2.2/calcRL/src/bicgstab.cpp 2011-02-24 19:36:32.000000000 +010= 0 +@@ -9,7 +9,8 @@ +=20 +=20 + //#include "stdafx.h" +-#include ++#include ++using namespace std; + #include +=20 + #include "vector.h" +diff -ruN tnt-1.2.2-2-bem/calcRL/src/ivectorl.h tnt-1.2.2/calcRL/src/ive= ctorl.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 + #include +-#include ++#include ++using namespace std; +=20 + class IVectorl + { +diff -ruN tnt-1.2.2-2-bem/calcRL/src/sparse.cpp tnt-1.2.2/calcRL/src/spa= rse.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 *******/ +=20 + #include +-#include ++#include ++using namespace std; + #include +-#include ++#include ++using namespace std; +=20 + #include "complex.h"=20 + #include "vector.h"=20 +diff -ruN tnt-1.2.2-2-bem/calcRL/src/stdafx.h tnt-1.2.2/calcRL/src/stdaf= x.h +--- tnt-1.2.2-2-bem/calcRL/src/stdafx.h 2002-10-09 22:23:56.000000000 +0= 200 ++++ tnt-1.2.2/calcRL/src/stdafx.h 2011-02-24 19:36:50.000000000 +0100 +@@ -2,11 +2,15 @@ + #define _stdafx__h_ +=20 + #include +-#include +-#include +-#include ++#include ++using namespace std; ++#include ++using namespace std; ++#include ++using namespace std; + #include +-#include ++#include ++using namespace std; +=20 + #include "complex.h" + #include "vector.h" +diff -ruN tnt-1.2.2-2-bem/calcRL/src/systsolv.cpp tnt-1.2.2/calcRL/src/s= ystsolv.cpp +--- tnt-1.2.2-2-bem/calcRL/src/systsolv.cpp 2002-10-09 22:23:57.00000000= 0 +0200 ++++ tnt-1.2.2/calcRL/src/systsolv.cpp 2011-02-24 19:36:32.000000000 +010= 0 +@@ -2,7 +2,8 @@ + /*****Source - "NUMERICAL RECIPES IN C", www.nr.com*****/ +=20 + //#include "stdafx.h" +-#include ++#include ++using namespace std; + #include + #include + #include "complex.h" +diff -ruN tnt-1.2.2-2-bem/calcRL/src/vector.h tnt-1.2.2/calcRL/src/vecto= r.h +--- tnt-1.2.2-2-bem/calcRL/src/vector.h 2002-10-09 22:23:59.000000000 +0= 200 ++++ tnt-1.2.2/calcRL/src/vector.h 2011-02-24 19:36:41.000000000 +0100 +@@ -3,8 +3,10 @@ +=20 + #include + #include +-#include +-#include ++#include ++using namespace std; ++#include ++using namespace std; +=20 + class Vector + { diff --git a/sci-electronics/tnt/tnt-1.2.2.ebuild b/sci-electronics/tnt/t= nt-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=3D"${RDEPEND} media-gfx/imagemagick " =20 +PATCHES=3D( "${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 f= riend. - 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//\\nusing\ namespace\ std\;/' `grep -r= -l iostream.h *` - sed -i 's//\\nusing\ namespace\ std\;/' `grep -r -= l iomanip.h *` - sed -i 's//\\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