Remove as planned. Bug 330683.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
RepoMan-Options: --force

11 files changed, 18 insertions, 501 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index f140a413b19c..38f6ca50db6f 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.279 2011/12/09 04:40:06 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.280 2011/12/09 15:37:28 ssuominen Exp $
+
+  09 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -files/wxGTK-2.6.3-unicode-odbc.patch, -wxGTK-2.6.4.0-r6.ebuild,
+  -files/wxGTK-2.6.4.0-g_free.patch, -files/wxGTK-2.6.4.0-wxrc_link_fix.patch,
+  -files/wxGTK-2.6.4-collision.patch, -files/wxGTK-2.6.4-mmedia.patch,
+  -files/wxGTK-2.8.10.1-CVE-2009-2369.patch,
+  -files/wxGTK-2.8.10.1-gsocket.patch,
+  -files/wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch:
+  old
 
 *wxGTK-2.8.12.1 (09 Dec 2011)
 
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index d7359d5fd961..c29e2d994bc4 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,37 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
-AUX wxGTK-2.6.4-collision.patch 5778 RMD160 cbe029a606ec1f46ae7f29605631b8f05bd50cb4 SHA1 05a80154ad673b26a6e8dadc79c488ce5a0357b4 SHA256 0f7ac329ce24fbac7828a0b7c249ac0b376334da0f563456572172359ad78435
-AUX wxGTK-2.6.4-mmedia.patch 599 RMD160 e894dacc346d7c10f9582c2885df8c0b82962bb1 SHA1 d1da9fe158c5db80f8e65395b9d2c3383133352c SHA256 0f848e5985e404d89fbcc4820ca07069845dc8219e0a8679ff5ad3bf28dbc93f
-AUX wxGTK-2.6.4.0-g_free.patch 1102 RMD160 a2b4fc260d834b5e8c5244a19b61dd2f74c9c3b1 SHA1 0af47b2b10b1c472b8d6ec9e43160c4b28527bf0 SHA256 029b962d7ca861e15b00712a786e070aaaaa89c1faa6b9a5e46e3c5a2b8b00f5
-AUX wxGTK-2.6.4.0-wxrc_link_fix.patch 1085 RMD160 2af7918740d4826822af82a50b63ea00c5f40694 SHA1 c03791332103b199921dbe6e132d5f215d3a2aee SHA256 63cec2a3eb7c0a12c92230a68aa5878d518f7ebe504d8714c49140a23e72fbd3
-AUX wxGTK-2.8.10.1-CVE-2009-2369.patch 2348 RMD160 0b0c37a21bd68a99d837592c7745bb9d4f783ebb SHA1 36e74d5384e912f6bf1890c582d872b805e5bbfb SHA256 6a7427a621bc33b65928aee09261be28bfb4b85568554ae5c9c1fc147aea2e9e
-AUX wxGTK-2.8.10.1-gsocket.patch 480 RMD160 8aa2654dfe926980388235a91d78aa73fc8471d1 SHA1 885442567f2f80f78f9ed4f0ac2483c6fc932efe SHA256 a2955800a8ece8d3e328d0a287bd73d021cf7e14898432b1771e708a1f960fac
 AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 RMD160 2444b56d28dacf4def2e329419596a491e88f2a2 SHA1 80039dc3e6a796c6fa86088d0c2d6ccda1a3d040 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698
-AUX wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch 1620 RMD160 5263552010efd258e94251f215d26ed0b2cedd38 SHA1 a18887d73b8c04a865f10521f5197ed217ec6c6d SHA256 28574bdcdddf6223038727d2bb0637611d3e39bb6613ed8353634e7d2621658f
 AUX wxGTK-2.8.11-collision.patch 5710 RMD160 fd89803d48791e2900fec6ef4de1db8c650b3cdf SHA1 1a8c83d14fd8035843095cd18ecbc277bd63bf88 SHA256 b4a34748a0e3c8f784d777b197f903de9d681baf12395fa1b8a5d2b2636c9ffe
 AUX wxGTK-2.8.11-libpng15.patch 1390 RMD160 0f835458016a5eddda4f865ddadc6f96da72be58 SHA1 44c6086e3651c669df468bd129161693d0ba3e55 SHA256 b04b82f0db227cd1b5d2d5cd332b917eac1cd18967eab84791e23375e6245982
 AUX wxGTK-2.8.11-unicode-odbc.patch 624 RMD160 436cc03a4e45ed649298cf08a8ec134b97f4c4b5 SHA1 6cdf8f6e5140355d7bf6433d3afad483201c0961 SHA256 2e2cbeb2240770497611bf845127f737e67311c4b898d21446fc3d739941cb65
 AUX wxGTK-2.8.7-mmedia.patch 585 RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19 SHA1 2c453b6a70de916ffc9e61518937fc6f487bd9bb SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85
 AUX wxGTK-2.9.1.1-collision.patch 5953 RMD160 a80b62e8a6c099d27ff7df6e63a0c55078f342a7 SHA1 3f6897bfe49c5d3123f7fc53479dcb31977b5600 SHA256 b7470d4e2eaed28b2fedc5f8e94fb897a837daa0aa33c77ca99e4e379b0e9cdf
-DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661
 DIST wxPython-src-2.8.12.0.tar.bz2 31156191 RMD160 6420a8e6e59386b344ac058435a4ae6693c2c04b SHA1 f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4 SHA256 6d5e82772b87981c2a0d78d7a08b3a4498529127be2f05016892e8866e98babd
 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 RMD160 94eae06087bdd930e21bf90cc6672f93a1f5a17a SHA1 05688dc03d61631750f5904273122bb40a2115f5 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0
 DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a
-DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
-EBUILD wxGTK-2.6.4.0-r6.ebuild 5079 RMD160 355f1a2077d296254dfd172d914555407d460be5 SHA1 f14398400cf3673516a2b7118c75e37002994771 SHA256 8110dd38ac23024b58d3d58259c4e1ee5a668d6e842626e3b74019c8032225e7
 EBUILD wxGTK-2.8.11.0.ebuild 3607 RMD160 6c432fdde32ef01a5ea96101e78e4b0df950b260 SHA1 8d982b93d53c1829048d857b38fe6cdd4aa0bdec SHA256 468ea1693f80687de7cabf75f93a1a2b6c8588cf8d012be1489b8ada9e58a424
 EBUILD wxGTK-2.8.12.0.ebuild 3984 RMD160 cf1b21bd2ea5a0ba3cc330838cbdfc87f66e4776 SHA1 ac568f6fedfde0eead02752bac21af4f65a1942e SHA256 e8888ae59d6f2ccf87d4aad6a65ef768ff2b9e374d0946fa46cac56b25da4d32
 EBUILD wxGTK-2.8.12.1.ebuild 3920 RMD160 44d5991d83308bf4a656f33144f28f46725f4708 SHA1 eded7d061201c7a4188315ac8b22253e25ec1677 SHA256 e586dd1ed0028de25b9822c32be6cef089a04b2dc77b55ecb363fa415b0600fb
 EBUILD wxGTK-2.9.1.1.ebuild 4173 RMD160 146b9a46d5f274e048d17620aadcf278c85ff2cd SHA1 aaa2dc23d443ebaadedfba1e5fe7859309e169b8 SHA256 1a37870888dcff024271330dfd4d2251a82c6a61211ebd390c04c5281e4e18c2
-MISC ChangeLog 43790 RMD160 57baf4f263e211b6f23c2d550985a87d15310fd6 SHA1 57ec2f0fc15828cb98e405cb3c8cf59868066ef9 SHA256 576ddd62a2c8be1c89ace1e3a469ca0e826a71ca4640da721f4270c072965ceb
+MISC ChangeLog 44206 RMD160 256ae0548632ec778a6f73a35af13ffc35caa377 SHA1 507a75449f4472521ff32696764bd2c147af6d5c SHA256 29f4f368e8b0848c6dafa97ace6707ca070f77163afd2e68ca66f5f1376f865a
 MISC metadata.xml 670 RMD160 af633c7a38fd8d4fce77e2e05836d38c3ecccf54 SHA1 a463ce81e4784cb35f53a5fb7551a508fa5fce19 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7hk4UACgkQiqiDRvmkBmJ2UQCeIvZSDwQlvWHfdvReNVBl/ORJ
