Update collision patch to take into account new names of bakefile presets.

Package-Manager: portage-2.1.3.16

3 files changed, 39 insertions, 17 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index ae8ee1f8e901..3f487a82dc89 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.150 2007/10/25 04:06:32 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.151 2007/10/25 13:11:54 dirtyepic Exp $
+
+  25 Oct 2007; Ryan Hill <dirtyepic@gentoo.org>
+  files/wxGTK-2.6.4-collision.patch:
+  Update collision patch to take into account new names of bakefile presets.
 
   25 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> ChangeLog, Manifest:
   Fix docs installation.
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 634d49ff0f10..783471f14f96 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -21,10 +21,10 @@ AUX wxGTK-2.6.3.3-wxrc_link_fix.patch 1127 RMD160 7ebd632e7811982d8128f0e4281e29
 MD5 83b70046c421613c0a5df2802e8ad481 files/wxGTK-2.6.3.3-wxrc_link_fix.patch 1127
 RMD160 7ebd632e7811982d8128f0e4281e29ee25b76f9b files/wxGTK-2.6.3.3-wxrc_link_fix.patch 1127
 SHA256 e946d312dd609595e1c61782b0e9019ef361a7c0478380e8891d61d38a4d6233 files/wxGTK-2.6.3.3-wxrc_link_fix.patch 1127
-AUX wxGTK-2.6.4-collision.patch 5061 RMD160 b31e57d12b31a493060163a7ab641c7d9f7d832f SHA1 0719d0e6f29f09d04c3a9f2d6c46b36b0303a451 SHA256 e46490bb1e058d42c5c095b00900031bb05e04df27d1028325374ff47825cecb
-MD5 a8dbc930e410d220ac70d1e760403eb4 files/wxGTK-2.6.4-collision.patch 5061
-RMD160 b31e57d12b31a493060163a7ab641c7d9f7d832f files/wxGTK-2.6.4-collision.patch 5061
-SHA256 e46490bb1e058d42c5c095b00900031bb05e04df27d1028325374ff47825cecb files/wxGTK-2.6.4-collision.patch 5061
+AUX wxGTK-2.6.4-collision.patch 5863 RMD160 f9f24f6604e2aa3e93fe61c658e45ae9d5f639eb SHA1 8d7e7588d4711f74d9354d1d6a8ec5362ce9243d SHA256 ec73d0c7c87cc4b6132c5fb58d98c91c8ddaa3d596b19857b3ba443e6ea1be90
+MD5 3f9aeed95a22a39f8b7f7c90d395653a files/wxGTK-2.6.4-collision.patch 5863
+RMD160 f9f24f6604e2aa3e93fe61c658e45ae9d5f639eb files/wxGTK-2.6.4-collision.patch 5863
+SHA256 ec73d0c7c87cc4b6132c5fb58d98c91c8ddaa3d596b19857b3ba443e6ea1be90 files/wxGTK-2.6.4-collision.patch 5863
 AUX wxGTK-2.6.4.0-g_free.patch 1102 RMD160 a2b4fc260d834b5e8c5244a19b61dd2f74c9c3b1 SHA1 0af47b2b10b1c472b8d6ec9e43160c4b28527bf0 SHA256 029b962d7ca861e15b00712a786e070aaaaa89c1faa6b9a5e46e3c5a2b8b00f5
 MD5 d51b15154c5a72c0534c2275a50b5e08 files/wxGTK-2.6.4.0-g_free.patch 1102
 RMD160 a2b4fc260d834b5e8c5244a19b61dd2f74c9c3b1 files/wxGTK-2.6.4.0-g_free.patch 1102
@@ -45,10 +45,10 @@ EBUILD wxGTK-2.6.4.0.ebuild 4470 RMD160 2c30b63472085e9d6d8a339d7332b4c36e3ad99e
 MD5 a002f718ae5840ab00b36a4f7d0107c1 wxGTK-2.6.4.0.ebuild 4470
 RMD160 2c30b63472085e9d6d8a339d7332b4c36e3ad99e wxGTK-2.6.4.0.ebuild 4470
 SHA256 dce260673a1dd0e9a1ae10f0370a543b559c62247f738f0c598f2b3f36e46750 wxGTK-2.6.4.0.ebuild 4470
-MISC ChangeLog 23398 RMD160 dab6a43fc6ed004ff0b7209f8c4de98de228c053 SHA1 777710c21556c27162e41c0741946a973614bbed SHA256 9e0e11fb8272a5adddeea246384937bb556746ae51f0b77a0d8b125cf2353fca
-MD5 44143e7ff931c25df06f6a5fde62a0c1 ChangeLog 23398
-RMD160 dab6a43fc6ed004ff0b7209f8c4de98de228c053 ChangeLog 23398
-SHA256 9e0e11fb8272a5adddeea246384937bb556746ae51f0b77a0d8b125cf2353fca ChangeLog 23398
+MISC ChangeLog 23561 RMD160 6e8339c0618dcaf2aecc5d144a0955ffd9587b8c SHA1 1a0297e46ebfae9a089e19081afd7f0e85f6ca01 SHA256 f8eab8e988dbbe08b8cc977c38c8651efafaaec990c8a116eb0898cfe9e6b348
+MD5 571c732fb8724cbc8667bc8b992d2507 ChangeLog 23561
+RMD160 6e8339c0618dcaf2aecc5d144a0955ffd9587b8c ChangeLog 23561
+SHA256 f8eab8e988dbbe08b8cc977c38c8651efafaaec990c8a116eb0898cfe9e6b348 ChangeLog 23561
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -62,7 +62,7 @@ SHA256 c6fc3d1efa916b8bed0c000de832879341897fd2c70ce23a6f5fe2b711e5b2d9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHIBaWiqiDRvmkBmIRAqw6AKDvRpdw6Isdi/U+sx1Rto0+BjhBzACeOGZB
-vhNyGISEQbPuRi9oEyBc2rw=
-=qwPw
+iD8DBQFHIJYliqiDRvmkBmIRAnj1AJ42XfDtdBquoyE6fr2GAmjKwgci+ACeOzme
+Vk6Nh7CuuDl6vZE/HqArDmY=
+=g0hb
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch
index 1d4e151ea007..26287794abc9 100644
--- a/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch
@@ -1,6 +1,24 @@
+diff -Naur wxPython-src-2.6.4.0-orig/build/bakefiles/wxpresets/presets/wx.bkl wxPython-src-2.6.4.0/build/bakefiles/wxpresets/presets/wx.bkl
+--- wxPython-src-2.6.4.0-orig/build/bakefiles/wxpresets/presets/wx.bkl	2005-01-27 16:47:16.000000000 -0600
++++ wxPython-src-2.6.4.0/build/bakefiles/wxpresets/presets/wx.bkl	2007-10-25 06:46:31.000000000 -0600
+@@ -15,12 +15,12 @@
+     <set var="__wx_included_impl">0</set>
+ 
+     <if cond="FORMAT in ['autoconf','gnu']">
+-        <include file="wx_unix.bkl"/>
++        <include file="wx26_unix.bkl"/>
+         <set var="__wx_included_impl">1</set>
+     </if>
+ 
+     <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
+-        <include file="wx_win32.bkl"/>
++        <include file="wx26_win32.bkl"/>
+         <set var="__wx_included_impl">1</set>
+     </if>
+ 
 diff -Naur wxPython-src-2.6.4.0-orig/Makefile.in wxPython-src-2.6.4.0/Makefile.in
---- wxPython-src-2.6.4.0-orig/Makefile.in	2007-09-08 18:58:36.000000000 -0600
-+++ wxPython-src-2.6.4.0/Makefile.in	2007-09-08 19:00:36.000000000 -0600
+--- wxPython-src-2.6.4.0-orig/Makefile.in	2007-10-25 06:35:58.000000000 -0600
++++ wxPython-src-2.6.4.0/Makefile.in	2007-10-25 06:37:21.000000000 -0600
 @@ -26,6 +26,7 @@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -44,7 +62,7 @@ diff -Naur wxPython-src-2.6.4.0-orig/Makefile.in wxPython-src-2.6.4.0/Makefile.i
  
 diff -Naur wxPython-src-2.6.4.0-orig/src/common/intl.cpp wxPython-src-2.6.4.0/src/common/intl.cpp
 --- wxPython-src-2.6.4.0-orig/src/common/intl.cpp	2007-03-20 09:25:41.000000000 -0600
-+++ wxPython-src-2.6.4.0/src/common/intl.cpp	2007-09-08 19:00:36.000000000 -0600
++++ wxPython-src-2.6.4.0/src/common/intl.cpp	2007-10-25 06:37:21.000000000 -0600
 @@ -1452,6 +1452,8 @@
    m_initialized = false;
  }
@@ -64,8 +82,8 @@ diff -Naur wxPython-src-2.6.4.0-orig/src/common/intl.cpp wxPython-src-2.6.4.0/sr
      // there may be a catalog with toolkit specific overrides, it is not
      // an error if this does not exist
 diff -Naur wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in wxPython-src-2.6.4.0/utils/wxrc/Makefile.in
---- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in	2007-09-08 18:58:36.000000000 -0600
-+++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in	2007-09-08 19:01:46.000000000 -0600
+--- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in	2007-10-25 06:35:58.000000000 -0600
++++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in	2007-10-25 06:37:21.000000000 -0600
 @@ -125,7 +125,6 @@
  @COND_USE_XRC_1@	$(INSTALL_DIR) $(DESTDIR)$(bindir)
  @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)