Version bump. gcc4 fix bug# 89937. Changed evil no_wxgtk1 USE flag to wxgtk1

(Portage version: 2.0.51.20-r5)

12 files changed, 908 insertions, 25 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index e9f20b6ed399..f90d9f5b2430 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.71 2005/03/26 22:54:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.72 2005/05/02 17:57:03 pythonhead Exp $
+
+*wxGTK-2.6.0 (02 May 2005)
+*wxGTK-2.4.2-r4 (02 May 2005)
+
+  02 May 2005; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.4.2-r2.ebuild,
+  wxGTK-2.4.2-r3.ebuild, +wxGTK-2.4.2-r4.ebuild, +wxGTK-2.6.0.ebuild:
+  Version bump. Marked 2.4.2-r3 stable. Added gcc4 patch bug# 89937. Thanks flameeyes for wxlib.eclass and dirtyepic@metawire.org Ryan Hill for gcc4 fix. Changed evil no_wxgtk1 USE flag to wxgtk1
 
   26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
   wxGTK-2.4.2-r3.ebuild, wxGTK-2.5.3.ebuild:
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 5d67c52962b2..64a41a211fd4 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,24 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9e1ac6d86326168be740c43f817db971 ChangeLog 11886
+MD5 57fd837fa134b2a6f0bed0368af9dc36 ChangeLog 12287
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
-MD5 d1cf8d27f22f29814923bb3327849f85 wxGTK-2.4.2-r2.ebuild 4325
-MD5 1e5334577d9e5b5108ba8c60251ee164 wxGTK-2.4.2-r3.ebuild 4815
+MD5 f12ba8f6405d5667e2302999f7c058b8 wxGTK-2.4.2-r2.ebuild 4233
+MD5 685b5eba6596d7315fbe6ee460ab2e94 wxGTK-2.4.2-r3.ebuild 4732
+MD5 851baa95043eec0f801c2a6c9e58bdea wxGTK-2.6.0.ebuild 1641
+MD5 c77ec347490515241d4b937ac33e450e wxGTK-2.4.2-r4.ebuild 4717
 MD5 48b73cda9bc1b6e03065dbb9d4ecb9bb wxGTK-2.5.3.ebuild 4812
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r3 65
-MD5 d3163f84f4f7dbabab06613667542f9b files/digest-wxGTK-2.5.3 65
+MD5 c8ab55f4ce498e00d800d420ba86ea08 files/digest-wxGTK-2.6.0 143
 MD5 574b30817d120dcaf7e94832c64b003a files/wxGTK-2.4.1-contrib.patch 572
 MD5 522f6b3a771ea33a1af7ede9c795ab4c files/wxGTK-2.4.1-wxpython1.patch 1102
 MD5 1e85c1c970da32626580dfef7228b314 files/wxGTK-2.4.1-wxpython2.patch 8459
 MD5 6c8af85a3bfec0c477a778258368de56 files/wxGTK-2.4.2-cleanup.patch 18162
 MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
 MD5 f3bc3ab73cb31c91683e3ed58f8ffabb files/wxGTK-2.4.2-menu.cpp.patch 2253
