Move wxwin.m4 handling to eselect-wxwidgets. Remove old.

Package-Manager: portage-2.1.4_rc10

12 files changed, 50 insertions, 316 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 358978d95a45..42641dd306e4 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,18 @@
 # 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.171 2007/12/15 00:40:08 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.172 2007/12/20 00:14:00 dirtyepic Exp $
+
+*wxGTK-2.6.4.0-r3 (20 Dec 2007)
+
+  20 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
+  -files/wxGTK-2.6.3.3-dialog_focus.patch,
+  -files/wxGTK-2.6.3.3-slider_linesize.patch,
+  -files/wxGTK-2.6.3.3-wxrc_build_fix.patch,
+  -files/wxGTK-2.6.3.3-wxrc_link_fix.patch,
+  files/wxGTK-2.6.4-collision.patch, files/wxGTK-2.8.4-collision.patch,
+  -wxGTK-2.6.3.3.ebuild, -wxGTK-2.6.4.0-r2.ebuild, +wxGTK-2.6.4.0-r3.ebuild,
+  wxGTK-2.8.7.1.ebuild:
+  Move wxwin.m4 handling to eselect-wxwidgets. Remove old.
 
   15 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.8.7.1.ebuild:
   Pass --enable-graphics_ctx to configure for wxWebKit/Editra/leio.
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.3.3 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.3.3
deleted file mode 100644
index a13365d0e0f7..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.6.3.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 66b9c5f8e20a9505c39dab1a1234daa9 wxPython-src-2.6.3.3.tar.bz2 18963104
-RMD160 7feacff6808574143590a0a421ee60f3692eb783 wxPython-src-2.6.3.3.tar.bz2 18963104
-SHA256 fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb wxPython-src-2.6.3.3.tar.bz2 18963104
-MD5 e575ac25e30749bd540b23ed9b370029 wxWidgets-2.6.3-HTML.tar.gz 1349870
-RMD160 3be20dce033c3e14999783a959fe0804fcab3d91 wxWidgets-2.6.3-HTML.tar.gz 1349870
-SHA256 d564729b6e862c751dcea2487137832f9fbf95a665481c50d029fba9d4dd9cc1 wxWidgets-2.6.3-HTML.tar.gz 1349870
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.4.0-r2 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.4.0-r3
index 2e41e5d3dd41..2e41e5d3dd41 100644
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.6.4.0-r2
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.4.0-r3
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-dialog_focus.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-dialog_focus.patch
deleted file mode 100644
index d003fbe199ff..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-dialog_focus.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Do not set focus inside ShowModal. Fixes wxWindow::SetFocus for modal dialogs, and wxFileDialog initial focus problem.
-
-Index: src/gtk/dialog.cpp
-===================================================================
-RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/gtk/dialog.cpp,v
-retrieving revision 1.109
-retrieving revision 1.109.2.1
-diff -u -B -w -p -r1.109 -r1.109.2.1
---- src/gtk/dialog.cpp	2005/06/20 08:18:39	1.109
-+++ src/gtk/dialog.cpp	2006/07/29 16:40:58	1.109.2.1
-@@ -205,8 +205,6 @@ int wxDialog::ShowModal()
-     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
- 
-     Show( true );
--
--    SetFocus();
- 
-     m_modalShowing = true;
- 
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-slider_linesize.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-slider_linesize.patch
deleted file mode 100644
index c82c770b3ef2..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-slider_linesize.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Implement Get/SetLineSize due to no timeline for a 2.6.4 release that would include this.
-Useful for applications like xara-xtreme.
-
-Index: src/gtk/slider.cpp
-===================================================================
-RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/gtk/slider.cpp,v
-retrieving revision 1.58.2.3
-retrieving revision 1.58.2.4
-diff -u -B -w -p -r1.58.2.3 -r1.58.2.4
---- src/gtk/slider.cpp	2006/03/10 18:45:31	1.58.2.3
-+++ src/gtk/slider.cpp	2006/07/27 13:34:33	1.58.2.4
-@@ -335,13 +335,24 @@ int wxSlider::GetThumbLength() const
-     return (int)ceil(m_adjust->page_size);
- }
- 
--void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
-+void wxSlider::SetLineSize( int lineSize )
- {
-+    double fline = (double)lineSize;
-+
-+    if (fabs(fline-m_adjust->step_increment) < 0.2) return;
-+
-+    m_adjust->step_increment = fline;
-+
-+    GtkDisableEvents();
-+
-+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-+
-+    GtkEnableEvents();
- }
- 
- int wxSlider::GetLineSize() const
- {
--    return 0;
-+    return (int)ceil(m_adjust->step_increment);
- }
- 
- bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_build_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_build_fix.patch
deleted file mode 100644
index 11100cf1690d..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_build_fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fixes makefiles to fail if building wxrc fails.
-Ensures wxrc will be present, for the applications that needs it, if emerge succeeds.
-
-Index: Makefile.in
-===================================================================
-RCS file: /pack/cvsroots/wxwidgets/wxWidgets/Makefile.in,v
-retrieving revision 1.521.2.10
-diff -u -B -r1.521.2.10 Makefile.in
---- Makefile.in	2006/05/23 18:13:44	1.521.2.10
-+++ Makefile.in	2006/09/24 07:44:55
-@@ -9933,13 +9933,13 @@
- 	(cd samples && $(MAKE) all)
- 
- @COND_USE_XRC_1@wxrc: $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__xmldll___depname) $(__xmllib___depname)
--@COND_USE_XRC_1@	(test -d utils/wxrc && cd utils/wxrc && $(MAKE) all) || true
-+@COND_USE_XRC_1@	(if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) all ; fi)
- 
- @COND_USE_XRC_1@clean-wxrc: 
--@COND_USE_XRC_1@	(test -d utils/wxrc && cd utils/wxrc && $(MAKE) clean) || true
-+@COND_USE_XRC_1@	(if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) clean ; fi)
- 
- @COND_USE_XRC_1@install-wxrc: $(__wxrc___depname)
--@COND_USE_XRC_1@	(test -d utils/wxrc && cd utils/wxrc && $(MAKE) install) || true
-+@COND_USE_XRC_1@	(if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) install ; fi)
- 
- install-wxconfig: 
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_link_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_link_fix.patch
deleted file mode 100644
index f5e05eba0406..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_link_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix bug 150435 - wxrc build fails because it tries to link against system wx libraries, if present,
-                 due to LDFLAGS containing -L to /usr/lib as a symlink - swap $LDFLAGS and $LIBDIRNAME
-
---- utils/wxrc/Makefile.in.orig	2007-01-10 13:25:40.000000000 +0200
-+++ utils/wxrc/Makefile.in	2007-01-10 13:27:56.000000000 +0200
-@@ -114,7 +114,7 @@
- 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
- 
- @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
--@COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
-+@COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME)     $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(LDFLAGS) $(EXTRALIBS_FOR_BASE)
- @COND_USE_XRC_1@	
- @COND_USE_XRC_1@	$(__wxrc___mac_setfilecmd)
- 
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 26287794abc9..77b85a51a430 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,6 @@
 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
