reinit the tree, so we can have metadata

11 files changed, 824 insertions, 0 deletions

diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch
new file mode 100644
index 000000000000..3636b64f976a
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch
@@ -0,0 +1,39 @@
+unixODBC 2.2.14 defines SQLLEN and SQLULEN using the compiler typedef
+declaration instead of preprocessor #define macro definition.  This breaks
+the preprocessor checks in this include file.cpp, causing the source to fall
+back to older types instead, leading to compile time errors like this:
+
+db.cpp:1636: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘6’ to
+‘SQLRETURN SQLGetData(void*, SQLUSMALLINT, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’
+...
+dbtable.cpp:592: error: cannot convert ‘SQLUINTEGER*’ to ‘SQLULEN*’ for argument ‘4’ to
+‘SQLRETURN SQLExtendedFetch(void*, SQLUSMALLINT, SQLLEN, SQLULEN*, SQLUSMALLINT*)’
+...
+
+This change hard-wires the new names, breaking compatibility with ancient
+(pre 2001) unixODBC versions.  This change may break other ODBC implementations
+but in Gentoo only unixODBC is supported.
+
+References:
+http://bugs.gentoo.org/310923
+
+2010-03-23 Martin von Gagern
+
+--- wxPython-src-2.6.4.0.orig/include/wx/db.h
++++ wxPython-src-2.6.4.0/include/wx/db.h
+@@ -134,15 +134,6 @@ enum enumDummy {enumDum1};
+     #endif
+ #endif
+ 
+-#ifndef _WIN64
+-#ifndef SQLLEN
+-#define SQLLEN SQLINTEGER
+-#endif
+-#ifndef SQLULEN
+-#define SQLULEN SQLUINTEGER
+-#endif
+-#endif
+-
+ const int wxDB_PATH_MAX                 = 254;
+ 
+ extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_LOG_FILENAME;
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch
new file mode 100644
index 000000000000..a5c574cb2d6a
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch
@@ -0,0 +1,74 @@
+Prevent file collisions between multiple installed SLOTs.
+
+  - Don't install wxwin.m4.  It is installed with app-eselect/eselect-wxwidgets.
+  - Version the bakefile preset filenames.  Unversioned symlinks to these files
+    are handled by eselect.
+  - Version wx-config and wxrc.  Unversioned wrapper scripts are installed with
+    eselect-wxwidgets.
+  - Version wxstd.mo and modify AddCatalog to find it. (this might need more
+    work but no one has complained yet)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11695,10 +11695,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+ 
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+-	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ 	$(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 \
+@@ -12455,7 +12454,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) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++	&& $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -12463,7 +12463,7 @@ locale_install:
+ 	$(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
+ 
+--- a/src/common/intl.cpp
++++ b/src/common/intl.cpp
+@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit()
+   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,
+@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName,
+   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
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -120,7 +120,6 @@ distclean: clean
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+ 
+ @COND_USE_XRC_1@uninstall_wxrc: 
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch
new file mode 100644
index 000000000000..d272247091b8
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch
@@ -0,0 +1,13 @@
+Allow odbc to be used with unicode builds.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1217,7 +1217,7 @@ ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ 	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ 	$(__THREAD_DEFINE_p) -DWXBUILDING $(__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) \
++	$(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT $(PIC_FLAG) \
+ 	$(CPPFLAGS) $(CXXFLAGS)
+ ODBCDLL_OBJECTS =  \
+ 	$(__odbcdll___win32rc) \
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch
new file mode 100644
index 000000000000..2701500d7ad9
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch
@@ -0,0 +1,27 @@
+From 4164cd68d45ec4b3b46c22ed981c81f766154428 Mon Sep 17 00:00:00 2001
+From: Vadim Zeitlin <vadim@wxwidgets.org>
+Date: Thu, 17 Jun 2010 22:30:27 +0000
+Subject: Backport fix from bakefile svn for autoconf 2.65.
+
+Use AC_REQUIRE() instead of directly using a macro, the latter doesn't work
+with autoconf 2.65.
+
+This is a backport of r1337 from bakefile svn to allow people to use autoconf
+2.65 immediately and will become unnecessary when we update to the next
+bakefile version.
+
+git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
+
+diff --git a/build/aclocal/bakefile-lang.m4 b/build/aclocal/bakefile-lang.m4
+index 4cc4a67..ec0f711 100644
+--- a/build/aclocal/bakefile-lang.m4
++++ b/build/aclocal/bakefile-lang.m4
+@@ -240,7 +240,7 @@ dnl check for different proprietary compilers depending on target platform
+ dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
+ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
+ [
+-    AC_PROG_$1
++    AC_REQUIRE([AC_PROG_$1])
+ 
+     dnl Intel compiler can be used under several different OS and even
+     dnl different architectures (x86, amd64 and Itanium) so it's easier to just
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch
new file mode 100644
index 000000000000..f497665cef8f
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch
@@ -0,0 +1,25 @@
+From 006b0650b0f390c1e9a19361988b6af7a327e296 Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Wed, 5 Aug 2015 12:38:39 +0300
+Subject: [PATCH 2/2] Fixed bakefile version
+
+---
+ build/aclocal/bakefile.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
+index 88478ca..aa04b16 100644
+--- a/build/aclocal/bakefile.m4
++++ b/build/aclocal/bakefile.m4
+@@ -837,7 +837,7 @@ AC_DEFUN([AC_BAKEFILE],
+     AC_SUBST(OBJCXXFLAGS)
+ 
+ 
+-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.8"
++    BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
+ 
+     dnl includes autoconf_inc.m4:
+     $1
+-- 
+2.4.6
+
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch
new file mode 100644
index 000000000000..dc9b14359107
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch
@@ -0,0 +1,77 @@
+Fix building with C++14, which errors out due to narrowing conversions.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=592442
+
+Patch by Francesco Turco
+
+--- a/src/gtk/bdiag.xbm
++++ b/src/gtk/bdiag.xbm
+@@ -1,6 +1,6 @@
+ #define bdiag_width 16
+ #define bdiag_height 16
+ static char bdiag_bits[] = {
+-   0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04,
+-   0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10,
+-   0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01};
++   (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10, (char)0x08, (char)0x08, (char)0x04, (char)0x04,
++   (char)0x02, (char)0x02, (char)0x01, (char)0x01, (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10,
++   (char)0x08, (char)0x08, (char)0x04, (char)0x04, (char)0x02, (char)0x02, (char)0x01, (char)0x01};
+--- a/src/gtk/cdiag.xbm
++++ b/src/gtk/cdiag.xbm
+@@ -1,6 +1,6 @@
+ #define cdiag_width 16
+ #define cdiag_height 16
+ static char cdiag_bits[] = {
+-   0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24,
+-   0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18,
+-   0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81};
++   (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18, (char)0x18, (char)0x18, (char)0x24, (char)0x24,
++   (char)0x42, (char)0x42, (char)0x81, (char)0x81, (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18,
++   (char)0x18, (char)0x18, (char)0x24, (char)0x24, (char)0x42, (char)0x42, (char)0x81, (char)0x81};
+--- a/src/gtk/cross.xbm
++++ b/src/gtk/cross.xbm
+@@ -1,6 +1,6 @@
+ #define cross_width 15
+ #define cross_height 15
+ static char cross_bits[] = {
+-   0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0xff, 0x7f, 0x84, 0x10, 0x84, 0x10};
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10};
+--- a/src/gtk/fdiag.xbm
++++ b/src/gtk/fdiag.xbm
+@@ -1,6 +1,6 @@
+ #define fdiag_width 16
+ #define fdiag_height 16
+ static char fdiag_bits[] = {
+-   0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20,
+-   0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08,
+-   0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80};
++   (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08, (char)0x10, (char)0x10, (char)0x20, (char)0x20,
++   (char)0x40, (char)0x40, (char)0x80, (char)0x80, (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08,
++   (char)0x10, (char)0x10, (char)0x20, (char)0x20, (char)0x40, (char)0x40, (char)0x80, (char)0x80};
+--- a/src/gtk/horiz.xbm
++++ b/src/gtk/horiz.xbm
+@@ -1,6 +1,6 @@
+ #define horiz_width 15
+ #define horiz_height 15
+ static char horiz_bits[] = {
+-   0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0xff, 0x7f, 0x00, 0x00, 0x00, 0x00};
++   (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
++   (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
++   (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00};
+--- a/src/gtk/verti.xbm
++++ b/src/gtk/verti.xbm
+@@ -1,6 +1,6 @@
+ #define verti_width 15
+ #define verti_height 15
+ static char verti_bits[] = {
+-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10};
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10};
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch
new file mode 100644
index 000000000000..db9571438d86
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch
@@ -0,0 +1,304 @@
+From e87336e8d583044d62b1a9400db4c29f1474fa50 Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Wed, 5 Aug 2015 12:37:36 +0300
+Subject: [PATCH 1/2] Backported new libraries search code
+
+---
+ acinclude.m4 | 75 ++++++++++++++++++++++++++++++++++++++++++++---
+ configure.in | 96 +++++++++++++++++++++++-------------------------------------
+ 2 files changed, 107 insertions(+), 64 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index a44747c..1e307c9 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -43,16 +43,17 @@ for ac_dir in $1 /usr/include;
+ ])
+ 
+ dnl ---------------------------------------------------------------------------
+-dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
+-dnl to the full name of the file that was found or leaves it empty if not found
++dnl call WX_PATH_FIND_LIBRARIES(lib name, [optional extra search paths])
++dnl sets ac_find_libraries to the full name of the file that was found
++dnl or leaves it empty if not found
+ dnl ---------------------------------------------------------------------------
+ AC_DEFUN([WX_PATH_FIND_LIBRARIES],
+ [
+   ac_find_libraries=
+-  for ac_dir in $1;
++  for ac_dir in $2 $SEARCH_LIB
+   do
+     for ac_extension in a so sl dylib dll.a; do
+-      if test -f "$ac_dir/lib$2.$ac_extension"; then
++      if test -f "$ac_dir/lib$1.$ac_extension"; then
+         ac_find_libraries=$ac_dir
+         break 2
+       fi
+@@ -115,6 +116,72 @@ AC_DEFUN([WX_LINK_PATH_EXIST],
+   fi
+ ])
+ 
++dnl ---------------------------------------------------------------------------
++dnl Usage: WX_FIND_LIB(lib-name, [lib-function to test], [extra search paths])
++dnl
++dnl Tests in a variety of ways for the presence of lib-name
++dnl
++dnl On success, returns any novel path found in ac_find_libraries; else "std"
++dnl             and any cflags in ac_find_cflags
++dnl On failure, ac_find_libraries will be empty
++dnl ---------------------------------------------------------------------------
++AC_DEFUN([WX_FIND_LIB],
++[
++  ac_find_libraries=
++
++  dnl Try with pkg-config first. It requires its lib-name parameter lowercase
++  fl_pkgname=`echo "$1" | tr [[:upper:]] [[:lower:]]`
++  dnl suppress PKG_PROG_PKG_CONFIG output; we don't want to keep seeing it
++  PKG_PROG_PKG_CONFIG() AS_MESSAGE_FD> /dev/null
++  PKG_CHECK_MODULES([$1], [$fl_pkgname],
++    [
++      dnl Start by assuming there are no novel lib paths
++      ac_find_libraries="std"
++
++      dnl A simple copy of the internal vars $1_CFLAGS $1_LIBS doesn't work
++      dnl inside the macro
++      dnl
++      dnl TODO: When we stop being autoconf 2.61 compatible, the next 2 lines
++      dnl should become:
++      dnl AS_VAR_COPY([ac_find_cflags], [$1_CFLAGS])
++      dnl AS_VAR_COPY([fl_libs], [$1_LIBS])
++      eval ac_find_cflags=\$$1_CFLAGS
++      eval fl_libs=\$$1_LIBS
++
++      dnl fl_libs may now contain -Lfoopath -lfoo (only non-standard paths are
++      dnl added) We only want the path bit, not the lib names
++      for fl_path in $fl_libs
++      do
++        if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
++          dnl there shouldn't be >1 novel path
++          dnl return it without the -L, ready for WX_LINK_PATH_EXIST
++          ac_find_libraries=`echo "$fl_path" | cut -c 3-`
++        fi
++      done
++    ],
++    [
++      if test "x$ac_find_libraries" = "x"; then
++        dnl Next with AC_CHECK_LIB, if a test function was provided
++        if test "x$2" != "x"; then
++          AC_CHECK_LIB([$1], [$2], [ac_find_libraries="std"])
++        fi
++      fi
++
++      if test "x$ac_find_libraries" = "x"; then
++        dnl Finally try the search path
++        dnl Output a message again, as AC_CHECK_LIB will just have said "no"
++        AC_MSG_CHECKING([elsewhere])
++        dnl $3 will occasionally hold extra path(s) to search
++        WX_PATH_FIND_LIBRARIES([$1], [$3])
++        if test "x$ac_find_libraries" != "x"; then
++          AC_MSG_RESULT([yes])
++        else
++          AC_MSG_RESULT([no])
++        fi
++      fi
++    ])
++])
++
+ dnl ===========================================================================
+ dnl C++ features test
+ dnl ===========================================================================
+diff --git a/configure.in b/configure.in
+index 021845d..9c78ba3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2767,7 +2767,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then
+             x_includes=$ac_find_includes
+         fi
+         if test -z "$x_libraries" -o "$x_libraries" = NONE; then
+-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xt)
++            WX_PATH_FIND_LIBRARIES(Xt)
+             x_libraries=$ac_find_libraries
+         fi
+     fi
+@@ -3554,7 +3554,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+         dnl test for external libxpm if we're configured to use it
+         if test "$wxUSE_GPE" = "yes"; then
+             AC_MSG_CHECKING(for gpewidget library)
+-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget)
++            WX_PATH_FIND_LIBRARIES(gpewidget)
+             if test "$ac_find_libraries" != "" ; then
+                 WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+                 dnl -lgpewidget must be before all GTK libs and
+@@ -3567,7 +3567,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+             fi
+ 
+             dnl AC_MSG_CHECKING(for gpe library)
+-            dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe)
++            dnl WX_PATH_FIND_LIBRARIES(gpe)
+             dnl if test "$ac_find_libraries" != "" ; then
+             dnl     WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+             dnl     GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe"
+@@ -3817,7 +3817,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+ 
+ 
+         AC_MSG_CHECKING(for Motif/Lesstif library)
+-        WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm)
++        WX_PATH_FIND_LIBRARIES(Xm)
+ 
+         if test "x$ac_find_libraries" != "x" ; then
+             AC_MSG_RESULT(found in $ac_find_libraries)
+@@ -3956,7 +3956,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+         dnl test for external libxpm if we're configured to use it
+         if test "$wxUSE_LIBXPM" = "sys"; then
+             AC_MSG_CHECKING(for Xpm library)
+-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
++            WX_PATH_FIND_LIBRARIES(Xpm)
+             if test "$ac_find_libraries" != "" ; then
+                 WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+                 GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+@@ -4192,41 +4192,23 @@ dnl ---------------------------------------------------------------------------
+ dnl wxDisplay Sanity checks
+ dnl ---------------------------------------------------------------------------
+ 
++USE_XINERAMA=0
+ if test "$wxUSE_DISPLAY" = "yes"; then
+ dnl ---------------------------------------------------------------------------
+ dnl Xinerama (for unix ) - Brian Victor
+ dnl ---------------------------------------------------------------------------
+     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+-        AC_MSG_CHECKING([for Xinerama])
+-        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
++        WX_FIND_LIB(Xinerama, XineramaQueryScreens)
+         if test "$ac_find_libraries" != "" ; then
+-            WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+-            if test "$ac_path_to_link" != " -L/usr/lib" ; then
+-                LDFLAGS="$LDFLAGS $ac_path_to_link"
++            if test "$ac_find_libraries" != "std" ; then
++              WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++              if test "$ac_path_to_link" != " -L/usr/lib" ; then
++                  LDFLAGS="$LDFLAGS $ac_path_to_link"
++              fi
+             fi
++            USE_XINERAMA=1
+             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
+-            AC_MSG_RESULT([yes])
+-
+-            AC_MSG_CHECKING([for Xxf86vm extension])
+-            WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
+-            if test "$ac_find_libraries" != "" ; then
+-                AC_MSG_RESULT([yes])
+-                AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
+-                                 [
+-                                  GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
+-                                 ],
+-                                 [],
+-                                 [
+-                                      #if HAVE_X11_XLIB_H
+-                                        #include <X11/Xlib.h>
+-                                      #endif
+-                                 ])
+-            else
+-                AC_MSG_RESULT([no])
+-            fi
+-
+         else
+-            AC_MSG_RESULT([no])
+             AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
+             wxUSE_DISPLAY="no"
+         fi
+@@ -4243,17 +4225,16 @@ dnl X11 session management
+ dnl ---------------------------------------------------------------------------
+ if test "$wxUSE_DETECT_SM" = "yes"; then
+     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+-        AC_MSG_CHECKING([for -lSM - X11 session management])
+-        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM)
++        WX_FIND_LIB(SM, SmcOpenConnection)
+         if test "$ac_find_libraries" != "" ; then
+-            WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+-            if test "$ac_path_to_link" != " -L/usr/lib" ; then
++            if test "$ac_find_libraries" != "std" ; then
++              WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++              if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                 LDFLAGS="$LDFLAGS $ac_path_to_link"
++              fi
+             fi
+             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM"
+-            AC_MSG_RESULT([yes])
+         else
+-            AC_MSG_RESULT([no])
+             AC_MSG_WARN([libSM not found; disabling session management detection])
+             wxUSE_DETECT_SM="no"
+         fi
+@@ -4295,51 +4276,46 @@ if test "$wxUSE_OPENGL" = "yes"; then
+             AC_CHECK_HEADER(GL/glu.h, [
+                 found_gl=0
+ 
+-                AC_MSG_CHECKING([for -lGL])
+-                WX_PATH_FIND_LIBRARIES([$SEARCH_LIB /opt/graphics/OpenGL/lib],GL)
++                WX_FIND_LIB(GL, glBegin, [/opt/graphics/OpenGL/lib])
+                 if test "$ac_find_libraries" != "" ; then
+-                    AC_MSG_RESULT([found in $ac_find_libraries])
+-
+-                    WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+-                    if test "$ac_path_to_link" != " -L/usr/lib" ; then
++                    if test "$ac_find_libraries" != "std" ; then
++                      WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++                      if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                         LDFLAGS_GL="$ac_path_to_link"
++                      fi
+                     fi
+ 
+                     dnl don't suppose that libGL and libGLU are always in the
+                     dnl same directory -- this is not true for some common
+                     dnl distributions
+-                    AC_MSG_CHECKING([for -lGLU])
+-                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
++                    WX_FIND_LIB(GLU, gluBeginCurve, [/opt/graphics/OpenGL/lib])
+                     if test "$ac_find_libraries" != "" ; then
++                      if test "$ac_find_libraries" != "std" ; then
+                         WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+                         if test "$ac_path_to_link" != " -L/usr/lib" -a \
+-                                    "$ac_path_to_link" != "$LDFLAGS_GL"; then
+-                            LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
++                                "$ac_path_to_link" != "$LDFLAGS_GL" ; then
++                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+                         fi
++                      fi
+ 
+                         found_gl=1
+                         OPENGL_LIBS="-lGL -lGLU"
+-                        AC_MSG_RESULT([yes])
+-                    else
+-                        AC_MSG_RESULT([no])
+                     fi
+-                else
+-                    AC_MSG_RESULT([no])
+                 fi
+ 
+                 if test "$found_gl" != 1; then
+-                    AC_MSG_CHECKING([for -lMesaGL])
+-                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
++                    WX_FIND_LIB(MesaGL, glEnable, [/opt/graphics/OpenGL/lib])
+                     if test "$ac_find_libraries" != "" ; then
++                      if test "$ac_find_libraries" != "std" ; then
+                         WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+-                        LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+-                        OPENGL_LIBS="-lMesaGL -lMesaGLU"
+-                        AC_MSG_RESULT([yes])
+-                    else
+-                        AC_MSG_RESULT([no])
++                        if test "$ac_path_to_link" != " -L/usr/lib" ; then
++                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
++                        fi
++                      fi
++                      OPENGL_LIBS="-lMesaGL -lMesaGLU"
+                     fi
+                 fi
+-            ])
++            ],, [ ])
+         ],
+         [],
+         [ ])
+-- 
+2.4.6
+
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
new file mode 100644
index 000000000000..cbe3103a0bce
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
@@ -0,0 +1,11 @@
+diff -Naur wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in wxPython-src-2.8.7.1/contrib/src/Makefile.in
+--- wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in	2007-07-27 17:57:27.000000000 -0600
++++ wxPython-src-2.8.7.1/contrib/src/Makefile.in	2007-12-28 17:34:28.000000000 -0600
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg #deprecated #applet mmedia
+ 
+ all:
+ 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
new file mode 100644
index 000000000000..a2c6c6e1a8e3
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
@@ -0,0 +1,75 @@
+Prevent file collisions between multiple installed SLOTs.
+
+  - Don't install wxwin.m4.  It is installed with app-eselect/eselect-wxwidgets.
+  - Version the bakefile preset filenames.  Unversioned symlinks to these files
+    are handled by eselect.
+  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
+    installed with eselect-wxwidgets.
+  - Version wxstd.mo and modify AddStdCatalog to use it.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+ 
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___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_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___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)
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
++	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ 	$(DYLIB_RPATH_INSTALL)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ 	for f in setup.h $(RCDEFS_H); do \
+@@ -16101,7 +16101,7 @@ 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) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -16109,7 +16109,7 @@ locale_install:
+ 	$(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
+ 
+--- a/build/bakefiles/wx.bkl
++++ b/build/bakefiles/wx.bkl
+@@ -137,7 +137,7 @@
+         <using module="gettext"/>
+         <gettext-catalogs id="locale">
+             <srcdir>$(SRCDIR)/locale</srcdir>
+-            <catalog-name>wxstd</catalog-name>
++            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+             <linguas>
+                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+                 zh zh_CN zh_TW
+--- a/src/common/translation.cpp
++++ b/src/common/translation.cpp
+@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
+ 
+ bool wxTranslations::AddStdCatalog()
+ {
+-    if ( !AddCatalog(wxS("wxstd")) )
++    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
+         return false;
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -125,7 +125,6 @@ distclean: clean
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+ 
+ @COND_USE_XRC_1@uninstall_wxrc: 
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch
new file mode 100644
index 000000000000..119175c624d2
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch
@@ -0,0 +1,39 @@
+From 73e9e18ea09ffffcaac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt@techie.net>
+Date: Sat, 20 Feb 2016 00:08:14 -0500
+Subject: [PATCH] Fix STC compilation with GCC6
+
+Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems
+with ambiguous overloads.
+
+Closes #17147.
+
+Closes https://github.com/wxWidgets/wxWidgets/pull/222
+---
+ src/stc/scintilla/src/Editor.cxx | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
+index cd72953..2081df2 100644
+--- a/src/stc/scintilla/src/Editor.cxx
++++ b/src/stc/scintilla/src/Editor.cxx
+@@ -11,6 +11,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+ 
++#include <cmath>
+ #include <string>
+ #include <vector>
+ #include <map>
+@@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) {
+ }
+ 
+ static bool Close(Point pt1, Point pt2) {
+-	if (abs(pt1.x - pt2.x) > 3)
++	if (std::abs(pt1.x - pt2.x) > 3)
+ 		return false;
+-	if (abs(pt1.y - pt2.y) > 3)
++	if (std::abs(pt1.y - pt2.y) > 3)
+ 		return false;
+ 	return true;
+ }
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch
new file mode 100644
index 000000000000..727fda16ddc1
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch
@@ -0,0 +1,140 @@
+Backport various webkit-related build fixes:
+
+a309157a	Don't include "webview" in "standard" libraries.
+d24f711f	Only link webview library with libwebkitgtk in wxGTK, not the core one.
+bde287ba	Rebake webview sample makefile after EXTRALIBS_WEBVIEW addition	
+037f6977	Report libraries in EXTRALIBS_WEBVIEW in wx-config output
+
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -65,6 +65,7 @@ EXTRALIBS_MEDIA = @EXTRALIBS_MEDIA@
+ EXTRALIBS_GUI = @EXTRALIBS_GUI@
+ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
+ EXTRALIBS_SDL = @EXTRALIBS_SDL@
++EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
+ CXXWARNINGS = @CXXWARNINGS@
+ HOST_SUFFIX = @HOST_SUFFIX@
+ DYLIB_RPATH_INSTALL = @DYLIB_RPATH_INSTALL@
+@@ -15493,7 +15494,7 @@ distclean: clean
+ @COND_SHARED_0_USE_STC_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+ 
+ @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP)
+-@COND_MONOLITHIC_1_SHARED_1@	$(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR)    -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
++@COND_MONOLITHIC_1_SHARED_1@	$(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR)    -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(EXTRALIBS_WEBVIEW) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
+ @COND_MONOLITHIC_1_SHARED_1@	$(DYLIB_RPATH_POSTLINK)
+ @COND_MONOLITHIC_1_SHARED_1@	
+ @COND_MONOLITHIC_1_SHARED_1@	$(__monodll___so_symlinks_cmd)
+@@ -15750,7 +15751,7 @@ distclean: clean
+ @COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
+ 
+ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__webviewdll___win32rc) $(__coredll___depname) $(__basedll___depname)
+-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
++@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_WEBVIEW) $(LIBS)
+ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(DYLIB_RPATH_POSTLINK)
+ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	
+ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@	$(__webviewdll___so_symlinks_cmd)
+--- a/build/bakefiles/config.bkl
++++ b/build/bakefiles/config.bkl
+@@ -423,6 +423,7 @@ to run the tests, include CppUnit library here.
+         <option name="EXTRALIBS_GUI"/>
+         <option name="EXTRALIBS_OPENGL"/>
+         <option name="EXTRALIBS_SDL"/>
++        <option name="EXTRALIBS_WEBVIEW"/>
+         <option name="CXXWARNINGS"/>
+         <option name="HOST_SUFFIX"/>
+         <option name="DYLIB_RPATH_INSTALL"/>
+@@ -506,6 +507,7 @@ it if SHARED=1 unless you know what you are doing.
+             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
+         </set>
+         <set var="EXTRALIBS_SDL"/>
++        <set var="EXTRALIBS_WEBVIEW"/>
+ 
+         <set var="WITH_PLUGIN_SDL">0</set>
+ 
+--- a/build/bakefiles/monolithic.bkl
++++ b/build/bakefiles/monolithic.bkl
+@@ -26,6 +26,7 @@
+         <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
+         <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
+         <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
++        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
+         <library>$(wxscintilla_library_link)</library>
+     </dll>
+ 
+--- a/build/bakefiles/multilib.bkl
++++ b/build/bakefiles/multilib.bkl
+@@ -183,6 +183,7 @@
+         <sources>$(WEBVIEW_SRC)</sources>
+         <library>coredll</library>
+         <library>basedll</library>
++        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
+         <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
+     </dll>
+ 
+--- a/build/bakefiles/wxwin.py
++++ b/build/bakefiles/wxwin.py
+@@ -51,6 +51,7 @@ EXTRALIBS = {
+     'html' : '$(EXTRALIBS_HTML)',
+     'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
+     'media' : '$(EXTRALIBS_MEDIA)',
++    'webview' : '$(EXTRALIBS_WEBVIEW)',
+ }
+ 
+ def mkLibName(wxid):
+--- a/configure.in
++++ b/configure.in
+@@ -7249,7 +7249,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
+                               [
+                                 USE_WEBVIEW_WEBKIT=1
+                                 CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
+-                                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS"
++                                EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
+                               ],
+                               [
+                                 AC_MSG_WARN([webkitgtk not found.])
+@@ -7689,7 +7689,6 @@ if test "$wxUSE_GUI" = "yes"; then
+         BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
+     fi
+     if test "$wxUSE_WEBVIEW" = "yes" ; then
+-        STD_GUI_LIBS="webview $STD_GUI_LIBS"
+         BUILT_WX_LIBS="webview $BUILT_WX_LIBS"
+     fi
+     if test "$wxUSE_XRC" = "yes" ; then
+@@ -8002,6 +8001,7 @@ AC_SUBST(EXTRALIBS_GUI)
+ AC_SUBST(EXTRALIBS_OPENGL)
+ AC_SUBST(EXTRALIBS_SDL)
+ AC_SUBST(EXTRALIBS_STC)
++AC_SUBST(EXTRALIBS_WEBVIEW)
+ AC_SUBST(WITH_PLUGIN_SDL)
+ AC_SUBST(UNICODE)
+ AC_SUBST(DEBUG_INFO)
+--- a/samples/webview/Makefile.in
++++ b/samples/webview/Makefile.in
+@@ -33,6 +33,7 @@ EXTRALIBS = @EXTRALIBS@
+ EXTRALIBS_XML = @EXTRALIBS_XML@
+ EXTRALIBS_GUI = @EXTRALIBS_GUI@
+ EXTRALIBS_SDL = @EXTRALIBS_SDL@
++EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
+ CXXWARNINGS = @CXXWARNINGS@
+ HOST_SUFFIX = @HOST_SUFFIX@
+ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+@@ -163,7 +164,7 @@ distclean: clean
+ 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+ 
+ webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc)
+-	$(CXX) -o $@ $(WEBVIEW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
++	$(CXX) -o $@ $(WEBVIEW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+ 	
+ 	$(__webview___mac_setfilecmd)
+ 	$(__webview___os2_emxbindcmd)
+--- a/wx-config.in
++++ b/wx-config.in
+@@ -1032,6 +1032,7 @@ ldlibs_html="@EXTRALIBS_HTML@"
+ ldlibs_xml="@EXTRALIBS_XML@"
+ ldlibs_adv="@EXTRALIBS_SDL@"
+ ldlibs_stc="@EXTRALIBS_STC@"
++ldlibs_webview="@EXTRALIBS_WEBVIEW@"
+ 
+ 
+ # Order the libraries passed to us correctly for static linking.