Version bump.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 30 insertions, 132 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 66bd75df6852..4730214035d8 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/wxGTK
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.221 2009/04/25 02:25:43 dirtyepic Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.222 2009/05/18 03:15:29 dirtyepic Exp $
+
+*wxGTK-2.8.10.1 (18 May 2009)
+
+  18 May 2009; Ryan Hill <dirtyepic@gentoo.org>
+  -files/wxGTK-2.8.4-collision.patch, -files/wxGTK-2.8.7-race-fix.patch,
+  -wxGTK-2.8.9.2.ebuild, +wxGTK-2.8.10.1.ebuild,
+  +files/wxGTK-2.8.10-collision.patch:
+  Version bump.
 
 *wxGTK-2.8.9.2-r1 (25 Apr 2009)
 
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch
index b22633029b6a..a31f3c13ddee 100644
--- a/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.10-collision.patch
@@ -1,7 +1,7 @@
-diff -Naur wxPython-src-2.8.7.1-orig/Makefile.in wxPython-src-2.8.7.1/Makefile.in
---- wxPython-src-2.8.7.1-orig/Makefile.in	2007-12-17 19:48:48.000000000 -0600
-+++ wxPython-src-2.8.7.1/Makefile.in	2007-12-17 19:58:42.000000000 -0600
-@@ -26,6 +26,7 @@
+diff -Naurp wxPython-src-2.8.10.1-orig/Makefile.in wxPython-src-2.8.10.1/Makefile.in
+--- wxPython-src-2.8.10.1-orig/Makefile.in	2009-05-17 15:57:18.682065956 -0600
++++ wxPython-src-2.8.10.1/Makefile.in	2009-05-17 16:01:41.554066672 -0600
+@@ -27,6 +27,7 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
@@ -9,20 +9,20 @@ diff -Naur wxPython-src-2.8.7.1-orig/Makefile.in wxPython-src-2.8.7.1/Makefile.i
  BK_DEPS = @BK_DEPS@
  BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
