gentoo resync : 25.08.2018

12 files changed, 3 insertions, 770 deletions

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 5b79c9e69f75..9707855aaef9 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,23 +1,13 @@
-AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 BLAKE2B 249762eba2c1add589ba23de02ddb421824031c0ef20b7c816c2f4e500f7d4cf5002438a7b80805dc48b2ba66657b7ae0bcedf4f08b367b96cb67d8fe9019577 SHA512 119e99f06f238d0982bc1a5fac834ef0ca7c09dc5a97f612cf3f0fffd9e01eebb0d8bfe122ebff6f3857cf6518a226477d2cb5959c47c4fd5c50ea5040abe6b2
-AUX wxGTK-2.8.11-collision.patch 5712 BLAKE2B 3c4e4450369361772c434f4c361de2c7d8918d445d2d5aacb68574384ca38d4d92a51eb51cd943e00b311e629bd569d93ed2c9adf26fa9d13dd3247ae422b193 SHA512 55a5e55a7233e0ca99f7604bcd6c71816d2ba7630056c8c67d78c2b6080e26c010f6b3120b7d46b32818ce6dc1b09d97b8295fe23628c561e2079483922baf13
-AUX wxGTK-2.8.11-unicode-odbc.patch 624 BLAKE2B 0948414d44b424e0c2c094317bb934ef3798fe229f26a2c6350d48dbac0b9c6abc6f84c90e6876b306e78e9b43bb5ced69983a0d92cf1445e56899d6439e00ca SHA512 e58e661ae95deb7da31c7742088c6e8b8705494261d00975a7dd0eba0fc720ae7d91017616152915849b747c96f3a0302cd958946db886d7491520883f311a86
-AUX wxGTK-2.8.12.1-autoconf.patch 1140 BLAKE2B 160b0dff38bccd49277f1c5a4696e3f2042960219fafe39b4186f5a131ccda171bee9b95efc5596dcc43a30767cfe6126c8d00aa466792f56262223c8a516f11 SHA512 533c6c2f3611b8af4b6dc954aa09a3c70197ad7fe7fb1874c7c6f61b48e45355c41bdb7fb4379fea9e418ed0f547332d6083f60c6382d090b1700f213ede9b20
-AUX wxGTK-2.8.12.1-bakefile.patch 653 BLAKE2B 078a0d5ee86f473a4823a2d1b3473c2dad3764bd94daf782a6b87270ff3880a75cc4fe2e42c23c43accc57dfd87898549daf96d6af940157bad5bd3b5538b52b SHA512 9235ab4ff1117bb15ae88a4f9a836e30af3cee6b897031a8a89bbe1ee87df7a700bd2d6a2dce01e8e96ced2aff52ea4265490103a80a18e8fc54d4e7e59dcc08
-AUX wxGTK-2.8.12.1-fix-c++14.patch 4518 BLAKE2B 7ea578c93bc87178c35a8257f4fb2857c68fee69e479960f88122d42fd35ba186fa206c5caadf7cab5a237cc8251dcd13d6f49c29436f4c01af8b7137ac3eae1 SHA512 cd7fc58e883ff9ef185bc8deff333f7a785d8bd3e8abebef741b598436bc486f2904540be7d2c891ef070b45008f2e5f5961c7978b0a8166ef259e17b7481739
-AUX wxGTK-2.8.12.1-libdir.patch 13266 BLAKE2B d96df55c4e156962db77a317c1046341c679720e75c4adb1daaef3a3bb580c21b8ea025264cb348b2edd15ab1b8300d76859f152745a58af3113c3871793451f SHA512 15eb72936176bfe03b5acb7d52c4158fe4f6bdf9870e72aab8d41e1689ee9886aa3bc8216e782abb756d06607bcedbec184575a2e9634f67f6add1b930297671
-AUX wxGTK-2.8.7-mmedia.patch 518 BLAKE2B 7fbaeea8eb8b11a1cfbcbabf2cb1d159d197ff5cbb390c38e8686820276265603c3fd2b7cc3e28bbb264730e08da63c57806aada2d3d0a33af650f855ff511c9 SHA512 8577a701f5d0d03296d2d2dbb3a041023cf7adffc2d09492d2ebd094e0a6796e27abe1f442fee92e661f0f1ea6268499c37ace042cc1434b80aac58639bbc56c
 AUX wxGTK-3.0-gtk3-translation-domain.patch 454 BLAKE2B fd0b6d6a0c1fe7f1dfbd7692d549dfd6f78c85e25f06e2e44630ca9b3c9dda4c12af2df6e4fcc02de73e75524631b858cc21b9f63b8799b0d157a38bd5541fac SHA512 8cdf57558e8d09e3e0613c25ac7701cce0bf78da13060e2b36167b69b8ae4f265607cb5216a33054f6c0c2f21beba8cc7f8297f4de2b2db1ec9f3f5bb8177ff3
 AUX wxGTK-3.0.3-collision.patch 6299 BLAKE2B 1130b96f32e2abe7109ca84f1cd0cae0a6742f2f96ad905996157e227236deaff64813f892b649adb2b17beb8fa2b3e9b651f7c397960eb6346bb4bc1e50b417 SHA512 e38a7985c750a34f7ed0b3772677b6b6942340c48d3e70a7c1f1851d2933a4d7823c225203a79c8b713f3d6a1bb0c0d0690d5df027674cd826cea300f9b2ed0f
 DIST wxGTK-3.0.3_p20180104.tar.xz 84260 BLAKE2B 3840a4a202778b3e7df0c3470945dd8f083b1b18aa69013ae59975b368cec4f5e9fea3bdd8a05a200fcd146c8616d2258f0b2ee389a6457a638201a8534f9a18 SHA512 840c8248d5a689a462d1dcb9d9962dd453473597d10289802728218a881808f594ff799d2002ceb319d2e79b1b7063d59b181d4a0efff7920a2dee9653b40a72
 DIST wxGTK-3.0.4_p20180507.tar.xz 2972 BLAKE2B 431855d43aefac6227925195c107b21f7539ca2709c98f6d6beb7d25dbdf8633c61bb160fb4e5c993e97dbddc37cdf90dc7b09753a312c25b16f79f0207cfe98 SHA512 9caa7ca3b6f15fd70014ccd4008c4fa76f12cb07d3fc58a8f0d2b9a591cf8be3f0eb40497dc757b9d0a04d26f54296aaa8fe693aa601bb1c058365529bb4bc8b
-DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3
 DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb
 DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
 DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
-EBUILD wxGTK-2.8.12.1-r2.ebuild 4675 BLAKE2B b73898dba9c7e77e560e7ba9ab960dc2608d20db1c2debcf70f4101fea9a05b832c4912e102f2cf8e29d03090fc3b25bcaf2ff6f73b19504d3197564fdfabc69 SHA512 8580b8f943fbbec1b1df60f58880c83064533afd8a4b4f5156b02aa4042e85cb1bbf17939ac08aebdd2488082d7e0f5d16e4cbe0c70282e57e4696e4e9b5fec6
 EBUILD wxGTK-3.0.3-r300.ebuild 5056 BLAKE2B 187c4e043e912beee9a58c9796866493fe83b85e5c814b30029bf5e4d92a3c561d814cd41e635028d97b9e9d8b7dbdb9b19694023caed063976b9ec1b919d5fe SHA512 aa1ba5f27f7593e0a3f57010509169173ab6521f66890400d2f654f636cbc154723cc2fea403c02bdfca516ef7ec5cf83e71be74ef5cdc543b2676d01ec3d65e
 EBUILD wxGTK-3.0.3.ebuild 3982 BLAKE2B 5b49474a6ab03648d801c2cc1e1df298bb52b2cc61c2e957368f1d2bb06f910d20b533ab1cf80dcf9fdf124b9c37b56b9233b775e3fc07803173d440e3a28e29 SHA512 4c63f058ba1c7eded7978a9adac5637d3d4b40de6cdb92eb079eb697a3792581a32641f4d8e6062181d1c2e763e2528416691f5b4fe8d88d7bd41092eeda0509
 EBUILD wxGTK-3.0.4-r300.ebuild 5204 BLAKE2B b7d741d315a1091eb1ebc59e410991bf5311ee23366c71977ea23d5573d96496fe853de25860b24e990becb24995c61d5dbaa2f178097f22781600efcb6961b4 SHA512 13e00e1e0435a9be0e521373b59a0760755bdb26b8e7644976a3df7253fe8eed320ac7b8b4a1356d344b51339521f48661ce563d5806e907e5031f89e2b5e687