+MD5 2d361232a9c035079512fa384199d8c1 files/wxGTK-2.4.2-gcc4.patch 10318
+MD5 d57c68877aee54c29a3b850988e3964b files/wxGTK-2.6.0-gcc4.patch 12275
+MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r4 65
+MD5 d3163f84f4f7dbabab06613667542f9b files/digest-wxGTK-2.5.3 65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCRehYArHZZzCEUG0RAo2uAJ947I8B1M4wnmR5CWor5dXPhFN8tgCfUfqB
-YJrQB1u9ubAN5Ly/XmvFDs0=
-=0YAU
+iD8DBQFCdmnsz2gxt1z4IGYRAqIWAJ9F5407l/mXGWEhdSq1IUXTkhLONQCgoxT0
+EQJNra/9t8FFVwC9e9TlXvs=
+=yBge
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4
new file mode 100644
index 000000000000..81bb0e836695
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4
@@ -0,0 +1 @@
+MD5 cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2 5381935
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.5.3 b/x11-libs/wxGTK/files/digest-wxGTK-2.5.3
new file mode 100644
index 000000000000..c3befefec80c
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.5.3
@@ -0,0 +1 @@
+MD5 eccd8fee99f7031b380b7ce026ea78be wxGTK-2.5.3.tar.bz2 6783651
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.0 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.0
new file mode 100644
index 000000000000..dfba0bbdf465
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.0
@@ -0,0 +1,2 @@
+MD5 93359c101085770ff6c8aae42d25adcf wxWidgets-2.6.0.tar.bz2 13036418
+MD5 3e137bdfa2406e6c8687d0b650e8b47a wxWidgets-2.6.0-HTML.tar.gz 1429436
diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch b/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch
new file mode 100644
index 000000000000..810902be838b
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch
@@ -0,0 +1,247 @@
+--- wxGTK-2.4.2/contrib/src/xrc/xml.cpp.gcc4	2003-09-21 07:32:56.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/xrc/xml.cpp	2005-04-15 06:59:47.000000000 -0400
+@@ -354,8 +354,8 @@
+ #else
+     if ( conv )
+     {
+-        size_t nLen = (len != wxSTRING_MAXLEN) ? len :
+-                          nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
++        size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
++                          wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
+ 
+         wchar_t *buf = new wchar_t[nLen+1];
+         wxConvUTF8.MB2WC(buf, s, nLen);
+--- wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c.gcc4	2003-09-21 07:32:54.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c	2005-04-15 06:59:47.000000000 -0400
+@@ -203,8 +203,10 @@
+ static enum XML_Error
+ doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
+ 	 const char *end, int tok, const char *next, const char **nextPtr);
++#ifdef XML_DTD
+ static enum XML_Error
+ processInternalParamEntity(XML_Parser parser, ENTITY *entity);
++#endif /* XML_DTD */
+ static enum XML_Error
+ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
+ 	  const char *start, const char *end, const char **endPtr);
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx.gcc4	2003-09-21 07:32:47.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx	2005-04-15 06:59:47.000000000 -0400
+@@ -850,6 +850,7 @@
+ 	DocumentIndexer(Document *pdoc_, int end_) :
+ 		pdoc(pdoc_), end(end_) {
+ 	}
++	virtual ~DocumentIndexer() {};
+ 
+ 	virtual char CharAt(int index) {
+ 		if (index < 0 || index >= end)
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h.gcc4	2003-09-21 07:32:50.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h	2005-04-15 06:59:47.000000000 -0400
+@@ -38,6 +38,7 @@
+ 		strncpy(name, languageName_, sizeof(name));
+ 		languageName = name;
+ 	};
++	virtual ~ExternalLexerModule() {};
+ 	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
+ 					WordList *keywordlists[], Accessor &styler) const;
+ 	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.h.gcc4	2003-09-21 07:32:50.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.h	2005-04-15 06:59:47.000000000 -0400
+@@ -20,6 +20,7 @@
+ class CharacterIndexer {
+ public: 
+ 	virtual char CharAt(int index)=0;
++	virtual ~CharacterIndexer() {};
+ };
+ 
+ class RESearch {
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h.gcc4	2003-09-21 07:32:47.000000000 -0400
++++ wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h	2005-04-15 06:59:47.000000000 -0400
+@@ -29,6 +29,7 @@
+ 	LexerModule(int language_, LexerFunction fnLexer_, 
+ 		const char *languageName_=0, LexerFunction fnFolder_=0,
+ 		const char * const wordListDescriptions_[] = NULL);
++	virtual ~LexerModule() {};
+ 	int GetLanguage() const { return language; }
+ 
+ 	// -1 is returned if no WordList information is available
+--- wxGTK-2.4.2/src/common/dircmn.cpp.gcc4	2003-09-21 07:31:39.000000000 -0400
++++ wxGTK-2.4.2/src/common/dircmn.cpp	2005-04-15 06:59:47.000000000 -0400
+@@ -147,6 +147,7 @@
+ {
+ public:
+     wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
++    virtual ~wxDirTraverserSimple() {};
+ 
+     virtual wxDirTraverseResult OnFile(const wxString& filename)
+     {
+--- wxGTK-2.4.2/src/common/xpmdecod.cpp.gcc4	2003-09-21 07:31:39.000000000 -0400
++++ wxGTK-2.4.2/src/common/xpmdecod.cpp	2005-04-15 14:06:53.000000000 -0400
+@@ -669,7 +669,7 @@
+     wxChar key[64];
+     const char *clr_def;
+     bool hasMask;
+-    wxXPMColourMapData clr_data;
++    wxXPMColourMapData clr_data = {0, 0, 0};
+     wxXPMColourMap clr_tbl;
+ 
+     /*
+@@ -712,7 +712,7 @@
+         }
+         else
+         {
+-            bool isNone;
++            bool isNone = false;
+             if ( !GetRGBFromName(clr_def, &isNone,
+                                  &clr_data.R, &clr_data.G, &clr_data.B) )
+             {
+--- wxGTK-2.4.2/src/unix/mimetype.cpp.gcc4	2003-09-21 07:31:40.000000000 -0400
++++ wxGTK-2.4.2/src/unix/mimetype.cpp	2005-04-15 06:59:47.000000000 -0400
+@@ -1580,7 +1580,7 @@
+     {
+         // now got a file we can write to ....
+         wxMimeTypeCommands * entries = m_aEntries[index];
+-        size_t iOpen;
++        size_t iOpen = 0;
+         wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
+         wxString sTmp;
+ 
+--- wxGTK-2.4.2/include/wx/statline.h.gcc4	2003-09-21 07:31:35.000000000 -0400
++++ wxGTK-2.4.2/include/wx/statline.h	2005-04-15 06:59:47.000000000 -0400
+@@ -39,6 +39,7 @@
+ public:
+     // constructor
+     wxStaticLineBase() { }
++    virtual ~wxStaticLineBase() {};
+ 
+     // is the line vertical?
+     bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
+--- wxGTK-2.4.2/include/wx/datetime.h.gcc4	2003-09-21 07:31:30.000000000 -0400
++++ wxGTK-2.4.2/include/wx/datetime.h	2005-04-15 06:59:47.000000000 -0400
+@@ -1300,6 +1300,7 @@
+ {
+ friend class wxDateTimeHolidaysModule;
+ public:
++    virtual ~wxDateTimeHolidayAuthority() {};
+     // returns TRUE if the given date is a holiday
+     static bool IsHoliday(const wxDateTime& dt);
+ 
+@@ -1340,6 +1341,8 @@
+ // the holidays for this class are all Saturdays and Sundays
+ class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
+ {
++public:
++    virtual ~wxDateTimeWorkDays() {};
+ protected:
+     virtual bool DoIsHoliday(const wxDateTime& dt) const;
+     virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
+--- wxGTK-2.4.2/include/wx/notebook.h.gcc4	2003-09-21 07:31:34.000000000 -0400
++++ wxGTK-2.4.2/include/wx/notebook.h	2005-04-15 06:59:47.000000000 -0400
+@@ -193,6 +193,7 @@
+             m_nSel = nSel;
+             m_nOldSel = nOldSel;
+         }
++    virtual ~wxNotebookEvent() {};
+ 
+     // accessors
+         // the currently selected page (-1 if none)
+--- wxGTK-2.4.2/include/wx/event.h.gcc4	2003-09-21 07:31:33.000000000 -0400
++++ wxGTK-2.4.2/include/wx/event.h	2005-04-15 06:59:47.000000000 -0400
+@@ -1952,6 +1952,7 @@
+         : wxEventTableEntryBase(id, idLast, fn, data),
+         m_eventType(evType)
+     { }
++    virtual ~wxEventTableEntry() {};
+ 
+     // the reference to event type: this allows us to not care about the
+     // (undefined) order in which the event table entries and the event types
+--- wxGTK-2.4.2/include/wx/geometry.h.gcc4	2003-09-21 07:31:34.000000000 -0400
++++ wxGTK-2.4.2/include/wx/geometry.h	2005-04-15 06:59:47.000000000 -0400
+@@ -785,6 +785,7 @@
+ class wxTransform2D
+ {
+ public :
++    virtual ~wxTransform2D() {};
+     virtual void                    Transform( wxPoint2DInt* pt )const  = 0;
+     virtual void                    Transform( wxRect2DInt* r ) const;
+     virtual wxPoint2DInt    Transform( const wxPoint2DInt &pt ) const;
+--- wxGTK-2.4.2/include/wx/list.h.gcc4	2003-09-21 07:31:34.000000000 -0400
++++ wxGTK-2.4.2/include/wx/list.h	2005-04-15 14:05:22.000000000 -0400
+@@ -384,6 +384,7 @@
+                  T *data = (T *)NULL,                                       \
+                  const wxListKey& key = wxDefaultListKey)                   \
+             : wxNodeBase(list, previous, next, data, key) { }               \
++        virtual ~nodetype() {};                                             \
+                                                                             \
+         nodetype *GetNext() const                                           \
+             { return (nodetype *)wxNodeBase::GetNext(); }                   \
+@@ -410,6 +411,7 @@
+                                                                             \
+         name& operator=(const name& list)                                   \
+             { (void) wxListBase::operator=(list); return *this; }           \
++        virtual ~name() {};                                                 \
+                                                                             \
+         nodetype *GetFirst() const                                          \
+             { return (nodetype *)wxListBase::GetFirst(); }                  \
+--- wxGTK-2.4.2/include/wx/radiobox.h.gcc4	2003-09-21 07:31:35.000000000 -0400
++++ wxGTK-2.4.2/include/wx/radiobox.h	2005-04-15 06:59:47.000000000 -0400
+@@ -35,6 +35,7 @@
+ class WXDLLEXPORT wxRadioBoxBase
+ {
+ public:
++    virtual ~wxRadioBoxBase() {};
+     // selection
+     virtual void SetSelection(int n) = 0;
+     virtual int GetSelection() const = 0;
+--- wxGTK-2.4.2/include/wx/caret.h.gcc4	2003-09-21 07:31:30.000000000 -0400
++++ wxGTK-2.4.2/include/wx/caret.h	2005-04-15 06:59:47.000000000 -0400
+@@ -60,6 +60,7 @@
+ 
+         (void)Create(window, size);
+     }
++    virtual ~wxCaretBase() {};
+ 
+     // Create() functions - same as ctor but returns the success code
+     // --------------------------------------------------------------
+--- wxGTK-2.4.2/include/wx/dir.h.gcc4	2003-09-21 07:31:32.000000000 -0400
++++ wxGTK-2.4.2/include/wx/dir.h	2005-04-15 06:59:47.000000000 -0400
+@@ -52,6 +52,7 @@
+ class WXDLLEXPORT wxDirTraverser
+ {
+ public:
++    virtual ~wxDirTraverser() {};
+     // called for each file found by wxDir::Traverse()
+     //
+     // return wxDIR_STOP or wxDIR_CONTINUE from here
+--- wxGTK-2.4.2/include/wx/clipbrd.h.gcc4	2003-09-21 07:31:30.000000000 -0400
++++ wxGTK-2.4.2/include/wx/clipbrd.h	2005-04-15 06:59:47.000000000 -0400
+@@ -39,6 +39,7 @@
+ {
+ public:
+     wxClipboardBase();
++    virtual ~wxClipboardBase() {};
+ 
+     // open the clipboard before Add/SetData() and GetData()
+     virtual bool Open() = 0;
+--- wxGTK-2.4.2/src/common/sckfile.cpp.orig	2005-04-16 16:50:11.000000000 -0700
++++ wxGTK-2.4.2/src/common/sckfile.cpp	2005-04-16 16:50:14.000000000 -0700
+@@ -9,7 +9,7 @@
+ // Licence:     wxWindows license
+ /////////////////////////////////////////////////////////////////////////////
+ #ifdef __GNUG__
+-#pragma implementation "sckfile.h"
++#pragma implementation "file.h"
+ #endif
+ 
+ // For compilers that support precompilation, includes "wx.h".
+--- wxGTK-2.4.2/include/wx/protocol/file.h  2003-09-21 05:31:38.000000000 -0600
++++ wxGTK-2.4.2/include/wx/protocol/file.h     2005-02-15 23:36:57.000000000 -0700
+@@ -13,7 +13,7 @@
+ #define __WX_PROTO_FILE_H__
+
+ #if defined(__GNUG__) && !defined(__APPLE__)
+-#pragma interface "sckfile.h"
++#pragma interface
+ #endif
+
+ #include "wx/defs.h"
+
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.0-gcc4.patch b/x11-libs/wxGTK/files/wxGTK-2.6.0-gcc4.patch
new file mode 100644
index 000000000000..81a966f9b77f
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.0-gcc4.patch
@@ -0,0 +1,256 @@
+diff -ru wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/include/KeyWords.h wxWidgets-2.6.0/contrib/src/stc/scintilla/include/KeyWords.h
+--- wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/include/KeyWords.h	2003-09-18 10:28:17.000000000 -0600
++++ wxWidgets-2.6.0/contrib/src/stc/scintilla/include/KeyWords.h	2005-04-29 13:34:00.000000000 -0600
+@@ -29,6 +29,7 @@
+ 	LexerModule(int language_, LexerFunction fnLexer_, 
+ 		const char *languageName_=0, LexerFunction fnFolder_=0,
+ 		const char * const wordListDescriptions_[] = NULL);
++	virtual ~LexerModule() {};
+ 	int GetLanguage() const { return language; }
+ 
+ 	// -1 is returned if no WordList information is available
+diff -ru wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/Document.cxx wxWidgets-2.6.0/contrib/src/stc/scintilla/src/Document.cxx
+--- wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/Document.cxx	2005-03-21 05:17:52.000000000 -0600
++++ wxWidgets-2.6.0/contrib/src/stc/scintilla/src/Document.cxx	2005-04-29 13:29:52.000000000 -0600
+@@ -925,7 +925,8 @@
+ 	DocumentIndexer(Document *pdoc_, int end_) :
+ 		pdoc(pdoc_), end(end_) {
+ 	}
+-
++	virtual ~DocumentIndexer () {};
++	
+ 	virtual char CharAt(int index) {
+ 		if (index < 0 || index >= end)
+ 			return 0;
+diff -ru wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/ExternalLexer.h wxWidgets-2.6.0/contrib/src/stc/scintilla/src/ExternalLexer.h
+--- wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/ExternalLexer.h	2003-09-18 10:28:17.000000000 -0600
++++ wxWidgets-2.6.0/contrib/src/stc/scintilla/src/ExternalLexer.h	2005-04-29 13:31:37.000000000 -0600
+@@ -38,6 +38,7 @@
+ 		strncpy(name, languageName_, sizeof(name));
+ 		languageName = name;
+ 	};
++	virtual ~ExternalLexerModule() {};
+ 	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
+ 					WordList *keywordlists[], Accessor &styler) const;
+ 	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
+diff -ru wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/RESearch.h wxWidgets-2.6.0/contrib/src/stc/scintilla/src/RESearch.h
+--- wxWidgets-2.6.0-orig/contrib/src/stc/scintilla/src/RESearch.h	2003-09-18 10:28:18.000000000 -0600
++++ wxWidgets-2.6.0/contrib/src/stc/scintilla/src/RESearch.h	2005-04-29 13:32:46.000000000 -0600
+@@ -20,6 +20,7 @@
+ class CharacterIndexer {
+ public: 
+ 	virtual char CharAt(int index)=0;
++	virtual ~CharacterIndexer() {};
+ };
+ 
+ class RESearch {
+diff -ru wxWidgets-2.6.0-orig/include/wx/caret.h wxWidgets-2.6.0/include/wx/caret.h
+--- wxWidgets-2.6.0-orig/include/wx/caret.h	2005-03-21 05:18:14.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/caret.h	2005-04-29 14:22:27.000000000 -0600
+@@ -62,7 +62,7 @@
+     }
+ 
+     // a virtual dtor has been provided since this class has virtual members
+-    virtual ~wxCaretBase() { }
++    virtual ~wxCaretBase() { };
+ 
+     // Create() functions - same as ctor but returns the success code
+     // --------------------------------------------------------------
+diff -ru wxWidgets-2.6.0-orig/include/wx/clipbrd.h wxWidgets-2.6.0/include/wx/clipbrd.h
+--- wxWidgets-2.6.0-orig/include/wx/clipbrd.h	2004-09-19 09:04:46.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/clipbrd.h	2005-04-29 14:24:27.000000000 -0600
+@@ -39,7 +39,8 @@
+ class WXDLLEXPORT wxClipboardBase : public wxObject
+ {
+ public:
+-    wxClipboardBase() {}
++    wxClipboardBase() {};
++	virtual ~wxClipboardBase() {};
+ 
+     // open the clipboard before Add/SetData() and GetData()
+     virtual bool Open() = 0;
+diff -ru wxWidgets-2.6.0-orig/include/wx/datetime.h wxWidgets-2.6.0/include/wx/datetime.h
+--- wxWidgets-2.6.0-orig/include/wx/datetime.h	2005-02-07 14:56:48.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/datetime.h	2005-04-29 14:43:16.000000000 -0600
+@@ -1447,7 +1447,7 @@
+ {
+ friend class wxDateTimeHolidaysModule;
+ public:
+-    // returns true if the given date is a holiday
++	// returns true if the given date is a holiday
+     static bool IsHoliday(const wxDateTime& dt);
+ 
+     // fills the provided array with all holidays in the given range, returns
+@@ -1490,6 +1490,8 @@
+ // the holidays for this class are all Saturdays and Sundays
+ class WXDLLIMPEXP_BASE wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
+ {
++public:
++	virtual ~wxDateTimeWorkDays() {};
+ protected:
+     virtual bool DoIsHoliday(const wxDateTime& dt) const;
+     virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
+diff -ru wxWidgets-2.6.0-orig/include/wx/dir.h wxWidgets-2.6.0/include/wx/dir.h
+--- wxWidgets-2.6.0-orig/include/wx/dir.h	2005-03-21 05:18:15.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/dir.h	2005-04-29 14:23:17.000000000 -0600
+@@ -55,7 +55,7 @@
+ {
+ public:
+     /// a virtual dtor has been provided since this class has virtual members
+-    virtual ~wxDirTraverser() { }
++    virtual ~wxDirTraverser() { };
+     // called for each file found by wxDir::Traverse()
+     //
+     // return wxDIR_STOP or wxDIR_CONTINUE from here (wxDIR_IGNORE doesn't
+diff -ru wxWidgets-2.6.0-orig/include/wx/event.h wxWidgets-2.6.0/include/wx/event.h
+--- wxWidgets-2.6.0-orig/include/wx/event.h	2005-03-21 05:18:15.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/event.h	2005-04-29 14:06:38.000000000 -0600
+@@ -2174,6 +2174,7 @@
+         : wxEventTableEntryBase(winid, idLast, fn, data),
+         m_eventType(evType)
+     { }
++	virtual ~wxEventTableEntry() {};
+ 
+     // the reference to event type: this allows us to not care about the
+     // (undefined) order in which the event table entries and the event types
+diff -ru wxWidgets-2.6.0-orig/include/wx/geometry.h wxWidgets-2.6.0/include/wx/geometry.h
+--- wxWidgets-2.6.0-orig/include/wx/geometry.h	2005-03-21 05:18:16.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/geometry.h	2005-04-29 14:08:19.000000000 -0600
+@@ -785,7 +785,7 @@
+ class wxTransform2D
+ {
+ public :
+-    virtual ~wxTransform2D() { }
++    virtual ~wxTransform2D() { };
+     virtual void                    Transform( wxPoint2DInt* pt )const  = 0;
+     virtual void                    Transform( wxRect2DInt* r ) const;
+     virtual wxPoint2DInt    Transform( const wxPoint2DInt &pt ) const;
+diff -ru wxWidgets-2.6.0-orig/include/wx/list.h wxWidgets-2.6.0/include/wx/list.h
+--- wxWidgets-2.6.0-orig/include/wx/list.h	2005-04-11 14:18:26.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/list.h	2005-04-29 14:14:57.000000000 -0600
+@@ -662,6 +662,7 @@
+                  T *data = (T *)NULL,                                       \
+                  const wxListKey& key = wxDefaultListKey)                   \
+             : wxNodeBase(list, previous, next, data, key) { }               \
++        virtual ~nodetype() {};                                             \
+                                                                             \
+         nodetype *GetNext() const                                           \
+             { return (nodetype *)wxNodeBase::GetNext(); }                   \
+@@ -694,6 +695,7 @@
+                                                                             \
+         name& operator=(const name& list)                                   \
+             { Assign(list); return *this; }                                 \
++        virtual ~name() {};                                                 \
+                                                                             \
+         nodetype *GetFirst() const                                          \
+             { return (nodetype *)wxListBase::GetFirst(); }                  \
+diff -ru wxWidgets-2.6.0-orig/include/wx/notebook.h wxWidgets-2.6.0/include/wx/notebook.h
+--- wxWidgets-2.6.0-orig/include/wx/notebook.h	2005-04-17 00:56:07.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/notebook.h	2005-04-29 14:04:38.000000000 -0600
+@@ -118,7 +118,8 @@
+         : wxBookCtrlBaseEvent(commandType, winid, nSel, nOldSel)
+     {
+     }
+-
++	virtual ~wxNotebookEvent() {};
++	
+ private:
+     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebookEvent)
+ };
+diff -ru wxWidgets-2.6.0-orig/include/wx/protocol/file.h wxWidgets-2.6.0/include/wx/protocol/file.h
+--- wxWidgets-2.6.0-orig/include/wx/protocol/file.h	2004-05-25 01:45:34.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/protocol/file.h	2005-04-29 14:28:36.000000000 -0600
+@@ -13,7 +13,7 @@
+ #define __WX_PROTO_FILE_H__
+ 
+ #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+-#pragma interface "sckfile.h"
++#pragma interface
+ #endif
+ 
+ #include "wx/defs.h"
+diff -ru wxWidgets-2.6.0-orig/include/wx/radiobox.h wxWidgets-2.6.0/include/wx/radiobox.h
+--- wxWidgets-2.6.0-orig/include/wx/radiobox.h	2005-03-21 05:18:17.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/radiobox.h	2005-04-29 14:19:54.000000000 -0600
+@@ -31,6 +31,7 @@
+ class WXDLLEXPORT wxRadioBoxBase : public wxItemContainerImmutable
+ {
+ public:
++	virtual ~wxRadioBoxBase() {};
+     // change the individual radio button state
+     virtual bool Enable(int n, bool enable = true) = 0;
+     virtual bool Show(int n, bool show = true) = 0;
+diff -ru wxWidgets-2.6.0-orig/include/wx/statline.h wxWidgets-2.6.0/include/wx/statline.h
+--- wxWidgets-2.6.0-orig/include/wx/statline.h	2005-04-11 14:18:27.000000000 -0600
++++ wxWidgets-2.6.0/include/wx/statline.h	2005-04-29 13:46:31.000000000 -0600
+@@ -39,6 +39,7 @@
+ public:
+     // constructor
+     wxStaticLineBase() { }
++	virtual ~wxStaticLineBase() {};
+ 
+     // is the line vertical?
+     bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
+diff -ru wxWidgets-2.6.0-orig/src/common/dircmn.cpp wxWidgets-2.6.0/src/common/dircmn.cpp
+--- wxWidgets-2.6.0-orig/src/common/dircmn.cpp	2005-02-07 14:58:18.000000000 -0600
++++ wxWidgets-2.6.0/src/common/dircmn.cpp	2005-04-29 13:36:28.000000000 -0600
+@@ -204,6 +204,7 @@
+ {
+ public:
+     wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
++	virtual ~wxDirTraverserSimple() {};
+ 
+     virtual wxDirTraverseResult OnFile(const wxString& filename)
+     {
+diff -ru wxWidgets-2.6.0-orig/src/common/sckfile.cpp wxWidgets-2.6.0/src/common/sckfile.cpp
+--- wxWidgets-2.6.0-orig/src/common/sckfile.cpp	2004-11-01 10:05:25.000000000 -0600
++++ wxWidgets-2.6.0/src/common/sckfile.cpp	2005-04-29 14:24:59.000000000 -0600
+@@ -9,7 +9,7 @@
+ // Licence:     wxWindows licence
+ /////////////////////////////////////////////////////////////////////////////
+ #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+-#pragma implementation "sckfile.h"
++#pragma implementation "file.h"
+ #endif
+ 
+ // For compilers that support precompilation, includes "wx.h".
+diff -ru wxWidgets-2.6.0-orig/src/expat/lib/xmlparse.c wxWidgets-2.6.0/src/expat/lib/xmlparse.c
+--- wxWidgets-2.6.0-orig/src/expat/lib/xmlparse.c	2004-10-06 14:24:04.000000000 -0600
++++ wxWidgets-2.6.0/src/expat/lib/xmlparse.c	2005-04-29 13:27:23.000000000 -0600
+@@ -299,8 +299,10 @@
+ static enum XML_Error
+ doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
+          const char *end, int tok, const char *next, const char **nextPtr);
++#ifdef XML_DTD
+ static enum XML_Error
+ processInternalParamEntity(XML_Parser parser, ENTITY *entity);
++#endif /* XML_DTD */
+ static enum XML_Error
+ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
+           const char *start, const char *end, const char **endPtr);
+diff -ru wxWidgets-2.6.0-orig/src/unix/mimetype.cpp wxWidgets-2.6.0/src/unix/mimetype.cpp
+--- wxWidgets-2.6.0-orig/src/unix/mimetype.cpp	2004-05-25 01:47:07.000000000 -0600
++++ wxWidgets-2.6.0/src/unix/mimetype.cpp	2005-04-29 13:45:18.000000000 -0600
+@@ -1749,7 +1749,7 @@
+     {
+         // now got a file we can write to ....
+         wxMimeTypeCommands * entries = m_aEntries[index];
+-        size_t iOpen;
++        size_t iOpen = 0;
+         wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
+         wxString sTmp;
+ 
+diff -ru wxWidgets-2.6.0-orig/src/xml/xml.cpp wxWidgets-2.6.0/src/xml/xml.cpp
+--- wxWidgets-2.6.0-orig/src/xml/xml.cpp	2005-03-29 13:12:15.000000000 -0600
++++ wxWidgets-2.6.0/src/xml/xml.cpp	2005-04-29 13:22:45.000000000 -0600
+@@ -360,8 +360,8 @@
+ #else
+     if ( conv )
+     {
+-        size_t nLen = (len != wxSTRING_MAXLEN) ? len :
+-                          wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
++        size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
++                          wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
+ 
+         wchar_t *buf = new wchar_t[nLen+1];
+         wxConvUTF8.MB2WC(buf, s, nLen);
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild
index 8541ea977e23..cd691ec349e8 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild,v 1.7 2005/03/03 21:35:03 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r2.ebuild,v 1.8 2005/05/02 17:57:03 pythonhead Exp $
 
 inherit flag-o-matic eutils gnuconfig
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
 LICENSE="wxWinLL-3"
 SLOT="2.4"
 KEYWORDS="x86 ppc sparc alpha arm amd64 ia64 hppa ppc64"
-IUSE="debug no_wxgtk1 gtk2 odbc opengl unicode"
+IUSE="debug wxgtk1 gtk2 odbc opengl unicode"
 
 RDEPEND="virtual/x11
 	sys-libs/zlib
@@ -21,7 +21,7 @@ RDEPEND="virtual/x11
 	!unicode? ( odbc? ( dev-db/unixODBC ) )
 	opengl? ( virtual/opengl )
 	gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 )
-	!no_wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
+	wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
 DEPEND="${RDEPEND}
 	gtk2? ( dev-util/pkgconfig )"
 
@@ -46,8 +46,7 @@ pkg_setup() {
 	einfo "New in >=wxGTK-2.4.2-r2:"
 	einfo "------------------------"
 	einfo "You can now have gtk, gtk2 and unicode versions installed"
-	einfo "simultaneously. gtk is installed by default because it is"
-	einfo "more stable than gtk2. Use no_wxgtk1 if you don't want it."
+	einfo "simultaneously. Use wxgtk1 if you want a gtk1 lib."
 	einfo "Put gtk2 and unicode in your USE flags to get those"
 	einfo "additional versions."
 	einfo "NOTE:"
@@ -56,8 +55,8 @@ pkg_setup() {
 	if  use unicode; then
 		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
 	fi
-	if use no_wxgtk1 && ! use gtk2; then
-		die "You must have at least gtk2 or -no_wxgtk1 in your USE"
+	if ! use wxgtk1 && ! use gtk2; then
+		die "You must have at least gtk2 or wxgtk1 in your USE"
 	fi
 }
 
@@ -69,7 +68,7 @@ src_compile() {
 	myconf="${myconf} --with-gtk"
 	myconf="${myconf} `use_enable debug`"
 
-	if ! use no_wxgtk1 ; then
+	if use wxgtk1 ; then
 		mkdir build_gtk
 		einfo "Building gtk version"
 		cd build_gtk
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
index 318849317452..f1a30655acf3 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild,v 1.6 2005/03/26 22:54:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild,v 1.7 2005/05/02 17:57:03 pythonhead Exp $
 
 inherit flag-o-matic eutils gnuconfig multilib toolchain-funcs
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
 
 LICENSE="wxWinLL-3"
 SLOT="2.4"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64"
-IUSE="debug no_wxgtk1 gtk2 odbc opengl unicode"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64"
+IUSE="debug wxgtk1 gtk gtk2 odbc opengl unicode"
 
 RDEPEND="virtual/x11
 	sys-libs/zlib
@@ -21,7 +21,7 @@ RDEPEND="virtual/x11
 	!unicode? ( odbc? ( dev-db/unixODBC ) )
 	opengl? ( virtual/opengl )
 	gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 )
-	!no_wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
+	wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
 DEPEND="${RDEPEND}
 	gtk2? ( dev-util/pkgconfig )"
 
@@ -46,8 +46,7 @@ pkg_setup() {
 	einfo "New in >=wxGTK-2.4.2-r2:"
 	einfo "------------------------"
 	einfo "You can now have gtk, gtk2 and unicode versions installed"
-	einfo "simultaneously. gtk is installed by default because it is"
-	einfo "more stable than gtk2. Use no_wxgtk1 if you don't want it."
+	einfo "simultaneously. Use wxgtk1 if you would like a gtk1 lib."
 	einfo "Put gtk2 and unicode in your USE flags to get those"
 	einfo "additional versions."
 	einfo "NOTE:"
@@ -56,8 +55,8 @@ pkg_setup() {
 	if  use unicode; then
 		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
 	fi
-	if use no_wxgtk1 && ! use gtk2; then
-		die "You must have at least gtk2 or -no_wxgtk1 in your USE"
+	if ! use wxgtk1 && ! use gtk2; then
+		die "You must have at least gtk2 or wxgtk1 in your USE"
 	fi
 }
 
@@ -70,7 +69,7 @@ src_compile() {
 	myconf="${myconf} `use_enable debug`"
 	myconf="${myconf} --libdir=/usr/$(get_libdir)"
 
-	if ! use no_wxgtk1 ; then
+	if use wxgtk1 ; then
 		mkdir build_gtk
 		einfo "Building gtk version"
 		cd build_gtk
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
new file mode 100644
index 000000000000..dd193e67377f
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild,v 1.1 2005/05/02 17:57:03 pythonhead Exp $
+
+inherit flag-o-matic eutils gnuconfig multilib toolchain-funcs
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://www.wxwidgets.org/"
+SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
+
+LICENSE="wxWinLL-3"
+SLOT="2.4"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64"
+IUSE="debug wxgtk1 gtk2 odbc opengl unicode"
+
+RDEPEND="virtual/x11
+	sys-libs/zlib
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	!unicode? ( odbc? ( dev-db/unixODBC ) )
+	opengl? ( virtual/opengl )
+	gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 )
+	wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
+DEPEND="${RDEPEND}
+	gtk2? ( dev-util/pkgconfig )"
+
+# 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.
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PN}-2.4.2-menu.cpp.patch
+	# fix xml contrib makefile problems
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.1-contrib.patch
+	# disable contrib/src/animate
+	EPATCH_OPTS="-d ${S}/contrib/src" epatch ${FILESDIR}/${PN}-2.4.2-contrib_animate.patch
+	use amd64 && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.2-cleanup.patch
+	epatch ${FILESDIR}/${PN}-2.4.2-gcc4.patch
+	gnuconfig_update
+}
+
+pkg_setup() {
+	einfo "New in >=wxGTK-2.4.2-r2:"
+	einfo "------------------------"
+	einfo "You can now have gtk, gtk2 and unicode versions installed"
+	einfo "simultaneously. Use wxgtk1 if you want a gtk1 version."
+	einfo "Put gtk2 and unicode in your USE flags to get those"
+	einfo "two additional versions."
+	einfo "NOTE:"
+	einfo "You can also get debug versions of any of those, but not debug"
+	einfo "and normal installed at the same time."
+	if  use unicode; then
+		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
+	fi
+	if ! use wxgtk1 && ! use gtk2; then
+		die "You must have at least gtk2 or wxgtk1 in your USE"
+	fi
+}
+
+src_compile() {
+	local myconf
+	export LANG='C'
+
+	myconf="${myconf} `use_with opengl`"
+	myconf="${myconf} --with-gtk"
+	myconf="${myconf} `use_enable debug`"
+	myconf="${myconf} --libdir=/usr/$(get_libdir)"
+
+	if use wxgtk1 ; then
+		mkdir build_gtk
+		einfo "Building gtk version"
+		cd build_gtk
+		../configure ${myconf} `use_with odbc`\
+			--host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info \
+			--mandir=/usr/share/man || die "./configure failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed"
+		cd contrib/src
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk contrib failed"
+	fi
+	cd ${S}
+
+	if use gtk2 ; then
+		myconf="${myconf} --enable-gtk2"
+		einfo "Building gtk2 version"
+		mkdir build_gtk2
+		cd build_gtk2
+		../configure ${myconf} \
+			--host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info \
+			--mandir=/usr/share/man || die "./configure failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed"
+		cd contrib/src
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 contrib failed"
+
+		cd ${S}
+
+		if use unicode ; then
+			myconf="${myconf} --enable-unicode"
+			einfo "Building unicode version"
+			mkdir build_unicode
+			cd build_unicode
+			../configure ${myconf} \
+				--host=${CHOST} \
+				--prefix=/usr \
+				--infodir=/usr/share/info \
+				--mandir=/usr/share/man || die "./configure failed"
+
+			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed"
+
+			cd contrib/src
+			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed"
+		fi
+	fi
+}
+
+src_install() {
+	if [ -e ${S}/build_gtk ] ; then
+		cd ${S}/build_gtk
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk failed"
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk contrib failed"
+	fi
+
+	if [ -e ${S}/build_gtk2 ] ; then
+		cd ${S}/build_gtk2
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 failed"
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 contrib failed"
+	fi
+
+	if [ -e ${S}/build_unicode ] ; then
+		cd ${S}/build_unicode
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode failed"
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode contrib failed"
+	fi
+
+	# twp 20040830 wxGTK-2.4.2 forgets to install htmlproc.h; copy it manually
+	# Needed for wxruby:
+	insinto /usr/include/wx/html
+	doins ${S}/include/wx/html/htmlproc.h
+
+	cd ${S}
+	dodoc *.txt
+}
diff --git a/x11-libs/wxGTK/wxGTK-2.5.3.ebuild b/x11-libs/wxGTK/wxGTK-2.5.3.ebuild
new file mode 100644
index 000000000000..88681c5ed461
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.5.3.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.5.3.ebuild,v 1.7 2005/05/02 17:57:03 pythonhead Exp $
+
+inherit eutils gnuconfig multilib toolchain-funcs
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://www.wxwidgets.org/"
+SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
+
+LICENSE="wxWinLL-3"
+SLOT="2.5"
+KEYWORDS="~x86"
+IUSE="debug no_wxgtk1 gtk2 odbc opengl unicode"
+
+RDEPEND="virtual/x11
+	sys-libs/zlib
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	!unicode? ( odbc? ( dev-db/unixODBC ) )
+	opengl? ( virtual/opengl )
+	gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 )
+	!no_wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )"
+DEPEND="${RDEPEND}
+	gtk2? ( dev-util/pkgconfig )
+	sys-apps/sed"
+
+# 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.
+
+pkg_setup() {
+	einfo "New in >=wxGTK-2.4.2-r2:"
+	einfo "------------------------"
+	einfo "You can now have gtk, gtk2(ansi) and gtk2(unicode) versions installed"
+	einfo "simultaneously. gtk is installed by default because it is"
+	einfo "more stable than gtk2. Use no_wxgtk1 if you don't want it."
+	einfo "Put gtk2 and unicode in your USE flags to get those"
+	einfo "additional versions if desired."
+	einfo "NOTE:"
+	einfo "You can also get debug versions of any of those, but not debug"
+	einfo "and normal installed at the same time."
+	if  use unicode; then
+		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
+	fi
+	if use no_wxgtk1 && ! use gtk2; then
+		die "You must have at least gtk2 or -no_wxgtk1 in your USE"
+	fi
+}
+
+src_compile() {
+	gnuconfig_update
+
+	local myconf
+	export LANG='C'
+	sed -i "s/-O2//g" configure || die "sed configure failed"
+
+	myconf="${myconf} `use_with opengl`"
+	myconf="${myconf} --with-gtk"
+	myconf="${myconf} `use_enable debug`"
+	myconf="${myconf} --libdir=/usr/$(get_libdir)"
+
+	if ! use no_wxgtk1 ; then
+		mkdir build_gtk
+		einfo "Building gtk version"
+		cd build_gtk
+		../configure ${myconf} --disable-gtk2 `use_with odbc`\
+			--host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info \
+			--mandir=/usr/share/man || die "./configure failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed"
+		cd contrib/src
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk contrib failed"
+	fi
+	cd ${S}
+
+	if use gtk2 ; then
+		myconf="${myconf} --enable-gtk2"
+		einfo "Building gtk2 version"
+		mkdir build_gtk2
+		cd build_gtk2
+		../configure ${myconf} \
+			--host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info \
+			--mandir=/usr/share/man || die "./configure failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed"
+		cd contrib/src
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 contrib failed"
+
+		cd ${S}
+
+		if use unicode ; then
+			myconf="${myconf} --enable-unicode"
+			einfo "Building unicode version"
+			mkdir build_unicode
+			cd build_unicode
+			../configure ${myconf} \
+				--host=${CHOST} \
+				--prefix=/usr \
+				--infodir=/usr/share/info \
+				--mandir=/usr/share/man || die "./configure failed"
+
+			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed"
+
+			cd contrib/src
+			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed"
+		fi
+	fi
+}
+
+src_install() {
+	if [ -e ${S}/build_gtk ] ; then
+		cd ${S}/build_gtk
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk failed"
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk contrib failed"
+	fi
+
+	if [ -e ${S}/build_unicode ] ; then
+		cd ${S}/build_unicode
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode failed"
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode contrib failed"
+	fi
+
+	if [ -e ${S}/build_gtk2 ] ; then
+		cd ${S}/build_gtk2
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 failed"
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 contrib failed"
+	fi
+
+	# /usr/bin/wx-config is a symlink to the real wx-config. 2.4 and 2.5 
+	# don't have compatible versions. (See wxwidgets.eclass)
+	# Since 2.5.3 is un-tested and breaks most apps, we'll remove wx-config
+	# and force people to use the wxwidgets eclass and export WX_GTK_VER=2.5 
+	# to find it:
+	rm ${D}/usr/bin/wx-config
+
+	dodoc ${S}/*.txt
+
+	# twp 20040830 wxGTK forgets to install htmlproc.h; copy it manually
+	# Not sure if this will be necessary for 2.5, verify: pythonhead 10 Nov 2004
+	# This was for wxRuby
+	#insinto /usr/include/wx/html
+	#doins ${S}/include/wx/html/htmlproc.h
+}
diff --git a/x11-libs/wxGTK/wxGTK-2.6.0.ebuild b/x11-libs/wxGTK/wxGTK-2.6.0.ebuild
new file mode 100644
index 000000000000..fcb0d5d5e779
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.0.ebuild,v 1.1 2005/05/02 17:57:03 pythonhead Exp $
+
+inherit wxlib
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+
+SLOT="2.6"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64"
+IUSE="gnome gtk2 jpeg joystick odbc opengl png sdl tiff wxgtk1 xpm"
+
+RDEPEND="${RDEPEND}
+	opengl? ( virtual/opengl )
+	gtk2? ( >=x11-libs/gtk+-2.0
+		>=dev-libs/glib-2.0 )
+	wxgtk1? ( =x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2* )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	tiff? ( media-libs/tiff )
+	xpm? ( virtual/x11 )
+	odbc? ( dev-db/unixODBC )
+	!mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ))))))))"
+
+DEPEND="${RDEPEND}
+	${DEPEND}
+	gtk2? ( dev-util/pkgconfig )"
+S=${WORKDIR}/wxWidgets-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die "Couldn't cd to ${S}"
+	sed -i "s/-O2//g" configure || die "sed configure failed"
+	epatch ${FILESDIR}/${P}-gcc4.patch
+	gnuconfig_update
+}
+
+src_compile() {
+	myconf="${myconf}
+		$(use_enable opengl)
+		$(use_with png libpng)
+		$(use_with jpeg libjpeg)
+		$(use_with tiff libtiff)
+		$(use_with xpm libxpm) $(use_enable xpm)
+		$(use_with opengl)
+		$(use_with gnome gnomeprint)
+		$(use_with sdl)
+		$(use_enable joystick)"
+
+	use wxgtk1 && \
+		configure_build gtk1 "" "${myconf} --with-gtk=1"
+
+	use gtk2 && \
+		configure_build gtk2 unicode "${myconf} --with-gtk=2"
+}
+
+src_install() {
+	use wxgtk1 && install_build gtk1
+	use gtk2 && install_build gtk2
+
+	wxlib_src_install
+}