-@@ -11335,10 +11336,9 @@
+@@ -11448,10 +11449,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p =
  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: $(__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 \
-@@ -12094,8 +12094,8 @@
+@@ -12207,8 +12207,8 @@ samples: 
  install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
@@ -33,7 +33,7 @@ diff -Naur wxPython-src-2.8.7.1-orig/Makefile.in wxPython-src-2.8.7.1/Makefile.i
  
  locale_install: 
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -12103,7 +12103,7 @@
+@@ -12216,7 +12216,7 @@ locale_install: 
  	$(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 -Naur wxPython-src-2.8.7.1-orig/Makefile.in wxPython-src-2.8.7.1/Makefile.i
  	fi ; \
  	done
  
-diff -Naur wxPython-src-2.8.7.1-orig/src/common/intl.cpp wxPython-src-2.8.7.1/src/common/intl.cpp
---- wxPython-src-2.8.7.1-orig/src/common/intl.cpp	2007-11-12 13:33:31.000000000 -0600
-+++ wxPython-src-2.8.7.1/src/common/intl.cpp	2007-12-17 19:58:30.000000000 -0600
-@@ -1517,6 +1517,8 @@
+diff -Naurp wxPython-src-2.8.10.1-orig/src/common/intl.cpp wxPython-src-2.8.10.1/src/common/intl.cpp
+--- wxPython-src-2.8.10.1-orig/src/common/intl.cpp	2009-01-03 14:40:01.000000000 -0600
++++ wxPython-src-2.8.10.1/src/common/intl.cpp	2009-05-17 16:04:28.683867667 -0600
+@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit()
    m_initialized = false;
  }
  
@@ -54,7 +54,7 @@ diff -Naur wxPython-src-2.8.7.1-orig/src/common/intl.cpp wxPython-src-2.8.7.1/sr
  // NB: this function has (desired) side effect of changing current locale
  bool wxLocale::Init(const wxChar *szName,
                      const wxChar *szShort,
-@@ -1585,7 +1587,7 @@
+@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName
    bool bOk = true;
    if ( bLoadDefault )
    {
@@ -63,10 +63,10 @@ diff -Naur wxPython-src-2.8.7.1-orig/src/common/intl.cpp wxPython-src-2.8.7.1/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.8.7.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.7.1/utils/wxrc/Makefile.in
---- wxPython-src-2.8.7.1-orig/utils/wxrc/Makefile.in	2007-12-17 19:48:49.000000000 -0600
-+++ wxPython-src-2.8.7.1/utils/wxrc/Makefile.in	2007-12-17 19:58:30.000000000 -0600
-@@ -118,7 +118,6 @@
+diff -Naurp wxPython-src-2.8.10.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.10.1/utils/wxrc/Makefile.in
+--- wxPython-src-2.8.10.1-orig/utils/wxrc/Makefile.in	2009-04-27 21:38:59.000000000 -0600
++++ wxPython-src-2.8.10.1/utils/wxrc/Makefile.in	2009-05-17 16:03:56.490863515 -0600
+@@ -120,7 +120,6 @@ distclean: clean
  @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/files/wxGTK-2.8.7-race-fix.patch b/x11-libs/wxGTK/files/wxGTK-2.8.7-race-fix.patch
deleted file mode 100644
index c58f3956d453..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.7-race-fix.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- wxWidgets/src/gtk/app.cpp	2008/03/13 02:56:21	52464
-+++ wxWidgets/src/gtk/app.cpp	2008/03/13 04:37:03	52465
-@@ -174,59 +174,63 @@
-     if (!wxTheApp)
-         return false;
- 
--    bool moreIdles = false;
--
-+    guint idleID_save;
-+    {
-+        // Allow another idle source to be added while this one is busy.
-+        // Needed if an idle event handler runs a new event loop,
-+        // for example by showing a dialog.
-+#if wxUSE_THREADS
-+        wxMutexLocker lock(gs_idleTagsMutex);
-+#endif
-+        idleID_save = wxTheApp->m_idleTag;
-+        wxTheApp->m_idleTag = 0;
-+        g_isIdle = true;
-+        wxAddEmissionHook();
-+    }
- #ifdef __WXDEBUG__
-     // don't generate the idle events while the assert modal dialog is shown,
-     // this matches the behavior of wxMSW
--    if (!wxTheApp->IsInAssert())
-+    if (wxTheApp->IsInAssert())
-+        return false;
- #endif // __WXDEBUG__
--    {
--        guint idleID_save;
--        {
--            // Allow another idle source to be added while this one is busy.
--            // Needed if an idle event handler runs a new event loop,
--            // for example by showing a dialog.
--#if wxUSE_THREADS
--            wxMutexLocker lock(gs_idleTagsMutex);
--#endif
--            idleID_save = wxTheApp->m_idleTag;
--            wxTheApp->m_idleTag = 0;
--            g_isIdle = true;
--            wxAddEmissionHook();
--        }
- 
--        // When getting called from GDK's time-out handler
--        // we are no longer within GDK's grab on the GUI
--        // thread so we must lock it here ourselves.
--        gdk_threads_enter();
--
--        // Send idle event to all who request them as long as
--        // no events have popped up in the event queue.
--        do {
--            moreIdles = wxTheApp->ProcessIdle();
--        } while (moreIdles && gtk_events_pending() == 0);
-+    // When getting called from GDK's time-out handler
-+    // we are no longer within GDK's grab on the GUI
-+    // thread so we must lock it here ourselves.
-+    gdk_threads_enter();
- 
--        // Release lock again
--        gdk_threads_leave();
--        
--        {
--            // If another idle source was added, remove it
-+    // Send idle event to all who request them as long as
-+    // no events have popped up in the event queue.
-+    bool moreIdles;
-+    do {
-+        moreIdles = wxTheApp->ProcessIdle();
-+    } while (moreIdles && gtk_events_pending() == 0);
-+
-+    // Release lock again
-+    gdk_threads_leave();
-+    
- #if wxUSE_THREADS
--            wxMutexLocker lock(gs_idleTagsMutex);
-+    wxMutexLocker lock(gs_idleTagsMutex);
- #endif
--            if (wxTheApp->m_idleTag != 0)
--                g_source_remove(wxTheApp->m_idleTag);
--            wxTheApp->m_idleTag = idleID_save;
--            g_isIdle = false;
--        }
--    }
-+    // If another idle source was added, remove it
-+    if (wxTheApp->m_idleTag != 0)
-+        g_source_remove(wxTheApp->m_idleTag);
-+    wxTheApp->m_idleTag = idleID_save;
-+    g_isIdle = false;
- 
--    if (!moreIdles)
--    {
- #if wxUSE_THREADS
--        wxMutexLocker lock(gs_idleTagsMutex);
-+    if (wxPendingEventsLocker)
-+        wxPendingEventsLocker->Enter();
- #endif
-+    // Pending events can be added asynchronously,
-+    // need to keep idle source if any have appeared
-+    moreIdles = moreIdles || (wxPendingEvents && !wxPendingEvents->IsEmpty());
-+#if wxUSE_THREADS
-+    if (wxPendingEventsLocker)
-+        wxPendingEventsLocker->Leave();
-+#endif
-+    if (!moreIdles)
-+    {
-         // Indicate that we are now in idle mode and event handlers
-         // will have to reinstall the idle handler again.
-         g_isIdle = true;
-
diff --git a/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.10.1.ebuild
index ea90a396e2eb..7fa87700db9e 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild,v 1.2 2009/04/25 02:25:43 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1.ebuild,v 1.1 2009/05/18 03:15:29 dirtyepic Exp $
 
 EAPI="2"
 
@@ -59,8 +59,7 @@ S="${WORKDIR}/wxPython-src-${PV}"
 src_prepare() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
-	epatch "${FILESDIR}"/${PN}-2.8.8-collision.patch
-	epatch "${FILESDIR}"/${PN}-2.8.6-wxrc_link_fix.patch
+	epatch "${FILESDIR}"/${PN}-2.8.10-collision.patch
 	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
 }