Removed cvs tags in xrootd patch, closing bug #224195

Package-Manager: portage-2.1.5.2

3 files changed, 19 insertions, 21 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index cd9742e00aef..1f86a1808fe6 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,10 @@
 # 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.25 2008/05/29 18:55:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.26 2008/05/30 09:08:28 bicatali Exp $
+
+  30 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/xrootd-20071116-gcc43.patch:
+  Removed cvs tags in xrootd patch, closing bug #224195
 
 *root-5.18.00d (29 May 2008)
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index f9cd49f7e723..ecef71d99a23 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -12,7 +12,7 @@ AUX root-pic.patch 1308 RMD160 7cd58a088d5b9b6d8dacf24a4966c0ece8ccc1db SHA1 a17
 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
+AUX xrootd-20071116-gcc43.patch 26578 RMD160 0f5259642bad7dbb04dd3335103fdc94cdb69acb SHA1 9aa6413c98e946da6a10ac4824e871fa1883c5c3 SHA256 11e7c0a1cb99fd007ccd5d8759774bf144e47973c32d9503e2ac6a20986eebee
 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
@@ -24,12 +24,12 @@ EBUILD root-5.16.00-r1.ebuild 5046 RMD160 dd854d5fda59f6117cf3eeb8d84d9240b753e5
 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
 EBUILD root-5.18.00d.ebuild 4852 RMD160 d12f05e1a3e92daedf50f1f9a797a22bd13af024 SHA1 031215bf308f31b67fbf187d5143180890478d37 SHA256 3a4cb64319e702ce6843f34f39572306aec04b69c8e3208bc37769ba892d2ff8
-MISC ChangeLog 9334 RMD160 c55ff2a5e42447c14ff84e8a6c5908d739847ed0 SHA1 d1f0de18f045e57c6feef9a95454cfc4eb61b05a SHA256 317de9a45ba5770dbaf8e65349cccf71157828290a1d727b42558e01b5bbe287
+MISC ChangeLog 9483 RMD160 764372d58f55782fac36e9fa55b5a53589892099 SHA1 14e2275e4c39ae320c5ac44368cb07efda6c2dc4 SHA256 139e3f71256d3e0bcf706c878d9875442ac2506fbc152702bceb3b731668bf5f
 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
+iEYEARECAAYFAkg/xBUACgkQ1ycZbhPLE2DcfQCfQKyFeUVNos9vrdECT2j3laVK
+5boAn2y9vGlmsmbE+Y43C0wFaCfjYVnS
+=105d
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/files/xrootd-20071116-gcc43.patch b/sci-physics/root/files/xrootd-20071116-gcc43.patch
index 14697d790e8b..77bceb884031 100644
--- a/sci-physics/root/files/xrootd-20071116-gcc43.patch
+++ b/sci-physics/root/files/xrootd-20071116-gcc43.patch
@@ -525,21 +525,17 @@
  
  #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 @@
- /******************************************************************************/
+--- xrootd/src/XrdOuc/XrdOucTrace.hh.orig	2008-05-30 08:52:24.585885892 +0000
++++ xrootd/src/XrdOuc/XrdOucTrace.hh	2008-05-30 08:52:55.919671503 +0000
+@@ -14,8 +14,5 @@
  
- //         $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
@@ -902,20 +898,18 @@
  
  #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 $";
+--- xrootd/src/XrdSys/XrdSysXSLock.cc.orig	2008-05-30 08:56:14.698999291 +0000
++++ xrootd/src/XrdSys/XrdSysXSLock.cc	2008-05-30 08:57:02.805740738 +0000
+@@ -14,8 +14,6 @@
    
 -#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