Removed gcc4 patch, it breaks apps bug# 91443. wxbase can now be built with -gtk2 -wxgtk1 also multilib builds instead of monolithic bug# 91574

Package-Manager: portage-2.0.51.21-r1

9 files changed, 102 insertions, 734 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index e5e3c0682e5c..4ee355a995ee 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,14 @@
 # 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.76 2005/05/08 14:30:50 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.77 2005/05/11 19:35:37 pythonhead Exp $
+
+*wxGTK-2.6.0-r1 (11 May 2005)
+
+  11 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  -files/wxGTK-2.4.2-gcc4.patch, -files/wxGTK-2.6.0-gcc4.patch,
+  -wxGTK-2.4.2-r4.ebuild, -wxGTK-2.6.0.ebuild, +wxGTK-2.6.0-r1.ebuild:
+  Removed gcc4 patch, it breaks apps bug# 91443. wxbase can now be built with
+  -gtk2 -wxgtk1 also multilib builds instead of monolithic bug# 91574
 
   08 May 2005; Herbie Hopkins <herbs@gentoo.org> wxGTK-2.4.2-r3.ebuild:
   Stable on amd64.
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index d190a7da5997..a81938b99581 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,30 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b8d2d1196e6c7f31335748286b926533 wxGTK-2.5.3.ebuild 4812
-MD5 62be82618a657fca19a51e0825e5e4e9 wxGTK-2.4.2-r2.ebuild 4249
-MD5 5c1a799a45288e3dcd5b1d1723aa5790 wxGTK-2.4.2-r4.ebuild 4733
-MD5 0787ba5ed424f9eb47cf28c88009b8df wxGTK-2.6.0.ebuild 1576
-MD5 1ac0bf4605e3c195a6ef0efe9b8d65eb ChangeLog 12822
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
+MD5 62be82618a657fca19a51e0825e5e4e9 wxGTK-2.4.2-r2.ebuild 4249
 MD5 0f0136b6647734bd5243d443803602fc wxGTK-2.4.2-r3.ebuild 4742
-MD5 574b30817d120dcaf7e94832c64b003a files/wxGTK-2.4.1-contrib.patch 572
-MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
-MD5 f3bc3ab73cb31c91683e3ed58f8ffabb files/wxGTK-2.4.2-menu.cpp.patch 2253
-MD5 6c8af85a3bfec0c477a778258368de56 files/wxGTK-2.4.2-cleanup.patch 18162
-MD5 522f6b3a771ea33a1af7ede9c795ab4c files/wxGTK-2.4.1-wxpython1.patch 1102
-MD5 2d361232a9c035079512fa384199d8c1 files/wxGTK-2.4.2-gcc4.patch 10318
+MD5 c518ea5ef9bcdba99eaba7c4d4285608 wxGTK-2.6.0-r1.ebuild 2373
+MD5 7fd603dde064091c276c60c30932b202 ChangeLog 13195
+MD5 b8d2d1196e6c7f31335748286b926533 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 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r4 65
+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 d57c68877aee54c29a3b850988e3964b files/wxGTK-2.6.0-gcc4.patch 12275
+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 c8ab55f4ce498e00d800d420ba86ea08 files/digest-wxGTK-2.6.0-r1 143
 MD5 d3163f84f4f7dbabab06613667542f9b files/digest-wxGTK-2.5.3 65
-MD5 c8ab55f4ce498e00d800d420ba86ea08 files/digest-wxGTK-2.6.0 143
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCfiLN2G5bA0cA/ScRAnmuAKDLTdgxucbPgmSd3UGUAXwzs5+RCgCgxmgY
-w6KNfwm+ouyGPqtnQCs8eIA=
-=3vcS
+iD8DBQFCgl6rHOCQyz1WCXYRAtdjAKDQD5u8AoAELOvf7mQXlQQ2sTVzBgCfehfV
+38sb+nLNxCCygTCWEpzahnA=
+=Aexj
 -----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
deleted file mode 100644
index 81bb0e836695..000000000000
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2 5381935
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.0 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.0-r1
index dfba0bbdf465..dfba0bbdf465 100644
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.6.0
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.0-r1
diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch b/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch
deleted file mode 100644
index 810902be838b..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.4.2-gcc4.patch
+++ /dev/null
@@ -1,247 +0,0 @@
---- 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
deleted file mode 100644
index 81a966f9b77f..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.6.0-gcc4.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-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-r4.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
deleted file mode 100644
index 0a7a50d672e2..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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.2 2005/05/02 20:04:10 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} `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 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.6.0-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..9b25a1338e2d
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.6.0-r1.ebuild
@@ -0,0 +1,80 @@
+# 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-r1.ebuild,v 1.1 2005/05/11 19:35:37 pythonhead Exp $
+
+inherit wxlib gnuconfig
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and
+wxbase non-gui library"
+
+SLOT="2.6"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa ~ppc64"
+IUSE="gnome gtk2 jpeg joystick odbc opengl png sdl tiff wxgtk1"
+
+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 )
+	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}
+
+pkg_setup() {
+	einfo "To install only wxbase (non-gui libs) use -gtk2 -wxgtk1"
+	if use unicode; then
+		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
+	fi
+}
+
+src_compile() {
+	gnuconfig_update
+	if use wxgtk1 || use gtk2; then
+		myconf="${myconf}
+			$(use_enable opengl)
+			$(use_with png libpng)
+			$(use_with jpeg libjpeg)
+			$(use_with tiff libtiff)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			$(use_with sdl)
+			$(use_enable joystick)"
+	fi
+
+	use wxgtk1 && \
+		configure_build gtk1 "" "${myconf} --with-gtk=1"
+
+	use gtk2 && \
+		configure_build gtk2 unicode "${myconf} --with-gtk=2"
+
+	! use gtk2 && ! use wxgtk1 && \
+		configure_build base unicode "--disable-gui"
+}
+
+src_install() {
+	use wxgtk1 && install_build gtk1
+	use gtk2 && install_build gtk2
+	! use gtk2 && ! use wxgtk1 && install_build base
+
+	wxlib_src_install
+}
+
+pkg_postinst() {
+	einfo "IMPORTANT: If you are upgrading from wxGTK-2.6.0 to"
+	einfo "wxGTK-2.6.0-r1 you will need to recomplie applications"
+	einfo "linked to it. >=dev-db/pgadmin3-1.2.0 is one and any"
+	einfo "other non-portage wxGTK apps you may have installed also."
+	einfo "This is necessary due to changing the way wxGTK is built"
+	einfo "with multilibs instead of a monolithic build."
+	einfo "Also note dev-libs/wxbase has been removed from portage"
+	einfo "and can be installed with wxGTK by specifying the USE flags"
+	einfo "-gtk2 and -wxgtk1"
+}
diff --git a/x11-libs/wxGTK/wxGTK-2.6.0.ebuild b/x11-libs/wxGTK/wxGTK-2.6.0.ebuild
deleted file mode 100644
index e602d6846cce..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.6.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.2 2005/05/03 02:06:53 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"
-
-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 )
-	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 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
-}