-wrMAoI1pdzEMdv5UmZQieHFK+EsD/1g/
-=4ig4
+iQEcBAEBAgAGBQJO4isaAAoJEEdUh39IaPFN0NAIAI/pZClDzHLtW6+yqR0hrv+y
+rnqK2gDeGIjl/+6sgFrgau+rf+rev2gwh3K3R+Y+qfdb6sGoCAqRmoA2Kuso2SCP
+cxivOXjVTnvUwRfLvhTJVcFYtcTRbVZ05rC7IRBmekGMC8bWM6HA0dCDBNNFoher
+rpRR5LDv515pMzbXFO7zjQeFwfkvUFp5PvqXfAXQPm1/HMHMA4qTJwcSu3bmBxQI
+5hbdxut2WN2lW+eNlXp8TnkOskNhrbn0eolCAD7hu9iXeBr//GWoxvOqTrX5WqWj
+Ou1CXnhw5Z2gJQl6ZxIt6/vWMSvjMu1Di8PV5dMZ03B0DakwTS6cVgqXPVXs95U=
+=ijx2
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch
deleted file mode 100644
index cb0ce4370121..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur wxPython-src-2.6.3.3-orig/Makefile.in wxPython-src-2.6.3.3/Makefile.in
---- wxPython-src-2.6.3.3-orig/Makefile.in	2007-02-25 17:08:11.000000000 -0600
-+++ wxPython-src-2.6.3.3/Makefile.in	2007-02-25 17:20:46.000000000 -0600
-@@ -1081,8 +1081,8 @@
- 	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
- 	$(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
- 	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
--	-DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CPPFLAGS) \
--	$(CXXFLAGS)
-+	-DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT \
-+	$(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
- ODBCDLL_OBJECTS =  \
- 	$(__odbcdll___win32rc) \
- 	odbcdll_db.o \
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch
deleted file mode 100644
index ad5dae3f502c..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naur wxPython-src-2.6.4.0-orig/Makefile.in wxPython-src-2.6.4.0/Makefile.in
---- wxPython-src-2.6.4.0-orig/Makefile.in	2007-12-17 19:38:16.000000000 -0600
-+++ wxPython-src-2.6.4.0/Makefile.in	2007-12-17 19:41:49.000000000 -0600
-@@ -26,6 +26,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_DIR = @INSTALL_DIR@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- BK_DEPS = @BK_DEPS@
- BK_MAKE_PCH = @BK_MAKE_PCH@
- srcdir = @srcdir@
-@@ -9534,10 +9535,9 @@
- 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) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
- install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
--	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \
-+	do $(INSTALL_DATA)  $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
- 	for f in setup.h $(RCDEFS_H); do \
- 	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
-@@ -10215,8 +10215,8 @@
- install-wxconfig: 
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
--	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-+	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
-+	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
- 
- locale_install: 
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -10224,7 +10224,7 @@
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- 	if test -f $(srcdir)/locale/$$l.mo ; then \
--	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
- 	fi ; \
- 	done
- 
-diff -Naur wxPython-src-2.6.4.0-orig/src/common/intl.cpp wxPython-src-2.6.4.0/src/common/intl.cpp
---- wxPython-src-2.6.4.0-orig/src/common/intl.cpp	2007-03-20 09:25:41.000000000 -0600
-+++ wxPython-src-2.6.4.0/src/common/intl.cpp	2007-12-17 19:39:44.000000000 -0600
-@@ -1452,6 +1452,8 @@
-   m_initialized = false;
- }
- 
-+#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
-+
- // NB: this function has (desired) side effect of changing current locale
- bool wxLocale::Init(const wxChar *szName,
-                     const wxChar *szShort,
-@@ -1520,7 +1522,7 @@
-   bool bOk = true;
-   if ( bLoadDefault )
-   {
--    bOk = AddCatalog(wxT("wxstd"));
-+    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
- 
-     // there may be a catalog with toolkit specific overrides, it is not
-     // an error if this does not exist
-diff -Naur wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in wxPython-src-2.6.4.0/utils/wxrc/Makefile.in
---- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in	2007-12-17 19:38:16.000000000 -0600
-+++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in	2007-12-17 19:39:44.000000000 -0600
-@@ -125,7 +125,6 @@
- @COND_USE_XRC_1@	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- @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.6.4-mmedia.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4-mmedia.patch
deleted file mode 100644
index 0f0ba8f42f9b..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.6.4-mmedia.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur wxPython-src-2.6.4.0-orig/contrib/src/Makefile.in wxPython-src-2.6.4.0/contrib/src/Makefile.in
---- wxPython-src-2.6.4.0-orig/contrib/src/Makefile.in	2004-09-24 10:57:49.000000000 -0600
-+++ wxPython-src-2.6.4.0/contrib/src/Makefile.in	2008-06-28 22:00:31.000000000 -0600
-@@ -1,6 +1,6 @@
- # $Id: wxGTK-2.6.4-mmedia.patch,v 1.1 2008/06/29 04:31:59 dirtyepic Exp $
- 
--CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet
-+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated animate #applet mmedia
- 
- all:
- 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-g_free.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4.0-g_free.patch
deleted file mode 100644
index 49296d23f214..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-g_free.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-In >=gtk+-2.11 GtkBorder uses GSlice, and using g_free here will cause
-double free corruption.  Use gtk_border_free instead.
-
-diff -Naur gtk-orig/button.cpp gtk/button.cpp
---- src/gtk-orig/button.cpp	2005-12-15 18:11:43.000000000 -0600
-+++ src/gtk/button.cpp	2007-07-28 20:58:06.000000000 -0600
-@@ -89,7 +89,7 @@
-             right_border += default_border->right;
-             top_border += default_border->top;
-             bottom_border += default_border->bottom;
--            g_free( default_border );
-+            gtk_border_free( default_border );
-         }
- #else
-         left_border = 6;
-diff -Naur gtk-orig/window.cpp gtk/window.cpp
---- src/gtk-orig/window.cpp	2006-08-21 11:09:03.000000000 -0600
-+++ src/gtk/window.cpp	2007-07-28 20:58:36.000000000 -0600
-@@ -3273,7 +3273,7 @@
-                 right_border += default_border->right;
-                 top_border += default_border->top;
-                 bottom_border += default_border->bottom;
--                g_free( default_border );
-+                gtk_border_free( default_border );
-             }
- #else
-             left_border = 6;
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch
deleted file mode 100644
index e9db3480b0f0..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.6.4.0-wxrc_link_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in wxPython-src-2.6.4.0/utils/wxrc/Makefile.in
---- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in	2007-09-01 15:03:10.000000000 -0600
-+++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in	2007-09-01 15:06:56.000000000 -0600
-@@ -117,7 +117,7 @@
- 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
- 
- @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
--@COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
-+@COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS)   -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(LDFLAGS) $(EXTRALIBS_FOR_BASE)
- @COND_USE_XRC_1@	
- @COND_USE_XRC_1@	$(__wxrc___mac_setfilecmd)
- 
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-CVE-2009-2369.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-CVE-2009-2369.patch
deleted file mode 100644
index 42392c8bb3d4..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-CVE-2009-2369.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naurp wxPython-src-2.8.10.1-orig/src/common/imagpng.cpp wxPython-src-2.8.10.1/src/common/imagpng.cpp
---- wxPython-src-2.8.10.1-orig/src/common/imagpng.cpp	2008-05-11 22:26:45.000000000 -0600
-+++ wxPython-src-2.8.10.1/src/common/imagpng.cpp	2009-07-18 19:54:13.128547627 -0600
-@@ -568,18 +568,16 @@ wxPNGHandler::LoadFile(wxImage *image,
-     if (!image->Ok())
-         goto error;
- 
--    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
-+    // initialize all line pointers to NULL to ensure that they can be safely
-+    // free()d if an error occurs before all of them could be allocated
-+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
-     if ( !lines )
-         goto error;
- 
-     for (i = 0; i < height; i++)
-     {
-         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
--        {
--            for ( unsigned int n = 0; n < i; n++ )
--                free( lines[n] );
-             goto error;
--        }
-     }
- 
-     png_read_image( png_ptr, lines );
-diff -Naurp wxPython-src-2.8.10.1-orig/src/common/imagtiff.cpp wxPython-src-2.8.10.1/src/common/imagtiff.cpp
---- wxPython-src-2.8.10.1-orig/src/common/imagtiff.cpp	2007-09-21 14:27:05.000000000 -0600
-+++ wxPython-src-2.8.10.1/src/common/imagtiff.cpp	2009-07-18 19:54:35.801832862 -0600
-@@ -261,7 +261,6 @@ bool wxTIFFHandler::LoadFile( wxImage *i
-     }
- 
-     uint32 w, h;
--    uint32 npixels;
-     uint32 *raster;
- 
-     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
-@@ -275,9 +274,20 @@ bool wxTIFFHandler::LoadFile( wxImage *i
-                            (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
-                             samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
- 
--    npixels = w * h;
-+    // guard against integer overflow during multiplication which could result
-+    // in allocating a too small buffer and then overflowing it
-+    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
-+    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-+    {
-+        if ( verbose )
-+            wxLogError( _("TIFF: Image size is abnormally big.") );
-+
-+        TIFFClose(tif);
-+
-+        return false;
-+    }
- 
--    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
-+    raster = (uint32*) _TIFFmalloc( bytesNeeded );
- 
-     if (!raster)
-     {
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch
deleted file mode 100644
index b875cb814ad6..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- wxPython-src-2.8.10.1-orig/src/gtk/gsockgtk.cpp
-+++ wxPython-src-2.8.10.1/src/gtk/gsockgtk.cpp
-@@ -15,8 +15,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- 
-+// newer versions of glib define its own GSocket but we unfortunately use this
-+// name in our own (semi-)public header and so can't change it -- rename glib
-+// one instead
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
- #include <glib.h>
-+#undef GSocket
- 
- #include "wx/gsocket.h"
- #include "wx/unix/gsockunx.h"
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch
deleted file mode 100644
index ab9e48419e4f..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/301143
-http://trac.wxwidgets.org/ticket/11315
-
-diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
-index c203f08..3ccf82f 100644
---- a/src/gtk/app.cpp
-+++ b/src/gtk/app.cpp
-@@ -149,9 +149,11 @@ extern "C"
- // One-shot emission hook for "event" signal, to install idle handler.
- // This will be called when the "event" signal is issued on any GtkWidget object.
- static gboolean
--event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
-+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)
- {
-     wxapp_install_idle_handler();
-+    bool* hook_installed = (bool*)data;
-+    *hook_installed = false;
-     // remove hook
-     return false;
- }
-@@ -159,12 +161,17 @@ event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
- // add emission hook for "event" signal, to re-install idle handler when needed
- static inline void wxAddEmissionHook()
- {
-+    static bool hook_installed;
-     GType widgetType = GTK_TYPE_WIDGET;
--    // if GtkWidget type is loaded
--    if (g_type_class_peek(widgetType) != NULL)
-+    // if hook not installed and GtkWidget type is loaded
-+    if (!hook_installed && g_type_class_peek(widgetType))
-     {
--        guint sig_id = g_signal_lookup("event", widgetType);
--        g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
-+        static guint sig_id;
-+        if (sig_id == 0)
-+            sig_id = g_signal_lookup("event", widgetType);
-+        hook_installed = true;
-+        g_signal_add_emission_hook(
-+            sig_id, 0, event_emission_hook, &hook_installed, NULL);
-     }
- }
- 
diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
deleted file mode 100644
index 86d32a18f4ff..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.14 2011/11/12 13:55:52 jlec Exp $
-
-EAPI=1
-inherit eutils versionator flag-o-matic
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
-HOMEPAGE="http://wxwidgets.org/"
-
-BASE_PV="$(get_version_component_range 1-3)"
-BASE_P="${PN}-${BASE_PV}"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
-		doc? ( mirror://sourceforge/wxwindows/wxWidgets-${BASE_PV}-HTML.tar.gz )"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="X doc debug gnome odbc opengl pch sdl unicode"
-
-RDEPEND="
-	dev-libs/expat
-	odbc?	( dev-db/unixODBC )
-	sdl?	( media-libs/libsdl )
-	X?	(
-		dev-libs/glib:2
-		media-libs/libpng:0
-		media-libs/tiff:0
-		sys-libs/zlib
-		virtual/jpeg
-		x11-libs/gtk+:2
-		x11-libs/libSM
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		gnome?	( gnome-base/libgnomeprintui )
-		opengl?	( virtual/opengl )
-		)"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		X?	(
-			x11-proto/xproto
-			x11-proto/xineramaproto
-			x11-proto/xf86vidmodeproto
-			)"
-
-PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
-
-SLOT="2.6"
-LICENSE="wxWinLL-3
-		GPL-2
-		odbc? ( LGPL-2 )
-		doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-HTML_S="${WORKDIR}/wxWidgets-${BASE_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e 's:voidp:png_voidp:' src/common/imagpng.cpp || die # Bug 380833
-
-	# General Patches
-
-	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
-	epatch "${FILESDIR}"/${BASE_P}-collision.patch
-	epatch "${FILESDIR}"/${BASE_P}-mmedia.patch				# Bug #174874
-	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch  # Bug #310923
-
-	# Patches Specific to this version
-
-	epatch "${FILESDIR}"/${P}-wxrc_link_fix.patch
-	epatch "${FILESDIR}"/${P}-g_free.patch
-	epatch "${FILESDIR}"/${PN}-2.8.10.1-CVE-2009-2369.patch
-	epatch "${FILESDIR}"/${PN}-2.8.10.1-gsocket.patch
-
-	# Reverse apply patch in wxPython tarball that breaks ABI
-	EPATCH_SINGLE_MSG="Reversing listctrl-ongetitemcolumnimage.patch ..." \
-		EPATCH_OPTS="-R" epatch "${S}"/patches/listctrl-ongetitemcolumnimage.patch
-
-	# wxBase has an automagic sdl dependency.  short circuit it here.
-	# http://bugs.gentoo.org/show_bug.cgi?id=91574
-	use sdl || sed -i -e 's:$wxUSE_LIBSDL" != "no":$wxUSE_LIBSDL" = "yes":' configure
-
-	# Fix for >=libpng-1.4.0.  Bug #305119.
-	sed -i -e 's:png_check_sig:png_sig_cmp:g' "${S}"/configure
-}
-
-src_compile() {
-	local myconf
-
-	append-flags -fno-strict-aliasing
-
-	# X independent options
-	myconf="--enable-shared
-			--enable-compat24
-			--with-regex=builtin
-			--with-zlib=sys
-			--with-expat
-			$(use_enable pch precomp-headers)
-			$(use_with sdl)
-			$(use_with odbc)"
-
-	# wxGTK only
-	use X && \
-		myconf="${myconf}
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-libtiff=sys
-			$(use_enable opengl)
-			$(use_with opengl)
-			$(use_with gnome gnomeprint)"
-
-	# wxBase only
-	use X || \
-		myconf="${myconf}
-			--disable-gui"
-
-	# in 2.6 we always build ansi
-	# everything else is controlled by USE
-	if ! use debug; then
-		build_wx ansi
-	else
-		build_wx ansi-debug
-	fi
-
-	if use unicode; then
-		if ! use debug; then
-			build_wx unicode
-		else
-			build_wx unicode-debug
-		fi
-	fi
-}
-
-src_install() {
-	# Note - the last version to be installed becomes the default, so install
-	# ansi after unicode
-	install_wx unicode
-	install_wx unicode-debug
-	install_wx ansi
-	install_wx ansi-debug
-
-	dodoc "${S}"/docs/changes.txt
-	dodoc "${S}"/docs/gtk/readme.txt
-
-	if use doc; then
-		dohtml -r "${HTML_S}"/docs/html/*
-	fi
-
-	# We don't want this
-	rm "${D}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo
-}
-
-pkg_postinst() {
-	has_version app-admin/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-admin/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-build_wx() {
-	local build_wx_conf
-
-	case "$1" in
-		ansi)
-			build_wx_conf="${build_wx_conf}
-			--disable-unicode"
-		;;
-
-		ansi-debug)
-			build_wx_conf="${build_wx_conf}
-			--disable-unicode
-			--enable-debug_flag"
-		;;
-
-		unicode)
-			build_wx_conf="${build_wx_conf}
-			--enable-unicode"
-		;;
-
-		unicode-debug)
-			build_wx_conf="${build_wx_conf}
-			--enable-unicode
-			--enable-debug_flag"
-		;;
-
-		*)
-			eerror "wxlib.class: build_wx called with invalid argument(s)."
-			die "wxlib.class: build_wx called with invalid argument(s)."
-		;;
-	esac
-
-	mkdir -p build_$1
-	pushd build_$1
-
-	ECONF_SOURCE="${S}" econf \
-		${myconf} \
-		${build_wx_conf}
-
-	emake || die "Failed to make $1."
-
-	if [[ -e contrib/src ]]; then
-		cd contrib/src
-		emake || die "Failed to make $1 contrib."
-	fi
-
-	popd
-}
-
-install_wx() {
-	if [[ -d build_$1 ]]; then
-		pushd build_$1
-		emake DESTDIR="${D}" install || die "Failed to install $1."
-		if [[ -e contrib/src ]]; then
-			cd contrib/src
-			emake DESTDIR="${D}" install || die "Failed to install $1 contrib."
-		fi
-		popd
-	fi
-}