-EBUILD wxGTK-3.0.4.ebuild 3986 BLAKE2B 63705e4b3590beb819b46cdeaabf185c1a9a3411b0cb52c441a6b275875a7baec5705c2bc7e361222a69226a66273c8d039f30a54fa63c643c842389537f4374 SHA512 b0805e26a4f31a8a6f8e616d22cfcc8a09e9e2e470edfdd3af8974e687f0cc81c096e4a39fcadc0e117c4b6f528adfc724f2b82381c120c18c007e27938b9def
-MISC metadata.xml 856 BLAKE2B 9f03dc05155eba5aee9ca7233d96dc7d0929df2a016dce4131b3b639358eea8ebbecfb5e7f59e7382f5467259885c14bcdc3df416a678f213cd58cd3096b4252 SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb
+EBUILD wxGTK-3.0.4.ebuild 3985 BLAKE2B 6b3252c8f46f45f53a8f59ab03f5970dc20dbef2c6421756bdd17c7c6ae8a7f38b5ee491a5317110f57edc251ff94f862e66e4e1e3f0f77daaa79f3f18d0e688 SHA512 0cb5c63adca3db0cb2e22eb53cbdc0d6ee4be57af6a8fb0354770603fa2f18357773709900dc741cbefe1852f37d762e9e6c9f684db37e6022b02f451895310d
+MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
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
deleted file mode 100644
index 3636b64f976a..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index a5c574cb2d6a..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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
deleted file mode 100644
index d272247091b8..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 2701500d7ad9..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index f497665cef8f..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index dc9b14359107..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-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
deleted file mode 100644
index db9571438d86..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-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
deleted file mode 100644
index cbe3103a0bce..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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/metadata.xml b/x11-libs/wxGTK/metadata.xml
index e8b0e7257496..aa10f7e1f6dd 100644
--- a/x11-libs/wxGTK/metadata.xml
+++ b/x11-libs/wxGTK/metadata.xml
@@ -10,9 +10,6 @@
 			Enable the wxMediaCtrl class for playing audio and video through
 			gstreamer.
 		</flag>
-		<flag name="gnome">
-			Use <pkg>gnome-base/libgnomeprintui</pkg> for printing tasks.
-		</flag>
 		<flag name="sdl">
 			Use Simple Directmedia Layer (<pkg>media-libs/libsdl</pkg>) for
 			audio.
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
deleted file mode 100644
index 5bfab6f5f38e..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic versionator multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-
-BASE_PV="$(get_version_component_range 1-3)"
-BASE_P="${PN}-${BASE_PV}"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# docs, and are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff"
-
-SLOT="2.8"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	odbc?   ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-	sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X?  (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libXinerama[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
-		gnome?  ( gnome-base/libgnomeprintui:2.2[${MULTILIB_USEDEP}] )
-		gstreamer? (
-			gnome-base/gconf:2[${MULTILIB_USEDEP}]
-			media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)
-	aqua? (
-		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )
-"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-0.7"
-
-LICENSE="wxWinLL-3
-		GPL-2
-		odbc?	( LGPL-2 )
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
-	epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
-	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
-	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
-	epatch "${FILESDIR}"/${PN}-2.8.12.1-fix-c++14.patch        # Bug #592442
-
-	# Bug #421851
-	epatch "${FILESDIR}"/${P}-libdir.patch
-	epatch "${FILESDIR}"/${P}-bakefile.patch
-	epatch "${FILESDIR}"/${P}-autoconf.patch
-
-	# prefix https://bugs.gentoo.org/394123
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" \
-		-e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \
-		configure || die
-
-	epatch_user
-
-	mv configure.in configure.ac || die
-	eautoconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	append-flags -fno-strict-aliasing
-
-	# X independent options
-	myconf="--enable-compat26
-			--enable-shared
-			--enable-unicode
-			--with-regex=builtin
-			--with-zlib=sys
-			--with-expat=sys
-			$(use_enable debug)
-			$(use_enable pch precomp-headers)
-			$(use_with odbc odbc sys)
-			$(use_with sdl)
-			$(use_with tiff libtiff sys)"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			$(use_enable gstreamer mediactrl)
-			$(use_enable opengl)
-			$(use_with opengl)
-			$(use_with gnome gnomeprint)
-			--without-gnomevfs"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src || die
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src || die
-		emake DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt todo30.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	if use doc; then
-		dodoc -r "${S}"/docs/html
-	fi
-
-	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
index 3f733166a235..5e49ac1c23e2 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"