Fix collision patch to not install unversioned bakefile presets again to

prevent clobbering the symlinks created by eselect-wxwidgets. David
Leverton - Bug #243446.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r2 x86_64)

2 files changed, 24 insertions, 18 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index d098fde14a59..e560970da57b 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.206 2008/10/28 22:46:47 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.207 2008/10/28 22:52:59 dirtyepic Exp $
+
+  28 Oct 2008; Ryan Hill <dirtyepic@gentoo.org>
+  files/wxGTK-2.8.8-collision.patch:
+  Fix collision patch to not install unversioned bakefile presets again to
+  prevent clobbering the symlinks created by eselect-wxwidgets. David
+  Leverton - Bug #243446.
 
   28 Oct 2008; Ryan Hill <dirtyepic@gentoo.org> -wxGTK-2.6.4.0-r3.ebuild,
   -wxGTK-2.8.7.1-r1.ebuild, -wxGTK-2.8.7.1-r2.ebuild, -wxGTK-2.8.8.0.ebuild:
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch
index c0bfa6aeb3b7..6391b73a33ad 100644
--- a/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch
@@ -1,7 +1,7 @@
-diff -Naurp wxPython-src-2.8.8.0-orig/Makefile.in wxPython-src-2.8.8.0/Makefile.in
---- wxPython-src-2.8.8.0-orig/Makefile.in	2008-06-28 22:44:54.000000000 -0600
-+++ wxPython-src-2.8.8.0/Makefile.in	2008-06-28 22:53:43.000000000 -0600
-@@ -27,6 +27,7 @@ STRIP = @STRIP@
+diff -Naur wxPython-src-2.8.9.1-orig/Makefile.in wxPython-src-2.8.9.1/Makefile.in
+--- wxPython-src-2.8.9.1-orig/Makefile.in	2008-10-28 16:27:37.000000000 -0600
++++ wxPython-src-2.8.9.1/Makefile.in	2008-10-28 16:29:45.000000000 -0600
+@@ -27,6 +27,7 @@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
@@ -9,20 +9,20 @@ diff -Naurp wxPython-src-2.8.8.0-orig/Makefile.in wxPython-src-2.8.8.0/Makefile.
  BK_DEPS = @BK_DEPS@
  BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
-@@ -11337,10 +11338,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
+@@ -11342,10 +11343,9 @@
  all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
  
  install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
 -	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
 -	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
- 	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
 +	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \
 +	do $(INSTALL_DATA)  $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
  	for f in setup.h $(RCDEFS_H); do \
  	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
-@@ -12096,8 +12097,8 @@ samples: 
+@@ -12101,8 +12101,8 @@
  install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
@@ -33,7 +33,7 @@ diff -Naurp wxPython-src-2.8.8.0-orig/Makefile.in wxPython-src-2.8.8.0/Makefile.
  
  locale_install: 
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -12105,7 +12106,7 @@ locale_install: 
+@@ -12110,7 +12110,7 @@
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
  	if test -f $(srcdir)/locale/$$l.mo ; then \
@@ -42,10 +42,10 @@ diff -Naurp wxPython-src-2.8.8.0-orig/Makefile.in wxPython-src-2.8.8.0/Makefile.
  	fi ; \
  	done
  
-diff -Naurp wxPython-src-2.8.8.0-orig/src/common/intl.cpp wxPython-src-2.8.8.0/src/common/intl.cpp
---- wxPython-src-2.8.8.0-orig/src/common/intl.cpp	2008-05-31 00:04:05.000000000 -0600
-+++ wxPython-src-2.8.8.0/src/common/intl.cpp	2008-06-28 22:49:24.000000000 -0600
-@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit()
+diff -Naur wxPython-src-2.8.9.1-orig/src/common/intl.cpp wxPython-src-2.8.9.1/src/common/intl.cpp
+--- wxPython-src-2.8.9.1-orig/src/common/intl.cpp	2008-10-28 16:27:37.000000000 -0600
++++ wxPython-src-2.8.9.1/src/common/intl.cpp	2008-10-28 16:28:16.000000000 -0600
+@@ -1529,6 +1529,8 @@
    m_initialized = false;
  }
  
@@ -54,7 +54,7 @@ diff -Naurp wxPython-src-2.8.8.0-orig/src/common/intl.cpp wxPython-src-2.8.8.0/s
  // NB: this function has (desired) side effect of changing current locale
  bool wxLocale::Init(const wxChar *szName,
                      const wxChar *szShort,
-@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName
+@@ -1597,7 +1599,7 @@
    bool bOk = true;
    if ( bLoadDefault )
    {
@@ -63,10 +63,10 @@ diff -Naurp wxPython-src-2.8.8.0-orig/src/common/intl.cpp wxPython-src-2.8.8.0/s
  
      // there may be a catalog with toolkit specific overrides, it is not
      // an error if this does not exist
-diff -Naurp wxPython-src-2.8.8.0-orig/utils/wxrc/Makefile.in wxPython-src-2.8.8.0/utils/wxrc/Makefile.in
---- wxPython-src-2.8.8.0-orig/utils/wxrc/Makefile.in	2008-06-08 17:37:49.000000000 -0600
-+++ wxPython-src-2.8.8.0/utils/wxrc/Makefile.in	2008-06-28 22:49:24.000000000 -0600
-@@ -120,7 +120,6 @@ distclean: clean
+diff -Naur wxPython-src-2.8.9.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.9.1/utils/wxrc/Makefile.in
+--- wxPython-src-2.8.9.1-orig/utils/wxrc/Makefile.in	2008-10-28 16:27:37.000000000 -0600
++++ wxPython-src-2.8.9.1/utils/wxrc/Makefile.in	2008-10-28 16:28:16.000000000 -0600
+@@ -120,7 +120,6 @@
  @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
  @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
  @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)