Version bump. This is a major ebuild and build system rewrite. It may cause

breakage, so all untested arch keywords were dropped. Please test and
re-keyword. Will be unmasked after enough testing is done.
(Portage version: 2.1.3.7)

5 files changed, 126 insertions, 0 deletions

diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.4.0 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.4.0
new file mode 100644
index 000000000000..2e41e5d3dd41
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.4.0
@@ -0,0 +1,6 @@
+MD5 489301bffcf845a0f810e41c1f571ff5 wxPython-src-2.6.4.0.tar.bz2 19062795
+RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 wxPython-src-2.6.4.0.tar.bz2 19062795
+SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba wxPython-src-2.6.4.0.tar.bz2 19062795
+MD5 a231eec9c8f35ec12e55e133464ce7bd wxWidgets-2.6.4-HTML.tar.gz 1364468
+RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f wxWidgets-2.6.4-HTML.tar.gz 1364468
+SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c wxWidgets-2.6.4-HTML.tar.gz 1364468
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch
new file mode 100644
index 000000000000..cb0ce4370121
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch
@@ -0,0 +1,14 @@
+diff -Naur wxPython-src-2.6.3.3-orig/Makefile.in wxPython-src-2.6.3.3/Makefile.in
+--- wxPython-src-2.6.3.3-orig/Makefile.in	2007-02-25 17:08:11.000000000 -0600
++++ wxPython-src-2.6.3.3/Makefile.in	2007-02-25 17:20:46.000000000 -0600
+@@ -1081,8 +1081,8 @@
+ 	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ 	$(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+ 	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+-	-DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CPPFLAGS) \
+-	$(CXXFLAGS)
++	-DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT \
++	$(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ ODBCDLL_OBJECTS =  \
+ 	$(__odbcdll___win32rc) \
+ 	odbcdll_db.o \
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch
new file mode 100644
index 000000000000..a93f378955c7
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch
@@ -0,0 +1,65 @@
+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-07-29 11:47:53.000000000 -0600
++++ wxPython-src-2.6.4.0/Makefile.in	2007-07-29 12:35:22.000000000 -0600
+@@ -26,6 +26,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_DIR = @INSTALL_DIR@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ BK_DEPS = @BK_DEPS@
+ BK_MAKE_PCH = @BK_MAKE_PCH@
+ srcdir = @srcdir@
+@@ -9535,9 +9536,10 @@
+ 
+ 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
+-	(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; \
++	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 \
+@@ -10215,8 +10217,8 @@
+ install-wxconfig: 
+ 	$(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) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -10224,7 +10226,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ 	fi ; \
+ 	done
+ 
+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-07-29 12:29:45.000000000 -0600
+@@ -1452,6 +1452,8 @@
+   m_initialized = false;
+ }
+ 
++#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
++
+ // NB: this function has (desired) side effect of changing current locale
+ bool wxLocale::Init(const wxChar *szName,
+                     const wxChar *szShort,
+@@ -1520,7 +1522,7 @@
+   bool bOk = true;
+   if ( bLoadDefault )
+   {
+-    bOk = AddCatalog(wxT("wxstd"));
++    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
+     // an error if this does not exist
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-g_free.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4.0-g_free.patch
new file mode 100644
index 000000000000..49296d23f214
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.4.0-g_free.patch
@@ -0,0 +1,27 @@
+In >=gtk+-2.11 GtkBorder uses GSlice, and using g_free here will cause
+double free corruption.  Use gtk_border_free instead.
+
+diff -Naur gtk-orig/button.cpp gtk/button.cpp
+--- src/gtk-orig/button.cpp	2005-12-15 18:11:43.000000000 -0600
++++ src/gtk/button.cpp	2007-07-28 20:58:06.000000000 -0600
+@@ -89,7 +89,7 @@
+             right_border += default_border->right;
+             top_border += default_border->top;
+             bottom_border += default_border->bottom;
+-            g_free( default_border );
++            gtk_border_free( default_border );
+         }
+ #else
+         left_border = 6;
+diff -Naur gtk-orig/window.cpp gtk/window.cpp
+--- src/gtk-orig/window.cpp	2006-08-21 11:09:03.000000000 -0600
++++ src/gtk/window.cpp	2007-07-28 20:58:36.000000000 -0600
+@@ -3273,7 +3273,7 @@
+                 right_border += default_border->right;
+                 top_border += default_border->top;
+                 bottom_border += default_border->bottom;
+-                g_free( default_border );
++                gtk_border_free( default_border );
+             }
+ #else
+             left_border = 6;
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch
new file mode 100644
index 000000000000..a4f12ca62af6
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch
@@ -0,0 +1,14 @@
+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 - move $LDFLAGS further in the end

+

+--- 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

+@@ -117,7 +117,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)   $(LIBS) $(__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)     $(LIBS) $(__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)

+