update development version of wxGTK

* copy ebuild
* update the patch needed to prevent file collisions

3 files changed, 33 insertions, 29 deletions

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 0efa057..33b617a 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,3 +1,3 @@
-AUX wxGTK-2.9.2.4-collision.patch 5953 RMD160 a80b62e8a6c099d27ff7df6e63a0c55078f342a7 SHA1 3f6897bfe49c5d3123f7fc53479dcb31977b5600 SHA256 b7470d4e2eaed28b2fedc5f8e94fb897a837daa0aa33c77ca99e4e379b0e9cdf
-DIST wxPython-src-2.9.2.4.tar.bz2 47737427 RMD160 e2e73bf382bc6408164343b40f59e1afdd40ff32 SHA1 de0c9f68feaf8ed6f2e1fd8f9015a15440b7665b SHA256 6ebd4c21ad11ecc39d5d638281be447172455a8711e0eccee433335f763b2fff
-EBUILD wxGTK-2.9.2.4.ebuild 3658 RMD160 bd9ac22c5af59d8c6a6d84858396198f6958fdb6 SHA1 d516473fee9b104820fb108d2759a56079dcb5e9 SHA256 ebd79a56236a88b2ce6abcedece33c03e02ac3e903a43c1922ea92acc6dc79ad
+AUX wxGTK-2.9.3.1-collision.patch 6422 RMD160 9c2210e6e511304b90576513e4abf46d5f29e63f SHA1 4cefcc1165fdba08b6bd7d3024395a580713031f SHA256 ac7a85ede59ab983640b760994fdb4478bd7b4762e11bc95935322ff75294d02
+DIST wxPython-src-2.9.3.1.tar.bz2 49131100 RMD160 cd19b1d07d39c7918c72cf124f4f5cd48836d781 SHA1 0202f64e1e99fb69d22d7be0d38cf7dcf3d80d79 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d
+EBUILD wxGTK-2.9.3.1.ebuild 3658 RMD160 bd9ac22c5af59d8c6a6d84858396198f6958fdb6 SHA1 d516473fee9b104820fb108d2759a56079dcb5e9 SHA256 ebd79a56236a88b2ce6abcedece33c03e02ac3e903a43c1922ea92acc6dc79ad
diff --git a/x11-libs/wxGTK/files/wxGTK-2.9.2.4-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch
index 8d053fd..ff3dff8 100644
--- a/x11-libs/wxGTK/files/wxGTK-2.9.2.4-collision.patch
+++ b/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch
@@ -7,12 +7,25 @@ Prevent file collisions between multiple installed SLOTs.
     installed with eselect-wxwidgets.
   - Version wxstd.mo and modify AddStdCatalog to find it.
 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -13464,10 +13464,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___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) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+diff -urN a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
+--- a/build/bakefiles/wx.bkl	2010-07-29 01:18:17.000000000 +0200
++++ b/build/bakefiles/wx.bkl	2012-01-11 00:44:41.196287676 +0100
+@@ -138,7 +138,7 @@
+         <using module="gettext"/>
+         <gettext-catalogs id="locale">
+             <srcdir>$(SRCDIR)/locale</srcdir>
+-            <catalog-name>wxstd</catalog-name>
++            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+             <linguas>
+                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+                 zh zh_CN zh_TW
+diff -urN a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2011-12-29 21:10:54.000000000 +0100
++++ b/Makefile.in	2012-01-11 00:43:28.200286011 +0100
+@@ -14076,10 +14076,9 @@
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___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) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
  
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___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_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_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___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: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___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_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___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_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___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
@@ -22,17 +35,17 @@ Prevent file collisions between multiple installed SLOTs.
  	$(DYLIB_RPATH_INSTALL)
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
  	for f in setup.h $(RCDEFS_H); do \
-@@ -14310,7 +14309,8 @@ install-wxconfig:
+@@ -14964,7 +14963,8 @@
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
  	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
 +	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
-+		&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
++	        && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
  
  locale_install: 
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -14318,7 +14318,7 @@ locale_install:
+@@ -14972,7 +14972,7 @@
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
  	if test -f $(srcdir)/locale/$$l.mo ; then \
@@ -41,20 +54,10 @@ Prevent file collisions between multiple installed SLOTs.
  	fi ; \
  	done
  
---- a/build/bakefiles/wx.bkl
-+++ b/build/bakefiles/wx.bkl
-@@ -138,7 +138,7 @@
-         <using module="gettext"/>
-         <gettext-catalogs id="locale">
-             <srcdir>$(SRCDIR)/locale</srcdir>
--            <catalog-name>wxstd</catalog-name>
-+            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
-             <linguas>
-                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
-                 zh zh_CN zh_TW
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
+diff -urN a/src/common/translation.cpp b/src/common/translation.cpp
+--- a/src/common/translation.cpp	2011-04-19 01:08:44.000000000 +0200
++++ b/src/common/translation.cpp	2012-01-11 00:47:05.672290973 +0100
+@@ -1302,7 +1302,7 @@
  
  bool wxTranslations::AddStdCatalog()
  {
@@ -63,9 +66,10 @@ Prevent file collisions between multiple installed SLOTs.
          return false;
  
      // there may be a catalog with toolkit specific overrides, it is not
---- a/utils/wxrc/Makefile.in
-+++ b/utils/wxrc/Makefile.in
-@@ -120,7 +120,6 @@ distclean: clean
+diff -urN a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
+--- a/utils/wxrc/Makefile.in	2011-12-29 21:10:54.000000000 +0100
++++ b/utils/wxrc/Makefile.in	2012-01-11 00:48:54.088293444 +0100
+@@ -124,7 +124,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)
diff --git a/x11-libs/wxGTK/wxGTK-2.9.2.4.ebuild b/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
index 5e1e169..5e1e169 100644
--- a/x11-libs/wxGTK/wxGTK-2.9.2.4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild