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.
Package-Manager: portage-2.1.3.7

8 files changed, 365 insertions, 5 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 85eccecde6c6..fbca136b7eb1 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,16 @@
 # 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.144 2007/07/24 22:52:52 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.145 2007/09/01 08:50:37 dirtyepic Exp $
+
+*wxGTK-2.6.4.0 (01 Sep 2007)
+
+  01 Sep 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxGTK-2.6.3-unicode-odbc.patch, +files/wxGTK-2.6.4.0-g_free.patch,
+  +files/wxGTK-2.6.4.0-wxrc_link_fix.patch,
+  +files/wxGTK-2.6.4-collision.patch, +wxGTK-2.6.4.0.ebuild:
+  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.
 
   24 Jul 2007; Ryan Hill <dirtyepic@gentoo.org>
   -files/wxGTK-2.4.1-contrib.patch, -files/wxGTK-2.4.2-cleanup.patch,
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 60907e8da674..42a67f281944 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,3 +1,7 @@
+AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
+MD5 c014a7ad15c589b92519d6b2399baf56 files/wxGTK-2.6.3-unicode-odbc.patch 729
+RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa files/wxGTK-2.6.3-unicode-odbc.patch 729
+SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f files/wxGTK-2.6.3-unicode-odbc.patch 729
 AUX wxGTK-2.6.3.3-dialog_focus.patch 664 RMD160 20433654838ea0f1349bd32c2760a53ad14008c9 SHA1 31bb73a6edd2e32afa06abe079eb9906f68cfb47 SHA256 0583f9bf34c8aadbe8142c25739c80e41d6ce2388b15d336916ac1a7fa78e34e
 MD5 ddf5e2466e1d293156c3a0e0e056f719 files/wxGTK-2.6.3.3-dialog_focus.patch 664
 RMD160 20433654838ea0f1349bd32c2760a53ad14008c9 files/wxGTK-2.6.3.3-dialog_focus.patch 664
@@ -14,16 +18,34 @@ AUX wxGTK-2.6.3.3-wxrc_link_fix.patch 1127 RMD160 7ebd632e7811982d8128f0e4281e29
 MD5 83b70046c421613c0a5df2802e8ad481 files/wxGTK-2.6.3.3-wxrc_link_fix.patch 1127
 RMD160 7ebd632e7811982d8128f0e4281e29ee25b76f9b files/wxGTK-2.6.3.3-wxrc_link_fix.patch 1127
 SHA256 e946d312dd609595e1c61782b0e9019ef361a7c0478380e8891d61d38a4d6233 files/wxGTK-2.6.3.3-wxrc_link_fix.patch 1127
+AUX wxGTK-2.6.4-collision.patch 4362 RMD160 62645296b47c54025c824a20b5ca83c1778eb8eb SHA1 294a4608e7648de9c04c5716a2f90526edf8b210 SHA256 20cf6d4459c2ef70346175ae483386a90ca5925038d86a497d765befdfe045c3
+MD5 344ea6ceff40e06b4bbd3a7952d48d4f files/wxGTK-2.6.4-collision.patch 4362
+RMD160 62645296b47c54025c824a20b5ca83c1778eb8eb files/wxGTK-2.6.4-collision.patch 4362
+SHA256 20cf6d4459c2ef70346175ae483386a90ca5925038d86a497d765befdfe045c3 files/wxGTK-2.6.4-collision.patch 4362
+AUX wxGTK-2.6.4.0-g_free.patch 1102 RMD160 a2b4fc260d834b5e8c5244a19b61dd2f74c9c3b1 SHA1 0af47b2b10b1c472b8d6ec9e43160c4b28527bf0 SHA256 029b962d7ca861e15b00712a786e070aaaaa89c1faa6b9a5e46e3c5a2b8b00f5
+MD5 d51b15154c5a72c0534c2275a50b5e08 files/wxGTK-2.6.4.0-g_free.patch 1102
+RMD160 a2b4fc260d834b5e8c5244a19b61dd2f74c9c3b1 files/wxGTK-2.6.4.0-g_free.patch 1102
+SHA256 029b962d7ca861e15b00712a786e070aaaaa89c1faa6b9a5e46e3c5a2b8b00f5 files/wxGTK-2.6.4.0-g_free.patch 1102
+AUX wxGTK-2.6.4.0-wxrc_link_fix.patch 1160 RMD160 8e7672e902240997cc845c4f172e02a3fc9da040 SHA1 0578d6714c397d64443e860af0016e5b36ccf723 SHA256 0133a13189afa8ad0353a882d4f7e71e1b26490058692bf46c9535fb90e46dbd
+MD5 09ad597612088e88d83518234b5580e0 files/wxGTK-2.6.4.0-wxrc_link_fix.patch 1160
+RMD160 8e7672e902240997cc845c4f172e02a3fc9da040 files/wxGTK-2.6.4.0-wxrc_link_fix.patch 1160
+SHA256 0133a13189afa8ad0353a882d4f7e71e1b26490058692bf46c9535fb90e46dbd files/wxGTK-2.6.4.0-wxrc_link_fix.patch 1160
 DIST wxPython-src-2.6.3.3.tar.bz2 18963104 RMD160 7feacff6808574143590a0a421ee60f3692eb783 SHA1 e55a3a8cfbd1aff394be15297ae205a8c597bed8 SHA256 fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb
+DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxWidgets-2.6.3-HTML.tar.gz 1349870 RMD160 3be20dce033c3e14999783a959fe0804fcab3d91 SHA1 915f21d4cd2bb53403317f5b9514972111b72bdf SHA256 d564729b6e862c751dcea2487137832f9fbf95a665481c50d029fba9d4dd9cc1
+DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
 EBUILD wxGTK-2.6.3.3.ebuild 5135 RMD160 41025c701f01da88680857191f741e32cf923ea1 SHA1 102cf81d2390d5b12c2aad91493e9e281f990bb8 SHA256 31d82ff2ace13e538a1e11df4f92d1dc6157f1ea623226b74e87135a644cc815
 MD5 cf4e9cdf542cce1bef0a55f2995e0d2a wxGTK-2.6.3.3.ebuild 5135
 RMD160 41025c701f01da88680857191f741e32cf923ea1 wxGTK-2.6.3.3.ebuild 5135
 SHA256 31d82ff2ace13e538a1e11df4f92d1dc6157f1ea623226b74e87135a644cc815 wxGTK-2.6.3.3.ebuild 5135
-MISC ChangeLog 22463 RMD160 9333fdd6586c327a400a709982b76fd1593cb342 SHA1 2cff362e1745c686b2e7c1e8c50fb03203b7c829 SHA256 7063d13081343233c5dfc2f29f8c149f04fbaefa85e0f1710442f4ca65e9e869
-MD5 32e7c4b03f85d46bc16e1805b31ee38a ChangeLog 22463
-RMD160 9333fdd6586c327a400a709982b76fd1593cb342 ChangeLog 22463
-SHA256 7063d13081343233c5dfc2f29f8c149f04fbaefa85e0f1710442f4ca65e9e869 ChangeLog 22463
+EBUILD wxGTK-2.6.4.0.ebuild 4386 RMD160 2ac6ff94cfb853f6b06a2c9fa62270c6f23d60f9 SHA1 ace322e6e05438634fb487851c6ff23db02f1d7d SHA256 cfb006fbd566358b03e9e2012ed49f465c5da946daed6f031de46e019f3a4644
+MD5 aa48a13c7013e6422c6b0eee64e6eee6 wxGTK-2.6.4.0.ebuild 4386
+RMD160 2ac6ff94cfb853f6b06a2c9fa62270c6f23d60f9 wxGTK-2.6.4.0.ebuild 4386
+SHA256 cfb006fbd566358b03e9e2012ed49f465c5da946daed6f031de46e019f3a4644 wxGTK-2.6.4.0.ebuild 4386
+MISC ChangeLog 22934 RMD160 c42694a5ffb68a1aeb7b59d9520f7540587d61fa SHA1 3c7c00ef360f940d39b5153a91e02e76ab34f3c9 SHA256 0d70b37fbbb645c8c44e56304001aa34bac3e3915b071484a865a4ec75a0ec2c
+MD5 1cf7773e458515aa540ab015618952b5 ChangeLog 22934
+RMD160 c42694a5ffb68a1aeb7b59d9520f7540587d61fa ChangeLog 22934
+SHA256 0d70b37fbbb645c8c44e56304001aa34bac3e3915b071484a865a4ec75a0ec2c ChangeLog 22934
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -31,3 +53,6 @@ SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e metadata
 MD5 eb68af7b26b012c1917773f8e8ef72ac files/digest-wxGTK-2.6.3.3 536
 RMD160 df919a5e942c91fc9be13999d0b3db38d3880b3c files/digest-wxGTK-2.6.3.3 536
 SHA256 38f9f296e8a111b7459cdc57231520a7d0277574f8153cb2353c46534378695f files/digest-wxGTK-2.6.3.3 536
+MD5 93bb905fd69b1ddd387cf1e25b310ff7 files/digest-wxGTK-2.6.4.0 536
+RMD160 02d6744262a4fcfa2095c4a56a9ac0e00e74e327 files/digest-wxGTK-2.6.4.0 536
+SHA256 c6fc3d1efa916b8bed0c000de832879341897fd2c70ce23a6f5fe2b711e5b2d9 files/digest-wxGTK-2.6.4.0 536
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)

+ 

diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0.ebuild
new file mode 100644
index 000000000000..72a76d284101
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.6.4.0.ebuild
@@ -0,0 +1,199 @@
+# 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.ebuild,v 1.1 2007/09/01 08:50:37 dirtyepic Exp $
+
+inherit eutils versionator flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+HOMEPAGE="http://wxwidgets.org/"
+
+BASE_PV="$(get_version_component_range 1-3)"
+BASE_P="${PN}-${BASE_PV}"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+		doc? ( mirror://sourceforge/wxwindows/wxWidgets-${BASE_PV}-HTML.tar.gz )"
+
+KEYWORDS="~x86"
+IUSE="X doc debug gnome joystick odbc opengl sdl unicode"
+
+DEPEND="
+	dev-libs/expat
+	odbc?	( dev-db/unixODBC )
+	sdl?	( media-libs/libsdl )
+	X?	(
+		>=x11-libs/gtk+-2.0
+		>=dev-libs/glib-2.0
+		media-libs/jpeg
+		media-libs/tiff
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		gnome?	( gnome-base/libgnomeprintui )
+		opengl?	( virtual/opengl )
+		)"
+
+SLOT="2.6"
+LICENSE="wxWinLL-3 GPL-2
+		odbc? ( LGPL-2 )
+		doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+HTML_S="${WORKDIR}/wxWidgets-${BASE_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# General Patches
+
+	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
+	epatch "${FILESDIR}"/${BASE_P}-collision.patch
+
+	# Patches Specific to this version
+
+	epatch "${FILESDIR}"/${P}-wxrc_link_fix.patch
+	epatch "${FILESDIR}"/${P}-g_free.patch
+
+	# Reverse apply patch in wxPython tarball that breaks ABI
+	EPATCH_SINGLE_MSG="Reversing listctrl-ongetitemcolumnimage.patch ..." \
+		EPATCH_OPTS="-R" epatch "${S}"/patches/listctrl-ongetitemcolumnimage.patch
+
+	# wxBase has an automagic sdl dependency.  short circuit it here.
+	# http://bugs.gentoo.org/show_bug.cgi?id=91574
+	use sdl || sed -i -e 's:$wxUSE_LIBSDL" != "no":$wxUSE_LIBSDL" = "yes":' configure
+}
+
+src_compile() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-shared
+			--disable-optimise
+			--disable-rpath
+			--enable-compat24
+			--with-regex=builtin
+			--with-zlib=sys
+			--with-expat
+			$(use_enable joystick)
+			$(use_with sdl)
+			$(use_with odbc)"
+
+	# wxGTK only
+	use X && \
+		myconf="${myconf}
+			--enable-gui
+			--with-libpng
+			--with-libxpm
+			--with-libjpeg
+			--with-libtiff
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)"
+
+	# wxBase only
+	use X || \
+		myconf="${myconf}
+			--disable-gui"
+
+	# in 2.6 we always build ansi
+	# everything else is controlled by USE
+	if ! use debug; then
+		build_wx ansi
+	else
+		build_wx ansi-debug
+	fi
+
+	if use unicode; then
+		if ! use debug; then
+			build_wx unicode
+		else
+			build_wx unicode-debug
+		fi
+	fi
+}
+
+src_install() {
+	# Note - the last version to be installed becomes the default, so install
+	# unicode after ansi.
+	install_wx ansi
+	install_wx ansi-debug
+	install_wx unicode
+	install_wx unicode-debug
+
+	if use doc; then
+		mkdir -p "${D}"usr/share/doc/${PF}/
+		cp -R "${S}"/docs/* "${D}"usr/share/doc/${PF}/
+	fi
+
+	# I don't know what this is, but it's causing a collision.
+	rm ${D}usr/share/locale/it/LC_MESSAGES/wxmsw.mo
+
+	# This is temporary until we have the wx-config wrapper
+	dosym /usr/bin/wx-config-2.6 /usr/bin/wx-config
+}
+
+build_wx() {
+	local build_wx_conf
+
+	case "$1" in
+		ansi)
+			build_wx_conf="${build_wx_conf}
+			--disable-unicode"
+		;;
+
+		ansi-debug)
+			build_wx_conf="${build_wx_conf}
+			--disable-unicode
+			--enable-debug_flag"
+		;;
+
+		unicode)
+			build_wx_conf="${build_wx_conf}
+			--enable-unicode"
+		;;
+
+		unicode-debug)
+			build_wx_conf="${build_wx_conf}
+			--enable-unicode
+			--enable-debug_flag"
+		;;
+
+		*)
+			eerror "wxlib.class: build_wx called with invalid argument(s)."
+			die "wxlib.class: build_wx called with invalid argument(s)."
+		;;
+	esac
+
+	mkdir -p build_$1
+	pushd build_$1
+
+	ECONF_SOURCE="${S}" econf \
+		${myconf} \
+		${build_wx_conf} \
+		|| die "Failed to configure $1."
+
+	emake || die "Failed to make $1."
+
+	if [[ -e contrib/src ]]; then
+		cd contrib/src
+		emake || die "Failed to make $1 contrib."
+	fi
+
+	popd
+}
+
+install_wx() {
+	if [[ -d build_$1 ]]; then
+		pushd build_$1
+		emake DESTDIR="${D}" install || die "Failed to install $1."
+		if [[ -e contrib/src ]]; then
+			cd contrib/src
+			emake DESTDIR="${D}" install || die "Failed to install $1 contrib."
+		fi
+		popd
+	fi
+}