fix CVS tainted patches

4 files changed, 8 insertions, 94 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 3ef9d702aaa7..3f0623147874 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.30 2003/07/09 00:58:58 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.31 2003/07/09 02:29:45 liquidx Exp $
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org>
+  files/wxGTK-2.4.1-wxpython1.patch, files/wxGTK-2.4.1-wxpython2.patch:
+  RCS/CVS headers spoiled patches. removed all RCS/CVS triggers from patches
 
 *wxGTK-2.4.1 (09 Jul 2003)
 
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 76ae05fc28e6..fa88ccf28ac0 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,8 +1,8 @@
-MD5 6a179cf78d3a99e15994bbb83bb56e56 ChangeLog 5532
+MD5 57cce05d8446210bd3049d2b2de4f226 ChangeLog 5731
 MD5 5f3fa8c79699b437c9d8bd2154dc98db wxGTK-2.4.1.ebuild 2505
 MD5 7b6cbaf39f7346190040182c8c0bf5c8 wxGTK-2.4.0.ebuild 2705
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 MD5 16ea0622454512339b2c613af61a9aa4 files/digest-wxGTK-2.4.0 65
 MD5 86ee1d94ec752953d445a824f643fef5 files/digest-wxGTK-2.4.1 65
-MD5 3b31bf6114fd932a2843725064d25caf files/wxGTK-2.4.1-wxpython1.patch 1933
-MD5 780bae884c651040c4b9833d82f88d9a files/wxGTK-2.4.1-wxpython2.patch 12054
+MD5 522f6b3a771ea33a1af7ede9c795ab4c files/wxGTK-2.4.1-wxpython1.patch 1102
+MD5 1e85c1c970da32626580dfef7228b314 files/wxGTK-2.4.1-wxpython2.patch 8459
diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch b/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch
index d391754d302c..273b45bec201 100644
--- a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch
+++ b/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython1.patch
@@ -1,15 +1,6 @@
 diff -ur wx/chkconf.h ../../wxPythonSrc-2.4.1.2/include/wx/chkconf.h
 --- wxGTK-2.4.1/include/wx/chkconf.h	2003-06-08 09:13:10.000000000 +0100
 +++ wxGTK-2.4.1/include/wx/chkconf.h	2003-06-16 21:46:45.000000000 +0100
-@@ -4,7 +4,7 @@
-  * Author:      Vadim Zeitlin
-  * Modified by:
-  * Created:     09.08.00
-- * RCS-ID:      $Id: wxGTK-2.4.1-wxpython1.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
-+ * RCS-ID:      $Id: wxGTK-2.4.1-wxpython1.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
-  * Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwindows.org>
-  * Licence:     wxWindows license
-  */
 @@ -772,6 +772,17 @@
  #   endif
  #endif /* wxUSE_FILESYSTEM */
@@ -31,15 +22,6 @@ diff -ur wx/chkconf.h ../../wxPythonSrc-2.4.1.2/include/wx/chkconf.h
 diff -ur wx/menuitem.h ../../wxPythonSrc-2.4.1.2/include/wx/menuitem.h
 --- wxGTK-2.4.1/include/wx/menuitem.h	2003-06-08 09:13:11.000000000 +0100
 +++ wxGTK-2.4.1/include/wx/menuitem.h	2003-06-11 00:48:45.000000000 +0100
-@@ -4,7 +4,7 @@
- // Author:      Vadim Zeitlin
- // Modified by:
- // Created:     25.10.99
--// RCS-ID:      $Id: wxGTK-2.4.1-wxpython1.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
-+// RCS-ID:      $Id: wxGTK-2.4.1-wxpython1.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
- // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
- // Licence:     wxWindows license
- ///////////////////////////////////////////////////////////////////////////////
 @@ -49,6 +49,7 @@
  
      // the menu we're in
diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch b/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch
index 1bebae8e3f78..3f38d913d1bd 100644
--- a/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch
+++ b/x11-libs/wxGTK/files/wxGTK-2.4.1-wxpython2.patch
@@ -1,15 +1,6 @@
 diff -ru ./common/filefn.cpp ../../wxPythonSrc-2.4.1.2/src/common/filefn.cpp
 --- wxGTK-2.4.1/src/common/filefn.cpp	2003-06-08 09:13:13.000000000 +0100
 +++ wxGTK-2.4.1/src/common/filefn.cpp	2003-06-11 21:20:15.000000000 +0100
-@@ -4,7 +4,7 @@
- // Author:      Julian Smart
- // Modified by:
- // Created:     29/01/98
--// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
-+// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
- // Copyright:   (c) 1998 Julian Smart
- // Licence:     wxWindows license
- /////////////////////////////////////////////////////////////////////////////
 @@ -1595,6 +1595,8 @@
      wxChar buf[256];
      GetWindowsDirectory(buf, 256);
@@ -22,15 +13,6 @@ diff -ru ./common/filefn.cpp ../../wxPythonSrc-2.4.1.2/src/common/filefn.cpp
 diff -ru ./common/log.cpp ../../wxPythonSrc-2.4.1.2/src/common/log.cpp
 --- wxGTK-2.4.1/src/common/log.cpp	2003-06-08 09:13:14.000000000 +0100
 +++ wxGTK-2.4.1/src/common/log.cpp	2003-06-16 21:46:45.000000000 +0100
-@@ -4,7 +4,7 @@
- // Author:      Vadim Zeitlin
- // Modified by:
- // Created:     29/01/98
--// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
-+// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
- // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
- // Licence:     wxWindows license
- /////////////////////////////////////////////////////////////////////////////
 @@ -114,13 +114,24 @@
  //     macros and not all compilers inline vararg functions.
  // ----------------------------------------------------------------------------
