diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2008-05-29 18:55:34 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2008-05-29 18:55:34 +0000 |
commit | 8c6c521a3da62936cfacce3c6c4852326d142e31 (patch) | |
tree | 90475db3170ef37d42190ec6e956548b107ab69f /sci-physics/root | |
parent | Fixed broken HOMEPAGE and SRC_URI. (diff) | |
download | historical-8c6c521a3da62936cfacce3c6c4852326d142e31.tar.gz historical-8c6c521a3da62936cfacce3c6c4852326d142e31.tar.bz2 historical-8c6c521a3da62936cfacce3c6c4852326d142e31.zip |
Version bump. This version is includes patches from upstream (included in sources), some local gcc-4.3 patches and various xrootd patches. Now works with afs on amd64. Removed cint7 flag as it is still too buggy, added xrootd use flag, added a math flag triggering all math libraries (mathcore, mathmore, minuit2, roofit, unuran). Much cleanup: qt-4.4 ready, removed afterimage dependency (will be back in 5.20). This version should be targeted for stabilization.
Package-Manager: portage-2.1.5.2
Diffstat (limited to 'sci-physics/root')
-rw-r--r-- | sci-physics/root/ChangeLog | 16 | ||||
-rw-r--r-- | sci-physics/root/Manifest | 18 | ||||
-rw-r--r-- | sci-physics/root/files/root-5.18.00d-gcc43.patch | 732 | ||||
-rw-r--r-- | sci-physics/root/files/root-5.18.00d-makefile.patch | 13 | ||||
-rw-r--r-- | sci-physics/root/files/xrootd-20071116-checksymbol.patch | 129 | ||||
-rw-r--r-- | sci-physics/root/files/xrootd-20071116-gcc43.patch | 948 | ||||
-rw-r--r-- | sci-physics/root/root-5.18.00d.ebuild | 182 |
7 files changed, 2036 insertions, 2 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index d4e27ba73387..cd9742e00aef 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for sci-physics/root # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.24 2008/05/21 19:02:38 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.25 2008/05/29 18:55:33 bicatali Exp $ + +*root-5.18.00d (29 May 2008) + + 29 May 2008; Sébastien Fabbro <bicatali@gentoo.org> + +files/root-5.18.00d-gcc43.patch, +files/root-5.18.00d-makefile.patch, + +files/xrootd-20071116-checksymbol.patch, + +files/xrootd-20071116-gcc43.patch, +root-5.18.00d.ebuild: + Version bump. This version is includes patches from upstream (included in + sources), some local gcc-4.3 patches and various xrootd patches. Now works + with afs on amd64. Removed cint7 flag as it is still too buggy, added + xrootd use flag, added a math flag triggering all math libraries + (mathcore, mathmore, minuit2, roofit, unuran). Much cleanup: qt-4.4 ready, + removed afterimage dependency (will be back in 5.20). This version should + be targeted for stabilization. 21 May 2008; Tiziano Müller <dev-zero@gentoo.org> root-3.05.04.ebuild, root-5.16.00.ebuild, root-5.16.00-r1.ebuild, root-5.18.00.ebuild: diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index cdd2cd8b3eb1..f9cd49f7e723 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,19 +1,35 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX root-5.16.00-afs.patch 1320 RMD160 76896f12113782f9ee534b6920a1dde53eb09c72 SHA1 052a6113f5c2c4bc786f7f1d567c1990a5791d8b SHA256 04b2e484cad98943487f3691d57d20b923bb0ce5998f28f423f94995a832a9dc AUX root-5.16.00-flags.patch 502 RMD160 758a2b4977dc16f61e51297de855b532e30bf2c6 SHA1 17435caa24eb4ee5da738df11b167991b2663cbf SHA256 51eebc176ec25c46b470ef55f622cb3fcf60fbc2294ec94109cf10c13167f3c1 AUX root-5.16.00-fortran.patch 5076 RMD160 2218584a3a5093a8d4171913a2b024bb759aae03 SHA1 4ed648d54260fd2593174154d8331c5d5afd5f09 SHA256 4ad7a3057528f30716d200c8f1462cf92da6f1ebef9bc3fee1874000bc10deec AUX root-5.16.00-postgres.patch 868 RMD160 5a79ae0308968bb579f4ae04eb8067fdb5c1668b SHA1 cf8eef875bd755ccbe827332661a2ce573dfafba SHA256 40e33d371e4cec38f7680a16bf089705ebdd835ef1c06989082508bf2c6dd638 AUX root-5.16.00-xft.patch 687 RMD160 58efbc6efea7970ce267d05998deb8f849ecd5c5 SHA1 19ba24f17846a46d0ca10d0958587bd9166efd6d SHA256 e3540b4cecae6eb9e1c80e7edc923334056d63b4dedfc8bece34d29eec76d0a1 +AUX root-5.18.00d-gcc43.patch 21888 RMD160 f4f23ee8ac5ca833b7f2e05e57436f7cffa0bb40 SHA1 a89ab7e887c171abb81206c6cf3b6b42b732eb52 SHA256 3f9bd2a3639dfbd752b09d79dd9448ebb6ecd215146a4f13c7a490998cc564f4 +AUX root-5.18.00d-makefile.patch 667 RMD160 b99d04ff116bd6dce5c8d45dfedd474e83ab6a67 SHA1 00d8dbdc3b2398031547e9c4f793b3c857b14fd3 SHA256 a168d6fa609fcd61973a189039a59f03f8a21b9343644214eb9a16dcdba81c7f AUX root-pic.patch 1308 RMD160 7cd58a088d5b9b6d8dacf24a4966c0ece8ccc1db SHA1 a173c2c2a354df1b61a9ada4df81aa6784733f21 SHA256 204d8959d544e4b94546444d9a1912099cca90b477227ff85107c1e428fbb374 AUX root-xrootd-flags.patch 436 RMD160 5b4a138b795ebe1030c9dabe7088a12c06e736d9 SHA1 03e500d10a6f530669f0b3d2701770561e87f82e SHA256 311ec777faed99503cbf3b1d942f961ace48a42ae051e94d5f085b96c19c3728 AUX sparc-root-5.16.00.patch 1337 RMD160 182648130788f70df92342042a889e91ba665d24 SHA1 d46dbb7f10e83e5bcde97175ef5df71ea9750140 SHA256 bd3f08a8283e7b0e4b4f5f583fbe448cbc2908e2935e6bcc961085a58d6bbe3a +AUX xrootd-20071116-checksymbol.patch 3725 RMD160 dc3439e73b232303f92c9f7e76e99044c1cba126 SHA1 41e69e83772b0962c348a5efa5705d65e4ef1c26 SHA256 45b14e5773ded2f6c828c2cd2629b50c63f9e4a96608c757c5b80c80dd394cb1 +AUX xrootd-20071116-gcc43.patch 26929 RMD160 37aeecaf72820a91846e0d49155e8ee2ea1bddf0 SHA1 156ca6a125d7f49f5e0412231f18d75ca7c9e754 SHA256 27472f3304d7ee028ef81a06a9abb2092e93d9324b85a6ceff0fcd81b9ddd879 DIST Users_Guide_5_16.pdf 11196352 RMD160 149c2421b7453273e6e1d849e17b736878ebb316 SHA1 b5d4eade69a5b945aa37c182d83d5233c2d54475 SHA256 c20fb206aa3eff6f3ec034c24483c4ceed04e08a1eef8b117da7956c2f471d34 DIST root-5.16.00-gcc-4.2.patch.bz2 18670 RMD160 254e50b4560a3b98dc39dd7a6df431df6935e457 SHA1 1038b64e5d6894bf218c7aea66478b91efd3b096 SHA256 581ac1071a8d5e0c31285ed11e9195a5ffb6577e2746d81d2cc8fadc060656d2 DIST root_v3.05.04.source.tar.gz 9386408 RMD160 d20b2b5d933d8abf1a3343a9b8886a3ed97f1cfb SHA1 481f2b3a60e0c56be0a61f3e652e7e43c065aeb7 SHA256 ae93c08cfe4dc05c53fade420ac560fff88ec967b2e85b26a7268ef12e1bbe9e DIST root_v5.16.00.source.tar.gz 22210601 RMD160 3e9a29e6b899e3fb0986ef8a7b4a162d4933bf47 SHA1 0fcb1aba303b463598373ba44aa38a45279773e3 SHA256 41a36d9a469c8b86247aca59317fa40371db846555045679e759f7f332a927f8 DIST root_v5.18.00.source.tar.gz 23804036 RMD160 e38e075706102cce5b97c4f0e921cf9ff4a53409 SHA1 4c150e93e25087d7594f1346e330901f97115e6e SHA256 a47ac29a826bd55717e4793806277c15d1e186bae9abe291bd2ff72843c19772 +DIST root_v5.18.00d.source.tar.gz 23581098 RMD160 8fd731b271d542e73ba0c7982f344d0c09c27ee7 SHA1 f046745864c287dafab8b152b6f18f1a5a431ba0 SHA256 e1ba9e307caf64868c3c2a8a66bcbc119f7d8e9599c8d3ec2860b3b7bbba2ac0 EBUILD root-3.05.04.ebuild 1654 RMD160 7f96255fd29b2fc2f2d30e41aa1e41ac57d24622 SHA1 ca10f01367a50aa1c867a4e48e435f4eb24e5151 SHA256 d74fbfd44a1da70c297196b56885128ca47297c9c349f8a083050ff346058dce EBUILD root-5.16.00-r1.ebuild 5046 RMD160 dd854d5fda59f6117cf3eeb8d84d9240b753e5c9 SHA1 5e7abdf94333492fb3bc5a8e32aa4d2f6636d532 SHA256 194f725cb6356fecfec73484bb6ee74547a4f8f8f0e90800094c453a266e2d92 EBUILD root-5.16.00.ebuild 4966 RMD160 d83d9b2c340f44e6e3b33fab6e8353101059c6ce SHA1 6a7695c895f6e734f5e9bc6ca4c59085a3d95748 SHA256 06d1ec56a70621f19d79dac76424829415eead9b58179b1f54627b8a19362bbd EBUILD root-5.18.00.ebuild 4807 RMD160 6cba0f5364492dc9ef1baa52785f81f86b23a325 SHA1 2318dd9e31135ca216b92951473b11810d4dcbfb SHA256 7d57f8f6591b6cc63b64de6506aab34a96b0ac868130519460f11c91d603f33c -MISC ChangeLog 8592 RMD160 a3851ce1e6afb9aa89c4be2eb6ef06ce48d48904 SHA1 ba787fedd215a64eed5f2284b20ceb644d20519e SHA256 42c937bb87dac504f59d9a0fe20054b715ab8402e73781a80a26456756f93ff4 +EBUILD root-5.18.00d.ebuild 4852 RMD160 d12f05e1a3e92daedf50f1f9a797a22bd13af024 SHA1 031215bf308f31b67fbf187d5143180890478d37 SHA256 3a4cb64319e702ce6843f34f39572306aec04b69c8e3208bc37769ba892d2ff8 +MISC ChangeLog 9334 RMD160 c55ff2a5e42447c14ff84e8a6c5908d739847ed0 SHA1 d1f0de18f045e57c6feef9a95454cfc4eb61b05a SHA256 317de9a45ba5770dbaf8e65349cccf71157828290a1d727b42558e01b5bbe287 MISC metadata.xml 597 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d SHA1 8fd69478a8a90f6222b1e428961815e0e697905a SHA256 8ae8ab4051e8534ca2df70f81fb999c478b8f1223980c0b366dc0501fa987c6c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkg+/DUACgkQ1ycZbhPLE2CgfgCdEAL48GFhY2hF/lu+Y2jM8qRs +2b8Anib9ZKYHHhTwZZJRM4u6qrGUwJye +=OD7p +-----END PGP SIGNATURE----- diff --git a/sci-physics/root/files/root-5.18.00d-gcc43.patch b/sci-physics/root/files/root-5.18.00d-gcc43.patch new file mode 100644 index 000000000000..64093de04e28 --- /dev/null +++ b/sci-physics/root/files/root-5.18.00d-gcc43.patch @@ -0,0 +1,732 @@ +--- auth/src/TAuthenticate.cxx.orig 2008-05-27 14:59:39.398520340 +0000 ++++ auth/src/TAuthenticate.cxx 2008-05-27 15:00:18.112726537 +0000 +@@ -39,6 +39,7 @@ + #include "snprintf.h" + #include "TVirtualMutex.h" + #include "TTimer.h" ++#include <cstdlib> + + #ifndef R__LYNXOS + #include <sys/stat.h> +--- ./auth/src/THostAuth.cxx.orig 2008-05-25 10:28:02.251108184 +0000 ++++ ./auth/src/THostAuth.cxx 2008-05-25 10:28:13.215733022 +0000 +@@ -26,7 +26,7 @@ + #include "TAuthenticate.h" + #include "TSocket.h" + #include "TUrl.h" +- ++#include <cstdlib> + + ClassImp(THostAuth) + +--- ./base/src/TAttAxis.cxx.orig 2008-05-24 22:36:33.708124609 +0000 ++++ ./base/src/TAttAxis.cxx 2008-05-25 08:49:23.464427930 +0000 +@@ -16,6 +16,7 @@ + #include "TColor.h" + #include "TClass.h" + #include "TMathBase.h" ++#include <cstdlib> + + ClassImp(TAttAxis) + +--- ./base/src/TError.cxx.orig 2008-05-24 22:40:36.445957450 +0000 ++++ ./base/src/TError.cxx 2008-05-24 22:40:55.715055533 +0000 +@@ -172,7 +172,7 @@ + gSystem->StackTrace(); + gSystem->Abort(); + } else +- ::abort(); ++ abort; + } + } + +--- ./base/src/TUUID.cxx.orig 2008-05-25 08:41:54.035949249 +0000 ++++ ./base/src/TUUID.cxx 2008-05-25 08:42:18.485342541 +0000 +@@ -112,6 +112,7 @@ + #include "TMD5.h" + #include "Bytes.h" + #include <string.h> ++#include <cstdlib> + #ifdef R__WIN32 + #include "Windows4Root.h" + #include <Iphlpapi.h> +--- ./cint/src/v6_newlink.cxx.orig 2008-05-24 22:24:14.891930941 +0000 ++++ ./cint/src/v6_newlink.cxx 2008-05-24 22:30:11.464250840 +0000 +@@ -7419,7 +7419,7 @@ + } + else { + if (type_name[0] == '\'') { +- type_name[std::strlen(type_name)-1] = '\0'; ++ type_name[strlen(type_name)-1] = '\0'; + typenum = G__defined_typename(type_name + 1); + } + else { +@@ -7427,7 +7427,7 @@ + } + } + G__separate_parameter(paras, &os, c_reftype_const); +- reftype_const = std::atoi(c_reftype_const); ++ reftype_const = atoi(c_reftype_const); + #ifndef G__OLDIMPLEMENTATION1861 + //if (typenum != -1) { + // NO - this is already taken into account when writing the dictionary +--- ./cint/tool/makecint.cxx.orig 2008-05-24 22:30:46.370240018 +0000 ++++ ./cint/tool/makecint.cxx 2008-05-24 22:32:51.115285863 +0000 +@@ -32,6 +32,8 @@ + #include <iostream> + #include <fstream> + #include <list> ++#include <cstring> ++#include <cstdlib> + + std::string G__DLLID; + std::string G__MACRO; +--- ./cint7/tool/makecint.cxx.orig 2008-05-26 10:54:04.645078613 +0000 ++++ ./cint7/tool/makecint.cxx 2008-05-26 10:54:27.114359064 +0000 +@@ -32,6 +32,8 @@ + #include <iostream> + #include <fstream> + #include <list> ++#include <cstring> ++#include <cstdlib> + + std::string G__DLLID; + std::string G__MACRO; +--- ./cintex/src/ROOTClassEnhancer.cxx.orig 2008-05-25 15:52:43.464836386 +0000 ++++ ./cintex/src/ROOTClassEnhancer.cxx 2008-05-25 15:53:02.765936293 +0000 +@@ -32,6 +32,7 @@ + #undef G__DICTIONARY + + #include <sstream> ++#include <memory> + + #if ROOT_VERSION_CODE >= ROOT_VERSION(5,1,1) + #include "TVirtualIsAProxy.h" +--- ./cont/src/TObjArray.cxx.orig 2008-05-25 08:43:10.644314911 +0000 ++++ ./cont/src/TObjArray.cxx 2008-05-25 08:43:38.361894446 +0000 +@@ -28,6 +28,7 @@ + #include "TObjArray.h" + #include "TError.h" + #include "TROOT.h" ++#include <cstdlib> + + ClassImp(TObjArray) + +--- ./eg/src/TDatabasePDG.cxx.orig 2008-05-25 10:20:38.801837450 +0000 ++++ ./eg/src/TDatabasePDG.cxx 2008-05-25 10:20:53.242660386 +0000 +@@ -17,7 +17,7 @@ + #include "TDatabasePDG.h" + #include "TDecayChannel.h" + #include "TParticlePDG.h" +- ++#include <cstdlib> + + //////////////////////////////////////////////////////////////////////// + // +--- ./eve/src/TEveTrans.cxx.orig 2008-05-25 14:25:05.515059385 +0000 ++++ ./eve/src/TEveTrans.cxx 2008-05-25 14:25:19.659865451 +0000 +@@ -41,6 +41,7 @@ + #include "TClass.h" + + #include <ctype.h> ++#include <iostream> + + #define F00 0 + #define F01 4 +--- ./gdml/src/TGDMLParse.cxx.orig 2008-05-25 17:42:19.033722903 +0000 ++++ ./gdml/src/TGDMLParse.cxx 2008-05-25 17:43:16.480996636 +0000 +@@ -78,6 +78,7 @@ + + ****************************************************************************/ + ++#include <cstdlib> + #include "TGeoMatrix.h" + #include "TXMLEngine.h" + #include "TGeoVolume.h" +--- ./ged/src/TStyleDialog.cxx.orig 2008-05-25 10:15:22.252869328 +0000 ++++ ./ged/src/TStyleDialog.cxx 2008-05-25 10:15:35.321614073 +0000 +@@ -32,6 +32,7 @@ + #include <TStyle.h> + #include <TVirtualPad.h> + #include <TVirtualMutex.h> ++#include <cstdlib> + + ClassImp(TStyleDialog) + +--- ./geompainter/src/TGeoChecker.cxx.orig 2008-05-25 10:25:11.005349444 +0000 ++++ ./geompainter/src/TGeoChecker.cxx 2008-05-25 10:25:27.546292059 +0000 +@@ -88,6 +88,7 @@ + #include "TBuffer3D.h" + #include "TBuffer3DTypes.h" + #include "TMath.h" ++#include <cstdlib> + + // statics and globals + +--- ./gl/src/TX11GL.cxx.orig 2008-05-25 14:19:39.424476542 +0000 ++++ ./gl/src/TX11GL.cxx 2008-05-25 14:19:58.021536328 +0000 +@@ -11,7 +11,7 @@ + + #include <deque> + #include <map> +- ++#include <cstdlib> + #include "TVirtualViewer3D.h" + #include "TVirtualX.h" + #include "TGLViewer.h" +@@ -521,7 +521,7 @@ + char *dest = ctx.fXImage->data; + const UChar_t *src = &ctx.fBUBuffer[ctx.fW * 4 * (ctx.fH - 1)]; + for (UInt_t i = 0, e = ctx.fH; i < e; ++i) { +- std::memcpy(dest, src, ctx.fW * 4); ++ memcpy(dest, src, ctx.fW * 4); + dest += ctx.fW * 4; + src -= ctx.fW * 4; + } +--- ./graf/src/TGraph.cxx.orig 2008-05-25 09:26:57.835797472 +0000 ++++ ./graf/src/TGraph.cxx 2008-05-25 09:27:09.664471550 +0000 +@@ -10,6 +10,7 @@ + *************************************************************************/ + + #include <string.h> ++#include <cstdlib> + + #include "Riostream.h" + #include "TROOT.h" +--- ./graf/src/TMultiGraph.cxx.orig 2008-05-25 09:27:21.449143120 +0000 ++++ ./graf/src/TMultiGraph.cxx 2008-05-25 09:27:35.985971527 +0000 +@@ -20,6 +20,7 @@ + #include "TMath.h" + + #include <ctype.h> ++#include <cstdlib> + + extern void H1LeastSquareSeqnd(Int_t n, Double_t *a, Int_t idim, Int_t &ifail, Int_t k, Double_t *b); + +--- ./gui/inc/TGFSContainer.h.orig 2008-05-25 09:37:07.946565703 +0000 ++++ ./gui/inc/TGFSContainer.h 2008-05-25 09:37:22.427390919 +0000 +@@ -12,6 +12,7 @@ + #ifndef ROOT_TGFSContainer + #define ROOT_TGFSContainer + ++#include <cstdlib> + + ////////////////////////////////////////////////////////////////////////// + // // +--- ./gui/src/TGCanvas.cxx.orig 2008-05-25 09:33:15.625326471 +0000 ++++ ./gui/src/TGCanvas.cxx 2008-05-25 09:33:38.994658213 +0000 +@@ -68,7 +68,7 @@ + #include "TKeyMapFile.h" + #include "TGDNDManager.h" + #include "Riostream.h" +- ++#include <cstdlib> + + TGGC *TGContainer::fgLineGC = 0; + +--- ./gui/src/TGFileBrowser.cxx.orig 2008-05-25 09:38:24.270915180 +0000 ++++ ./gui/src/TGFileBrowser.cxx 2008-05-25 09:38:38.427721931 +0000 +@@ -37,6 +37,7 @@ + #include "Getline.h" + #include <time.h> + #include <string.h> ++#include <cstdlib> + + #include "TGFileBrowser.h" + #include "TRootBrowser.h" +--- ./gui/src/TGFont.cxx.orig 2008-05-25 09:39:31.914769984 +0000 ++++ ./gui/src/TGFont.cxx 2008-05-25 09:39:51.429168201 +0000 +@@ -40,6 +40,8 @@ + #include "TObjString.h" + #include "TGWidget.h" + #include <errno.h> ++#include <cstdlib> ++#include <climits> + + #include "Riostream.h" + #include "TROOT.h" +--- ./gui/src/TGFontDialog.cxx.orig 2008-05-25 09:40:59.463015168 +0000 ++++ ./gui/src/TGFontDialog.cxx 2008-05-25 09:41:13.344862645 +0000 +@@ -28,7 +28,7 @@ + #include "TGLabel.h" + #include "TGListBox.h" + #include "TGComboBox.h" +- ++#include <cstdlib> + + + enum EFontDialog { +--- ./gui/src/TGListBox.cxx.orig 2008-05-25 09:44:07.356365781 +0000 ++++ ./gui/src/TGListBox.cxx 2008-05-25 09:44:23.409280584 +0000 +@@ -45,7 +45,7 @@ + #include "TGResourcePool.h" + #include "TSystem.h" + #include "Riostream.h" +- ++#include <cstdlib> + + const TGFont *TGTextLBEntry::fgDefaultFont = 0; + TGGC *TGTextLBEntry::fgDefaultGC = 0; +--- ./gui/src/TGPicture.cxx.orig 2008-05-25 09:51:57.143137403 +0000 ++++ ./gui/src/TGPicture.cxx 2008-05-25 09:52:14.584131309 +0000 +@@ -38,6 +38,7 @@ + #include "TGWindow.h" + #include "TVirtualX.h" + #include "TImage.h" ++#include <cstdlib> + + TGGC *TGSelectedPicture::fgSelectedGC = 0; + +--- ./gui/src/TGTripleSlider.cxx.orig 2008-05-25 10:10:41.092846931 +0000 ++++ ./gui/src/TGTripleSlider.cxx 2008-05-25 10:10:55.553671007 +0000 +@@ -66,6 +66,7 @@ + #include "TGPicture.h" + #include "Riostream.h" + #include "TSystem.h" ++#include <cstdlib> + + ClassImp(TGTripleVSlider) + ClassImp(TGTripleHSlider) +--- ./guihtml/src/TGHtmlBrowser.cxx.orig 2008-05-25 11:24:03.352261093 +0000 ++++ ./guihtml/src/TGHtmlBrowser.cxx 2008-05-25 11:26:01.675003922 +0000 +@@ -9,6 +9,7 @@ + * For the list of contributors see $ROOTSYS/README/CREDITS. * + *************************************************************************/ + ++#include <cstdlib> + #include "TROOT.h" + #include "TApplication.h" + #include "TSystem.h" +--- ./guihtml/src/TGHtmlIndex.cxx.orig 2008-05-25 11:25:16.760444387 +0000 ++++ ./guihtml/src/TGHtmlIndex.cxx 2008-05-25 11:25:35.581516939 +0000 +@@ -35,6 +35,7 @@ + + #include <ctype.h> + #include <string.h> ++#include <cstdlib> + + #include "TGHtml.h" + +--- ./hist/src/TGraph2D.cxx.orig 2008-05-25 09:18:31.516888891 +0000 ++++ ./hist/src/TGraph2D.cxx 2008-05-25 09:19:08.553054573 +0000 +@@ -20,6 +20,7 @@ + #include "TVirtualPad.h" + #include "TVirtualFitter.h" + #include "TClass.h" ++#include <cstdlib> + + ClassImp(TGraph2D) + +--- ./html/src/TDocDirective.cxx.orig 2008-05-25 10:18:34.367817335 +0000 ++++ ./html/src/TDocDirective.cxx 2008-05-25 10:18:48.938177793 +0000 +@@ -18,6 +18,7 @@ + #include "TVirtualMutex.h" + #include <fstream> + #include <sstream> ++#include <cstdlib> + + //______________________________________________________________________________ + // +--- ./html/src/TDocOutput.cxx.orig 2008-05-25 10:19:54.305206711 +0000 ++++ ./html/src/TDocOutput.cxx 2008-05-25 10:20:08.882745853 +0000 +@@ -28,6 +28,7 @@ + #include <list> + #include <set> + #include <sstream> ++#include <cstdlib> + + namespace { + +--- ./io/src/TArchiveFile.cxx.orig 2008-05-25 08:50:00.030511713 +0000 ++++ ./io/src/TArchiveFile.cxx 2008-05-25 08:50:15.595398705 +0000 +@@ -25,7 +25,7 @@ + #include "TObjString.h" + #include "TError.h" + #include "TUrl.h" +- ++#include <cstdlib> + + ClassImp(TArchiveFile) + +--- ./io/src/TContainerConverters.cxx.orig 2008-05-25 08:51:09.186452685 +0000 ++++ ./io/src/TContainerConverters.cxx 2008-05-25 08:51:27.199479189 +0000 +@@ -23,6 +23,7 @@ + #include "TError.h" + #include "TGenCollectionStreamer.h" + #include "TClassStreamer.h" ++#include <cstdlib> + + namespace { + const Int_t kMapOffset = 2; +--- ./main/src/pmain.cxx.orig 2008-05-25 18:14:20.624507431 +0000 ++++ ./main/src/pmain.cxx 2008-05-25 18:14:33.073216842 +0000 +@@ -18,6 +18,7 @@ + ////////////////////////////////////////////////////////////////////////// + #include <stdio.h> + #include <errno.h> ++#include <cstdlib> + + #ifdef WIN32 + #include <io.h> +--- ./main/src/hadd.cxx.orig 2008-05-26 10:41:56.074140838 +0000 ++++ ./main/src/hadd.cxx 2008-05-26 10:42:21.211573339 +0000 +@@ -59,6 +59,7 @@ + + #include "RConfig.h" + #include <string> ++#include <cstdlib> + #include "TChain.h" + #include "TFile.h" + #include "THashList.h" +--- ./math/src/TRandom1.cxx.orig 2008-05-25 08:43:53.014729463 +0000 ++++ ./math/src/TRandom1.cxx 2008-05-25 08:48:16.172593187 +0000 +@@ -19,6 +19,7 @@ + #include "TRandom1.h" + #include "TRandom3.h" + #include "TMath.h" ++#include <cstdlib> + + // Number of instances with automatic seed selection + int TRandom1::fgNumEngines = 0; +--- ./mathmore/src/GSLRndmEngines.cxx.orig 2008-05-25 15:06:34.176639662 +0000 ++++ ./mathmore/src/GSLRndmEngines.cxx 2008-05-25 15:06:51.937651805 +0000 +@@ -34,6 +34,7 @@ + // need to be included later + #include <time.h> + #include <cassert> ++#include <cstdlib> + + #include "gsl/gsl_rng.h" + #include "gsl/gsl_randist.h" +--- ./matrix/src/TMatrixTBase.cxx.orig 2008-05-25 09:13:03.646204606 +0000 ++++ ./matrix/src/TMatrixTBase.cxx 2008-05-25 09:14:18.674480223 +0000 +@@ -207,6 +207,7 @@ + #include "TROOT.h" + #include "TClass.h" + #include "TMath.h" ++#include <climits> + + Int_t gMatrixCheck = 1; + +--- ./minuit2/src/MnUserTransformation.cxx.orig 2008-05-25 15:13:19.005328722 +0000 ++++ ./minuit2/src/MnUserTransformation.cxx 2008-05-25 15:13:35.010240790 +0000 +@@ -11,6 +11,7 @@ + #include "Minuit2/MnUserCovariance.h" + + #include <algorithm> ++#include <cstdio> + + namespace ROOT { + +--- ./mlp/src/TMLPAnalyzer.cxx.orig 2008-05-25 10:26:07.216552738 +0000 ++++ ./mlp/src/TMLPAnalyzer.cxx 2008-05-25 10:26:20.093286541 +0000 +@@ -38,6 +38,7 @@ + #include "TRegexp.h" + #include "TMath.h" + #include "Riostream.h" ++#include <cstdlib> + + ClassImp(TMLPAnalyzer) + +--- ./mlp/src/TMultiLayerPerceptron.cxx.orig 2008-05-25 10:27:02.107680805 +0000 ++++ ./mlp/src/TMultiLayerPerceptron.cxx 2008-05-25 10:27:24.544959433 +0000 +@@ -242,6 +242,7 @@ + #include "TLine.h" + #include "TText.h" + #include "TObjString.h" ++#include <cstdlib> + + ClassImp(TMultiLayerPerceptron) + +--- ./mysql/src/TMySQLStatement.cxx.orig 2008-05-25 14:27:19.826713370 +0000 ++++ ./mysql/src/TMySQLStatement.cxx 2008-05-25 14:27:40.607897622 +0000 +@@ -21,6 +21,7 @@ + #include "TDataType.h" + #include "TDatime.h" + #include "snprintf.h" ++#include <cstdlib> + + ClassImp(TMySQLStatement) + +--- ./net/src/TWebFile.cxx.orig 2008-05-25 09:12:33.080462763 +0000 ++++ ./net/src/TWebFile.cxx 2008-05-25 09:12:48.141321033 +0000 +@@ -22,6 +22,7 @@ + #include "TROOT.h" + #include "TSocket.h" + #include "Bytes.h" ++#include <cstdlib> + + static const char *gUserAgent = "User-Agent: ROOT-TWebFile/1.0"; + +--- ./newdelete/src/MemCheck.cxx.orig 2008-05-25 09:18:01.787194692 +0000 ++++ ./newdelete/src/MemCheck.cxx 2008-05-25 09:18:18.764162155 +0000 +@@ -57,6 +57,7 @@ + #include <stdio.h> + #include <string.h> + #include <signal.h> ++#include <cstdlib> + #include "MemCheck.h" + #include "TSystem.h" + #include "TEnv.h" +--- ./odbc/src/TODBCStatement.cxx.orig 2008-05-25 14:43:38.376313784 +0000 ++++ ./odbc/src/TODBCStatement.cxx 2008-05-25 14:43:53.429171597 +0000 +@@ -24,6 +24,7 @@ + #include "snprintf.h" + #include "Riostream.h" + ++#include <cstdlib> + #include <sqlext.h> + + #define kSqlTime 123781 +--- ./proof/src/TCondor.cxx.orig 2008-05-25 11:19:42.985423633 +0000 ++++ ./proof/src/TCondor.cxx 2008-05-25 11:20:00.374414575 +0000 +@@ -28,6 +28,7 @@ + #include "Riostream.h" + #include "TEnv.h" + #include "TClass.h" ++#include <cstdlib> + + ClassImp(TCondorSlave) + ClassImp(TCondor) +--- ./proof/src/TProof.cxx.orig 2008-05-25 11:20:29.484073440 +0000 ++++ ./proof/src/TProof.cxx 2008-05-25 11:20:41.060733156 +0000 +@@ -22,6 +22,7 @@ + + #include <fcntl.h> + #include <errno.h> ++#include <cstdlib> + #ifdef WIN32 + # include <io.h> + # include <sys/stat.h> +--- ./proof/src/TProofServ.cxx.orig 2008-05-25 11:21:04.342059883 +0000 ++++ ./proof/src/TProofServ.cxx 2008-05-25 11:21:17.246795282 +0000 +@@ -23,7 +23,7 @@ + #include "RConfigure.h" + #include "RConfig.h" + #include "Riostream.h" +- ++#include <cstdlib> + #ifdef WIN32 + #include <io.h> + typedef long off_t; +--- ./proof/src/TSlave.cxx.orig 2008-05-25 11:21:49.988661135 +0000 ++++ ./proof/src/TSlave.cxx 2008-05-25 11:22:56.160432049 +0000 +@@ -20,6 +20,7 @@ + // // + ////////////////////////////////////////////////////////////////////////// + ++#include <cstdlib> + #include "RConfigure.h" + #include "TApplication.h" + #include "TSlave.h" +--- ./reflex/src/DataMember.cxx.orig 2008-05-25 14:49:19.567757176 +0000 ++++ ./reflex/src/DataMember.cxx 2008-05-25 14:50:02.166184722 +0000 +@@ -23,7 +23,7 @@ + + #include "Reflex/Tools.h" + #include "Class.h" +- ++#include <cstring> + + //------------------------------------------------------------------------------- + ROOT::Reflex::DataMember::DataMember( const char * nam, +--- ./reflex/src/PluginFactoryMap.cxx.orig 2008-05-25 14:58:58.622679122 +0000 ++++ ./reflex/src/PluginFactoryMap.cxx 2008-05-25 15:00:31.051946365 +0000 +@@ -21,6 +21,7 @@ + #include <vector> + #include <map> + #include <set> ++#include <cstring> + + using namespace ROOT::Reflex; + using namespace std; +--- ./reflex/src/Tools.cxx.orig 2008-05-25 15:02:11.333661095 +0000 ++++ ./reflex/src/Tools.cxx 2008-05-25 15:02:22.654306221 +0000 +@@ -13,6 +13,7 @@ + #define REFLEX_BUILD + #endif + ++#include <cstring> + #include "Reflex/Tools.h" + + #include "Reflex/Kernel.h" +--- ./sessionviewer/src/TSessionViewer.cxx.orig 2008-05-25 11:23:25.334094561 +0000 ++++ ./sessionviewer/src/TSessionViewer.cxx 2008-05-25 11:23:39.210885354 +0000 +@@ -18,6 +18,7 @@ + // // + ////////////////////////////////////////////////////////////////////////// + ++#include <cstdlib> + #include "TApplication.h" + #include "TROOT.h" + #include "THashList.h" +--- ./smatrix/inc/Math/Expression.h.orig 2008-05-25 10:33:42.434494130 +0000 ++++ ./smatrix/inc/Math/Expression.h 2008-05-25 10:33:55.707250502 +0000 +@@ -45,6 +45,7 @@ + + + #include <iomanip> ++#include <iostream> + + namespace ROOT { + +--- ./sql/inc/TSQLFile.h.orig 2008-05-25 10:36:17.827349464 +0000 ++++ ./sql/inc/TSQLFile.h 2008-05-25 10:36:39.340575433 +0000 +@@ -12,6 +12,7 @@ + #ifndef ROOT_TSQLFile + #define ROOT_TSQLFile + ++#include <cstdlib> + + ///////////////////////////////////////////////////////////////////////// + // // +--- ./tmva/src/BinarySearchTree.cxx.orig 2008-05-25 10:41:43.737922050 +0000 ++++ ./tmva/src/BinarySearchTree.cxx 2008-05-25 10:42:07.063251284 +0000 +@@ -66,6 +66,7 @@ + #ifndef ROOT_TMVA_BinarySearchTree + #include "TMVA/BinarySearchTree.h" + #endif ++#include <algorithm> + + ClassImp(TMVA::BinarySearchTree) + +--- ./tmva/src/MethodANNBase.cxx.orig 2008-05-25 10:42:47.477554364 +0000 ++++ ./tmva/src/MethodANNBase.cxx 2008-05-25 10:43:04.486523650 +0000 +@@ -31,6 +31,7 @@ + + #include "TString.h" + #include <vector> ++#include <cstdlib> + #include "TTree.h" + #include "TDirectory.h" + #include "Riostream.h" +--- ./tmva/src/MethodCFMlpANN.cxx.orig 2008-05-25 10:43:52.501259854 +0000 ++++ ./tmva/src/MethodCFMlpANN.cxx 2008-05-25 10:43:27.107812764 +0000 +@@ -65,6 +65,7 @@ + + #include <iostream> + #include <string> ++#include <cstdlib> + + #include "Riostream.h" + #include "TMath.h" +--- ./tmva/src/MethodCFMlpANN_Utils.cxx.orig 2008-05-25 10:44:57.164944827 +0000 ++++ ./tmva/src/MethodCFMlpANN_Utils.cxx 2008-05-25 10:45:09.757662445 +0000 +@@ -58,6 +58,7 @@ + //_______________________________________________________________________ + + #include <iostream> ++#include <cstdlib> + + #include "TMVA/MethodCFMlpANN_Utils.h" + #include "TMVA/Timer.h" +--- ./tmva/src/MethodCuts.cxx.orig 2008-05-25 10:45:47.783829433 +0000 ++++ ./tmva/src/MethodCuts.cxx 2008-05-25 10:46:04.640790057 +0000 +@@ -91,6 +91,7 @@ + //_______________________________________________________________________ + + #include <iostream> ++#include <cstdlib> + + #include <stdio.h> + #include "time.h" +--- ./tmva/src/MethodFDA.cxx.orig 2008-05-25 10:46:38.050693979 +0000 ++++ ./tmva/src/MethodFDA.cxx 2008-05-25 10:46:50.347720956 +0000 +@@ -33,6 +33,7 @@ + // Algorithm, Simulated Annealing, MINUIT and combinations of these. // + //_______________________________________________________________________ + ++#include <cstdlib> + #include "Riostream.h" + #include "TList.h" + #include "TFormula.h" +--- ./tmva/src/MethodKNN.cxx.orig 2008-05-25 10:47:22.277569444 +0000 ++++ ./tmva/src/MethodKNN.cxx 2008-05-25 10:47:34.772031819 +0000 +@@ -33,6 +33,7 @@ + + // C++ + #include <string> ++#include <cstdlib> + + // ROOT + #include "TFile.h" +--- ./tmva/src/MethodPDERS.cxx.orig 2008-05-25 10:48:06.849814742 +0000 ++++ ./tmva/src/MethodPDERS.cxx 2008-05-25 10:48:24.949792717 +0000 +@@ -66,6 +66,7 @@ + //_______________________________________________________________________ + + #include <assert.h> ++#include <algorithm> + + #include "TFile.h" + #include "TObjString.h" +--- ./tmva/src/MethodSeedDistance.cxx.orig 2008-05-25 10:48:56.188225273 +0000 ++++ ./tmva/src/MethodSeedDistance.cxx 2008-05-25 10:49:11.417093116 +0000 +@@ -29,6 +29,7 @@ + End_Html */ + //_______________________________________________________________________ + ++#include <cstdlib> + #include "Riostream.h" + #include "TList.h" + #include "TFormula.h" +--- ./tmva/src/MsgLogger.cxx.orig 2008-05-25 10:49:50.563323933 +0000 ++++ ./tmva/src/MsgLogger.cxx 2008-05-25 10:50:03.972088055 +0000 +@@ -30,6 +30,7 @@ + #include <iomanip> + #include <iostream> + #include <string> ++#include <cstdlib> + + using std::string; + using std::cout; +--- ./tree/src/TBufferSQL.cxx.orig 2008-05-25 09:24:39.647922594 +0000 ++++ ./tree/src/TBufferSQL.cxx 2008-05-25 09:24:53.280699482 +0000 +@@ -18,6 +18,7 @@ + ////////////////////////////////////////////////////////////////////////// + + #include <stdio.h> ++#include <cstdlib> + #include "Riostream.h" + #include "TError.h" + +--- ./tree/src/TTreeSQL.cxx.orig 2008-05-25 09:25:53.536133243 +0000 ++++ ./tree/src/TTreeSQL.cxx 2008-05-25 09:26:05.680825330 +0000 +@@ -20,6 +20,7 @@ + #include <Riostream.h> + #include <vector> + #include <map> ++#include <cstdlib> + + #include "TString.h" + #include "TROOT.h" +--- ./utils/src/rlibmap.cxx.orig 2008-05-24 22:33:42.550370884 +0000 ++++ ./utils/src/rlibmap.cxx 2008-05-24 22:34:01.139430215 +0000 +@@ -28,6 +28,7 @@ + #include <fcntl.h> + #include <string> + #include <vector> ++#include <cstring> + #ifndef WIN32 + # include <unistd.h> + #else +--- ./xml/src/TXMLEngine.cxx.orig 2008-05-25 10:30:33.687738066 +0000 ++++ ./xml/src/TXMLEngine.cxx 2008-05-25 10:30:47.300513814 +0000 +@@ -23,6 +23,7 @@ + + #include "Riostream.h" + #include "TString.h" ++#include <cstdlib> + + ClassImp(TXMLEngine); + +--- ./xml/src/TXMLSetup.cxx.orig 2008-05-25 10:31:20.746419787 +0000 ++++ ./xml/src/TXMLSetup.cxx 2008-05-25 10:31:38.287419392 +0000 +@@ -38,6 +38,7 @@ + #include "TStreamerElement.h" + + #include "Riostream.h" ++#include <cstdlib> + + ClassImp(TXMLSetup); + diff --git a/sci-physics/root/files/root-5.18.00d-makefile.patch b/sci-physics/root/files/root-5.18.00d-makefile.patch new file mode 100644 index 000000000000..634c99319815 --- /dev/null +++ b/sci-physics/root/files/root-5.18.00d-makefile.patch @@ -0,0 +1,13 @@ +--- Makefile.orig 2008-05-27 09:06:38.300582081 +0000 ++++ Makefile 2008-05-27 09:07:17.946841392 +0000 +@@ -898,8 +898,8 @@ + $(INSTALLDATA) build/misc/root-help.el $(DESTDIR)$(ELISPDIR); \ + echo "Installing GDML conversion scripts in $(DESTDIR)$(LIBDIR)"; \ + $(INSTALLDATA) gdml/*.py $(DESTDIR)$(LIBDIR); \ +- find $(DESTDIR)$(DATADIR) -name CVS -exec rm -rf {} \; >/dev/null 2>&1; \ +- find $(DESTDIR)$(DATADIR) -name .svn -exec rm -rf {} \; >/dev/null 2>&1; \ ++ find $(DESTDIR)$(LIBDIR) -name CVS -exec rm -rf {} \; >/dev/null 2>&1; \ ++ find $(DESTDIR)$(LIBDIR) -name .svn -exec rm -rf {} \; >/dev/null 2>&1; \ + fi + + uninstall: diff --git a/sci-physics/root/files/xrootd-20071116-checksymbol.patch b/sci-physics/root/files/xrootd-20071116-checksymbol.patch new file mode 100644 index 000000000000..e3b0bc63d22b --- /dev/null +++ b/sci-physics/root/files/xrootd-20071116-checksymbol.patch @@ -0,0 +1,129 @@ +--- xrootd/configure.classic.orig 2008-05-26 15:52:33.337003344 +0000 ++++ xrootd/configure.classic 2008-05-26 22:17:49.601277080 +0000 +@@ -339,7 +339,8 @@ + + # Assert that we got enough arguments + if test $# -ne 3 ; then +- echo "check_symbol: Not 3 arguments" ++ echo "check_symbol: not 3 arguments" ++ found_symbol=0 + return 1 + fi + +@@ -348,34 +349,105 @@ + symbollib=$1 ; shift + symboldir=$1 + ++ if test "x$symbollib" = "x" ; then ++ found_symbol=0 ++ return 1 ++ fi ++ ++ symbollib=`echo $symbollib | sed -e 's/^-l/lib/'` ++ ++ if test ! "x$symboldir" = "x" ; then ++ symboldir=`echo $symboldir | sed -e 's/^-L//'` ++ fi ++ + # Check if we got a specific argument as to where the library + # is to be found + symbolfile=$symbollib +- if test ! "x$symboldir" = "x" ; then +- symbolfile=$symboldir/$symbollib +- if test ! -r $symbolfile ; then +- for i in .a .so .lib ; do +- if test -r $symbolfile$i ; then +- symbolfile=$symbolfile$i +- break ++ exts=".so .lib" ++ if test ! "x$shared" = "xno" ; then ++ exts="$exts .a" ++ else ++ exts=".a $exts" ++ fi ++ ++ usrlib="/usr/lib" ++ # look first in the lib32 directories ++ if test "x$checklib32" = "xyes" ; then ++ usrlib="/usr/lib32 $usrlib" ++ fi ++ # look first in the lib64 directories ++ if test "x$checklib64" = "xyes" ; then ++ usrlib="/usr/lib64 $usrlib" ++ fi ++ # look only in the lib64 directories ++ if test "x$checkonlylib64" = "xyes" ; then ++ usrlib="/usr/lib64" ++ fi ++ # look only in the hpux64 directories ++ if test "x$checkhpux64" = "xyes" ; then ++ usrlib="/usr/lib/hpux64" ++ fi ++ ++ for d in "$symboldir" $usrlib ; do ++ echo " Checking in $d" ++ if test ! -r $d/$symbollib ; then ++ echo " $d/$symbollib not readable" ++ for i in $exts ; do ++ echo " Checking extension $i with $d/$symbollib" ++ if test -r $d/$symbollib$i ; then ++ echo " $d/$symbollib$i readable" ++ symbolfile=$d/$symbollib$i ++ break 2 + fi + done ++ else ++ echo "$d/$symbollib readable" ++ symbolfile=$d/$symbollib ++ break + fi +- fi ++ done + + if test "x$symbolfile" = "x" || test ! -r $symbolfile ; then + found_symbol=0 ++ echo " Symbol not found" + return 1 + fi + +- symbol_in_lib=`nm $symbolfile | grep $symbol > /dev/null 2>&1` ++ checking_msg "$symbol in $symbolfile" ++ nm $symbolfile 2>&1 | grep $symbol > /dev/null 2>&1 + if test $? -eq 0 ; then + found_symbol=1 ++ echo " Symbol found" + else +- found_symbol=0 ++ nm $symbolfile 2>&1 | grep "no symbols" > /dev/null 2>&1 ++ if test $? -eq 0 ; then ++ echo " $symbolfile is stripped, trying a link" ++ # stripped library - only safe test is to link against the ++ # library! However, we do not know what compiler to use ++ # so we can not do the test. Assume the symbol is in ++ cat <<EOF > conftest.mk ++conftest:conftest.c $symbolfile ++ \$(CC) \$(CFLAGS) \$(LDFLAGS) $symbolfile \$< -o \$@ ++ ++conftest.c: ++ echo "extern int $symbol (); " > \$@ ++ echo "int main() { $symbol (); return 0; }" >> \$@ ++EOF ++ make -f conftest.mk >> config.log 2>&1 ++ if test $? -eq 0 ; then ++ found_symbol=1 ++ echo " Link OK" ++ else ++ found_symbol=0 ++ echo " Failed code was" ++ cat conftest.mk >> config.log ++ fi ++ rm -rf conftest.c conftest.mk conftest ++ else ++ found_symbol=0 ++ fi + fi + } +- + #_____________________________________________________________________ + guess_architecture () { + # Try to guess the architecture of the host system diff --git a/sci-physics/root/files/xrootd-20071116-gcc43.patch b/sci-physics/root/files/xrootd-20071116-gcc43.patch new file mode 100644 index 000000000000..14697d790e8b --- /dev/null +++ b/sci-physics/root/files/xrootd-20071116-gcc43.patch @@ -0,0 +1,948 @@ +--- xrootd/src/Xrd/XrdConfig.cc.orig 2008-01-29 06:38:09.000000000 +0000 ++++ xrootd/src/Xrd/XrdConfig.cc 2008-05-26 11:18:26.736398449 +0000 +@@ -21,7 +21,6 @@ + + #include <unistd.h> + #include <ctype.h> +-#include <iostream.h> + #include <pwd.h> + #include <string.h> + #include <stdio.h> +@@ -29,7 +28,8 @@ + #include <sys/resource.h> + #include <sys/types.h> + #include <sys/stat.h> +- ++#include <iostream> ++using namespace std; + #include "Xrd/XrdBuffer.hh" + #include "Xrd/XrdConfig.hh" + #include "Xrd/XrdInet.hh" +--- xrootd/src/Xrd/XrdMain.cc.orig 2007-07-31 02:23:35.000000000 +0000 ++++ xrootd/src/Xrd/XrdMain.cc 2008-05-26 11:18:26.864405743 +0000 +@@ -46,13 +46,14 @@ + #include <unistd.h> + #include <ctype.h> + #include <errno.h> +-#include <iostream.h> + #include <signal.h> + #include <stdlib.h> + #include <string.h> + #include <strings.h> + #include <stdio.h> + #include <sys/param.h> ++#include <iostream> ++using namespace std; + + #include "Xrd/XrdBuffer.hh" + #include "Xrd/XrdConfig.hh" +--- xrootd/src/Xrd/XrdTrace.hh.orig 2004-08-30 07:16:52.000000000 +0000 ++++ xrootd/src/Xrd/XrdTrace.hh 2008-05-26 11:18:26.784401184 +0000 +@@ -26,7 +26,7 @@ + + #ifndef NODEBUG + +-#include <iostream.h> ++#include <iostream> + #include "XrdOuc/XrdOucTrace.hh" + + #ifndef XRD_TRACE +--- xrootd/src/XrdAcc/XrdAccConfig.cc.orig 2007-07-31 02:24:01.000000000 +0000 ++++ xrootd/src/XrdAcc/XrdAccConfig.cc 2008-05-26 11:18:31.644678155 +0000 +@@ -23,13 +23,14 @@ + #include <unistd.h> + #include <ctype.h> + #include <fcntl.h> +-#include <iostream.h> + #include <strings.h> + #include <stdio.h> + #include <time.h> + #include <sys/param.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <iostream> ++using namespace std; + + #include "XrdOuc/XrdOucLock.hh" + #include "XrdOuc/XrdOucEnv.hh" +--- xrootd/src/XrdAcc/XrdAccGroups.cc.orig 2004-07-07 02:47:55.000000000 +0000 ++++ xrootd/src/XrdAcc/XrdAccGroups.cc 2008-05-26 11:18:31.540672229 +0000 +@@ -15,7 +15,6 @@ + #include <unistd.h> + #include <ctype.h> + #include <errno.h> +-#include <iostream.h> + #include <limits.h> + #include <netdb.h> + #include <pwd.h> +@@ -23,6 +22,8 @@ + #include <strings.h> + #include <sys/param.h> + #include <sys/types.h> ++#include <iostream> ++using namespace std; + + #include "XrdAcc/XrdAccCapability.hh" + #include "XrdAcc/XrdAccGroups.hh" +--- xrootd/src/XrdAcc/XrdAccTest.cc.orig 2007-07-31 02:24:03.000000000 +0000 ++++ xrootd/src/XrdAcc/XrdAccTest.cc 2008-05-26 11:18:31.576674280 +0000 +@@ -28,7 +28,6 @@ + #include <unistd.h> + #include <ctype.h> + #include <errno.h> +-#include <iostream.h> + #include <stdlib.h> + #include <strings.h> + #include <stdio.h> +@@ -36,6 +35,8 @@ + #include <arpa/inet.h> + #include <sys/param.h> + #include <sys/socket.h> ++#include <iostream> ++using namespace std; + + #include "XrdAcc/XrdAccAuthorize.hh" + #include "XrdAcc/XrdAccConfig.hh" +--- xrootd/src/XrdClient/XrdClientPhyConnection.cc.orig 2007-12-06 15:04:21.000000000 +0000 ++++ xrootd/src/XrdClient/XrdClientPhyConnection.cc 2008-05-26 11:18:24.896293587 +0000 +@@ -220,14 +220,14 @@ + Error("PhyConnection", + "Can't create reader thread: out of system resources"); + // HELP: what do we do here +- std::exit(-1); ++ ::exit(-1); + } + + if (fReaderthreadhandler[i]->Run(this)) { + Error("PhyConnection", + "Can't run reader thread: out of system resources. Critical error."); + // HELP: what do we do here +- std::exit(-1); ++ ::exit(-1); + } + + if (fReaderthreadhandler[i]->Detach()) +--- xrootd/src/XrdCrypto/XrdCryptoAux.hh.orig 2006-09-28 22:39:57.000000000 +0000 ++++ xrootd/src/XrdCrypto/XrdCryptoAux.hh 2008-05-26 11:18:29.344547078 +0000 +@@ -3,9 +3,7 @@ + #define __CRYPTO_AUX_H__ + + #include <stdio.h> +-#ifndef WIN32 +-#include <iostream.h> +-#endif ++#include <iostream> + #include <XProtocol/XProtocol.hh> + + /******************************************************************************/ +--- xrootd/src/XrdCrypto/XrdCryptoCipher.cc.orig 2005-06-16 12:17:17.000000000 +0000 ++++ xrootd/src/XrdCrypto/XrdCryptoCipher.cc 2008-05-26 11:18:29.052530437 +0000 +@@ -19,6 +19,7 @@ + + #include <XrdCrypto/XrdCryptoAux.hh> + #include <XrdCrypto/XrdCryptoCipher.hh> ++using namespace std; + + //_____________________________________________________________________________ + bool XrdCryptoCipher::Finalize(char *, int, const char *) +--- xrootd/src/XrdCrypto/XrdCryptoMsgDigest.cc.orig 2005-06-16 12:17:18.000000000 +0000 ++++ xrootd/src/XrdCrypto/XrdCryptoMsgDigest.cc 2008-05-26 11:18:28.904522003 +0000 +@@ -18,6 +18,7 @@ + /* ************************************************************************** */ + + #include <string.h> ++using namespace std; + + #include <XrdCrypto/XrdCryptoAux.hh> + #include <XrdCrypto/XrdCryptoMsgDigest.hh> +--- xrootd/src/XrdCrypto/XrdCryptosslTrace.hh.orig 2005-06-16 12:17:23.000000000 +0000 ++++ xrootd/src/XrdCrypto/XrdCryptosslTrace.hh 2008-05-26 11:18:29.220540012 +0000 +@@ -16,7 +16,7 @@ + + #ifndef NODEBUG + +-#include <iostream.h> ++#include <iostream> + + #define QTRACE(act) (sslTrace && (sslTrace->What & cryptoTRACE_ ## act)) + #define PRINT(y) {if (sslTrace) {sslTrace->Beg(epname); \ +--- xrootd/src/XrdCrypto/XrdCryptoTrace.hh.orig 2006-01-19 21:05:07.000000000 +0000 ++++ xrootd/src/XrdCrypto/XrdCryptoTrace.hh 2008-05-26 11:18:29.036529526 +0000 +@@ -16,7 +16,7 @@ + + #ifndef NODEBUG + +-#include <iostream.h> ++#include <iostream> + + #define QTRACE(act) (cryptoTrace && (cryptoTrace->What & cryptoTRACE_ ## act)) + #define PRINT(y) {if (cryptoTrace) {cryptoTrace->Beg(epname); \ +--- xrootd/src/XrdNet/XrdNetDNS.cc.orig 2007-07-26 15:18:18.000000000 +0000 ++++ xrootd/src/XrdNet/XrdNetDNS.cc 2008-05-26 11:18:31.200652852 +0000 +@@ -24,8 +24,9 @@ + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-#include <iostream.h> + #endif ++#include <iostream> ++using namespace std; + + #include "XrdNet/XrdNetDNS.hh" + #include "XrdSys/XrdSysPlatform.hh" +--- xrootd/src/XrdOdc/XrdOdcConfig.cc.orig 2007-07-31 02:24:52.000000000 +0000 ++++ xrootd/src/XrdOdc/XrdOdcConfig.cc 2008-05-26 11:18:21.136079305 +0000 +@@ -14,7 +14,6 @@ + + #include <unistd.h> + #include <ctype.h> +-#include <iostream.h> + #include <strings.h> + #include <stdio.h> + #include <sys/param.h> +@@ -23,6 +22,8 @@ + #include <sys/stat.h> + #include <sys/un.h> + #include <fcntl.h> ++#include <iostream> ++using namespace std; + + #include "XrdOdc/XrdOdcConfig.hh" + #include "XrdOdc/XrdOdcMsg.hh" +--- xrootd/src/XrdOdc/XrdOdcTrace.hh.orig 2004-08-30 07:16:55.000000000 +0000 ++++ xrootd/src/XrdOdc/XrdOdcTrace.hh 2008-05-26 11:18:21.040073834 +0000 +@@ -23,7 +23,9 @@ + + #ifndef NODEBUG + +-#include <iostream.h> ++#include <iostream> ++using namespace std; ++ + #include "XrdOuc/XrdOucTrace.hh" + + #define QTRACE(act) OdcTrace.What & TRACE_ ## act +--- xrootd/src/XrdOfs/XrdOfs.cc.orig 2007-11-15 22:24:14.000000000 +0000 ++++ xrootd/src/XrdOfs/XrdOfs.cc 2008-05-26 11:18:32.120705283 +0000 +@@ -35,13 +35,14 @@ + #include <string.h> + #include <stdio.h> + #include <time.h> +-#include <iostream.h> + #include <netdb.h> + #include <stdlib.h> + #include <sys/param.h> + #include <sys/stat.h> + #include <sys/time.h> + #include <sys/types.h> ++#include <iostream> ++using namespace std; + + #include "XrdVersion.hh" + +--- xrootd/src/XrdOfs/XrdOfsConfig.cc.orig 2007-10-04 01:33:34.000000000 +0000 ++++ xrootd/src/XrdOfs/XrdOfsConfig.cc 2008-05-26 11:18:31.972696848 +0000 +@@ -26,13 +26,14 @@ + #include <ctype.h> + #include <errno.h> + #include <fcntl.h> +-#include <iostream.h> + #include <netdb.h> + #include <stdlib.h> + #include <strings.h> + #include <stdio.h> + #include <netinet/in.h> + #include <sys/param.h> ++#include <iostream> ++using namespace std; + + #include "XrdOfs/XrdOfs.hh" + #include "XrdOfs/XrdOfsConfig.hh" +--- xrootd/src/XrdOfs/XrdOfsTrace.hh.orig 2004-08-30 07:16:57.000000000 +0000 ++++ xrootd/src/XrdOfs/XrdOfsTrace.hh 2008-05-26 11:18:32.028700040 +0000 +@@ -14,7 +14,7 @@ + + #ifndef NODEBUG + +-#include <iostream.h> ++#include <iostream> + #include "XrdOfs/XrdOfs.hh" + + #define GTRACE(act) OfsTrace.What & TRACE_ ## act +--- xrootd/src/XrdOlb/XrdOlbConfig.cc.orig 2007-11-09 21:31:37.000000000 +0000 ++++ xrootd/src/XrdOlb/XrdOlbConfig.cc 2008-05-26 11:18:22.924181203 +0000 +@@ -25,7 +25,6 @@ + #include <unistd.h> + #include <ctype.h> + #include <fcntl.h> +-#include <iostream.h> + #include <strings.h> + #include <stdio.h> + #include <sys/param.h> +@@ -34,6 +33,8 @@ + #include <sys/types.h> + #include <sys/un.h> + #include <dirent.h> ++#include <iostream> ++using namespace std; + + #include "../XrdVersion.hh" + #include "Xrd/XrdJob.hh" +--- xrootd/src/XrdOlb/XrdOlbProtocol.cc.orig 2007-11-09 21:31:38.000000000 +0000 ++++ xrootd/src/XrdOlb/XrdOlbProtocol.cc 2008-05-26 11:18:23.088190549 +0000 +@@ -16,13 +16,14 @@ + #include <unistd.h> + #include <ctype.h> + #include <errno.h> +-#include <iostream.h> + #include <signal.h> + #include <stdlib.h> + #include <string.h> + #include <strings.h> + #include <stdio.h> + #include <sys/param.h> ++#include <iostream> ++using namespace std; + + #include "Xrd/XrdInet.hh" + #include "Xrd/XrdLink.hh" +--- xrootd/src/XrdOlb/XrdOlbTrace.hh.orig 2007-07-31 02:25:18.000000000 +0000 ++++ xrootd/src/XrdOlb/XrdOlbTrace.hh 2008-05-26 11:18:23.132193057 +0000 +@@ -26,7 +26,7 @@ + #define XRDOLBTRACETYPE . + #endif + +-#include <iostream.h> ++#include <iostream> + #include "XrdOuc/XrdOucTrace.hh" + + #define DEBUG(y) if (Trace XRDOLBTRACETYPE What & TRACE_Debug) TRACEX(y) +--- xrootd/src/XrdOss/XrdOssApi.cc.orig 2007-10-04 01:34:13.000000000 +0000 ++++ xrootd/src/XrdOss/XrdOssApi.cc 2008-05-26 11:18:20.408037816 +0000 +@@ -24,7 +24,6 @@ + #include <unistd.h> + #include <errno.h> + #include <fcntl.h> +-#include <iostream.h> + #include <signal.h> + #include <strings.h> + #include <stdio.h> +@@ -34,6 +33,8 @@ + #ifdef __solaris__ + #include <sys/vnode.h> + #endif ++#include <iostream> ++using namespace std; + + #include "XrdVersion.hh" + +--- xrootd/src/XrdOss/XrdOssApi.hh.orig 2007-07-31 02:25:27.000000000 +0000 ++++ xrootd/src/XrdOss/XrdOssApi.hh 2008-05-26 11:18:20.428038956 +0000 +@@ -14,7 +14,7 @@ + + #include <sys/types.h> + #include <errno.h> +-#include <iostream.h> ++#include <iostream> + + #include "XrdOss/XrdOss.hh" + #include "XrdOss/XrdOssCache.hh" +--- xrootd/src/XrdOss/XrdOssCache.cc.orig 2007-07-31 02:25:28.000000000 +0000 ++++ xrootd/src/XrdOss/XrdOssCache.cc 2008-05-26 11:18:20.296031433 +0000 +@@ -15,11 +15,12 @@ + #include <unistd.h> + #include <errno.h> + #include <strings.h> +-#include <iostream.h> + #include <stdio.h> + #include <time.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <iostream> ++using namespace std; + + #include "XrdOss/XrdOssApi.hh" + #include "XrdOss/XrdOssCache.hh" +--- xrootd/src/XrdOss/XrdOssConfig.cc 2007-11-09 21:32:41.000000000 +0000 ++++ src/xrootd/src/XrdOss/XrdOssConfig.cc 2008-05-26 11:18:20.340033941 +0000 +@@ -27,13 +27,14 @@ + #include <ctype.h> + #include <dirent.h> + #include <fcntl.h> +-#include <iostream.h> + #include <strings.h> + #include <stdio.h> + #include <sys/param.h> + #include <sys/resource.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <iostream> ++using namespace std; + + #include "XrdOss/XrdOssApi.hh" + #include "XrdOss/XrdOssConfig.hh" +--- xrootd/src/XrdOss/XrdOssCreate.cc.orig 2007-08-15 00:45:11.000000000 +0000 ++++ xrootd/src/XrdOss/XrdOssCreate.cc 2008-05-26 11:18:20.272030065 +0000 +@@ -19,7 +19,6 @@ + #include <unistd.h> + #include <errno.h> + #include <fcntl.h> +-#include <iostream.h> + #include <strings.h> + #include <stdio.h> + #include <sys/file.h> +@@ -28,6 +27,8 @@ + #if defined(__solaris__) || defined(AIX) + #include <sys/vnode.h> + #endif ++#include <iostream> ++using namespace std; + + #include "XrdOss/XrdOssApi.hh" + #include "XrdOss/XrdOssConfig.hh" +--- xrootd/src/XrdOss/XrdOssLock.cc.orig 2007-07-31 02:25:31.000000000 +0000 ++++ xrootd/src/XrdOss/XrdOssLock.cc 2008-05-26 11:18:20.140022543 +0000 +@@ -68,11 +68,12 @@ + #include <sys/types.h> + #include <sys/wait.h> + #include <errno.h> +-#include <iostream.h> + #include <fcntl.h> + #include <limits.h> + #include <strings.h> + #include <utime.h> ++#include <iostream> ++using namespace std; + + #include "XrdOss/XrdOssApi.hh" + #include "XrdOss/XrdOssConfig.hh" +--- xrootd/src/XrdOss/XrdOssMSS.cc.orig 2007-07-31 02:25:32.000000000 +0000 ++++ xrootd/src/XrdOss/XrdOssMSS.cc 2008-05-26 11:18:20.232027786 +0000 +@@ -16,7 +16,6 @@ + #include <unistd.h> + #include <errno.h> + #include <strings.h> +-#include <iostream.h> + #include <signal.h> + #include <stdio.h> + #include <time.h> +@@ -29,6 +28,8 @@ + #include <sys/socket.h> + #include <sys/un.h> + #include <sys/wait.h> ++#include <iostream> ++using namespace std; + + #include "XrdNet/XrdNetOpts.hh" + #include "XrdNet/XrdNetSocket.hh" +--- xrootd/src/XrdOss/XrdOssRename.cc.orig 2007-07-31 02:25:34.000000000 +0000 ++++ xrootd/src/XrdOss/XrdOssRename.cc 2008-05-26 11:18:20.356034852 +0000 +@@ -15,11 +15,12 @@ + #include <unistd.h> + #include <errno.h> + #include <strings.h> +-#include <iostream.h> + #include <limits.h> + #include <stdio.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <iostream> ++using namespace std; + + #include "XrdOss/XrdOssApi.hh" + #include "XrdOss/XrdOssError.hh" +--- xrootd/src/XrdOss/XrdOssStage.cc.orig 2007-07-31 02:25:34.000000000 +0000 ++++ xrootd/src/XrdOss/XrdOssStage.cc 2008-05-26 11:18:20.316032573 +0000 +@@ -25,13 +25,14 @@ + #include <unistd.h> + #include <errno.h> + #include <strings.h> +-#include <iostream.h> + #include <signal.h> + #include <stdio.h> + #include <time.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/wait.h> ++#include <iostream> ++using namespace std; + + #include "XrdOss/XrdOssApi.hh" + #include "XrdOss/XrdOssCache.hh" +--- xrootd/src/XrdOss/XrdOssTrace.hh.orig 2005-01-10 08:10:49.000000000 +0000 ++++ xrootd/src/XrdOss/XrdOssTrace.hh 2008-05-26 11:18:20.384036448 +0000 +@@ -24,7 +24,7 @@ + + #ifndef NODEBUG + +-#include <iostream.h> ++#include <iostream> + + #define QTRACE(act) OssTrace.What & TRACE_ ## act + +--- xrootd/src/XrdOss/XrdOssUnlink.cc.orig 2007-08-09 01:18:46.000000000 +0000 ++++ xrootd/src/XrdOss/XrdOssUnlink.cc 2008-05-26 11:18:20.216026874 +0000 +@@ -15,11 +15,12 @@ + #include <unistd.h> + #include <errno.h> + #include <strings.h> +-#include <iostream.h> + #include <limits.h> + #include <stdio.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <iostream> ++using namespace std; + + #include "XrdOss/XrdOssApi.hh" + #include "XrdOss/XrdOssError.hh" +--- xrootd/src/XrdOuc/XrdOucStream.cc.orig 2008-01-14 11:25:06.000000000 +0000 ++++ xrootd/src/XrdOuc/XrdOucStream.cc 2008-05-26 11:18:30.556616150 +0000 +@@ -19,15 +19,11 @@ + #include <string.h> + #include <stdio.h> + #ifndef WIN32 +-#include <iostream.h> + #include <unistd.h> + #include <strings.h> + #if !defined(__linux__) && !defined(__CYGWIN__) + #include <sys/conf.h> + #endif +-#if !defined(__macos__) && !defined(__CYGWIN__) +-#include <stropts.h> +-#endif + #include <sys/stat.h> + #include <sys/termios.h> + #include <sys/types.h> +@@ -35,9 +31,9 @@ + #else // WIN32 + #include "XrdSys/XrdWin32.hh" + #include <process.h> ++#endif // WIN32 + #include <iostream> + using namespace std; +-#endif // WIN32 + + #include "XrdOuc/XrdOucEnv.hh" + #include "XrdOuc/XrdOucStream.hh" +--- xrootd/src/XrdOuc/XrdOucTrace.hh.orig 2007-07-31 02:25:53.000000000 +0000 ++++ xrootd/src/XrdOuc/XrdOucTrace.hh 2008-05-26 16:38:39.779442480 +0000 +@@ -11,13 +11,8 @@ + /******************************************************************************/ + + // $Id: xrootd-20071116-gcc43.patch,v 1.1 2008/05/29 18:55:34 bicatali Exp $ +- +-#ifndef WIN32 +-#include <iostream.h> +-#else + #include <iostream> + using namespace std; +-#endif + + #include "XrdSys/XrdSysError.hh" + +--- xrootd/src/XrdPosix/XrdPosix.cc.orig 2007-07-28 00:25:25.000000000 +0000 ++++ xrootd/src/XrdPosix/XrdPosix.cc 2008-05-26 11:18:18.119907423 +0000 +@@ -18,7 +18,8 @@ + #include <fcntl.h> + #include <unistd.h> + #include <sys/uio.h> +-#include <iostream.h> ++#include <iostream> ++using namespace std; + + #include "XrdPosix/XrdPosixLinkage.hh" + #include "XrdPosix/XrdPosixXrootd.hh" +--- xrootd/src/XrdPosix/XrdPosixLinkage.cc.orig 2007-07-28 00:25:26.000000000 +0000 ++++ xrootd/src/XrdPosix/XrdPosixLinkage.cc 2008-05-26 11:18:18.091905827 +0000 +@@ -25,7 +25,8 @@ + #if !defined(__macos__) && !defined(__CYGWIN__) + #include <link.h> + #endif +-#include <iostream.h> ++#include <iostream> ++using namespace std; + + #include <errno.h> + #include "XrdPosix/XrdPosixLinkage.hh" +--- xrootd/src/XrdPosix/XrdPosixPreload32.cc.orig 2007-08-07 21:28:55.000000000 +0000 ++++ xrootd/src/XrdPosix/XrdPosixPreload32.cc 2008-05-26 11:18:18.095906055 +0000 +@@ -21,7 +21,8 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> +-#include <iostream.h> ++#include <iostream> ++using namespace std; + + #include "XrdPosix/XrdPosixExtern.hh" + #include "XrdPosix/XrdPosixLinkage.hh" +--- xrootd/src/XrdPosix/XrdPosixPreload.cc.orig 2007-07-28 00:25:27.000000000 +0000 ++++ xrootd/src/XrdPosix/XrdPosixPreload.cc 2008-05-26 11:18:18.687939793 +0000 +@@ -15,7 +15,8 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> +-#include <iostream.h> ++#include <iostream> ++using namespace std; + + #include "XrdPosix/XrdPosixExtern.hh" + #include "XrdPosix/XrdPosixLinkage.hh" +--- xrootd/src/XrdPss/XrdPss.cc.orig 2007-07-31 02:26:01.000000000 +0000 ++++ xrootd/src/XrdPss/XrdPss.cc 2008-05-26 11:18:20.772058560 +0000 +@@ -19,7 +19,6 @@ + #include <unistd.h> + #include <errno.h> + #include <fcntl.h> +-#include <iostream.h> + #include <signal.h> + #include <strings.h> + #include <stdio.h> +@@ -29,6 +28,8 @@ + #ifdef __solaris__ + #include <sys/vnode.h> + #endif ++#include <iostream> ++using namespace std; + + #include "XrdVersion.hh" + +--- xrootd/src/XrdPss/XrdPssConfig.cc.orig 2007-07-31 02:26:02.000000000 +0000 ++++ xrootd/src/XrdPss/XrdPssConfig.cc 2008-05-26 11:18:20.796059928 +0000 +@@ -14,7 +14,6 @@ + + #include <unistd.h> + #include <ctype.h> +-#include <iostream.h> + #include <strings.h> + #include <stdio.h> + #include <sys/param.h> +@@ -23,6 +22,8 @@ + #include <sys/stat.h> + #include <sys/un.h> + #include <fcntl.h> ++#include <iostream> ++using namespace std; + + #include "XrdPss/XrdPss.hh" + #include "XrdOuc/XrdOuca2x.hh" +--- xrootd/src/XrdPss/XrdPss.hh.orig 2007-07-31 02:26:02.000000000 +0000 ++++ xrootd/src/XrdPss/XrdPss.hh 2008-05-26 11:18:20.760057876 +0000 +@@ -14,7 +14,7 @@ + + #include <sys/types.h> + #include <errno.h> +-#include <iostream.h> ++#include <iostream> + + #include "XrdOss/XrdOss.hh" + +--- xrootd/src/XrdSec/XrdSecClient.cc.orig 2007-07-26 15:18:31.000000000 +0000 ++++ xrootd/src/XrdSec/XrdSecClient.cc 2008-05-26 11:18:21.460097769 +0000 +@@ -15,7 +15,6 @@ + #include <unistd.h> + #include <ctype.h> + #include <errno.h> +-#include <iostream.h> + #include <netdb.h> + #include <stdlib.h> + #include <strings.h> +@@ -25,6 +24,8 @@ + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> ++#include <iostream> ++using namespace std; + + #include "XrdOuc/XrdOucErrInfo.hh" + #include "XrdSys/XrdSysPthread.hh" +--- xrootd/src/XrdSec/XrdSecPManager.cc.orig 2006-01-26 02:02:10.000000000 +0000 ++++ xrootd/src/XrdSec/XrdSecPManager.cc 2008-05-26 11:18:21.444096857 +0000 +@@ -31,7 +31,8 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <errno.h> +-#include <iostream.h> ++#include <iostream> ++using namespace std; + + #include "XrdSec/XrdSecInterface.hh" + #include "XrdSec/XrdSecPManager.hh" +--- xrootd/src/XrdSec/XrdSecServer.cc.orig 2007-08-31 19:24:40.000000000 +0000 ++++ xrootd/src/XrdSec/XrdSecServer.cc 2008-05-26 11:18:21.400094350 +0000 +@@ -16,12 +16,13 @@ + #include <ctype.h> + #include <errno.h> + #include <fcntl.h> +-#include <iostream.h> + #include <netdb.h> + #include <stdlib.h> + #include <strings.h> + #include <stdio.h> + #include <sys/param.h> ++#include <iostream> ++using namespace std; + + #include "XrdOuc/XrdOucEnv.hh" + #include "XrdSys/XrdSysError.hh" +--- xrootd/src/XrdSec/XrdSectestClient.cc.orig 2005-03-25 08:25:59.000000000 +0000 ++++ xrootd/src/XrdSec/XrdSectestClient.cc 2008-05-26 11:18:21.472098453 +0000 +@@ -20,7 +20,6 @@ + #include <unistd.h> + #include <ctype.h> + #include <errno.h> +-#include <iostream.h> + #include <stdlib.h> + #include <strings.h> + #include <stdio.h> +@@ -28,6 +27,8 @@ + #include <arpa/inet.h> + #include <sys/param.h> + #include <sys/socket.h> ++#include <iostream> ++using namespace std; + + #include "XrdSec/XrdSecInterface.hh" + +--- xrootd/src/XrdSec/XrdSectestServer.cc.orig 2007-07-31 02:26:15.000000000 +0000 ++++ xrootd/src/XrdSec/XrdSectestServer.cc 2008-05-26 11:18:21.412095034 +0000 +@@ -15,7 +15,6 @@ + #include <unistd.h> + #include <ctype.h> + #include <errno.h> +-#include <iostream.h> + #include <stdlib.h> + #include <strings.h> + #include <stdio.h> +@@ -23,6 +22,8 @@ + #include <arpa/inet.h> + #include <sys/param.h> + #include <sys/socket.h> ++#include <iostream> ++using namespace std; + + #include "XrdOuc/XrdOucErrInfo.hh" + #include "XrdSys/XrdSysLogger.hh" +--- xrootd/src/XrdSec/XrdSecTrace.hh.orig 2004-08-30 07:17:04.000000000 +0000 ++++ xrootd/src/XrdSec/XrdSecTrace.hh 2008-05-26 11:18:21.412095034 +0000 +@@ -16,7 +16,7 @@ + + #ifndef NODEBUG + +-#include <iostream.h> ++#include <iostream> + + #define QTRACE(act) SecTrace->What & TRACE_ ## act + +--- xrootd/src/XrdSeckrb5/XrdSecProtocolkrb5.cc.orig 2007-07-26 15:18:35.000000000 +0000 ++++ xrootd/src/XrdSeckrb5/XrdSecProtocolkrb5.cc 2008-05-26 11:18:36.856975187 +0000 +@@ -18,7 +18,6 @@ + #include <unistd.h> + #include <ctype.h> + #include <errno.h> +-#include <iostream.h> + #include <stdlib.h> + #include <strings.h> + #include <stdio.h> +@@ -26,6 +25,8 @@ + #include <pwd.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <iostream> ++using namespace std; + + extern "C" { + #include "krb5.h" +--- xrootd/src/XrdSecpwd/XrdSecProtocolpwd.cc.orig 2008-02-19 08:17:31.000000000 +0000 ++++ xrootd/src/XrdSecpwd/XrdSecProtocolpwd.cc 2008-05-26 11:18:29.604561896 +0000 +@@ -12,7 +12,6 @@ + #include <unistd.h> + #include <ctype.h> + #include <errno.h> +-#include <iostream.h> + #include <stdlib.h> + #include <strings.h> + #include <stdio.h> +@@ -22,6 +21,8 @@ + #include <sys/stat.h> + #include <fcntl.h> + #include <sys/times.h> ++#include <iostream> ++using namespace std; + + // AFS support + #ifdef R__AFS +--- xrootd/src/XrdSecunix/XrdSecProtocolunix.cc.orig 2007-08-02 01:41:06.000000000 +0000 ++++ xrootd/src/XrdSecunix/XrdSecProtocolunix.cc 2008-05-26 11:18:25.468326185 +0000 +@@ -15,12 +15,13 @@ + #include <unistd.h> + #include <ctype.h> + #include <errno.h> +-#include <iostream.h> + #include <stdlib.h> + #include <strings.h> + #include <grp.h> + #include <pwd.h> + #include <sys/types.h> ++#include <iostream> ++using namespace std; + + #include "XrdOuc/XrdOucErrInfo.hh" + #include "XrdSys/XrdSysPthread.hh" +--- xrootd/src/XrdSfs/XrdSfsNative.cc.orig 2007-10-04 01:34:19.000000000 +0000 ++++ xrootd/src/XrdSfs/XrdSfsNative.cc 2008-05-26 11:18:36.652963561 +0000 +@@ -20,10 +20,11 @@ + #include <memory.h> + #include <string.h> + #include <stdio.h> +-#include <iostream.h> + #include <stdlib.h> + #include <sys/param.h> + #include <sys/stat.h> ++#include <iostream> ++using namespace std; + + #include "XrdVersion.hh" + #include "XrdSys/XrdSysError.hh" +--- xrootd/src/XrdSut/XrdSutAux.hh.orig 2008-02-19 08:17:32.000000000 +0000 ++++ xrootd/src/XrdSut/XrdSutAux.hh 2008-05-26 11:18:22.096134015 +0000 +@@ -11,9 +11,7 @@ + /* DE-AC03-76-SFO0515 with the Department of Energy */ + /******************************************************************************/ + +-#ifndef WIN32 +-#include <iostream.h> +-#endif ++#include <iostream> + #ifndef __XPROTOCOL_H + #include <XProtocol/XProtocol.hh> + #endif +--- xrootd/src/XrdSut/XrdSutTrace.hh.orig 2005-06-16 12:28:32.000000000 +0000 ++++ xrootd/src/XrdSut/XrdSutTrace.hh 2008-05-26 11:18:22.104134471 +0000 +@@ -19,7 +19,7 @@ + + #ifndef NODEBUG + +-#include <iostream.h> ++#include <iostream> + + #define QTRACE(act) (sutTrace && (sutTrace->What & sutTRACE_ ## act)) + #define PRINT(y) {if (sutTrace) {sutTrace->Beg(epname); \ +--- xrootd/src/XrdSys/XrdSysError.cc.orig 2007-07-31 02:26:44.000000000 +0000 ++++ xrootd/src/XrdSys/XrdSysError.cc 2008-05-26 11:18:25.968354680 +0000 +@@ -16,25 +16,21 @@ + #ifndef WIN32 + #include <unistd.h> + #include <errno.h> +-#include <iostream.h> + #include <stdlib.h> + #include <stdio.h> + #include <string.h> + #include <strings.h> + #include <sys/types.h> + #include <sys/uio.h> +-#if !defined(__macos__) && !defined(__CYGWIN__) +-#include <stropts.h> +-#endif + #else +-#include <iostream> +-using namespace std; + #include <stdlib.h> + #include <stdio.h> + #include <string.h> + #include <sys/types.h> + #include "XrdSys/XrdWin32.hh" + #endif ++#include <iostream> ++using namespace std; + + #include "XrdSys/XrdSysError.hh" + #include "XrdSys/XrdSysLogger.hh" +--- xrootd/src/XrdSys/XrdSysLogger.cc.orig 2007-07-31 02:26:45.000000000 +0000 ++++ xrootd/src/XrdSys/XrdSysLogger.cc 2008-05-26 11:18:25.868348981 +0000 +@@ -26,9 +26,6 @@ + #include <strings.h> + #include <sys/termios.h> + #include <sys/uio.h> +-#if !defined(__macos__) && !defined(__CYGWIN__) +-#include <stropts.h> +-#endif + #endif // WIN32 + + #include "XrdSys/XrdSysLogger.hh" +--- xrootd/src/XrdSys/XrdSysPlugin.cc.orig 2007-07-31 02:26:47.000000000 +0000 ++++ xrootd/src/XrdSys/XrdSysPlugin.cc 2008-05-26 11:18:25.992356048 +0000 +@@ -32,12 +32,11 @@ + #include <strings.h> + #include <sys/types.h> + #include <errno.h> +-#include <iostream.h> + #else + #include "XrdSys/XrdWin32.hh" ++#endif + #include <iostream> + using namespace std; +-#endif + + #include "XrdSys/XrdSysError.hh" + #include "XrdSys/XrdSysPlugin.hh" +--- xrootd/src/XrdSys/XrdSysPriv.cc.orig 2007-11-14 11:55:06.000000000 +0000 ++++ xrootd/src/XrdSys/XrdSysPriv.cc 2008-05-26 11:18:25.884349893 +0000 +@@ -23,10 +23,11 @@ + + #if !defined(WINDOWS) + #include <stdio.h> +-#include <iostream.h> + #include <unistd.h> + #include <pwd.h> + #include <errno.h> ++#include <iostream> ++using namespace std; + + #define NOUC ((uid_t)(-1)) + #define NOGC ((gid_t)(-1)) +--- xrootd/src/XrdSys/XrdSysXSLock.cc.orig 2007-07-31 02:26:53.000000000 +0000 ++++ xrootd/src/XrdSys/XrdSysXSLock.cc 2008-05-26 16:49:42.632709871 +0000 +@@ -12,12 +12,8 @@ + + const char *XrdSysXSLockCVSID = "$Id: xrootd-20071116-gcc43.patch,v 1.1 2008/05/29 18:55:34 bicatali Exp $"; + +-#ifndef WIN32 +-#include <iostream.h> +-#else + #include <iostream> + using namespace std; +-#endif + + #include "XrdSys/XrdSysXSLock.hh" + +--- xrootd/src/XrdXrootd/XrdXrootdConfig.cc.orig 2007-10-02 02:30:01.000000000 +0000 ++++ xrootd/src/XrdXrootd/XrdXrootdConfig.cc 2008-05-26 11:18:27.808459542 +0000 +@@ -15,13 +15,14 @@ + #include <unistd.h> + #include <ctype.h> + #include <fcntl.h> +-#include <iostream.h> + #include <string.h> + #include <stdio.h> + #include <sys/param.h> + #include <sys/stat.h> + #include <sys/types.h> + #include <sys/un.h> ++#include <iostream> ++using namespace std; + + #include "XrdVersion.hh" + +--- xrootd/src/XrdXrootd/XrdXrootdTrace.hh.orig 2004-08-30 07:17:08.000000000 +0000 ++++ xrootd/src/XrdXrootd/XrdXrootdTrace.hh 2008-05-26 11:18:27.860462505 +0000 +@@ -28,7 +28,7 @@ + + #ifndef NODEBUG + +-#include <iostream.h> ++#include <iostream> + #include "XrdOuc/XrdOucTrace.hh" + + #define TRACE(act, x) \ diff --git a/sci-physics/root/root-5.18.00d.ebuild b/sci-physics/root/root-5.18.00d.ebuild new file mode 100644 index 000000000000..ae9e4d2d8359 --- /dev/null +++ b/sci-physics/root/root-5.18.00d.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.18.00d.ebuild,v 1.1 2008/05/29 18:55:33 bicatali Exp $ + +EAPI="1" +inherit versionator flag-o-matic eutils toolchain-funcs qt3 qt4 fortran + +#DOC_PV=$(get_major_version)_$(get_version_component_range 2) +DOC_PV=5_16 + +DESCRIPTION="C++ data analysis framework and interpreter from CERN" +SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz + doc? ( ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf )" +HOMEPAGE="http://root.cern.ch/" + +SLOT="0" +LICENSE="LGPL-2" +KEYWORDS="~amd64 ~hppa ~sparc ~x86" + +IUSE="afs cern doc fftw kerberos ldap +math mysql odbc + pch postgres python ruby qt3 qt4 ssl +truetype xml xrootd" + +# libafterimage ignored, may be re-install for >=5.20 +# see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944 +# || ( >=media-libs/libafterimage-1.15 x11-wm/afterstep ) +RDEPEND="sys-apps/shadow + x11-libs/libXpm + media-libs/ftgl + dev-libs/libpcre + virtual/opengl + virtual/glu + math? ( >=sci-libs/gsl-1.8 ) + afs? ( >=net-fs/openafs-1.4.7 ) + mysql? ( virtual/mysql ) + postgres? ( virtual/postgresql-server ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + qt3? ( !qt4? ( $(qt_min_version 3.3.4) ) ) + qt4? ( || ( >=x11-libs/qt-4.3:4 x11-libs/qt-gui:4 ) ) + fftw? ( >=sci-libs/fftw-3 ) + python? ( dev-lang/python ) + ruby? ( dev-lang/ruby ) + ssl? ( dev-libs/openssl ) + xml? ( dev-libs/libxml2 ) + cern? ( sci-physics/cernlib ) + odbc? ( dev-db/unixODBC ) + truetype? ( x11-libs/libXft )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +S="${WORKDIR}/${PN}" + +QT4_BUILT_WITH_USE_CHECK="qt3support" + +pkg_setup() { + elog + elog "You may want to build ROOT with these non Gentoo extra packages:" + elog "AliEn, castor, Chirp, clarens, gfal, Globus, GEANT4, Monalisa, " + elog "Oracle, peac, PYTHIA, PYTHIA6, SapDB, SRP, Venus" + elog "You can use the env variable EXTRA_ECONF variable for this." + elog "Example, for PYTHIA, you would do: " + elog "EXTRA_ECONF=\"--enable-pythia --with-pythia-libdir=/usr/$(get_libdir)\"" + elog + epause 7 + if use cern; then + FORTRAN="gfortran g77 ifc" + fortran_pkg_setup + fi + use qt4 && qt4_pkg_setup +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-pic.patch + epatch "${FILESDIR}"/${PN}-5.16.00-xft.patch + epatch "${FILESDIR}"/${P}-gcc43.patch + epatch "${FILESDIR}"/${P}-makefile.patch + cd xrootd/src + local xp=xrootd-20071116 + tar xfz ${xp}-0000.src.tgz + epatch "${FILESDIR}"/${xp}-checksymbol.patch + epatch "${FILESDIR}"/${xp}-gcc43.patch + tar cfz ${xp}-0000.src.tgz xrootd +} + +src_compile() { + + local target + if [[ "$(tc-getCXX)" == icc* ]]; then + if use amd64; then + target=linuxx8664icc + elif use x86; then + target=linuxicc + fi + fi + + #local myfortran + #use cern && \ + # myfortran="${FORTRANC} ${FFLAGS}" + local myconf + use postgres && \ + myconf="--with-pgsql-incdir=/usr/include/postgresql" + + if use qt3 || use qt4; then + myconf="${myconf} --enable-qt --enable-qtgsi" + else + myconf="${myconf} --disable-qt --disable-qtgsi" + fi + + # watch: the configure script is not the standard autotools + local docdir=/usr/share/doc/${PF} + ./configure \ + ${target} \ + --prefix=/usr \ + --libdir=/usr/$(get_libdir)/${PN} \ + --docdir=${docdir} \ + --disable-builtin-afterimage \ + --disable-builtin-freetype \ + --disable-builtin-ftgl \ + --disable-builtin-pcre \ + --disable-builtin-zlib \ + --enable-asimage \ + --enable-astiff \ + --enable-cintex \ + --enable-exceptions \ + --enable-explicitlink \ + --enable-gdml \ + --enable-opengl \ + --enable-reflex \ + --enable-shadowpw \ + --enable-shared \ + --enable-soversion \ + --enable-table \ + ${myconf} \ + $(use_enable afs) \ + $(use_enable cern) \ + $(use_enable cint7) \ + $(use_enable fftw fftw3) \ + $(use_enable kerberos krb5) \ + $(use_enable ldap) \ + $(use_enable math mathcore) \ + $(use_enable math mathmore) \ + $(use_enable math minuit2) \ + $(use_enable math roofit) \ + $(use_enable math unuran) \ + $(use_enable mysql) \ + $(use_enable odbc) \ + $(use_enable pch) \ + $(use_enable postgres pgsql) \ + $(use_enable python) \ + $(use_enable ruby) \ + $(use_enable ssl) \ + $(use_enable truetype xft) \ + $(use_enable xml) \ + $(use_enable xrootd) \ + ${EXTRA_ECONF} \ + || die "configure failed" + + local myfortran + use cern && myfortran="F77=${FORTRANC}" + emake \ + OPT="${CXXFLAGS}" \ + OPTFLAGS="${CXXFLAGS}" \ + ${myfortran} \ + || die "emake failed" + emake cintdlls || die "emake cintdlls failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + echo "LDPATH=/usr/$(get_libdir)/root" > 99root + doenvd 99root || die "doenvd failed" + + if use doc; then + einfo "Installing user's guide and ref manual" + insinto /usr/share/doc/${PF} + doins "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \ + || die "pdf install failed" + fi +} |