++++ wxPython-src-2.6.4.0/build/bakefiles/wxpresets/presets/wx.bkl	2007-12-17 19:39:44.000000000 -0600
 @@ -15,12 +15,12 @@
      <set var="__wx_included_impl">0</set>
  
@@ -17,8 +17,8 @@ diff -Naur wxPython-src-2.6.4.0-orig/build/bakefiles/wxpresets/presets/wx.bkl wx
      </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-10-25 06:35:58.000000000 -0600
-+++ wxPython-src-2.6.4.0/Makefile.in	2007-10-25 06:37:21.000000000 -0600
+--- wxPython-src-2.6.4.0-orig/Makefile.in	2007-12-17 19:38:16.000000000 -0600
++++ wxPython-src-2.6.4.0/Makefile.in	2007-12-17 19:41:49.000000000 -0600
 @@ -26,6 +26,7 @@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -27,12 +27,12 @@ diff -Naur wxPython-src-2.6.4.0-orig/Makefile.in wxPython-src-2.6.4.0/Makefile.i
  BK_DEPS = @BK_DEPS@
  BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
-@@ -9535,9 +9536,10 @@
+@@ -9534,10 +9535,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) $(__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_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
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
 -	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-+	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
  	$(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/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \
@@ -40,7 +40,7 @@ diff -Naur wxPython-src-2.6.4.0-orig/Makefile.in wxPython-src-2.6.4.0/Makefile.i
  	$(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 \
-@@ -10215,8 +10217,8 @@
+@@ -10215,8 +10215,8 @@
  install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
@@ -51,7 +51,7 @@ diff -Naur wxPython-src-2.6.4.0-orig/Makefile.in wxPython-src-2.6.4.0/Makefile.i
  
  locale_install: 
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -10224,7 +10226,7 @@
+@@ -10224,7 +10224,7 @@
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
  	if test -f $(srcdir)/locale/$$l.mo ; then \
@@ -62,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-10-25 06:37:21.000000000 -0600
++++ wxPython-src-2.6.4.0/src/common/intl.cpp	2007-12-17 19:39:44.000000000 -0600
 @@ -1452,6 +1452,8 @@
    m_initialized = false;
  }
@@ -82,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-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
+--- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in	2007-12-17 19:38:16.000000000 -0600
++++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in	2007-12-17 19:39:44.000000000 -0600
 @@ -125,7 +125,6 @@
  @COND_USE_XRC_1@	$(INSTALL_DIR) $(DESTDIR)$(bindir)
  @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch
index 967c93a45a88..2d1cc69b005f 100644
--- a/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch
@@ -1,6 +1,6 @@
-diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx.bkl wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx.bkl
---- wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx.bkl	2007-07-04 13:24:53.000000000 -0600
-+++ wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx.bkl	2007-10-25 19:15:37.000000000 -0600
+diff -Naur wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx.bkl wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx.bkl
+--- wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx.bkl	2007-07-04 13:24:53.000000000 -0600
++++ wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx.bkl	2007-12-17 19:58:30.000000000 -0600
 @@ -51,12 +51,12 @@
      <set var="__wx_included_impl">0</set>
  
@@ -16,9 +16,9 @@ diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx.bkl wx
          <set var="__wx_included_impl">1</set>
      </if>
  
-diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx_unix.bkl
---- wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl	2007-07-04 13:24:53.000000000 -0600
-+++ wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx_unix.bkl	2007-10-25 19:15:23.000000000 -0600
+diff -Naur wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx_unix.bkl
+--- wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl	2007-11-12 13:33:30.000000000 -0600
++++ wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx_unix.bkl	2007-12-17 19:58:30.000000000 -0600
 @@ -3,7 +3,7 @@
  
  <!--
@@ -37,9 +37,9 @@ diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx_unix.b
          </error>
      </if>
  
-diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.in
---- wxPython-src-2.8.6.0-orig/Makefile.in	2007-10-25 19:11:40.000000000 -0600
-+++ wxPython-src-2.8.6.0/Makefile.in	2007-10-25 19:13:06.000000000 -0600
+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 @@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -48,12 +48,12 @@ diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.i
  BK_DEPS = @BK_DEPS@
  BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
-@@ -11335,9 +11336,10 @@
+@@ -11335,10 +11336,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
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
 -	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-+	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
  	$(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/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \
@@ -61,7 +61,7 @@ diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.i
  	$(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 \
-@@ -12093,8 +12095,8 @@
+@@ -12094,8 +12094,8 @@
  install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
@@ -72,7 +72,7 @@ diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.i
  
  locale_install: 
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -12102,7 +12104,7 @@
+@@ -12103,7 +12103,7 @@
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
  	if test -f $(srcdir)/locale/$$l.mo ; then \
@@ -81,10 +81,10 @@ diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.i
  	fi ; \
  	done
  
-diff -Naur wxPython-src-2.8.6.0-orig/src/common/intl.cpp wxPython-src-2.8.6.0/src/common/intl.cpp
---- wxPython-src-2.8.6.0-orig/src/common/intl.cpp	2007-07-04 13:25:04.000000000 -0600
-+++ wxPython-src-2.8.6.0/src/common/intl.cpp	2007-10-25 19:13:06.000000000 -0600
-@@ -1513,6 +1513,8 @@
+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 @@
    m_initialized = false;
  }
  
@@ -93,7 +93,7 @@ diff -Naur wxPython-src-2.8.6.0-orig/src/common/intl.cpp wxPython-src-2.8.6.0/sr
  // NB: this function has (desired) side effect of changing current locale
  bool wxLocale::Init(const wxChar *szName,
                      const wxChar *szShort,
-@@ -1581,7 +1583,7 @@
+@@ -1585,7 +1587,7 @@
    bool bOk = true;
    if ( bLoadDefault )
    {
@@ -102,9 +102,9 @@ diff -Naur wxPython-src-2.8.6.0-orig/src/common/intl.cpp wxPython-src-2.8.6.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.8.6.0-orig/utils/wxrc/Makefile.in wxPython-src-2.8.6.0/utils/wxrc/Makefile.in
---- wxPython-src-2.8.6.0-orig/utils/wxrc/Makefile.in	2007-09-11 15:25:24.000000000 -0600
-+++ wxPython-src-2.8.6.0/utils/wxrc/Makefile.in	2007-10-25 19:13:06.000000000 -0600
+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 @@
  @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)
diff --git a/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild b/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild
deleted file mode 100644
index d3a6031ae36b..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild,v 1.17 2007/07/15 05:53:11 mr_bones_ Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-HTML_PV="$(get_version_component_range 1-3)"
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and wxbase non-gui library"
-
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
-	doc? ( mirror://sourceforge/wxwindows/wxWidgets-${HTML_PV}-HTML.tar.gz )"
-
-SLOT="2.6"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc gnome joystick odbc opengl sdl unicode X"
-LICENSE="wxWinLL-3"
-HOMEPAGE="http://www.wxwidgets.org"
-
-# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets
-#         has its own implementation of it
-# Note 2: PCX support is enabled if the correct libraries are detected.
-#         There is no USE flag for this.
-
-RDEPEND="X? ( opengl? ( virtual/opengl )
-		>=x11-libs/gtk+-2.0
-		>=dev-libs/glib-2.0
-		media-libs/tiff
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		gnome? ( >=gnome-base/libgnomeprintui-2.8 ) )
-	odbc? ( dev-db/unixODBC )
-	x86? ( sdl? ( >=media-libs/libsdl-1.2 ) )
-	amd64? ( sdl? ( >=media-libs/libsdl-1.2 ) )
-	ppc? ( sdl? ( >=media-libs/libsdl-1.2 ) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	X? (
-		x11-proto/xproto
-		x11-proto/xineramaproto
-		x11-proto/xf86vidmodeproto
-	   )"
-
-S=${WORKDIR}/wxPython-src-${PV}
-HTML_S=${WORKDIR}/wxWidgets-${HTML_PV}
-
-# Configure a build.
-# It takes three parameters;
-# $1: prefix for the build directory (used for wxGTK which has two
-#     builds needed.
-# $2: "unicode" if it must be build with else ""
-# $3: all the extra parameters to pass to configure script
-configure_build() {
-	export LANG='C'
-
-	mkdir ${S}/$1_build
-	cd ${S}/$1_build
-	# odbc works with ansi only:
-	subconfigure $3 $(use_with odbc)
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake failed"
-	#wxbase has no contrib:
-	if [[ -e contrib/src ]]; then
-		cd contrib/src
-		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake contrib failed"
-	fi
-
-	if [[ "$2" == "unicode" ]] && use unicode; then
-		mkdir ${S}/$1_build_unicode
-		cd ${S}/$1_build_unicode
-		subconfigure $3 --enable-unicode
-		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake failed"
-		if [[ -e contrib/src ]]; then
-			cd contrib/src
-			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake contrib failed"
-		fi
-	fi
-}
-
-# This is a commodity function which calls configure script
-# with the default parameters plus extra parameters. It's used
-# as building the unicode version required redoing it.
-# It takes all the params and passes them to the script
-subconfigure() {
-	ECONF_SOURCE="${S}" \
-		econf \
-			--with-zlib \
-			$(use_enable debug) $(use_enable debug debug_gdb) \
-			$* || die "./configure failed"
-}
-
-# Installs a build
-# It takes only a parameter: the prefix for the build directory
-# see configure_build function
-install_build() {
-	cd ${S}/$1_build
-	einstall libdir="${D}/usr/$(get_libdir)" || die "Install failed"
-	if [[ -e contrib ]]; then
-		cd contrib/src
-		einstall libdir="${D}/usr/$(get_libdir)" || die "Install contrib failed"
-	fi
-	if [[ -e ${S}/$1_build_unicode ]]; then
-		cd ${S}/$1_build_unicode
-		einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install failed"
-		cd contrib/src
-		einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install contrib failed"
-	fi
-}
-
-pkg_setup() {
-	if use X; then
-		elog "To install only wxbase (non-gui libs) use USE=-X"
-	else
-		elog "To install GUI libraries, in addition to wxbase, use USE=X"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-wxrc_build_fix.patch"
-	epatch "${FILESDIR}/${P}-wxrc_link_fix.patch"
-	epatch "${FILESDIR}/${P}-dialog_focus.patch"
-	epatch "${FILESDIR}/${P}-slider_linesize.patch"
-
-	# Reverse apply patch in wxPython tarball that breaks ABI
-	EPATCH_OPTS="-R" epatch "${S}/patches/listctrl-ongetitemcolumnimage.patch"
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-	myconf="${myconf}
-		$(use_with sdl)
-		$(use_enable joystick)"
-
-	if use X; then
-		myconf="${myconf}
-			$(use_enable opengl)
-			$(use_with opengl)
-			$(use_with gnome gnomeprint)"
-	fi
-
-	use X && configure_build gtk2 unicode "${myconf} --with-gtk=2"
-	use X || configure_build base unicode "${myconf} --disable-gui"
-}
-
-src_install() {
-	use X && install_build gtk2
-	use X || install_build base
-
-	cp ${D}/usr/bin/wx-config ${D}/usr/bin/wx-config-2.6 || die "Failed to cp wx-config"
-
-	# In 2.6 all wx-config*'s go in/usr/lib/wx/config
-	# Only install wx-config if 2.4 is not installed:
-	if [ -e "/usr/bin/wx-config" ]; then
-		if [ "$(/usr/bin/wx-config --release)" = "2.4" ]; then
-			rm ${D}/usr/bin/wx-config
-		fi
-	fi
-
-	dodoc ${S}/docs/changes.txt
-	dodoc ${S}/docs/gtk/readme.txt
-
-	if use doc; then
-		dohtml -r ${HTML_S}/docs/html/*
-	fi
-}
-
-pkg_postinst() {
-	elog "dev-libs/wxbase has been removed from portage."
-	elog "wxBase is installed with wxGTK, as one of many libraries."
-	elog "If only wxBase is wanted, -X USE flag may be specified."
-}
diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r3.ebuild
index 46945aba422d..07e4c7fecad4 100644
--- a/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.6.4.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild,v 1.6 2007/12/13 04:04:04 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r3.ebuild,v 1.1 2007/12/20 00:14:00 dirtyepic Exp $
 
 inherit eutils versionator flag-o-matic
 
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
 			x11-proto/xf86vidmodeproto
 			)"
 
-PDEPEND="app-admin/eselect-wxwidgets"
+PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
 
 SLOT="2.6"
 LICENSE="wxWinLL-3
diff --git a/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild
index baeee3a330d6..2eb252b4a607 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild,v 1.5 2007/12/15 00:40:08 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild,v 1.6 2007/12/20 00:14:00 dirtyepic Exp $
 
 inherit eutils versionator flag-o-matic
 
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
 			x11-proto/xf86vidmodeproto
 			)"
 
-PDEPEND="app-admin/eselect-wxwidgets"
+PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
 
 SLOT="2.8"
 LICENSE="wxWinLL-3