@@ -74,15 +56,6 @@ diff -ru ./common/log.cpp ../../wxPythonSrc-2.4.1.2/src/common/log.cpp
 diff -ru ./common/menucmn.cpp ../../wxPythonSrc-2.4.1.2/src/common/menucmn.cpp
 --- wxGTK-2.4.1/src/common/menucmn.cpp	2003-06-08 09:13:14.000000000 +0100
 +++ wxGTK-2.4.1/src/common/menucmn.cpp	2003-06-11 00:48:46.000000000 +0100
-@@ -4,7 +4,7 @@
- // Author:      Vadim Zeitlin
- // Modified by:
- // Created:     26.10.99
--// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
-+// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
- // Copyright:   (c) wxWindows team
- // Licence:     wxWindows license
- ///////////////////////////////////////////////////////////////////////////////
 @@ -332,6 +332,7 @@
      wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Append()") );
  
@@ -110,15 +83,6 @@ diff -ru ./common/menucmn.cpp ../../wxPythonSrc-2.4.1.2/src/common/menucmn.cpp
 diff -ru ./common/regex.cpp ../../wxPythonSrc-2.4.1.2/src/common/regex.cpp
 --- wxGTK-2.4.1/src/common/regex.cpp	2003-06-08 09:13:14.000000000 +0100
 +++ wxGTK-2.4.1/src/common/regex.cpp	2003-06-16 21:46:45.000000000 +0100
-@@ -4,7 +4,7 @@
- // Author:      Karsten Ballüder and Vadim Zeitlin
- // Modified by:
- // Created:     13.07.01
--// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
-+// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
- // Copyright:   (c) 2000 Karsten Ballüder <ballueder@gmx.net>
- //                  2001 Vadim Zeitlin <vadim@wxwindows.org>
- // Licence:     wxWindows licence
 @@ -204,21 +204,24 @@
              m_nMatches = 1;
  
@@ -158,15 +122,6 @@ diff -ru ./common/regex.cpp ../../wxPythonSrc-2.4.1.2/src/common/regex.cpp
 diff -ru ./gtk/timer.cpp ../../wxPythonSrc-2.4.1.2/src/gtk/timer.cpp
 --- wxGTK-2.4.1/src/gtk/timer.cpp	2003-06-08 09:13:21.000000000 +0100
 +++ wxGTK-2.4.1/src/gtk/timer.cpp	2003-06-17 18:23:24.000000000 +0100
-@@ -2,7 +2,7 @@
- // Name:        gtk/timer.cpp
- // Purpose:     wxTimer implementation
- // Author:      Robert Roebling
--// Id:          $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
-+// Id:          $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
- // Copyright:   (c) 1998 Robert Roebling
- // Licence:     wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
 @@ -41,12 +41,7 @@
      gdk_threads_leave();
  
@@ -183,15 +138,6 @@ diff -ru ./gtk/timer.cpp ../../wxPythonSrc-2.4.1.2/src/gtk/timer.cpp
 diff -ru ./gtk/window.cpp ../../wxPythonSrc-2.4.1.2/src/gtk/window.cpp
 --- wxGTK-2.4.1/src/gtk/window.cpp	2003-06-08 09:13:22.000000000 +0100
 +++ wxGTK-2.4.1/src/gtk/window.cpp	2003-06-19 20:14:52.000000000 +0100
-@@ -2,7 +2,7 @@
- // Name:        gtk/window.cpp
- // Purpose:
- // Author:      Robert Roebling
--// Id:          $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
-+// Id:          $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
- // Copyright:   (c) 1998 Robert Roebling, Julian Smart
- // Licence:     wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
 @@ -3629,12 +3629,10 @@
          wxapp_install_idle_handler();
  
@@ -219,15 +165,6 @@ diff -ru ./gtk/window.cpp ../../wxPythonSrc-2.4.1.2/src/gtk/window.cpp
 diff -ru ./html/htmlpars.cpp ../../wxPythonSrc-2.4.1.2/src/html/htmlpars.cpp
 --- wxGTK-2.4.1/src/html/htmlpars.cpp	2003-06-08 09:13:16.000000000 +0100
 +++ wxGTK-2.4.1/src/html/htmlpars.cpp	2003-06-11 00:34:25.000000000 +0100
-@@ -2,7 +2,7 @@
- // Name:        htmlpars.cpp
- // Purpose:     wxHtmlParser class (generic parser)
- // Author:      Vaclav Slavik
--// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
-+// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
- // Copyright:   (c) 1999 Vaclav Slavik
- // Licence:     wxWindows Licence
- /////////////////////////////////////////////////////////////////////////////
 @@ -872,7 +872,7 @@
      }
  
@@ -240,15 +177,6 @@ diff -ru ./html/htmlpars.cpp ../../wxPythonSrc-2.4.1.2/src/html/htmlpars.cpp
 diff -ru ./html/m_layout.cpp ../../wxPythonSrc-2.4.1.2/src/html/m_layout.cpp
 --- wxGTK-2.4.1/src/html/m_layout.cpp	2003-06-08 09:13:16.000000000 +0100
 +++ wxGTK-2.4.1/src/html/m_layout.cpp	2003-06-09 23:25:08.000000000 +0100
-@@ -2,7 +2,7 @@
- // Name:        m_layout.cpp
- // Purpose:     wxHtml module for basic paragraphs/layout handling
- // Author:      Vaclav Slavik
--// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
-+// RCS-ID:      $Id: wxGTK-2.4.1-wxpython2.patch,v 1.1 2003/07/09 00:58:58 liquidx Exp $
- // Copyright:   (c) 1999 Vaclav Slavik
- // Licence:     wxWindows Licence
- /////////////////////////////////////////////////////////////////////////////
 @@ -80,7 +80,7 @@
  };